From 8893981749817b64745ed0a13471376c1182416c Mon Sep 17 00:00:00 2001 From: Mayank77maruti Date: Fri, 21 Feb 2025 16:34:23 +0000 Subject: [PATCH 01/73] initial push --- d2graph/cyclediagram.go | 7 + d2layouts/d2cycle/layout.go | 242 +++ d2layouts/d2layouts.go | 10 + d2renderers/d2svg/d2svg.go | 90 +- d2target/d2target.go | 3 + .../txtar/cycle-diagram/dagre/board.exp.json | 1495 +++++++++++++++++ .../txtar/cycle-diagram/dagre/sketch.exp.svg | 103 ++ .../txtar/cycle-diagram/elk/board.exp.json | 1495 +++++++++++++++++ .../txtar/cycle-diagram/elk/sketch.exp.svg | 103 ++ e2etests/txtar.txt | 14 + lib/geo/point.go | 8 + 11 files changed, 3550 insertions(+), 20 deletions(-) create mode 100644 d2graph/cyclediagram.go create mode 100644 d2layouts/d2cycle/layout.go create mode 100644 e2etests/testdata/txtar/cycle-diagram/dagre/board.exp.json create mode 100644 e2etests/testdata/txtar/cycle-diagram/dagre/sketch.exp.svg create mode 100644 e2etests/testdata/txtar/cycle-diagram/elk/board.exp.json create mode 100644 e2etests/testdata/txtar/cycle-diagram/elk/sketch.exp.svg diff --git a/d2graph/cyclediagram.go b/d2graph/cyclediagram.go new file mode 100644 index 0000000000..1014dd1e81 --- /dev/null +++ b/d2graph/cyclediagram.go @@ -0,0 +1,7 @@ +package d2graph + +import "oss.terrastruct.com/d2/d2target" + +func (obj *Object) IsCycleDiagram() bool { + return obj != nil && obj.Shape.Value == d2target.ShapeCycleDiagram +} \ No newline at end of file diff --git a/d2layouts/d2cycle/layout.go b/d2layouts/d2cycle/layout.go new file mode 100644 index 0000000000..db489bf95c --- /dev/null +++ b/d2layouts/d2cycle/layout.go @@ -0,0 +1,242 @@ +package d2cycle + +import ( + "context" + "math" + + "oss.terrastruct.com/d2/d2graph" + "oss.terrastruct.com/d2/lib/geo" + "oss.terrastruct.com/d2/lib/label" + "oss.terrastruct.com/util-go/go2" +) + +const ( + MIN_RADIUS = 200 + PADDING = 20 + MIN_SEGMENT_LEN = 10 + ARC_STEPS = 30 // high resolution for smooth arcs +) + +// Layout arranges nodes in a circle and routes edges with properly clipped arcs +func Layout(ctx context.Context, g *d2graph.Graph, layout d2graph.LayoutGraph) error { + objects := g.Root.ChildrenArray + if len(objects) == 0 { + return nil + } + + // Position labels and icons first + for _, obj := range g.Objects { + positionLabelsIcons(obj) + } + + // Calculate layout parameters + nodeCircleRadius := calculateRadius(objects) + maxNodeSize := 0.0 + for _, obj := range objects { + size := math.Max(obj.Width, obj.Height) + maxNodeSize = math.Max(maxNodeSize, size) + } + + // Position nodes in circle + positionObjects(objects, nodeCircleRadius) + + // Create properly clipped edge arcs + for _, edge := range g.Edges { + createCircularArc(edge, nodeCircleRadius, maxNodeSize) + } + + return nil +} + +func calculateRadius(objects []*d2graph.Object) float64 { + numObjects := float64(len(objects)) + maxSize := 0.0 + for _, obj := range objects { + size := math.Max(obj.Width, obj.Height) + maxSize = math.Max(maxSize, size) + } + minRadius := (maxSize/2 + PADDING) / math.Sin(math.Pi/numObjects) + return math.Max(minRadius, MIN_RADIUS) +} + +func positionObjects(objects []*d2graph.Object, radius float64) { + numObjects := float64(len(objects)) + angleOffset := -math.Pi / 2 // Start at top + + for i, obj := range objects { + angle := angleOffset + (2*math.Pi*float64(i))/numObjects + x := radius * math.Cos(angle) + y := radius * math.Sin(angle) + + // Center object at calculated position + obj.TopLeft = geo.NewPoint( + x-obj.Width/2, + y-obj.Height/2, + ) + } +} + +func createCircularArc(edge *d2graph.Edge, nodeCircleRadius, maxNodeSize float64) { + if edge.Src == nil || edge.Dst == nil { + return + } + + srcCenter := edge.Src.Center() + dstCenter := edge.Dst.Center() + + // Calculate arc radius outside node circle + arcRadius := nodeCircleRadius + maxNodeSize/2 + PADDING + + // Calculate angles for arc endpoints + srcAngle := math.Atan2(srcCenter.Y, srcCenter.X) + dstAngle := math.Atan2(dstCenter.Y, dstCenter.X) + if dstAngle < srcAngle { + dstAngle += 2 * math.Pi + } + + // Generate arc path points + path := make([]*geo.Point, 0, ARC_STEPS+1) + for i := 0; i <= ARC_STEPS; i++ { + t := float64(i) / ARC_STEPS + angle := srcAngle + t*(dstAngle-srcAngle) + x := arcRadius * math.Cos(angle) + y := arcRadius * math.Sin(angle) + path = append(path, geo.NewPoint(x, y)) + } + + // Set exact endpoints (will be clipped later) + path[0] = srcCenter + path[len(path)-1] = dstCenter + + // Clip path to node borders + edge.Route = path + startIndex, endIndex := edge.TraceToShape(edge.Route, 0, len(edge.Route)-1) + if startIndex < endIndex { + edge.Route = edge.Route[startIndex : endIndex+1] + } + edge.IsCurve = true +} + +// clampPointOutsideBox walks forward from 'startIdx' until the path segment +// leaves the bounding box. Then it sets path[startIdx] to the intersection. +// If we never find it, we return (startIdx, path[startIdx]) meaning we can't clamp. +func clampPointOutsideBox(box *geo.Box, path []*geo.Point, startIdx int) (int, *geo.Point) { + if startIdx >= len(path)-1 { + return startIdx, path[startIdx] + } + // If path[startIdx] is outside, no clamp needed + if !boxContains(box, path[startIdx]) { + return startIdx, path[startIdx] + } + + // Walk forward looking for outside + for i := startIdx + 1; i < len(path); i++ { + insideNext := boxContains(box, path[i]) + if insideNext { + // still inside -> keep going + continue + } + // crossing from inside to outside between path[i-1], path[i] + seg := geo.NewSegment(path[i-1], path[i]) + inters := boxIntersections(box, *seg) + if len(inters) > 0 { + // use first intersection + return i, inters[0] + } + // fallback => no intersection found + return i, path[i] + } + // entire remainder is inside, so we can't clamp + // Just return the end + last := len(path) - 1 + return last, path[last] +} + +// clampPointOutsideBoxReverse scans backward from endIdx while path[j] is in the box. +// Once we find crossing (outside→inside), we return (j, intersection). +func clampPointOutsideBoxReverse(box *geo.Box, path []*geo.Point, endIdx int) (int, *geo.Point) { + if endIdx <= 0 { + return endIdx, path[endIdx] + } + if !boxContains(box, path[endIdx]) { + // already outside + return endIdx, path[endIdx] + } + + for j := endIdx - 1; j >= 0; j-- { + if boxContains(box, path[j]) { + continue + } + // crossing from outside -> inside between path[j], path[j+1] + seg := geo.NewSegment(path[j], path[j+1]) + inters := boxIntersections(box, *seg) + if len(inters) > 0 { + return j, inters[0] + } + return j, path[j] + } + + // entire path inside + return 0, path[0] +} + +// Helper if your geo.Box doesn’t implement Contains() +func boxContains(b *geo.Box, p *geo.Point) bool { + // typical bounding-box check + return p.X >= b.TopLeft.X && + p.X <= b.TopLeft.X+b.Width && + p.Y >= b.TopLeft.Y && + p.Y <= b.TopLeft.Y+b.Height +} + +// Helper if your geo.Box doesn’t implement Intersections(geo.Segment) yet +func boxIntersections(b *geo.Box, seg geo.Segment) []*geo.Point { + // We'll assume d2's standard geo.Box has a built-in Intersections(*Segment) method. + // If not, implement manually. For example, checking each of the 4 edges: + // left, right, top, bottom + // For simplicity, if you do have b.Intersections(...) you can just do: + // return b.Intersections(seg) + return b.Intersections(seg) + // If you don't have that, you'd code the line-rect intersection yourself. +} + +// positionLabelsIcons is basically your logic that sets default label/icon positions if needed +func positionLabelsIcons(obj *d2graph.Object) { + // If there's an icon but no icon position, give it a default + if obj.Icon != nil && obj.IconPosition == nil { + if len(obj.ChildrenArray) > 0 { + obj.IconPosition = go2.Pointer(label.OutsideTopLeft.String()) + if obj.LabelPosition == nil { + obj.LabelPosition = go2.Pointer(label.OutsideTopRight.String()) + return + } + } else if obj.SQLTable != nil || obj.Class != nil || obj.Language != "" { + obj.IconPosition = go2.Pointer(label.OutsideTopLeft.String()) + } else { + obj.IconPosition = go2.Pointer(label.InsideMiddleCenter.String()) + } + } + + // If there's a label but no label position, give it a default + if obj.HasLabel() && obj.LabelPosition == nil { + if len(obj.ChildrenArray) > 0 { + obj.LabelPosition = go2.Pointer(label.OutsideTopCenter.String()) + } else if obj.HasOutsideBottomLabel() { + obj.LabelPosition = go2.Pointer(label.OutsideBottomCenter.String()) + } else if obj.Icon != nil { + obj.LabelPosition = go2.Pointer(label.InsideTopCenter.String()) + } else { + obj.LabelPosition = go2.Pointer(label.InsideMiddleCenter.String()) + } + + // If the label is bigger than the shape, fallback to outside positions + if float64(obj.LabelDimensions.Width) > obj.Width || + float64(obj.LabelDimensions.Height) > obj.Height { + if len(obj.ChildrenArray) > 0 { + obj.LabelPosition = go2.Pointer(label.OutsideTopCenter.String()) + } else { + obj.LabelPosition = go2.Pointer(label.OutsideBottomCenter.String()) + } + } + } +} \ No newline at end of file diff --git a/d2layouts/d2layouts.go b/d2layouts/d2layouts.go index 87874a6b41..d4dc1ad812 100644 --- a/d2layouts/d2layouts.go +++ b/d2layouts/d2layouts.go @@ -9,6 +9,7 @@ import ( "strings" "oss.terrastruct.com/d2/d2graph" + "oss.terrastruct.com/d2/d2layouts/d2cycle" "oss.terrastruct.com/d2/d2layouts/d2grid" "oss.terrastruct.com/d2/d2layouts/d2near" "oss.terrastruct.com/d2/d2layouts/d2sequence" @@ -26,6 +27,7 @@ const ( ConstantNearGraph DiagramType = "constant-near" GridDiagram DiagramType = "grid-diagram" SequenceDiagram DiagramType = "sequence-diagram" + CycleDiagram DiagramType = "cycle-diagram" ) type GraphInfo struct { @@ -260,6 +262,12 @@ func LayoutNested(ctx context.Context, g *d2graph.Graph, graphInfo GraphInfo, co if err != nil { return err } + case CycleDiagram: + log.Debug(ctx, "layout sequence", slog.Any("rootlevel", g.RootLevel), slog.Any("shapes", g.PrintString())) + err = d2cycle.Layout(ctx, g, coreLayout) + if err != nil { + return err + } default: log.Debug(ctx, "default layout", slog.Any("rootlevel", g.RootLevel), slog.Any("shapes", g.PrintString())) err := coreLayout(ctx, g) @@ -360,6 +368,8 @@ func NestedGraphInfo(obj *d2graph.Object) (gi GraphInfo) { gi.DiagramType = SequenceDiagram } else if obj.IsGridDiagram() { gi.DiagramType = GridDiagram + } else if obj.IsCycleDiagram() { + gi.DiagramType = CycleDiagram } return gi } diff --git a/d2renderers/d2svg/d2svg.go b/d2renderers/d2svg/d2svg.go index 153b7b3451..a42ee3681b 100644 --- a/d2renderers/d2svg/d2svg.go +++ b/d2renderers/d2svg/d2svg.go @@ -452,37 +452,78 @@ func getArrowheadAdjustments(connection d2target.Connection, idToShape map[strin func pathData(connection d2target.Connection, srcAdj, dstAdj *geo.Point) string { var path []string route := connection.Route + if len(route) == 0 { + return "" + } + // Move command to start path = append(path, fmt.Sprintf("M %f %f", route[0].X+srcAdj.X, route[0].Y+srcAdj.Y, )) if connection.IsCurve { + // If we don't have enough points to do triple-step, handle small fallback + if len(route) < 3 { + // If only 1 or 2 points in route, just draw lines + for _, p := range route[1:] { + path = append(path, fmt.Sprintf("L %f %f", + p.X+dstAdj.X, p.Y+dstAdj.Y, + )) + } + return strings.Join(path, " ") + } + i := 1 - for ; i < len(route)-3; i += 3 { + // Process triple curves in steps of 3 + for ; i+2 < len(route)-1; i += 3 { path = append(path, fmt.Sprintf("C %f %f %f %f %f %f", route[i].X, route[i].Y, route[i+1].X, route[i+1].Y, route[i+2].X, route[i+2].Y, )) } - // final curve target adjustment - path = append(path, fmt.Sprintf("C %f %f %f %f %f %f", - route[i].X, route[i].Y, - route[i+1].X, route[i+1].Y, - route[i+2].X+dstAdj.X, - route[i+2].Y+dstAdj.Y, - )) + + // Now handle the “final” curve to last point + // Make sure i+2 is still within range + if i+2 < len(route) { + // last triple + path = append(path, fmt.Sprintf("C %f %f %f %f %f %f", + route[i].X, route[i].Y, + route[i+1].X, route[i+1].Y, + route[i+2].X+dstAdj.X, // final point plus dst adjustment + route[i+2].Y+dstAdj.Y, + )) + } else if i+1 < len(route) { + // We have i+1 but not i+2 => do a simpler final curve or line + path = append(path, fmt.Sprintf("C %f %f %f %f %f %f", + route[i].X, route[i].Y, + route[i].X, route[i].Y, // repeated for control + route[i+1].X+dstAdj.X, + route[i+1].Y+dstAdj.Y, + )) + } else { + // We have no final triple => do nothing or fallback line + } } else { + // Not a curve => the "rounded corner" logic for i := 1; i < len(route)-1; i++ { prevSource := route[i-1] prevTarget := route[i] currTarget := route[i+1] + + // Make sure i+1 is valid + if i+1 >= len(route) { + break + } + prevVector := prevSource.VectorTo(prevTarget) currVector := prevTarget.VectorTo(currTarget) - dist := geo.EuclideanDistance(prevTarget.X, prevTarget.Y, currTarget.X, currTarget.Y) + dist := geo.EuclideanDistance( + prevTarget.X, prevTarget.Y, + currTarget.X, currTarget.Y, + ) connectionBorderRadius := connection.BorderRadius units := math.Min(connectionBorderRadius, dist/2) @@ -490,20 +531,26 @@ func pathData(connection d2target.Connection, srcAdj, dstAdj *geo.Point) string prevTranslations := prevVector.Unit().Multiply(units).ToPoint() currTranslations := currVector.Unit().Multiply(units).ToPoint() + // Move to corner with "L" path = append(path, fmt.Sprintf("L %f %f", prevTarget.X-prevTranslations.X, prevTarget.Y-prevTranslations.Y, )) - // If the segment length is too small, instead of drawing 2 arcs, just skip this segment and bezier curve to the next one if units < connectionBorderRadius && i < len(route)-2 { + // Next checks i+2 => ensure it’s in range + if i+2 >= len(route) { + // can't do nextTarget => break or do fallback + continue + } nextTarget := route[i+2] - nextVector := geo.NewVector(nextTarget.X-currTarget.X, nextTarget.Y-currTarget.Y) - i++ + nextVector := geo.NewVector( + nextTarget.X-currTarget.X, + nextTarget.Y-currTarget.Y, + ) + i++ // skip next point nextTranslations := nextVector.Unit().Multiply(units).ToPoint() - // These 2 bezier control points aren't just at the corner -- they are reflected at the corner, which causes the curve to be ~tangent to the corner, - // which matches how the two arcs look path = append(path, fmt.Sprintf("C %f %f %f %f %f %f", // Control point prevTarget.X+prevTranslations.X, @@ -511,7 +558,7 @@ func pathData(connection d2target.Connection, srcAdj, dstAdj *geo.Point) string // Control point currTarget.X-nextTranslations.X, currTarget.Y-nextTranslations.Y, - // Where curve ends + // End currTarget.X+nextTranslations.X, currTarget.Y+nextTranslations.Y, )) @@ -525,11 +572,14 @@ func pathData(connection d2target.Connection, srcAdj, dstAdj *geo.Point) string } } - lastPoint := route[len(route)-1] - path = append(path, fmt.Sprintf("L %f %f", - lastPoint.X+dstAdj.X, - lastPoint.Y+dstAdj.Y, - )) + // Finally, draw a line to the last route point + dst offset + if len(route) > 1 { + lastPoint := route[len(route)-1] + path = append(path, fmt.Sprintf("L %f %f", + lastPoint.X+dstAdj.X, + lastPoint.Y+dstAdj.Y, + )) + } } return strings.Join(path, " ") diff --git a/d2target/d2target.go b/d2target/d2target.go index 266e0f184e..68e7eb3313 100644 --- a/d2target/d2target.go +++ b/d2target/d2target.go @@ -942,6 +942,7 @@ const ( ShapeSQLTable = "sql_table" ShapeImage = "image" ShapeSequenceDiagram = "sequence_diagram" + ShapeCycleDiagram = "cycle" ShapeHierarchy = "hierarchy" ) @@ -969,6 +970,7 @@ var Shapes = []string{ ShapeSQLTable, ShapeImage, ShapeSequenceDiagram, + ShapeCycleDiagram, ShapeHierarchy, } @@ -1037,6 +1039,7 @@ var DSL_SHAPE_TO_SHAPE_TYPE = map[string]string{ ShapeSQLTable: shape.TABLE_TYPE, ShapeImage: shape.IMAGE_TYPE, ShapeSequenceDiagram: shape.SQUARE_TYPE, + ShapeCycleDiagram: shape.SQUARE_TYPE, ShapeHierarchy: shape.SQUARE_TYPE, } diff --git a/e2etests/testdata/txtar/cycle-diagram/dagre/board.exp.json b/e2etests/testdata/txtar/cycle-diagram/dagre/board.exp.json new file mode 100644 index 0000000000..575de37120 --- /dev/null +++ b/e2etests/testdata/txtar/cycle-diagram/dagre/board.exp.json @@ -0,0 +1,1495 @@ +{ + "name": "", + "config": { + "sketch": false, + "themeID": 0, + "darkThemeID": null, + "pad": null, + "center": null, + "layoutEngine": null + }, + "isFolderOnly": false, + "fontFamily": "SourceSansPro", + "shapes": [ + { + "id": "1", + "type": "cycle", + "pos": { + "x": 0, + "y": 0 + }, + "width": 453, + "height": 466, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "N7", + "stroke": "B1", + "animated": false, + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "", + "fontSize": 28, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": false, + "underline": false, + "labelWidth": 0, + "labelHeight": 0, + "zIndex": 0, + "level": 1 + }, + { + "id": "1.a", + "type": "rectangle", + "pos": { + "x": -26, + "y": -233 + }, + "width": 53, + "height": 66, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "B5", + "stroke": "B1", + "animated": false, + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "a", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": true, + "underline": false, + "labelWidth": 8, + "labelHeight": 21, + "labelPosition": "INSIDE_MIDDLE_CENTER", + "zIndex": 0, + "level": 2 + }, + { + "id": "1.b", + "type": "rectangle", + "pos": { + "x": 173, + "y": -33 + }, + "width": 53, + "height": 66, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "B5", + "stroke": "B1", + "animated": false, + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "b", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": true, + "underline": false, + "labelWidth": 8, + "labelHeight": 21, + "labelPosition": "INSIDE_MIDDLE_CENTER", + "zIndex": 0, + "level": 2 + }, + { + "id": "1.c", + "type": "rectangle", + "pos": { + "x": -26, + "y": 167 + }, + "width": 53, + "height": 66, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "B5", + "stroke": "B1", + "animated": false, + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "c", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": true, + "underline": false, + "labelWidth": 8, + "labelHeight": 21, + "labelPosition": "INSIDE_MIDDLE_CENTER", + "zIndex": 0, + "level": 2 + }, + { + "id": "1.d", + "type": "rectangle", + "pos": { + "x": -227, + "y": -32 + }, + "width": 54, + "height": 66, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "B5", + "stroke": "B1", + "animated": false, + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "d", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": true, + "underline": false, + "labelWidth": 9, + "labelHeight": 21, + "labelPosition": "INSIDE_MIDDLE_CENTER", + "zIndex": 0, + "level": 2 + }, + { + "id": "2", + "type": "cycle", + "pos": { + "x": 513, + "y": 50 + }, + "width": 399, + "height": 366, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "N7", + "stroke": "B1", + "animated": false, + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "", + "fontSize": 28, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": false, + "underline": false, + "labelWidth": 0, + "labelHeight": 0, + "zIndex": 0, + "level": 1 + }, + { + "id": "2.a", + "type": "rectangle", + "pos": { + "x": 486, + "y": -183 + }, + "width": 53, + "height": 66, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "B5", + "stroke": "B1", + "animated": false, + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "a", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": true, + "underline": false, + "labelWidth": 8, + "labelHeight": 21, + "labelPosition": "INSIDE_MIDDLE_CENTER", + "zIndex": 0, + "level": 2 + }, + { + "id": "2.b", + "type": "rectangle", + "pos": { + "x": 659, + "y": 116 + }, + "width": 53, + "height": 66, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "B5", + "stroke": "B1", + "animated": false, + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "b", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": true, + "underline": false, + "labelWidth": 8, + "labelHeight": 21, + "labelPosition": "INSIDE_MIDDLE_CENTER", + "zIndex": 0, + "level": 2 + }, + { + "id": "2.c", + "type": "rectangle", + "pos": { + "x": 313, + "y": 117 + }, + "width": 53, + "height": 66, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "B5", + "stroke": "B1", + "animated": false, + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "c", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": true, + "underline": false, + "labelWidth": 8, + "labelHeight": 21, + "labelPosition": "INSIDE_MIDDLE_CENTER", + "zIndex": 0, + "level": 2 + }, + { + "id": "3", + "type": "cycle", + "pos": { + "x": 972, + "y": 0 + }, + "width": 53, + "height": 466, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "N7", + "stroke": "B1", + "animated": false, + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "", + "fontSize": 28, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": false, + "underline": false, + "labelWidth": 0, + "labelHeight": 0, + "zIndex": 0, + "level": 1 + }, + { + "id": "3.a", + "type": "rectangle", + "pos": { + "x": 945, + "y": -233 + }, + "width": 53, + "height": 66, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "B5", + "stroke": "B1", + "animated": false, + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "a", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": true, + "underline": false, + "labelWidth": 8, + "labelHeight": 21, + "labelPosition": "INSIDE_MIDDLE_CENTER", + "zIndex": 0, + "level": 2 + }, + { + "id": "3.b", + "type": "rectangle", + "pos": { + "x": 945, + "y": 167 + }, + "width": 53, + "height": 66, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "B5", + "stroke": "B1", + "animated": false, + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "b", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": true, + "underline": false, + "labelWidth": 8, + "labelHeight": 21, + "labelPosition": "INSIDE_MIDDLE_CENTER", + "zIndex": 0, + "level": 2 + } + ], + "connections": [ + { + "id": "1.(a -> b)[0]", + "src": "1.a", + "srcArrow": "none", + "dst": "1.b", + "dstArrow": "triangle", + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "stroke": "B1", + "borderRadius": 10, + "label": "", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N2", + "italic": true, + "bold": false, + "underline": false, + "labelWidth": 0, + "labelHeight": 0, + "labelPosition": "", + "labelPercentage": 0, + "link": "", + "route": [ + { + "x": 8.239999771118164, + "y": -232.6529998779297 + }, + { + "x": 13.239999771118164, + "y": -252.6529998779297 + }, + { + "x": 26.44499969482422, + "y": -251.61399841308594 + }, + { + "x": 39.57699966430664, + "y": -249.88499450683594 + }, + { + "x": 52.60100173950195, + "y": -247.4709930419922 + }, + { + "x": 65.48100280761719, + "y": -244.37899780273438 + }, + { + "x": 78.18099975585938, + "y": -240.61700439453125 + }, + { + "x": 90.66699981689453, + "y": -236.19500732421875 + }, + { + "x": 102.90399932861328, + "y": -231.1269989013672 + }, + { + "x": 114.85900115966797, + "y": -225.4239959716797 + }, + { + "x": 126.4990005493164, + "y": -219.10400390625 + }, + { + "x": 137.79299926757812, + "y": -212.18299865722656 + }, + { + "x": 148.70899963378906, + "y": -204.68099975585938 + }, + { + "x": 159.21800231933594, + "y": -196.61700439453125 + }, + { + "x": 169.2899932861328, + "y": -188.01499938964844 + }, + { + "x": 178.8979949951172, + "y": -178.8979949951172 + }, + { + "x": 188.01499938964844, + "y": -169.2899932861328 + }, + { + "x": 196.61700439453125, + "y": -159.21800231933594 + }, + { + "x": 204.68099975585938, + "y": -148.70899963378906 + }, + { + "x": 212.18299865722656, + "y": -137.79299926757812 + }, + { + "x": 219.10400390625, + "y": -126.5 + }, + { + "x": 225.4239959716797, + "y": -114.85900115966797 + }, + { + "x": 231.1269989013672, + "y": -102.90399932861328 + }, + { + "x": 236.19500732421875, + "y": -90.66699981689453 + }, + { + "x": 240.61700439453125, + "y": -78.18099975585938 + }, + { + "x": 244.37899780273438, + "y": -65.48100280761719 + }, + { + "x": 247.4709930419922, + "y": -52.60100173950195 + }, + { + "x": 249.88499450683594, + "y": -39.57699966430664 + }, + { + "x": 251.61399841308594, + "y": -26.44499969482422 + }, + { + "x": 252.6529998779297, + "y": -13.239999771118164 + }, + { + "x": 226.6529998779297, + "y": -6.239999771118164 + } + ], + "isCurve": true, + "animated": false, + "tooltip": "", + "icon": null, + "zIndex": 0 + }, + { + "id": "1.(b -> c)[0]", + "src": "1.b", + "srcArrow": "none", + "dst": "1.c", + "dstArrow": "triangle", + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "stroke": "B1", + "borderRadius": 10, + "label": "", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N2", + "italic": true, + "bold": false, + "underline": false, + "labelWidth": 0, + "labelHeight": 0, + "labelPosition": "", + "labelPercentage": 0, + "link": "", + "route": [ + { + "x": 226.6529998779297, + "y": 6.239999771118164 + }, + { + "x": 252.6529998779297, + "y": 13.239999771118164 + }, + { + "x": 251.61399841308594, + "y": 26.44499969482422 + }, + { + "x": 249.88499450683594, + "y": 39.57699966430664 + }, + { + "x": 247.4709930419922, + "y": 52.60100173950195 + }, + { + "x": 244.37899780273438, + "y": 65.48100280761719 + }, + { + "x": 240.61700439453125, + "y": 78.18099975585938 + }, + { + "x": 236.19500732421875, + "y": 90.66699981689453 + }, + { + "x": 231.1269989013672, + "y": 102.90399932861328 + }, + { + "x": 225.4239959716797, + "y": 114.85900115966797 + }, + { + "x": 219.10400390625, + "y": 126.4990005493164 + }, + { + "x": 212.18299865722656, + "y": 137.79299926757812 + }, + { + "x": 204.68099975585938, + "y": 148.70899963378906 + }, + { + "x": 196.61700439453125, + "y": 159.21800231933594 + }, + { + "x": 188.01499938964844, + "y": 169.2899932861328 + }, + { + "x": 178.8979949951172, + "y": 178.8979949951172 + }, + { + "x": 169.2899932861328, + "y": 188.01499938964844 + }, + { + "x": 159.21800231933594, + "y": 196.61700439453125 + }, + { + "x": 148.70899963378906, + "y": 204.68099975585938 + }, + { + "x": 137.79299926757812, + "y": 212.18299865722656 + }, + { + "x": 126.5, + "y": 219.10400390625 + }, + { + "x": 114.85900115966797, + "y": 225.4239959716797 + }, + { + "x": 102.90399932861328, + "y": 231.1269989013672 + }, + { + "x": 90.66699981689453, + "y": 236.19500732421875 + }, + { + "x": 78.18099975585938, + "y": 240.61700439453125 + }, + { + "x": 65.48100280761719, + "y": 244.37899780273438 + }, + { + "x": 52.60100173950195, + "y": 247.4709930419922 + }, + { + "x": 39.57699966430664, + "y": 249.88499450683594 + }, + { + "x": 26.44499969482422, + "y": 251.61399841308594 + }, + { + "x": 13.239999771118164, + "y": 252.6529998779297 + }, + { + "x": 8.239999771118164, + "y": 232.6529998779297 + } + ], + "isCurve": true, + "animated": false, + "tooltip": "", + "icon": null, + "zIndex": 0 + }, + { + "id": "1.(c -> d)[0]", + "src": "1.c", + "srcArrow": "none", + "dst": "1.d", + "dstArrow": "triangle", + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "stroke": "B1", + "borderRadius": 10, + "label": "", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N2", + "italic": true, + "bold": false, + "underline": false, + "labelWidth": 0, + "labelHeight": 0, + "labelPosition": "", + "labelPercentage": 0, + "link": "", + "route": [ + { + "x": -8.239999771118164, + "y": 232.6529998779297 + }, + { + "x": -13.239999771118164, + "y": 252.6529998779297 + }, + { + "x": -26.44499969482422, + "y": 251.61399841308594 + }, + { + "x": -39.57699966430664, + "y": 249.88499450683594 + }, + { + "x": -52.60100173950195, + "y": 247.4709930419922 + }, + { + "x": -65.48100280761719, + "y": 244.37899780273438 + }, + { + "x": -78.18099975585938, + "y": 240.61700439453125 + }, + { + "x": -90.66699981689453, + "y": 236.19500732421875 + }, + { + "x": -102.90399932861328, + "y": 231.1269989013672 + }, + { + "x": -114.85900115966797, + "y": 225.4239959716797 + }, + { + "x": -126.4990005493164, + "y": 219.10400390625 + }, + { + "x": -137.79299926757812, + "y": 212.18299865722656 + }, + { + "x": -148.70899963378906, + "y": 204.68099975585938 + }, + { + "x": -159.21800231933594, + "y": 196.61700439453125 + }, + { + "x": -169.2899932861328, + "y": 188.01499938964844 + }, + { + "x": -178.8979949951172, + "y": 178.8979949951172 + }, + { + "x": -188.01499938964844, + "y": 169.2899932861328 + }, + { + "x": -196.61700439453125, + "y": 159.21800231933594 + }, + { + "x": -204.68099975585938, + "y": 148.70899963378906 + }, + { + "x": -212.18299865722656, + "y": 137.79299926757812 + }, + { + "x": -219.10400390625, + "y": 126.5 + }, + { + "x": -225.4239959716797, + "y": 114.85900115966797 + }, + { + "x": -231.1269989013672, + "y": 102.90399932861328 + }, + { + "x": -236.19500732421875, + "y": 90.66699981689453 + }, + { + "x": -240.61700439453125, + "y": 78.18099975585938 + }, + { + "x": -244.37899780273438, + "y": 65.48100280761719 + }, + { + "x": -247.4709930419922, + "y": 52.60100173950195 + }, + { + "x": -249.88499450683594, + "y": 39.57699966430664 + }, + { + "x": -251.61399841308594, + "y": 26.44499969482422 + }, + { + "x": -252.6529998779297, + "y": 13.239999771118164 + }, + { + "x": -226.6529998779297, + "y": 7.239999771118164 + } + ], + "isCurve": true, + "animated": false, + "tooltip": "", + "icon": null, + "zIndex": 0 + }, + { + "id": "2.(a -> b)[0]", + "src": "2.a", + "srcArrow": "none", + "dst": "2.b", + "dstArrow": "triangle", + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "stroke": "B1", + "borderRadius": 10, + "label": "", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N2", + "italic": true, + "bold": false, + "underline": false, + "labelWidth": 0, + "labelHeight": 0, + "labelPosition": "", + "labelPercentage": 0, + "link": "", + "route": [ + { + "x": 523.6480102539062, + "y": -183.38299560546875 + }, + { + "x": 530.6480102539062, + "y": -202.38299560546875 + }, + { + "x": 548.2100219726562, + "y": -200.53700256347656 + }, + { + "x": 565.6010131835938, + "y": -197.4709930419922 + }, + { + "x": 582.7360229492188, + "y": -193.19900512695312 + }, + { + "x": 599.531005859375, + "y": -187.74200439453125 + }, + { + "x": 615.9039916992188, + "y": -181.1269989013672 + }, + { + "x": 631.7760009765625, + "y": -173.38499450683594 + }, + { + "x": 647.0689697265625, + "y": -164.55599975585938 + }, + { + "x": 661.708984375, + "y": -154.68099975585938 + }, + { + "x": 675.625, + "y": -143.8090057373047 + }, + { + "x": 688.7479858398438, + "y": -131.99200439453125 + }, + { + "x": 701.0150146484375, + "y": -119.29000091552734 + }, + { + "x": 712.3660278320312, + "y": -105.76200103759766 + }, + { + "x": 722.7459716796875, + "y": -91.4749984741211 + }, + { + "x": 732.10400390625, + "y": -76.5 + }, + { + "x": 740.3939819335938, + "y": -60.90700149536133 + }, + { + "x": 747.5770263671875, + "y": -44.775001525878906 + }, + { + "x": 753.6170043945312, + "y": -28.180999755859375 + }, + { + "x": 758.4840087890625, + "y": -11.206000328063965 + }, + { + "x": 762.156005859375, + "y": 6.066999912261963 + }, + { + "x": 764.614013671875, + "y": 23.554000854492188 + }, + { + "x": 765.844970703125, + "y": 41.16999816894531 + }, + { + "x": 765.844970703125, + "y": 58.82899856567383 + }, + { + "x": 764.614013671875, + "y": 76.44499969482422 + }, + { + "x": 762.156005859375, + "y": 93.93199920654297 + }, + { + "x": 758.4840087890625, + "y": 111.20600128173828 + }, + { + "x": 753.6170043945312, + "y": 128.18099975585938 + }, + { + "x": 747.5770263671875, + "y": 144.77499389648438 + }, + { + "x": 740.3939819335938, + "y": 160.90699768066406 + }, + { + "x": 712.3939819335938, + "y": 154.90699768066406 + } + ], + "isCurve": true, + "animated": false, + "tooltip": "", + "icon": null, + "zIndex": 0 + }, + { + "id": "2.(b -> c)[0]", + "src": "2.b", + "srcArrow": "none", + "dst": "2.c", + "dstArrow": "triangle", + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "stroke": "B1", + "borderRadius": 10, + "label": "", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N2", + "italic": true, + "bold": false, + "underline": false, + "labelWidth": 0, + "labelHeight": 0, + "labelPosition": "", + "labelPercentage": 0, + "link": "", + "route": [ + { + "x": 712.7459716796875, + "y": 180.47500610351562 + }, + { + "x": 722.7459716796875, + "y": 191.47500610351562 + }, + { + "x": 712.3660278320312, + "y": 205.76199340820312 + }, + { + "x": 701.0150146484375, + "y": 219.2899932861328 + }, + { + "x": 688.7479858398438, + "y": 231.99200439453125 + }, + { + "x": 675.625, + "y": 243.8090057373047 + }, + { + "x": 661.708984375, + "y": 254.68099975585938 + }, + { + "x": 647.0689697265625, + "y": 264.5559997558594 + }, + { + "x": 631.7760009765625, + "y": 273.385009765625 + }, + { + "x": 615.9039916992188, + "y": 281.12701416015625 + }, + { + "x": 599.531005859375, + "y": 287.74200439453125 + }, + { + "x": 582.7360229492188, + "y": 293.1990051269531 + }, + { + "x": 565.6010131835938, + "y": 297.47100830078125 + }, + { + "x": 548.2100219726562, + "y": 300.5369873046875 + }, + { + "x": 530.6480102539062, + "y": 302.38299560546875 + }, + { + "x": 513, + "y": 303 + }, + { + "x": 495.35101318359375, + "y": 302.38299560546875 + }, + { + "x": 477.78900146484375, + "y": 300.5369873046875 + }, + { + "x": 460.39801025390625, + "y": 297.47100830078125 + }, + { + "x": 443.26300048828125, + "y": 293.1990051269531 + }, + { + "x": 426.4679870605469, + "y": 287.74200439453125 + }, + { + "x": 410.0950012207031, + "y": 281.12701416015625 + }, + { + "x": 394.2229919433594, + "y": 273.385009765625 + }, + { + "x": 378.92999267578125, + "y": 264.5559997558594 + }, + { + "x": 364.2900085449219, + "y": 254.68099975585938 + }, + { + "x": 350.3739929199219, + "y": 243.8090057373047 + }, + { + "x": 337.2510070800781, + "y": 231.99200439453125 + }, + { + "x": 324.9840087890625, + "y": 219.2899932861328 + }, + { + "x": 313.63299560546875, + "y": 205.76199340820312 + }, + { + "x": 303.25299072265625, + "y": 191.47500610351562 + }, + { + "x": 313.25299072265625, + "y": 180.47500610351562 + } + ], + "isCurve": true, + "animated": false, + "tooltip": "", + "icon": null, + "zIndex": 0 + }, + { + "id": "3.(a -> b)[0]", + "src": "3.a", + "srcArrow": "none", + "dst": "3.b", + "dstArrow": "triangle", + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "stroke": "B1", + "borderRadius": 10, + "label": "", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N2", + "italic": true, + "bold": false, + "underline": false, + "labelWidth": 0, + "labelHeight": 0, + "labelPosition": "", + "labelPercentage": 0, + "link": "", + "route": [ + { + "x": 988.4450073242188, + "y": -232.61399841308594 + }, + { + "x": 998.4450073242188, + "y": -251.61399841308594 + }, + { + "x": 1024.6009521484375, + "y": -247.4709930419922 + }, + { + "x": 1050.1810302734375, + "y": -240.61700439453125 + }, + { + "x": 1074.904052734375, + "y": -231.1269989013672 + }, + { + "x": 1098.5, + "y": -219.10400390625 + }, + { + "x": 1120.708984375, + "y": -204.68099975585938 + }, + { + "x": 1141.2900390625, + "y": -188.01499938964844 + }, + { + "x": 1160.0150146484375, + "y": -169.2899932861328 + }, + { + "x": 1176.6810302734375, + "y": -148.70899963378906 + }, + { + "x": 1191.10400390625, + "y": -126.5 + }, + { + "x": 1203.126953125, + "y": -102.90399932861328 + }, + { + "x": 1212.616943359375, + "y": -78.18099975585938 + }, + { + "x": 1219.470947265625, + "y": -52.60100173950195 + }, + { + "x": 1223.614013671875, + "y": -26.44499969482422 + }, + { + "x": 1225, + "y": 0 + }, + { + "x": 1223.614013671875, + "y": 26.44499969482422 + }, + { + "x": 1219.470947265625, + "y": 52.60100173950195 + }, + { + "x": 1212.616943359375, + "y": 78.18099975585938 + }, + { + "x": 1203.126953125, + "y": 102.90399932861328 + }, + { + "x": 1191.10400390625, + "y": 126.4990005493164 + }, + { + "x": 1176.6810302734375, + "y": 148.70899963378906 + }, + { + "x": 1160.0150146484375, + "y": 169.2899932861328 + }, + { + "x": 1141.2900390625, + "y": 188.01499938964844 + }, + { + "x": 1120.708984375, + "y": 204.68099975585938 + }, + { + "x": 1098.5, + "y": 219.10400390625 + }, + { + "x": 1074.904052734375, + "y": 231.1269989013672 + }, + { + "x": 1050.1810302734375, + "y": 240.61700439453125 + }, + { + "x": 1024.6009521484375, + "y": 247.4709930419922 + }, + { + "x": 998.4450073242188, + "y": 251.61399841308594 + }, + { + "x": 988.4450073242188, + "y": 232.61399841308594 + } + ], + "isCurve": true, + "animated": false, + "tooltip": "", + "icon": null, + "zIndex": 0 + } + ], + "root": { + "id": "", + "type": "", + "pos": { + "x": 0, + "y": 0 + }, + "width": 0, + "height": 0, + "opacity": 0, + "strokeDash": 0, + "strokeWidth": 0, + "borderRadius": 0, + "fill": "N7", + "stroke": "", + "animated": false, + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "", + "fontSize": 0, + "fontFamily": "", + "language": "", + "color": "", + "italic": false, + "bold": false, + "underline": false, + "labelWidth": 0, + "labelHeight": 0, + "zIndex": 0, + "level": 0 + } +} diff --git a/e2etests/testdata/txtar/cycle-diagram/dagre/sketch.exp.svg b/e2etests/testdata/txtar/cycle-diagram/dagre/sketch.exp.svg new file mode 100644 index 0000000000..f619743133 --- /dev/null +++ b/e2etests/testdata/txtar/cycle-diagram/dagre/sketch.exp.svg @@ -0,0 +1,103 @@ +abcdabcab + + + + + + + + + + + \ No newline at end of file diff --git a/e2etests/testdata/txtar/cycle-diagram/elk/board.exp.json b/e2etests/testdata/txtar/cycle-diagram/elk/board.exp.json new file mode 100644 index 0000000000..6ff0b5c2d3 --- /dev/null +++ b/e2etests/testdata/txtar/cycle-diagram/elk/board.exp.json @@ -0,0 +1,1495 @@ +{ + "name": "", + "config": { + "sketch": false, + "themeID": 0, + "darkThemeID": null, + "pad": null, + "center": null, + "layoutEngine": null + }, + "isFolderOnly": false, + "fontFamily": "SourceSansPro", + "shapes": [ + { + "id": "1", + "type": "cycle", + "pos": { + "x": 12, + "y": 12 + }, + "width": 454, + "height": 466, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "N7", + "stroke": "B1", + "animated": false, + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "", + "fontSize": 28, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": false, + "underline": false, + "labelWidth": 0, + "labelHeight": 0, + "zIndex": 0, + "level": 1 + }, + { + "id": "1.a", + "type": "rectangle", + "pos": { + "x": -14, + "y": -221 + }, + "width": 53, + "height": 66, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "B5", + "stroke": "B1", + "animated": false, + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "a", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": true, + "underline": false, + "labelWidth": 8, + "labelHeight": 21, + "labelPosition": "INSIDE_MIDDLE_CENTER", + "zIndex": 0, + "level": 2 + }, + { + "id": "1.b", + "type": "rectangle", + "pos": { + "x": 185, + "y": -21 + }, + "width": 53, + "height": 66, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "B5", + "stroke": "B1", + "animated": false, + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "b", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": true, + "underline": false, + "labelWidth": 8, + "labelHeight": 21, + "labelPosition": "INSIDE_MIDDLE_CENTER", + "zIndex": 0, + "level": 2 + }, + { + "id": "1.c", + "type": "rectangle", + "pos": { + "x": -14, + "y": 179 + }, + "width": 53, + "height": 66, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "B5", + "stroke": "B1", + "animated": false, + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "c", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": true, + "underline": false, + "labelWidth": 8, + "labelHeight": 21, + "labelPosition": "INSIDE_MIDDLE_CENTER", + "zIndex": 0, + "level": 2 + }, + { + "id": "1.d", + "type": "rectangle", + "pos": { + "x": -215, + "y": -20 + }, + "width": 54, + "height": 66, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "B5", + "stroke": "B1", + "animated": false, + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "d", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": true, + "underline": false, + "labelWidth": 9, + "labelHeight": 21, + "labelPosition": "INSIDE_MIDDLE_CENTER", + "zIndex": 0, + "level": 2 + }, + { + "id": "2", + "type": "cycle", + "pos": { + "x": 485, + "y": 61 + }, + "width": 400, + "height": 367, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "N7", + "stroke": "B1", + "animated": false, + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "", + "fontSize": 28, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": false, + "underline": false, + "labelWidth": 0, + "labelHeight": 0, + "zIndex": 0, + "level": 1 + }, + { + "id": "2.a", + "type": "rectangle", + "pos": { + "x": 459, + "y": -171 + }, + "width": 53, + "height": 66, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "B5", + "stroke": "B1", + "animated": false, + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "a", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": true, + "underline": false, + "labelWidth": 8, + "labelHeight": 21, + "labelPosition": "INSIDE_MIDDLE_CENTER", + "zIndex": 0, + "level": 2 + }, + { + "id": "2.b", + "type": "rectangle", + "pos": { + "x": 632, + "y": 128 + }, + "width": 53, + "height": 66, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "B5", + "stroke": "B1", + "animated": false, + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "b", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": true, + "underline": false, + "labelWidth": 8, + "labelHeight": 21, + "labelPosition": "INSIDE_MIDDLE_CENTER", + "zIndex": 0, + "level": 2 + }, + { + "id": "2.c", + "type": "rectangle", + "pos": { + "x": 285, + "y": 129 + }, + "width": 53, + "height": 66, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "B5", + "stroke": "B1", + "animated": false, + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "c", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": true, + "underline": false, + "labelWidth": 8, + "labelHeight": 21, + "labelPosition": "INSIDE_MIDDLE_CENTER", + "zIndex": 0, + "level": 2 + }, + { + "id": "3", + "type": "cycle", + "pos": { + "x": 904, + "y": 12 + }, + "width": 53, + "height": 466, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "N7", + "stroke": "B1", + "animated": false, + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "", + "fontSize": 28, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": false, + "underline": false, + "labelWidth": 0, + "labelHeight": 0, + "zIndex": 0, + "level": 1 + }, + { + "id": "3.a", + "type": "rectangle", + "pos": { + "x": 878, + "y": -221 + }, + "width": 53, + "height": 66, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "B5", + "stroke": "B1", + "animated": false, + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "a", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": true, + "underline": false, + "labelWidth": 8, + "labelHeight": 21, + "labelPosition": "INSIDE_MIDDLE_CENTER", + "zIndex": 0, + "level": 2 + }, + { + "id": "3.b", + "type": "rectangle", + "pos": { + "x": 878, + "y": 179 + }, + "width": 53, + "height": 66, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "B5", + "stroke": "B1", + "animated": false, + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "b", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": true, + "underline": false, + "labelWidth": 8, + "labelHeight": 21, + "labelPosition": "INSIDE_MIDDLE_CENTER", + "zIndex": 0, + "level": 2 + } + ], + "connections": [ + { + "id": "1.(a -> b)[0]", + "src": "1.a", + "srcArrow": "none", + "dst": "1.b", + "dstArrow": "triangle", + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "stroke": "B1", + "borderRadius": 10, + "label": "", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N2", + "italic": true, + "bold": false, + "underline": false, + "labelWidth": 0, + "labelHeight": 0, + "labelPosition": "", + "labelPercentage": 0, + "link": "", + "route": [ + { + "x": 20.239999771118164, + "y": -220.6529998779297 + }, + { + "x": 25.239999771118164, + "y": -240.6529998779297 + }, + { + "x": 38.44499969482422, + "y": -239.61399841308594 + }, + { + "x": 51.57699966430664, + "y": -237.88499450683594 + }, + { + "x": 64.60099792480469, + "y": -235.4709930419922 + }, + { + "x": 77.48100280761719, + "y": -232.37899780273438 + }, + { + "x": 90.18099975585938, + "y": -228.61700439453125 + }, + { + "x": 102.66699981689453, + "y": -224.19500732421875 + }, + { + "x": 114.90399932861328, + "y": -219.1269989013672 + }, + { + "x": 126.85900115966797, + "y": -213.4239959716797 + }, + { + "x": 138.5, + "y": -207.10400390625 + }, + { + "x": 149.79299926757812, + "y": -200.18299865722656 + }, + { + "x": 160.70899963378906, + "y": -192.68099975585938 + }, + { + "x": 171.21800231933594, + "y": -184.61700439453125 + }, + { + "x": 181.2899932861328, + "y": -176.01499938964844 + }, + { + "x": 190.8979949951172, + "y": -166.8979949951172 + }, + { + "x": 200.01499938964844, + "y": -157.2899932861328 + }, + { + "x": 208.61700439453125, + "y": -147.21800231933594 + }, + { + "x": 216.68099975585938, + "y": -136.70899963378906 + }, + { + "x": 224.18299865722656, + "y": -125.79299926757812 + }, + { + "x": 231.10400390625, + "y": -114.5 + }, + { + "x": 237.4239959716797, + "y": -102.85900115966797 + }, + { + "x": 243.1269989013672, + "y": -90.90399932861328 + }, + { + "x": 248.19500732421875, + "y": -78.66699981689453 + }, + { + "x": 252.61700439453125, + "y": -66.18099975585938 + }, + { + "x": 256.3789978027344, + "y": -53.48099899291992 + }, + { + "x": 259.47100830078125, + "y": -40.60100173950195 + }, + { + "x": 261.885009765625, + "y": -27.57699966430664 + }, + { + "x": 263.614013671875, + "y": -14.444999694824219 + }, + { + "x": 264.65301513671875, + "y": -1.2400000095367432 + }, + { + "x": 238.6529998779297, + "y": 5.758999824523926 + } + ], + "isCurve": true, + "animated": false, + "tooltip": "", + "icon": null, + "zIndex": 0 + }, + { + "id": "1.(b -> c)[0]", + "src": "1.b", + "srcArrow": "none", + "dst": "1.c", + "dstArrow": "triangle", + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "stroke": "B1", + "borderRadius": 10, + "label": "", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N2", + "italic": true, + "bold": false, + "underline": false, + "labelWidth": 0, + "labelHeight": 0, + "labelPosition": "", + "labelPercentage": 0, + "link": "", + "route": [ + { + "x": 238.6529998779297, + "y": 18.239999771118164 + }, + { + "x": 264.65301513671875, + "y": 25.239999771118164 + }, + { + "x": 263.614013671875, + "y": 38.44499969482422 + }, + { + "x": 261.885009765625, + "y": 51.57699966430664 + }, + { + "x": 259.47100830078125, + "y": 64.60099792480469 + }, + { + "x": 256.3789978027344, + "y": 77.48100280761719 + }, + { + "x": 252.61700439453125, + "y": 90.18099975585938 + }, + { + "x": 248.19500732421875, + "y": 102.66699981689453 + }, + { + "x": 243.1269989013672, + "y": 114.90399932861328 + }, + { + "x": 237.4239959716797, + "y": 126.85900115966797 + }, + { + "x": 231.10400390625, + "y": 138.5 + }, + { + "x": 224.18299865722656, + "y": 149.79299926757812 + }, + { + "x": 216.68099975585938, + "y": 160.70899963378906 + }, + { + "x": 208.61700439453125, + "y": 171.21800231933594 + }, + { + "x": 200.01499938964844, + "y": 181.2899932861328 + }, + { + "x": 190.8979949951172, + "y": 190.8979949951172 + }, + { + "x": 181.2899932861328, + "y": 200.01499938964844 + }, + { + "x": 171.21800231933594, + "y": 208.61700439453125 + }, + { + "x": 160.70899963378906, + "y": 216.68099975585938 + }, + { + "x": 149.79299926757812, + "y": 224.18299865722656 + }, + { + "x": 138.5, + "y": 231.10400390625 + }, + { + "x": 126.85900115966797, + "y": 237.4239959716797 + }, + { + "x": 114.90399932861328, + "y": 243.1269989013672 + }, + { + "x": 102.66699981689453, + "y": 248.19500732421875 + }, + { + "x": 90.18099975585938, + "y": 252.61700439453125 + }, + { + "x": 77.48100280761719, + "y": 256.3789978027344 + }, + { + "x": 64.60099792480469, + "y": 259.47100830078125 + }, + { + "x": 51.57699966430664, + "y": 261.885009765625 + }, + { + "x": 38.44499969482422, + "y": 263.614013671875 + }, + { + "x": 25.239999771118164, + "y": 264.65301513671875 + }, + { + "x": 20.239999771118164, + "y": 244.6529998779297 + } + ], + "isCurve": true, + "animated": false, + "tooltip": "", + "icon": null, + "zIndex": 0 + }, + { + "id": "1.(c -> d)[0]", + "src": "1.c", + "srcArrow": "none", + "dst": "1.d", + "dstArrow": "triangle", + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "stroke": "B1", + "borderRadius": 10, + "label": "", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N2", + "italic": true, + "bold": false, + "underline": false, + "labelWidth": 0, + "labelHeight": 0, + "labelPosition": "", + "labelPercentage": 0, + "link": "", + "route": [ + { + "x": 3.759000062942505, + "y": 244.6529998779297 + }, + { + "x": -1.2400000095367432, + "y": 264.65301513671875 + }, + { + "x": -14.444999694824219, + "y": 263.614013671875 + }, + { + "x": -27.57699966430664, + "y": 261.885009765625 + }, + { + "x": -40.60100173950195, + "y": 259.47100830078125 + }, + { + "x": -53.48099899291992, + "y": 256.3789978027344 + }, + { + "x": -66.18099975585938, + "y": 252.61700439453125 + }, + { + "x": -78.66699981689453, + "y": 248.19500732421875 + }, + { + "x": -90.90399932861328, + "y": 243.1269989013672 + }, + { + "x": -102.85900115966797, + "y": 237.4239959716797 + }, + { + "x": -114.4990005493164, + "y": 231.10400390625 + }, + { + "x": -125.79299926757812, + "y": 224.18299865722656 + }, + { + "x": -136.70899963378906, + "y": 216.68099975585938 + }, + { + "x": -147.21800231933594, + "y": 208.61700439453125 + }, + { + "x": -157.2899932861328, + "y": 200.01499938964844 + }, + { + "x": -166.8979949951172, + "y": 190.8979949951172 + }, + { + "x": -176.01499938964844, + "y": 181.2899932861328 + }, + { + "x": -184.61700439453125, + "y": 171.21800231933594 + }, + { + "x": -192.68099975585938, + "y": 160.70899963378906 + }, + { + "x": -200.18299865722656, + "y": 149.79299926757812 + }, + { + "x": -207.10400390625, + "y": 138.5 + }, + { + "x": -213.4239959716797, + "y": 126.85900115966797 + }, + { + "x": -219.1269989013672, + "y": 114.90399932861328 + }, + { + "x": -224.19500732421875, + "y": 102.66699981689453 + }, + { + "x": -228.61700439453125, + "y": 90.18099975585938 + }, + { + "x": -232.37899780273438, + "y": 77.48100280761719 + }, + { + "x": -235.4709930419922, + "y": 64.60099792480469 + }, + { + "x": -237.88499450683594, + "y": 51.57699966430664 + }, + { + "x": -239.61399841308594, + "y": 38.44499969482422 + }, + { + "x": -240.6529998779297, + "y": 25.239999771118164 + }, + { + "x": -214.6529998779297, + "y": 19.239999771118164 + } + ], + "isCurve": true, + "animated": false, + "tooltip": "", + "icon": null, + "zIndex": 0 + }, + { + "id": "2.(a -> b)[0]", + "src": "2.a", + "srcArrow": "none", + "dst": "2.b", + "dstArrow": "triangle", + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "stroke": "B1", + "borderRadius": 10, + "label": "", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N2", + "italic": true, + "bold": false, + "underline": false, + "labelWidth": 0, + "labelHeight": 0, + "labelPosition": "", + "labelPercentage": 0, + "link": "", + "route": [ + { + "x": 496.14801025390625, + "y": -171.38299560546875 + }, + { + "x": 503.14801025390625, + "y": -190.38299560546875 + }, + { + "x": 520.7100219726562, + "y": -188.53700256347656 + }, + { + "x": 538.1010131835938, + "y": -185.4709930419922 + }, + { + "x": 555.2360229492188, + "y": -181.19900512695312 + }, + { + "x": 572.031005859375, + "y": -175.74200439453125 + }, + { + "x": 588.4039916992188, + "y": -169.1269989013672 + }, + { + "x": 604.2760009765625, + "y": -161.38499450683594 + }, + { + "x": 619.5689697265625, + "y": -152.55599975585938 + }, + { + "x": 634.208984375, + "y": -142.68099975585938 + }, + { + "x": 648.125, + "y": -131.8090057373047 + }, + { + "x": 661.2479858398438, + "y": -119.99199676513672 + }, + { + "x": 673.5150146484375, + "y": -107.29000091552734 + }, + { + "x": 684.8660278320312, + "y": -93.76200103759766 + }, + { + "x": 695.2459716796875, + "y": -79.4749984741211 + }, + { + "x": 704.60400390625, + "y": -64.5 + }, + { + "x": 712.8939819335938, + "y": -48.90700149536133 + }, + { + "x": 720.0770263671875, + "y": -32.775001525878906 + }, + { + "x": 726.1170043945312, + "y": -16.180999755859375 + }, + { + "x": 730.9840087890625, + "y": 0.7929999828338623 + }, + { + "x": 734.656005859375, + "y": 18.066999435424805 + }, + { + "x": 737.114013671875, + "y": 35.55400085449219 + }, + { + "x": 738.344970703125, + "y": 53.16999816894531 + }, + { + "x": 738.344970703125, + "y": 70.8290023803711 + }, + { + "x": 737.114013671875, + "y": 88.44499969482422 + }, + { + "x": 734.656005859375, + "y": 105.93199920654297 + }, + { + "x": 730.9840087890625, + "y": 123.20600128173828 + }, + { + "x": 726.1170043945312, + "y": 140.18099975585938 + }, + { + "x": 720.0770263671875, + "y": 156.77499389648438 + }, + { + "x": 712.8939819335938, + "y": 172.90699768066406 + }, + { + "x": 684.8939819335938, + "y": 166.90699768066406 + } + ], + "isCurve": true, + "animated": false, + "tooltip": "", + "icon": null, + "zIndex": 0 + }, + { + "id": "2.(b -> c)[0]", + "src": "2.b", + "srcArrow": "none", + "dst": "2.c", + "dstArrow": "triangle", + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "stroke": "B1", + "borderRadius": 10, + "label": "", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N2", + "italic": true, + "bold": false, + "underline": false, + "labelWidth": 0, + "labelHeight": 0, + "labelPosition": "", + "labelPercentage": 0, + "link": "", + "route": [ + { + "x": 685.2459716796875, + "y": 192.47500610351562 + }, + { + "x": 695.2459716796875, + "y": 203.47500610351562 + }, + { + "x": 684.8660278320312, + "y": 217.76199340820312 + }, + { + "x": 673.5150146484375, + "y": 231.2899932861328 + }, + { + "x": 661.2479858398438, + "y": 243.99200439453125 + }, + { + "x": 648.125, + "y": 255.8090057373047 + }, + { + "x": 634.208984375, + "y": 266.6809997558594 + }, + { + "x": 619.5689697265625, + "y": 276.5559997558594 + }, + { + "x": 604.2760009765625, + "y": 285.385009765625 + }, + { + "x": 588.4039916992188, + "y": 293.12701416015625 + }, + { + "x": 572.031005859375, + "y": 299.74200439453125 + }, + { + "x": 555.2360229492188, + "y": 305.1990051269531 + }, + { + "x": 538.1010131835938, + "y": 309.47100830078125 + }, + { + "x": 520.7100219726562, + "y": 312.5369873046875 + }, + { + "x": 503.14801025390625, + "y": 314.38299560546875 + }, + { + "x": 485.5, + "y": 315 + }, + { + "x": 467.85101318359375, + "y": 314.38299560546875 + }, + { + "x": 450.28900146484375, + "y": 312.5369873046875 + }, + { + "x": 432.89801025390625, + "y": 309.47100830078125 + }, + { + "x": 415.76300048828125, + "y": 305.1990051269531 + }, + { + "x": 398.9679870605469, + "y": 299.74200439453125 + }, + { + "x": 382.5950012207031, + "y": 293.12701416015625 + }, + { + "x": 366.7229919433594, + "y": 285.385009765625 + }, + { + "x": 351.42999267578125, + "y": 276.5559997558594 + }, + { + "x": 336.7900085449219, + "y": 266.6809997558594 + }, + { + "x": 322.8739929199219, + "y": 255.8090057373047 + }, + { + "x": 309.7510070800781, + "y": 243.99200439453125 + }, + { + "x": 297.4840087890625, + "y": 231.2899932861328 + }, + { + "x": 286.13299560546875, + "y": 217.76199340820312 + }, + { + "x": 275.75299072265625, + "y": 203.47500610351562 + }, + { + "x": 285.75299072265625, + "y": 192.47500610351562 + } + ], + "isCurve": true, + "animated": false, + "tooltip": "", + "icon": null, + "zIndex": 0 + }, + { + "id": "3.(a -> b)[0]", + "src": "3.a", + "srcArrow": "none", + "dst": "3.b", + "dstArrow": "triangle", + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "stroke": "B1", + "borderRadius": 10, + "label": "", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N2", + "italic": true, + "bold": false, + "underline": false, + "labelWidth": 0, + "labelHeight": 0, + "labelPosition": "", + "labelPercentage": 0, + "link": "", + "route": [ + { + "x": 921.35498046875, + "y": -220.61399841308594 + }, + { + "x": 931.35498046875, + "y": -239.61399841308594 + }, + { + "x": 957.510986328125, + "y": -235.4709930419922 + }, + { + "x": 983.0910034179688, + "y": -228.61700439453125 + }, + { + "x": 1007.8140258789062, + "y": -219.1269989013672 + }, + { + "x": 1031.4100341796875, + "y": -207.10400390625 + }, + { + "x": 1053.6190185546875, + "y": -192.68099975585938 + }, + { + "x": 1074.199951171875, + "y": -176.01499938964844 + }, + { + "x": 1092.925048828125, + "y": -157.2899932861328 + }, + { + "x": 1109.5909423828125, + "y": -136.70899963378906 + }, + { + "x": 1124.0140380859375, + "y": -114.5 + }, + { + "x": 1136.0369873046875, + "y": -90.90399932861328 + }, + { + "x": 1145.5269775390625, + "y": -66.18099975585938 + }, + { + "x": 1152.3809814453125, + "y": -40.60100173950195 + }, + { + "x": 1156.5240478515625, + "y": -14.444999694824219 + }, + { + "x": 1157.9100341796875, + "y": 12 + }, + { + "x": 1156.5240478515625, + "y": 38.44499969482422 + }, + { + "x": 1152.3809814453125, + "y": 64.60099792480469 + }, + { + "x": 1145.5269775390625, + "y": 90.18099975585938 + }, + { + "x": 1136.0369873046875, + "y": 114.90399932861328 + }, + { + "x": 1124.0140380859375, + "y": 138.49899291992188 + }, + { + "x": 1109.5909423828125, + "y": 160.70899963378906 + }, + { + "x": 1092.925048828125, + "y": 181.2899932861328 + }, + { + "x": 1074.199951171875, + "y": 200.01499938964844 + }, + { + "x": 1053.6190185546875, + "y": 216.68099975585938 + }, + { + "x": 1031.4100341796875, + "y": 231.10400390625 + }, + { + "x": 1007.8140258789062, + "y": 243.1269989013672 + }, + { + "x": 983.0910034179688, + "y": 252.61700439453125 + }, + { + "x": 957.510986328125, + "y": 259.47100830078125 + }, + { + "x": 931.35498046875, + "y": 263.614013671875 + }, + { + "x": 921.35498046875, + "y": 244.61399841308594 + } + ], + "isCurve": true, + "animated": false, + "tooltip": "", + "icon": null, + "zIndex": 0 + } + ], + "root": { + "id": "", + "type": "", + "pos": { + "x": 0, + "y": 0 + }, + "width": 0, + "height": 0, + "opacity": 0, + "strokeDash": 0, + "strokeWidth": 0, + "borderRadius": 0, + "fill": "N7", + "stroke": "", + "animated": false, + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "", + "fontSize": 0, + "fontFamily": "", + "language": "", + "color": "", + "italic": false, + "bold": false, + "underline": false, + "labelWidth": 0, + "labelHeight": 0, + "zIndex": 0, + "level": 0 + } +} diff --git a/e2etests/testdata/txtar/cycle-diagram/elk/sketch.exp.svg b/e2etests/testdata/txtar/cycle-diagram/elk/sketch.exp.svg new file mode 100644 index 0000000000..ac3081c7bb --- /dev/null +++ b/e2etests/testdata/txtar/cycle-diagram/elk/sketch.exp.svg @@ -0,0 +1,103 @@ +abcdabcab + + + + + + + + + + + \ No newline at end of file diff --git a/e2etests/txtar.txt b/e2etests/txtar.txt index fcc6a76192..61edb0372c 100644 --- a/e2etests/txtar.txt +++ b/e2etests/txtar.txt @@ -775,3 +775,17 @@ a -> b: hello { b -> c: { icon: https://icons.terrastruct.com/essentials%2F213-alarm.svg } + +-- cycle-diagram -- +1: "" { + shape: cycle + a -> b -> c -> d +} +2: "" { + shape: cycle + a -> b -> c +} +3: "" { + shape: cycle + a -> b +} \ No newline at end of file diff --git a/lib/geo/point.go b/lib/geo/point.go index ab8e034a02..47882bb181 100644 --- a/lib/geo/point.go +++ b/lib/geo/point.go @@ -324,3 +324,11 @@ func RemovePoints(points Points, toRemove []bool) Points { } return without } +func (v Vector) Normalize() Vector { + length := v.Length() + if length == 0 { + // avoid dividing by 0 + return Vector{0, 0} + } + return Vector{v[0] / length, v[1] / length} +} \ No newline at end of file From 527edda636127c0596a83c1d6ded071dc79fd4b0 Mon Sep 17 00:00:00 2001 From: Mayank77maruti Date: Fri, 21 Feb 2025 17:05:31 +0000 Subject: [PATCH 02/73] iteration 1 --- d2layouts/d2cycle/layout.go | 421 +++-- .../txtar/cycle-diagram/dagre/board.exp.json | 1460 ++++++++++++----- .../txtar/cycle-diagram/dagre/sketch.exp.svg | 154 +- .../txtar/cycle-diagram/elk/board.exp.json | 1460 ++++++++++++----- .../txtar/cycle-diagram/elk/sketch.exp.svg | 154 +- 5 files changed, 2626 insertions(+), 1023 deletions(-) diff --git a/d2layouts/d2cycle/layout.go b/d2layouts/d2cycle/layout.go index db489bf95c..43565df1ac 100644 --- a/d2layouts/d2cycle/layout.go +++ b/d2layouts/d2cycle/layout.go @@ -1,3 +1,246 @@ +// package d2cycle + +// import ( +// "context" +// "math" + +// "oss.terrastruct.com/d2/d2graph" +// "oss.terrastruct.com/d2/lib/geo" +// "oss.terrastruct.com/d2/lib/label" +// "oss.terrastruct.com/util-go/go2" +// ) + +// const ( +// MIN_RADIUS = 200 +// PADDING = 20 +// MIN_SEGMENT_LEN = 10 +// ARC_STEPS = 30 // high resolution for smooth arcs +// ) + +// // Layout arranges nodes in a circle and routes edges with properly clipped arcs +// func Layout(ctx context.Context, g *d2graph.Graph, layout d2graph.LayoutGraph) error { +// objects := g.Root.ChildrenArray +// if len(objects) == 0 { +// return nil +// } + +// // Position labels and icons first +// for _, obj := range g.Objects { +// positionLabelsIcons(obj) +// } + +// // Calculate layout parameters +// nodeCircleRadius := calculateRadius(objects) +// maxNodeSize := 0.0 +// for _, obj := range objects { +// size := math.Max(obj.Width, obj.Height) +// maxNodeSize = math.Max(maxNodeSize, size) +// } + +// // Position nodes in circle +// positionObjects(objects, nodeCircleRadius) + +// // Create properly clipped edge arcs +// for _, edge := range g.Edges { +// createCircularArc(edge, nodeCircleRadius, maxNodeSize) +// } + +// return nil +// } + +// func calculateRadius(objects []*d2graph.Object) float64 { +// numObjects := float64(len(objects)) +// maxSize := 0.0 +// for _, obj := range objects { +// size := math.Max(obj.Width, obj.Height) +// maxSize = math.Max(maxSize, size) +// } +// minRadius := (maxSize/2 + PADDING) / math.Sin(math.Pi/numObjects) +// return math.Max(minRadius, MIN_RADIUS) +// } + +// func positionObjects(objects []*d2graph.Object, radius float64) { +// numObjects := float64(len(objects)) +// angleOffset := -math.Pi / 2 // Start at top + +// for i, obj := range objects { +// angle := angleOffset + (2*math.Pi*float64(i))/numObjects +// x := radius * math.Cos(angle) +// y := radius * math.Sin(angle) + +// // Center object at calculated position +// obj.TopLeft = geo.NewPoint( +// x-obj.Width/2, +// y-obj.Height/2, +// ) +// } +// } + +// func createCircularArc(edge *d2graph.Edge, nodeCircleRadius, maxNodeSize float64) { +// if edge.Src == nil || edge.Dst == nil { +// return +// } + +// srcCenter := edge.Src.Center() +// dstCenter := edge.Dst.Center() + +// // Calculate arc radius outside node circle +// arcRadius := nodeCircleRadius + maxNodeSize/2 + PADDING + +// // Calculate angles for arc endpoints +// srcAngle := math.Atan2(srcCenter.Y, srcCenter.X) +// dstAngle := math.Atan2(dstCenter.Y, dstCenter.X) +// if dstAngle < srcAngle { +// dstAngle += 2 * math.Pi +// } + +// // Generate arc path points +// path := make([]*geo.Point, 0, ARC_STEPS+1) +// for i := 0; i <= ARC_STEPS; i++ { +// t := float64(i) / ARC_STEPS +// angle := srcAngle + t*(dstAngle-srcAngle) +// x := arcRadius * math.Cos(angle) +// y := arcRadius * math.Sin(angle) +// path = append(path, geo.NewPoint(x, y)) +// } + +// // Set exact endpoints (will be clipped later) +// path[0] = srcCenter +// path[len(path)-1] = dstCenter + +// // Clip path to node borders +// edge.Route = path +// startIndex, endIndex := edge.TraceToShape(edge.Route, 0, len(edge.Route)-1) +// if startIndex < endIndex { +// edge.Route = edge.Route[startIndex : endIndex+1] +// } +// edge.IsCurve = true +// } + +// // clampPointOutsideBox walks forward from 'startIdx' until the path segment +// // leaves the bounding box. Then it sets path[startIdx] to the intersection. +// // If we never find it, we return (startIdx, path[startIdx]) meaning we can't clamp. +// func clampPointOutsideBox(box *geo.Box, path []*geo.Point, startIdx int) (int, *geo.Point) { +// if startIdx >= len(path)-1 { +// return startIdx, path[startIdx] +// } +// // If path[startIdx] is outside, no clamp needed +// if !boxContains(box, path[startIdx]) { +// return startIdx, path[startIdx] +// } + +// // Walk forward looking for outside +// for i := startIdx + 1; i < len(path); i++ { +// insideNext := boxContains(box, path[i]) +// if insideNext { +// // still inside -> keep going +// continue +// } +// // crossing from inside to outside between path[i-1], path[i] +// seg := geo.NewSegment(path[i-1], path[i]) +// inters := boxIntersections(box, *seg) +// if len(inters) > 0 { +// // use first intersection +// return i, inters[0] +// } +// // fallback => no intersection found +// return i, path[i] +// } +// // entire remainder is inside, so we can't clamp +// // Just return the end +// last := len(path) - 1 +// return last, path[last] +// } + +// // clampPointOutsideBoxReverse scans backward from endIdx while path[j] is in the box. +// // Once we find crossing (outside→inside), we return (j, intersection). +// func clampPointOutsideBoxReverse(box *geo.Box, path []*geo.Point, endIdx int) (int, *geo.Point) { +// if endIdx <= 0 { +// return endIdx, path[endIdx] +// } +// if !boxContains(box, path[endIdx]) { +// // already outside +// return endIdx, path[endIdx] +// } + +// for j := endIdx - 1; j >= 0; j-- { +// if boxContains(box, path[j]) { +// continue +// } +// // crossing from outside -> inside between path[j], path[j+1] +// seg := geo.NewSegment(path[j], path[j+1]) +// inters := boxIntersections(box, *seg) +// if len(inters) > 0 { +// return j, inters[0] +// } +// return j, path[j] +// } + +// // entire path inside +// return 0, path[0] +// } + +// // Helper if your geo.Box doesn’t implement Contains() +// func boxContains(b *geo.Box, p *geo.Point) bool { +// // typical bounding-box check +// return p.X >= b.TopLeft.X && +// p.X <= b.TopLeft.X+b.Width && +// p.Y >= b.TopLeft.Y && +// p.Y <= b.TopLeft.Y+b.Height +// } + +// // Helper if your geo.Box doesn’t implement Intersections(geo.Segment) yet +// func boxIntersections(b *geo.Box, seg geo.Segment) []*geo.Point { +// // We'll assume d2's standard geo.Box has a built-in Intersections(*Segment) method. +// // If not, implement manually. For example, checking each of the 4 edges: +// // left, right, top, bottom +// // For simplicity, if you do have b.Intersections(...) you can just do: +// // return b.Intersections(seg) +// return b.Intersections(seg) +// // If you don't have that, you'd code the line-rect intersection yourself. +// } + +// // positionLabelsIcons is basically your logic that sets default label/icon positions if needed +// func positionLabelsIcons(obj *d2graph.Object) { +// // If there's an icon but no icon position, give it a default +// if obj.Icon != nil && obj.IconPosition == nil { +// if len(obj.ChildrenArray) > 0 { +// obj.IconPosition = go2.Pointer(label.OutsideTopLeft.String()) +// if obj.LabelPosition == nil { +// obj.LabelPosition = go2.Pointer(label.OutsideTopRight.String()) +// return +// } +// } else if obj.SQLTable != nil || obj.Class != nil || obj.Language != "" { +// obj.IconPosition = go2.Pointer(label.OutsideTopLeft.String()) +// } else { +// obj.IconPosition = go2.Pointer(label.InsideMiddleCenter.String()) +// } +// } + +// // If there's a label but no label position, give it a default +// if obj.HasLabel() && obj.LabelPosition == nil { +// if len(obj.ChildrenArray) > 0 { +// obj.LabelPosition = go2.Pointer(label.OutsideTopCenter.String()) +// } else if obj.HasOutsideBottomLabel() { +// obj.LabelPosition = go2.Pointer(label.OutsideBottomCenter.String()) +// } else if obj.Icon != nil { +// obj.LabelPosition = go2.Pointer(label.InsideTopCenter.String()) +// } else { +// obj.LabelPosition = go2.Pointer(label.InsideMiddleCenter.String()) +// } + +// // If the label is bigger than the shape, fallback to outside positions +// if float64(obj.LabelDimensions.Width) > obj.Width || +// float64(obj.LabelDimensions.Height) > obj.Height { +// if len(obj.ChildrenArray) > 0 { +// obj.LabelPosition = go2.Pointer(label.OutsideTopCenter.String()) +// } else { +// obj.LabelPosition = go2.Pointer(label.OutsideBottomCenter.String()) +// } +// } +// } +// } + package d2cycle import ( @@ -13,62 +256,49 @@ import ( const ( MIN_RADIUS = 200 PADDING = 20 - MIN_SEGMENT_LEN = 10 - ARC_STEPS = 30 // high resolution for smooth arcs + ARC_STEPS = 60 // High resolution for perfect circles ) -// Layout arranges nodes in a circle and routes edges with properly clipped arcs func Layout(ctx context.Context, g *d2graph.Graph, layout d2graph.LayoutGraph) error { objects := g.Root.ChildrenArray if len(objects) == 0 { return nil } - // Position labels and icons first for _, obj := range g.Objects { positionLabelsIcons(obj) } - // Calculate layout parameters - nodeCircleRadius := calculateRadius(objects) - maxNodeSize := 0.0 - for _, obj := range objects { - size := math.Max(obj.Width, obj.Height) - maxNodeSize = math.Max(maxNodeSize, size) - } - - // Position nodes in circle - positionObjects(objects, nodeCircleRadius) + baseRadius := calculateBaseRadius(objects) + positionObjects(objects, baseRadius) - // Create properly clipped edge arcs for _, edge := range g.Edges { - createCircularArc(edge, nodeCircleRadius, maxNodeSize) + createPerfectArc(edge, baseRadius) } return nil } -func calculateRadius(objects []*d2graph.Object) float64 { - numObjects := float64(len(objects)) +func calculateBaseRadius(objects []*d2graph.Object) float64 { + numNodes := float64(len(objects)) maxSize := 0.0 for _, obj := range objects { size := math.Max(obj.Width, obj.Height) maxSize = math.Max(maxSize, size) } - minRadius := (maxSize/2 + PADDING) / math.Sin(math.Pi/numObjects) - return math.Max(minRadius, MIN_RADIUS) + radius := (maxSize + 2*PADDING) / (2 * math.Sin(math.Pi/numNodes)) + return math.Max(radius, MIN_RADIUS) } func positionObjects(objects []*d2graph.Object, radius float64) { numObjects := float64(len(objects)) - angleOffset := -math.Pi / 2 // Start at top + angleOffset := -math.Pi / 2 for i, obj := range objects { angle := angleOffset + (2*math.Pi*float64(i))/numObjects x := radius * math.Cos(angle) y := radius * math.Sin(angle) - // Center object at calculated position obj.TopLeft = geo.NewPoint( x-obj.Width/2, y-obj.Height/2, @@ -76,131 +306,55 @@ func positionObjects(objects []*d2graph.Object, radius float64) { } } -func createCircularArc(edge *d2graph.Edge, nodeCircleRadius, maxNodeSize float64) { - if edge.Src == nil || edge.Dst == nil { +func createPerfectArc(edge *d2graph.Edge, baseRadius float64) { + if edge.Src == nil || edge.Dst == nil || edge.Src == edge.Dst { return } srcCenter := edge.Src.Center() dstCenter := edge.Dst.Center() + center := geo.NewPoint(0, 0) // Layout center - // Calculate arc radius outside node circle - arcRadius := nodeCircleRadius + maxNodeSize/2 + PADDING - - // Calculate angles for arc endpoints - srcAngle := math.Atan2(srcCenter.Y, srcCenter.X) - dstAngle := math.Atan2(dstCenter.Y, dstCenter.X) - if dstAngle < srcAngle { - dstAngle += 2 * math.Pi + // Calculate angles with proper wrapping + startAngle := math.Atan2(srcCenter.Y-center.Y, srcCenter.X-center.X) + endAngle := math.Atan2(dstCenter.Y-center.Y, dstCenter.X-center.X) + + // Handle angle wrapping for shortest path + angleDiff := endAngle - startAngle + if angleDiff < 0 { + angleDiff += 2 * math.Pi + } + if angleDiff > math.Pi { + angleDiff -= 2 * math.Pi } - // Generate arc path points + // Generate perfect circular arc path := make([]*geo.Point, 0, ARC_STEPS+1) for i := 0; i <= ARC_STEPS; i++ { t := float64(i) / ARC_STEPS - angle := srcAngle + t*(dstAngle-srcAngle) - x := arcRadius * math.Cos(angle) - y := arcRadius * math.Sin(angle) + currentAngle := startAngle + t*angleDiff + x := center.X + baseRadius*math.Cos(currentAngle) + y := center.Y + baseRadius*math.Sin(currentAngle) path = append(path, geo.NewPoint(x, y)) } - // Set exact endpoints (will be clipped later) - path[0] = srcCenter - path[len(path)-1] = dstCenter - - // Clip path to node borders + // Clip to shape boundaries while preserving arc edge.Route = path - startIndex, endIndex := edge.TraceToShape(edge.Route, 0, len(edge.Route)-1) - if startIndex < endIndex { - edge.Route = edge.Route[startIndex : endIndex+1] - } - edge.IsCurve = true -} - -// clampPointOutsideBox walks forward from 'startIdx' until the path segment -// leaves the bounding box. Then it sets path[startIdx] to the intersection. -// If we never find it, we return (startIdx, path[startIdx]) meaning we can't clamp. -func clampPointOutsideBox(box *geo.Box, path []*geo.Point, startIdx int) (int, *geo.Point) { - if startIdx >= len(path)-1 { - return startIdx, path[startIdx] - } - // If path[startIdx] is outside, no clamp needed - if !boxContains(box, path[startIdx]) { - return startIdx, path[startIdx] - } - - // Walk forward looking for outside - for i := startIdx + 1; i < len(path); i++ { - insideNext := boxContains(box, path[i]) - if insideNext { - // still inside -> keep going - continue - } - // crossing from inside to outside between path[i-1], path[i] - seg := geo.NewSegment(path[i-1], path[i]) - inters := boxIntersections(box, *seg) - if len(inters) > 0 { - // use first intersection - return i, inters[0] - } - // fallback => no intersection found - return i, path[i] - } - // entire remainder is inside, so we can't clamp - // Just return the end - last := len(path) - 1 - return last, path[last] -} + startIdx, endIdx := edge.TraceToShape(edge.Route, 0, len(edge.Route)-1) -// clampPointOutsideBoxReverse scans backward from endIdx while path[j] is in the box. -// Once we find crossing (outside→inside), we return (j, intersection). -func clampPointOutsideBoxReverse(box *geo.Box, path []*geo.Point, endIdx int) (int, *geo.Point) { - if endIdx <= 0 { - return endIdx, path[endIdx] - } - if !boxContains(box, path[endIdx]) { - // already outside - return endIdx, path[endIdx] - } - - for j := endIdx - 1; j >= 0; j-- { - if boxContains(box, path[j]) { - continue - } - // crossing from outside -> inside between path[j], path[j+1] - seg := geo.NewSegment(path[j], path[j+1]) - inters := boxIntersections(box, *seg) - if len(inters) > 0 { - return j, inters[0] + // Maintain smooth arc after clipping + if startIdx < endIdx { + edge.Route = edge.Route[startIdx : endIdx+1] + + // Ensure minimum points for smooth rendering + if len(edge.Route) < 3 { + edge.Route = []*geo.Point{path[0], path[len(path)-1]} } - return j, path[j] } - - // entire path inside - return 0, path[0] -} - -// Helper if your geo.Box doesn’t implement Contains() -func boxContains(b *geo.Box, p *geo.Point) bool { - // typical bounding-box check - return p.X >= b.TopLeft.X && - p.X <= b.TopLeft.X+b.Width && - p.Y >= b.TopLeft.Y && - p.Y <= b.TopLeft.Y+b.Height -} - -// Helper if your geo.Box doesn’t implement Intersections(geo.Segment) yet -func boxIntersections(b *geo.Box, seg geo.Segment) []*geo.Point { - // We'll assume d2's standard geo.Box has a built-in Intersections(*Segment) method. - // If not, implement manually. For example, checking each of the 4 edges: - // left, right, top, bottom - // For simplicity, if you do have b.Intersections(...) you can just do: - // return b.Intersections(seg) - return b.Intersections(seg) - // If you don't have that, you'd code the line-rect intersection yourself. + + edge.IsCurve = true } -// positionLabelsIcons is basically your logic that sets default label/icon positions if needed func positionLabelsIcons(obj *d2graph.Object) { // If there's an icon but no icon position, give it a default if obj.Icon != nil && obj.IconPosition == nil { @@ -217,7 +371,6 @@ func positionLabelsIcons(obj *d2graph.Object) { } } - // If there's a label but no label position, give it a default if obj.HasLabel() && obj.LabelPosition == nil { if len(obj.ChildrenArray) > 0 { obj.LabelPosition = go2.Pointer(label.OutsideTopCenter.String()) @@ -229,7 +382,6 @@ func positionLabelsIcons(obj *d2graph.Object) { obj.LabelPosition = go2.Pointer(label.InsideMiddleCenter.String()) } - // If the label is bigger than the shape, fallback to outside positions if float64(obj.LabelDimensions.Width) > obj.Width || float64(obj.LabelDimensions.Height) > obj.Height { if len(obj.ChildrenArray) > 0 { @@ -239,4 +391,15 @@ func positionLabelsIcons(obj *d2graph.Object) { } } } +} + +func boxContains(b *geo.Box, p *geo.Point) bool { + return p.X >= b.TopLeft.X && + p.X <= b.TopLeft.X+b.Width && + p.Y >= b.TopLeft.Y && + p.Y <= b.TopLeft.Y+b.Height +} + +func boxIntersections(b *geo.Box, seg geo.Segment) []*geo.Point { + return b.Intersections(seg) } \ 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 575de37120..5afda38eb0 100644 --- a/e2etests/testdata/txtar/cycle-diagram/dagre/board.exp.json +++ b/e2etests/testdata/txtar/cycle-diagram/dagre/board.exp.json @@ -540,128 +540,248 @@ "link": "", "route": [ { - "x": 8.239999771118164, - "y": -232.6529998779297 + "x": 0, + "y": -200 }, { - "x": 13.239999771118164, - "y": -252.6529998779297 + "x": 5.235000133514404, + "y": -199.93099975585938 }, { - "x": 26.44499969482422, - "y": -251.61399841308594 + "x": 10.467000007629395, + "y": -199.72500610351562 }, { - "x": 39.57699966430664, - "y": -249.88499450683594 + "x": 15.690999984741211, + "y": -199.38299560546875 }, { - "x": 52.60100173950195, - "y": -247.4709930419922 + "x": 20.905000686645508, + "y": -198.9040069580078 }, { - "x": 65.48100280761719, - "y": -244.37899780273438 + "x": 26.104999542236328, + "y": -198.28799438476562 }, { - "x": 78.18099975585938, - "y": -240.61700439453125 + "x": 31.285999298095703, + "y": -197.53700256347656 }, { - "x": 90.66699981689453, - "y": -236.19500732421875 + "x": 36.446998596191406, + "y": -196.64999389648438 }, { - "x": 102.90399932861328, - "y": -231.1269989013672 + "x": 41.582000732421875, + "y": -195.62899780273438 }, { - "x": 114.85900115966797, - "y": -225.4239959716797 + "x": 46.68899917602539, + "y": -194.47300720214844 }, { - "x": 126.4990005493164, - "y": -219.10400390625 + "x": 51.76300048828125, + "y": -193.18499755859375 }, { - "x": 137.79299926757812, - "y": -212.18299865722656 + "x": 56.803001403808594, + "y": -191.76300048828125 }, { - "x": 148.70899963378906, - "y": -204.68099975585938 + "x": 61.803001403808594, + "y": -190.21099853515625 }, { - "x": 159.21800231933594, - "y": -196.61700439453125 + "x": 66.76100158691406, + "y": -188.5279998779297 }, { - "x": 169.2899932861328, - "y": -188.01499938964844 + "x": 71.6729965209961, + "y": -186.71600341796875 }, { - "x": 178.8979949951172, - "y": -178.8979949951172 + "x": 76.53600311279297, + "y": -184.77499389648438 }, { - "x": 188.01499938964844, - "y": -169.2899932861328 + "x": 81.34700012207031, + "y": -182.70899963378906 }, { - "x": 196.61700439453125, - "y": -159.21800231933594 + "x": 86.10199737548828, + "y": -180.51699829101562 }, { - "x": 204.68099975585938, - "y": -148.70899963378906 + "x": 90.7979965209961, + "y": -178.2010040283203 }, { - "x": 212.18299865722656, - "y": -137.79299926757812 + "x": 95.43099975585938, + "y": -175.76300048828125 }, { - "x": 219.10400390625, - "y": -126.5 + "x": 99.9990005493164, + "y": -173.2050018310547 }, { - "x": 225.4239959716797, - "y": -114.85900115966797 + "x": 104.4990005493164, + "y": -170.5279998779297 }, { - "x": 231.1269989013672, - "y": -102.90399932861328 + "x": 108.927001953125, + "y": -167.73399353027344 }, { - "x": 236.19500732421875, - "y": -90.66699981689453 + "x": 113.28099822998047, + "y": -164.8249969482422 }, { - "x": 240.61700439453125, - "y": -78.18099975585938 + "x": 117.55699920654297, + "y": -161.80299377441406 }, { - "x": 244.37899780273438, - "y": -65.48100280761719 + "x": 121.75199890136719, + "y": -158.6699981689453 }, { - "x": 247.4709930419922, - "y": -52.60100173950195 + "x": 125.86399841308594, + "y": -155.4290008544922 }, { - "x": 249.88499450683594, - "y": -39.57699966430664 + "x": 129.88900756835938, + "y": -152.08099365234375 }, { - "x": 251.61399841308594, - "y": -26.44499969482422 + "x": 133.8260040283203, + "y": -148.6280059814453 }, { - "x": 252.6529998779297, - "y": -13.239999771118164 + "x": 137.6699981689453, + "y": -145.07400512695312 }, { - "x": 226.6529998779297, - "y": -6.239999771118164 + "x": 141.42100524902344, + "y": -141.42100524902344 + }, + { + "x": 145.07400512695312, + "y": -137.6699981689453 + }, + { + "x": 148.6280059814453, + "y": -133.8260040283203 + }, + { + "x": 152.08099365234375, + "y": -129.88900756835938 + }, + { + "x": 155.4290008544922, + "y": -125.86399841308594 + }, + { + "x": 158.6699981689453, + "y": -121.75199890136719 + }, + { + "x": 161.80299377441406, + "y": -117.55699920654297 + }, + { + "x": 164.8249969482422, + "y": -113.28099822998047 + }, + { + "x": 167.73399353027344, + "y": -108.927001953125 + }, + { + "x": 170.5279998779297, + "y": -104.4990005493164 + }, + { + "x": 173.2050018310547, + "y": -100 + }, + { + "x": 175.76300048828125, + "y": -95.43099975585938 + }, + { + "x": 178.2010040283203, + "y": -90.7979965209961 + }, + { + "x": 180.51699829101562, + "y": -86.10199737548828 + }, + { + "x": 182.70899963378906, + "y": -81.34700012207031 + }, + { + "x": 184.77499389648438, + "y": -76.53600311279297 + }, + { + "x": 186.71600341796875, + "y": -71.6729965209961 + }, + { + "x": 188.5279998779297, + "y": -66.76100158691406 + }, + { + "x": 190.21099853515625, + "y": -61.803001403808594 + }, + { + "x": 191.76300048828125, + "y": -56.803001403808594 + }, + { + "x": 193.18499755859375, + "y": -51.76300048828125 + }, + { + "x": 194.47300720214844, + "y": -46.68899917602539 + }, + { + "x": 195.62899780273438, + "y": -41.582000732421875 + }, + { + "x": 196.64999389648438, + "y": -36.446998596191406 + }, + { + "x": 197.53700256347656, + "y": -31.285999298095703 + }, + { + "x": 198.28799438476562, + "y": -26.104999542236328 + }, + { + "x": 198.9040069580078, + "y": -20.905000686645508 + }, + { + "x": 199.38299560546875, + "y": -15.690999984741211 + }, + { + "x": 199.72500610351562, + "y": -10.467000007629395 + }, + { + "x": 199.93099975585938, + "y": -5.235000133514404 + }, + { + "x": 200, + "y": 0 } ], "isCurve": true, @@ -696,128 +816,248 @@ "link": "", "route": [ { - "x": 226.6529998779297, - "y": 6.239999771118164 + "x": 200, + "y": 0 + }, + { + "x": 199.93099975585938, + "y": 5.235000133514404 + }, + { + "x": 199.72500610351562, + "y": 10.467000007629395 + }, + { + "x": 199.38299560546875, + "y": 15.690999984741211 + }, + { + "x": 198.9040069580078, + "y": 20.905000686645508 + }, + { + "x": 198.28799438476562, + "y": 26.104999542236328 + }, + { + "x": 197.53700256347656, + "y": 31.285999298095703 + }, + { + "x": 196.64999389648438, + "y": 36.446998596191406 + }, + { + "x": 195.62899780273438, + "y": 41.582000732421875 + }, + { + "x": 194.47300720214844, + "y": 46.68899917602539 + }, + { + "x": 193.18499755859375, + "y": 51.76300048828125 + }, + { + "x": 191.76300048828125, + "y": 56.803001403808594 + }, + { + "x": 190.21099853515625, + "y": 61.803001403808594 + }, + { + "x": 188.5279998779297, + "y": 66.76100158691406 + }, + { + "x": 186.71600341796875, + "y": 71.6729965209961 + }, + { + "x": 184.77499389648438, + "y": 76.53600311279297 + }, + { + "x": 182.70899963378906, + "y": 81.34700012207031 + }, + { + "x": 180.51699829101562, + "y": 86.10199737548828 + }, + { + "x": 178.2010040283203, + "y": 90.7979965209961 + }, + { + "x": 175.76300048828125, + "y": 95.43099975585938 + }, + { + "x": 173.2050018310547, + "y": 99.9990005493164 + }, + { + "x": 170.5279998779297, + "y": 104.4990005493164 + }, + { + "x": 167.73399353027344, + "y": 108.927001953125 + }, + { + "x": 164.8249969482422, + "y": 113.28099822998047 + }, + { + "x": 161.80299377441406, + "y": 117.55699920654297 + }, + { + "x": 158.6699981689453, + "y": 121.75199890136719 + }, + { + "x": 155.4290008544922, + "y": 125.86399841308594 }, { - "x": 252.6529998779297, - "y": 13.239999771118164 + "x": 152.08099365234375, + "y": 129.88900756835938 }, { - "x": 251.61399841308594, - "y": 26.44499969482422 + "x": 148.6280059814453, + "y": 133.8260040283203 }, { - "x": 249.88499450683594, - "y": 39.57699966430664 + "x": 145.07400512695312, + "y": 137.6699981689453 }, { - "x": 247.4709930419922, - "y": 52.60100173950195 + "x": 141.42100524902344, + "y": 141.42100524902344 }, { - "x": 244.37899780273438, - "y": 65.48100280761719 + "x": 137.6699981689453, + "y": 145.07400512695312 }, { - "x": 240.61700439453125, - "y": 78.18099975585938 + "x": 133.8260040283203, + "y": 148.6280059814453 }, { - "x": 236.19500732421875, - "y": 90.66699981689453 + "x": 129.88900756835938, + "y": 152.08099365234375 }, { - "x": 231.1269989013672, - "y": 102.90399932861328 + "x": 125.86399841308594, + "y": 155.4290008544922 }, { - "x": 225.4239959716797, - "y": 114.85900115966797 + "x": 121.75199890136719, + "y": 158.6699981689453 }, { - "x": 219.10400390625, - "y": 126.4990005493164 + "x": 117.55699920654297, + "y": 161.80299377441406 }, { - "x": 212.18299865722656, - "y": 137.79299926757812 + "x": 113.28099822998047, + "y": 164.8249969482422 }, { - "x": 204.68099975585938, - "y": 148.70899963378906 + "x": 108.927001953125, + "y": 167.73399353027344 }, { - "x": 196.61700439453125, - "y": 159.21800231933594 + "x": 104.4990005493164, + "y": 170.5279998779297 }, { - "x": 188.01499938964844, - "y": 169.2899932861328 + "x": 100, + "y": 173.2050018310547 }, { - "x": 178.8979949951172, - "y": 178.8979949951172 + "x": 95.43099975585938, + "y": 175.76300048828125 }, { - "x": 169.2899932861328, - "y": 188.01499938964844 + "x": 90.7979965209961, + "y": 178.2010040283203 }, { - "x": 159.21800231933594, - "y": 196.61700439453125 + "x": 86.10199737548828, + "y": 180.51699829101562 }, { - "x": 148.70899963378906, - "y": 204.68099975585938 + "x": 81.34700012207031, + "y": 182.70899963378906 }, { - "x": 137.79299926757812, - "y": 212.18299865722656 + "x": 76.53600311279297, + "y": 184.77499389648438 }, { - "x": 126.5, - "y": 219.10400390625 + "x": 71.6729965209961, + "y": 186.71600341796875 }, { - "x": 114.85900115966797, - "y": 225.4239959716797 + "x": 66.76100158691406, + "y": 188.5279998779297 }, { - "x": 102.90399932861328, - "y": 231.1269989013672 + "x": 61.803001403808594, + "y": 190.21099853515625 }, { - "x": 90.66699981689453, - "y": 236.19500732421875 + "x": 56.803001403808594, + "y": 191.76300048828125 }, { - "x": 78.18099975585938, - "y": 240.61700439453125 + "x": 51.76300048828125, + "y": 193.18499755859375 }, { - "x": 65.48100280761719, - "y": 244.37899780273438 + "x": 46.68899917602539, + "y": 194.47300720214844 }, { - "x": 52.60100173950195, - "y": 247.4709930419922 + "x": 41.582000732421875, + "y": 195.62899780273438 }, { - "x": 39.57699966430664, - "y": 249.88499450683594 + "x": 36.446998596191406, + "y": 196.64999389648438 }, { - "x": 26.44499969482422, - "y": 251.61399841308594 + "x": 31.285999298095703, + "y": 197.53700256347656 }, { - "x": 13.239999771118164, - "y": 252.6529998779297 + "x": 26.104999542236328, + "y": 198.28799438476562 }, { - "x": 8.239999771118164, - "y": 232.6529998779297 + "x": 20.905000686645508, + "y": 198.9040069580078 + }, + { + "x": 15.690999984741211, + "y": 199.38299560546875 + }, + { + "x": 10.467000007629395, + "y": 199.72500610351562 + }, + { + "x": 5.235000133514404, + "y": 199.93099975585938 + }, + { + "x": 0, + "y": 200 } ], "isCurve": true, @@ -852,128 +1092,248 @@ "link": "", "route": [ { - "x": -8.239999771118164, - "y": 232.6529998779297 + "x": 0, + "y": 200 + }, + { + "x": -5.235000133514404, + "y": 199.93099975585938 + }, + { + "x": -10.467000007629395, + "y": 199.72500610351562 + }, + { + "x": -15.690999984741211, + "y": 199.38299560546875 + }, + { + "x": -20.905000686645508, + "y": 198.9040069580078 + }, + { + "x": -26.104999542236328, + "y": 198.28799438476562 + }, + { + "x": -31.285999298095703, + "y": 197.53700256347656 + }, + { + "x": -36.446998596191406, + "y": 196.64999389648438 + }, + { + "x": -41.582000732421875, + "y": 195.62899780273438 + }, + { + "x": -46.68899917602539, + "y": 194.47300720214844 + }, + { + "x": -51.76300048828125, + "y": 193.18499755859375 + }, + { + "x": -56.803001403808594, + "y": 191.76300048828125 + }, + { + "x": -61.803001403808594, + "y": 190.21099853515625 + }, + { + "x": -66.76100158691406, + "y": 188.5279998779297 + }, + { + "x": -71.6729965209961, + "y": 186.71600341796875 + }, + { + "x": -76.53600311279297, + "y": 184.77499389648438 + }, + { + "x": -81.34700012207031, + "y": 182.70899963378906 + }, + { + "x": -86.10199737548828, + "y": 180.51699829101562 + }, + { + "x": -90.7979965209961, + "y": 178.2010040283203 + }, + { + "x": -95.43099975585938, + "y": 175.76300048828125 + }, + { + "x": -99.9990005493164, + "y": 173.2050018310547 + }, + { + "x": -104.4990005493164, + "y": 170.5279998779297 + }, + { + "x": -108.927001953125, + "y": 167.73399353027344 + }, + { + "x": -113.28099822998047, + "y": 164.8249969482422 + }, + { + "x": -117.55699920654297, + "y": 161.80299377441406 + }, + { + "x": -121.75199890136719, + "y": 158.6699981689453 + }, + { + "x": -125.86399841308594, + "y": 155.4290008544922 + }, + { + "x": -129.88900756835938, + "y": 152.08099365234375 + }, + { + "x": -133.8260040283203, + "y": 148.6280059814453 + }, + { + "x": -137.6699981689453, + "y": 145.07400512695312 + }, + { + "x": -141.42100524902344, + "y": 141.42100524902344 }, { - "x": -13.239999771118164, - "y": 252.6529998779297 + "x": -145.07400512695312, + "y": 137.6699981689453 }, { - "x": -26.44499969482422, - "y": 251.61399841308594 + "x": -148.6280059814453, + "y": 133.8260040283203 }, { - "x": -39.57699966430664, - "y": 249.88499450683594 + "x": -152.08099365234375, + "y": 129.88900756835938 }, { - "x": -52.60100173950195, - "y": 247.4709930419922 + "x": -155.4290008544922, + "y": 125.86399841308594 }, { - "x": -65.48100280761719, - "y": 244.37899780273438 + "x": -158.6699981689453, + "y": 121.75199890136719 }, { - "x": -78.18099975585938, - "y": 240.61700439453125 + "x": -161.80299377441406, + "y": 117.55699920654297 }, { - "x": -90.66699981689453, - "y": 236.19500732421875 + "x": -164.8249969482422, + "y": 113.28099822998047 }, { - "x": -102.90399932861328, - "y": 231.1269989013672 + "x": -167.73399353027344, + "y": 108.927001953125 }, { - "x": -114.85900115966797, - "y": 225.4239959716797 + "x": -170.5279998779297, + "y": 104.4990005493164 }, { - "x": -126.4990005493164, - "y": 219.10400390625 + "x": -173.2050018310547, + "y": 100 }, { - "x": -137.79299926757812, - "y": 212.18299865722656 + "x": -175.76300048828125, + "y": 95.43099975585938 }, { - "x": -148.70899963378906, - "y": 204.68099975585938 + "x": -178.2010040283203, + "y": 90.7979965209961 }, { - "x": -159.21800231933594, - "y": 196.61700439453125 + "x": -180.51699829101562, + "y": 86.10199737548828 }, { - "x": -169.2899932861328, - "y": 188.01499938964844 + "x": -182.70899963378906, + "y": 81.34700012207031 }, { - "x": -178.8979949951172, - "y": 178.8979949951172 + "x": -184.77499389648438, + "y": 76.53600311279297 }, { - "x": -188.01499938964844, - "y": 169.2899932861328 + "x": -186.71600341796875, + "y": 71.6729965209961 }, { - "x": -196.61700439453125, - "y": 159.21800231933594 + "x": -188.5279998779297, + "y": 66.76100158691406 }, { - "x": -204.68099975585938, - "y": 148.70899963378906 + "x": -190.21099853515625, + "y": 61.803001403808594 }, { - "x": -212.18299865722656, - "y": 137.79299926757812 + "x": -191.76300048828125, + "y": 56.803001403808594 }, { - "x": -219.10400390625, - "y": 126.5 + "x": -193.18499755859375, + "y": 51.76300048828125 }, { - "x": -225.4239959716797, - "y": 114.85900115966797 + "x": -194.47300720214844, + "y": 46.68899917602539 }, { - "x": -231.1269989013672, - "y": 102.90399932861328 + "x": -195.62899780273438, + "y": 41.582000732421875 }, { - "x": -236.19500732421875, - "y": 90.66699981689453 + "x": -196.64999389648438, + "y": 36.446998596191406 }, { - "x": -240.61700439453125, - "y": 78.18099975585938 + "x": -197.53700256347656, + "y": 31.285999298095703 }, { - "x": -244.37899780273438, - "y": 65.48100280761719 + "x": -198.28799438476562, + "y": 26.104999542236328 }, { - "x": -247.4709930419922, - "y": 52.60100173950195 + "x": -198.9040069580078, + "y": 20.905000686645508 }, { - "x": -249.88499450683594, - "y": 39.57699966430664 + "x": -199.38299560546875, + "y": 15.690999984741211 }, { - "x": -251.61399841308594, - "y": 26.44499969482422 + "x": -199.72500610351562, + "y": 10.467000007629395 }, { - "x": -252.6529998779297, - "y": 13.239999771118164 + "x": -199.93099975585938, + "y": 5.235000133514404 }, { - "x": -226.6529998779297, - "y": 7.239999771118164 + "x": -200, + "y": 0 } ], "isCurve": true, @@ -1008,128 +1368,248 @@ "link": "", "route": [ { - "x": 523.6480102539062, - "y": -183.38299560546875 + "x": 513, + "y": -150 + }, + { + "x": 519.97900390625, + "y": -149.8780059814453 + }, + { + "x": 526.9509887695312, + "y": -149.51199340820312 + }, + { + "x": 533.905029296875, + "y": -148.9040069580078 + }, + { + "x": 540.833984375, + "y": -148.05299377441406 + }, + { + "x": 547.72900390625, + "y": -146.96099853515625 + }, + { + "x": 554.5819702148438, + "y": -145.62899780273438 + }, + { + "x": 561.3839721679688, + "y": -144.0590057373047 + }, + { + "x": 568.1270141601562, + "y": -142.2519989013672 + }, + { + "x": 574.802978515625, + "y": -140.21099853515625 + }, + { + "x": 581.4039916992188, + "y": -137.93800354003906 + }, + { + "x": 587.9210205078125, + "y": -135.43600463867188 + }, + { + "x": 594.3469848632812, + "y": -132.70899963378906 + }, + { + "x": 600.6740112304688, + "y": -129.75799560546875 + }, + { + "x": 606.8939819335938, + "y": -126.58899688720703 + }, + { + "x": 613, + "y": -123.20500183105469 + }, + { + "x": 618.9829711914062, + "y": -119.60900115966797 + }, + { + "x": 624.8380126953125, + "y": -115.80699920654297 + }, + { + "x": 630.5570068359375, + "y": -111.8030014038086 + }, + { + "x": 636.1320190429688, + "y": -107.60199737548828 + }, + { + "x": 641.5570068359375, + "y": -103.20800018310547 + }, + { + "x": 646.8259887695312, + "y": -98.62799835205078 + }, + { + "x": 651.9310302734375, + "y": -93.86699676513672 }, { - "x": 530.6480102539062, - "y": -202.38299560546875 + "x": 656.8670043945312, + "y": -88.93099975585938 }, { - "x": 548.2100219726562, - "y": -200.53700256347656 + "x": 661.6279907226562, + "y": -83.82599639892578 }, { - "x": 565.6010131835938, - "y": -197.4709930419922 + "x": 666.2080078125, + "y": -78.55699920654297 }, { - "x": 582.7360229492188, - "y": -193.19900512695312 + "x": 670.6019897460938, + "y": -73.13200378417969 }, { - "x": 599.531005859375, - "y": -187.74200439453125 + "x": 674.802978515625, + "y": -67.55699920654297 }, { - "x": 615.9039916992188, - "y": -181.1269989013672 + "x": 678.8070068359375, + "y": -61.8380012512207 }, { - "x": 631.7760009765625, - "y": -173.38499450683594 + "x": 682.6090087890625, + "y": -55.983001708984375 }, { - "x": 647.0689697265625, - "y": -164.55599975585938 + "x": 686.2050170898438, + "y": -50 }, { - "x": 661.708984375, - "y": -154.68099975585938 + "x": 689.5889892578125, + "y": -43.89400100708008 }, { - "x": 675.625, - "y": -143.8090057373047 + "x": 692.7579956054688, + "y": -37.67399978637695 }, { - "x": 688.7479858398438, - "y": -131.99200439453125 + "x": 695.708984375, + "y": -31.347000122070312 }, { - "x": 701.0150146484375, - "y": -119.29000091552734 + "x": 698.4359741210938, + "y": -24.92099952697754 }, { - "x": 712.3660278320312, - "y": -105.76200103759766 + "x": 700.93798828125, + "y": -18.40399932861328 }, { - "x": 722.7459716796875, - "y": -91.4749984741211 + "x": 703.2109985351562, + "y": -11.803000450134277 }, { - "x": 732.10400390625, - "y": -76.5 + "x": 705.2520141601562, + "y": -5.126999855041504 }, { - "x": 740.3939819335938, - "y": -60.90700149536133 + "x": 707.0590209960938, + "y": 1.6150000095367432 }, { - "x": 747.5770263671875, - "y": -44.775001525878906 + "x": 708.6290283203125, + "y": 8.416999816894531 }, { - "x": 753.6170043945312, - "y": -28.180999755859375 + "x": 709.9609985351562, + "y": 15.270000457763672 }, { - "x": 758.4840087890625, - "y": -11.206000328063965 + "x": 711.052978515625, + "y": 22.165000915527344 }, { - "x": 762.156005859375, - "y": 6.066999912261963 + "x": 711.9039916992188, + "y": 29.0939998626709 }, { - "x": 764.614013671875, - "y": 23.554000854492188 + "x": 712.5120239257812, + "y": 36.04800033569336 }, { - "x": 765.844970703125, - "y": 41.16999816894531 + "x": 712.8779907226562, + "y": 43.02000045776367 }, { - "x": 765.844970703125, - "y": 58.82899856567383 + "x": 713, + "y": 50 }, { - "x": 764.614013671875, - "y": 76.44499969482422 + "x": 712.8779907226562, + "y": 56.979000091552734 }, { - "x": 762.156005859375, - "y": 93.93199920654297 + "x": 712.5120239257812, + "y": 63.95100021362305 }, { - "x": 758.4840087890625, - "y": 111.20600128173828 + "x": 711.9039916992188, + "y": 70.90499877929688 }, { - "x": 753.6170043945312, - "y": 128.18099975585938 + "x": 711.052978515625, + "y": 77.83399963378906 }, { - "x": 747.5770263671875, - "y": 144.77499389648438 + "x": 709.9609985351562, + "y": 84.72899627685547 }, { - "x": 740.3939819335938, - "y": 160.90699768066406 + "x": 708.6290283203125, + "y": 91.58200073242188 }, { - "x": 712.3939819335938, - "y": 154.90699768066406 + "x": 707.0590209960938, + "y": 98.38400268554688 + }, + { + "x": 705.2520141601562, + "y": 105.12699890136719 + }, + { + "x": 703.2109985351562, + "y": 111.8030014038086 + }, + { + "x": 700.93798828125, + "y": 118.40399932861328 + }, + { + "x": 698.4359741210938, + "y": 124.9209976196289 + }, + { + "x": 695.708984375, + "y": 131.3470001220703 + }, + { + "x": 692.7579956054688, + "y": 137.6739959716797 + }, + { + "x": 689.5889892578125, + "y": 143.8939971923828 + }, + { + "x": 686.2050170898438, + "y": 149.99899291992188 } ], "isCurve": true, @@ -1164,128 +1644,248 @@ "link": "", "route": [ { - "x": 712.7459716796875, - "y": 180.47500610351562 + "x": 686.2050170898438, + "y": 149.99899291992188 + }, + { + "x": 682.6090087890625, + "y": 155.98300170898438 + }, + { + "x": 678.8070068359375, + "y": 161.83799743652344 + }, + { + "x": 674.802978515625, + "y": 167.5570068359375 + }, + { + "x": 670.6019897460938, + "y": 173.1320037841797 + }, + { + "x": 666.2080078125, + "y": 178.5570068359375 + }, + { + "x": 661.6279907226562, + "y": 183.8260040283203 + }, + { + "x": 656.8670043945312, + "y": 188.93099975585938 + }, + { + "x": 651.9310302734375, + "y": 193.86700439453125 + }, + { + "x": 646.8259887695312, + "y": 198.6280059814453 + }, + { + "x": 641.5570068359375, + "y": 203.20799255371094 + }, + { + "x": 636.1320190429688, + "y": 207.6020050048828 + }, + { + "x": 630.5570068359375, + "y": 211.80299377441406 + }, + { + "x": 624.8380126953125, + "y": 215.8070068359375 + }, + { + "x": 618.9829711914062, + "y": 219.60899353027344 + }, + { + "x": 613, + "y": 223.2050018310547 }, { - "x": 722.7459716796875, - "y": 191.47500610351562 + "x": 606.8939819335938, + "y": 226.58900451660156 }, { - "x": 712.3660278320312, - "y": 205.76199340820312 + "x": 600.6740112304688, + "y": 229.75799560546875 }, { - "x": 701.0150146484375, - "y": 219.2899932861328 + "x": 594.3469848632812, + "y": 232.70899963378906 }, { - "x": 688.7479858398438, - "y": 231.99200439453125 + "x": 587.9210205078125, + "y": 235.43600463867188 }, { - "x": 675.625, - "y": 243.8090057373047 + "x": 581.4039916992188, + "y": 237.93800354003906 }, { - "x": 661.708984375, - "y": 254.68099975585938 + "x": 574.802978515625, + "y": 240.21099853515625 }, { - "x": 647.0689697265625, - "y": 264.5559997558594 + "x": 568.1270141601562, + "y": 242.2519989013672 }, { - "x": 631.7760009765625, - "y": 273.385009765625 + "x": 561.3839721679688, + "y": 244.0590057373047 }, { - "x": 615.9039916992188, - "y": 281.12701416015625 + "x": 554.5819702148438, + "y": 245.62899780273438 }, { - "x": 599.531005859375, - "y": 287.74200439453125 + "x": 547.72900390625, + "y": 246.96099853515625 }, { - "x": 582.7360229492188, - "y": 293.1990051269531 + "x": 540.833984375, + "y": 248.05299377441406 }, { - "x": 565.6010131835938, - "y": 297.47100830078125 + "x": 533.905029296875, + "y": 248.9040069580078 }, { - "x": 548.2100219726562, - "y": 300.5369873046875 + "x": 526.9509887695312, + "y": 249.51199340820312 }, { - "x": 530.6480102539062, - "y": 302.38299560546875 + "x": 519.97900390625, + "y": 249.8780059814453 }, { "x": 513, - "y": 303 + "y": 250 + }, + { + "x": 506.0199890136719, + "y": 249.8780059814453 + }, + { + "x": 499.0480041503906, + "y": 249.51199340820312 + }, + { + "x": 492.093994140625, + "y": 248.9040069580078 + }, + { + "x": 485.1650085449219, + "y": 248.05299377441406 + }, + { + "x": 478.2699890136719, + "y": 246.96099853515625 + }, + { + "x": 471.4169921875, + "y": 245.62899780273438 + }, + { + "x": 464.614990234375, + "y": 244.0590057373047 + }, + { + "x": 457.87200927734375, + "y": 242.2519989013672 + }, + { + "x": 451.1960144042969, + "y": 240.21099853515625 + }, + { + "x": 444.5950012207031, + "y": 237.93800354003906 + }, + { + "x": 438.0780029296875, + "y": 235.43600463867188 }, { - "x": 495.35101318359375, - "y": 302.38299560546875 + "x": 431.6520080566406, + "y": 232.70899963378906 }, { - "x": 477.78900146484375, - "y": 300.5369873046875 + "x": 425.32501220703125, + "y": 229.75799560546875 }, { - "x": 460.39801025390625, - "y": 297.47100830078125 + "x": 419.1050109863281, + "y": 226.58900451660156 }, { - "x": 443.26300048828125, - "y": 293.1990051269531 + "x": 413, + "y": 223.2050018310547 }, { - "x": 426.4679870605469, - "y": 287.74200439453125 + "x": 407.0159912109375, + "y": 219.60899353027344 }, { - "x": 410.0950012207031, - "y": 281.12701416015625 + "x": 401.1610107421875, + "y": 215.8070068359375 }, { - "x": 394.2229919433594, - "y": 273.385009765625 + "x": 395.4419860839844, + "y": 211.80299377441406 }, { - "x": 378.92999267578125, - "y": 264.5559997558594 + "x": 389.86700439453125, + "y": 207.6020050048828 }, { - "x": 364.2900085449219, - "y": 254.68099975585938 + "x": 384.4419860839844, + "y": 203.20799255371094 }, { - "x": 350.3739929199219, - "y": 243.8090057373047 + "x": 379.1730041503906, + "y": 198.6280059814453 }, { - "x": 337.2510070800781, - "y": 231.99200439453125 + "x": 374.0679931640625, + "y": 193.86700439453125 }, { - "x": 324.9840087890625, - "y": 219.2899932861328 + "x": 369.1319885253906, + "y": 188.93099975585938 }, { - "x": 313.63299560546875, - "y": 205.76199340820312 + "x": 364.3710021972656, + "y": 183.8260040283203 }, { - "x": 303.25299072265625, - "y": 191.47500610351562 + "x": 359.7909851074219, + "y": 178.5570068359375 }, { - "x": 313.25299072265625, - "y": 180.47500610351562 + "x": 355.3970031738281, + "y": 173.1320037841797 + }, + { + "x": 351.1960144042969, + "y": 167.5570068359375 + }, + { + "x": 347.1919860839844, + "y": 161.83799743652344 + }, + { + "x": 343.3900146484375, + "y": 155.98300170898438 + }, + { + "x": 339.79400634765625, + "y": 150 } ], "isCurve": true, @@ -1320,128 +1920,248 @@ "link": "", "route": [ { - "x": 988.4450073242188, - "y": -232.61399841308594 + "x": 972, + "y": -200 + }, + { + "x": 982.4669799804688, + "y": -199.72500610351562 + }, + { + "x": 992.905029296875, + "y": -198.9040069580078 }, { - "x": 998.4450073242188, - "y": -251.61399841308594 + "x": 1003.2860107421875, + "y": -197.53700256347656 }, { - "x": 1024.6009521484375, - "y": -247.4709930419922 + "x": 1013.5819702148438, + "y": -195.62899780273438 }, { - "x": 1050.1810302734375, - "y": -240.61700439453125 + "x": 1023.7630004882812, + "y": -193.18499755859375 }, { - "x": 1074.904052734375, - "y": -231.1269989013672 + "x": 1033.802978515625, + "y": -190.21099853515625 }, { - "x": 1098.5, - "y": -219.10400390625 + "x": 1043.6729736328125, + "y": -186.71600341796875 }, { - "x": 1120.708984375, - "y": -204.68099975585938 + "x": 1053.3470458984375, + "y": -182.70899963378906 }, { - "x": 1141.2900390625, - "y": -188.01499938964844 + "x": 1062.7979736328125, + "y": -178.2010040283203 }, { - "x": 1160.0150146484375, - "y": -169.2899932861328 + "x": 1072, + "y": -173.2050018310547 }, { - "x": 1176.6810302734375, - "y": -148.70899963378906 + "x": 1080.927001953125, + "y": -167.73399353027344 }, { - "x": 1191.10400390625, - "y": -126.5 + "x": 1089.5570068359375, + "y": -161.80299377441406 }, { - "x": 1203.126953125, - "y": -102.90399932861328 + "x": 1097.864013671875, + "y": -155.4290008544922 }, { - "x": 1212.616943359375, - "y": -78.18099975585938 + "x": 1105.8260498046875, + "y": -148.6280059814453 }, { - "x": 1219.470947265625, - "y": -52.60100173950195 + "x": 1113.4210205078125, + "y": -141.42100524902344 }, { - "x": 1223.614013671875, - "y": -26.44499969482422 + "x": 1120.6280517578125, + "y": -133.8260040283203 }, { - "x": 1225, + "x": 1127.428955078125, + "y": -125.86399841308594 + }, + { + "x": 1133.802978515625, + "y": -117.55699920654297 + }, + { + "x": 1139.7340087890625, + "y": -108.927001953125 + }, + { + "x": 1145.2049560546875, + "y": -100 + }, + { + "x": 1150.2010498046875, + "y": -90.7979965209961 + }, + { + "x": 1154.708984375, + "y": -81.34700012207031 + }, + { + "x": 1158.7159423828125, + "y": -71.6729965209961 + }, + { + "x": 1162.2110595703125, + "y": -61.803001403808594 + }, + { + "x": 1165.18505859375, + "y": -51.76300048828125 + }, + { + "x": 1167.6290283203125, + "y": -41.582000732421875 + }, + { + "x": 1169.5369873046875, + "y": -31.285999298095703 + }, + { + "x": 1170.904052734375, + "y": -20.905000686645508 + }, + { + "x": 1171.7249755859375, + "y": -10.467000007629395 + }, + { + "x": 1172, "y": 0 }, { - "x": 1223.614013671875, - "y": 26.44499969482422 + "x": 1171.7249755859375, + "y": 10.467000007629395 + }, + { + "x": 1170.904052734375, + "y": 20.905000686645508 + }, + { + "x": 1169.5369873046875, + "y": 31.285999298095703 + }, + { + "x": 1167.6290283203125, + "y": 41.582000732421875 + }, + { + "x": 1165.18505859375, + "y": 51.76300048828125 + }, + { + "x": 1162.2110595703125, + "y": 61.803001403808594 + }, + { + "x": 1158.7159423828125, + "y": 71.6729965209961 + }, + { + "x": 1154.708984375, + "y": 81.34700012207031 + }, + { + "x": 1150.2010498046875, + "y": 90.7979965209961 + }, + { + "x": 1145.2049560546875, + "y": 99.9990005493164 + }, + { + "x": 1139.7340087890625, + "y": 108.927001953125 + }, + { + "x": 1133.802978515625, + "y": 117.55699920654297 + }, + { + "x": 1127.428955078125, + "y": 125.86399841308594 + }, + { + "x": 1120.6280517578125, + "y": 133.8260040283203 + }, + { + "x": 1113.4210205078125, + "y": 141.42100524902344 + }, + { + "x": 1105.8260498046875, + "y": 148.6280059814453 }, { - "x": 1219.470947265625, - "y": 52.60100173950195 + "x": 1097.864013671875, + "y": 155.4290008544922 }, { - "x": 1212.616943359375, - "y": 78.18099975585938 + "x": 1089.5570068359375, + "y": 161.80299377441406 }, { - "x": 1203.126953125, - "y": 102.90399932861328 + "x": 1080.927001953125, + "y": 167.73399353027344 }, { - "x": 1191.10400390625, - "y": 126.4990005493164 + "x": 1072, + "y": 173.2050018310547 }, { - "x": 1176.6810302734375, - "y": 148.70899963378906 + "x": 1062.7979736328125, + "y": 178.2010040283203 }, { - "x": 1160.0150146484375, - "y": 169.2899932861328 + "x": 1053.3470458984375, + "y": 182.70899963378906 }, { - "x": 1141.2900390625, - "y": 188.01499938964844 + "x": 1043.6729736328125, + "y": 186.71600341796875 }, { - "x": 1120.708984375, - "y": 204.68099975585938 + "x": 1033.802978515625, + "y": 190.21099853515625 }, { - "x": 1098.5, - "y": 219.10400390625 + "x": 1023.7630004882812, + "y": 193.18499755859375 }, { - "x": 1074.904052734375, - "y": 231.1269989013672 + "x": 1013.5819702148438, + "y": 195.62899780273438 }, { - "x": 1050.1810302734375, - "y": 240.61700439453125 + "x": 1003.2860107421875, + "y": 197.53700256347656 }, { - "x": 1024.6009521484375, - "y": 247.4709930419922 + "x": 992.905029296875, + "y": 198.9040069580078 }, { - "x": 998.4450073242188, - "y": 251.61399841308594 + "x": 982.4669799804688, + "y": 199.72500610351562 }, { - "x": 988.4450073242188, - "y": 232.61399841308594 + "x": 972, + "y": 200 } ], "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 f619743133..dc0dacddde 100644 --- a/e2etests/testdata/txtar/cycle-diagram/dagre/sketch.exp.svg +++ b/e2etests/testdata/txtar/cycle-diagram/dagre/sketch.exp.svg @@ -1,9 +1,9 @@ -abcdabcab - + .d2-4000015886 .fill-N1{fill:#0A0F25;} + .d2-4000015886 .fill-N2{fill:#676C7E;} + .d2-4000015886 .fill-N3{fill:#9499AB;} + .d2-4000015886 .fill-N4{fill:#CFD2DD;} + .d2-4000015886 .fill-N5{fill:#DEE1EB;} + .d2-4000015886 .fill-N6{fill:#EEF1F8;} + .d2-4000015886 .fill-N7{fill:#FFFFFF;} + .d2-4000015886 .fill-B1{fill:#0D32B2;} + .d2-4000015886 .fill-B2{fill:#0D32B2;} + .d2-4000015886 .fill-B3{fill:#E3E9FD;} + .d2-4000015886 .fill-B4{fill:#E3E9FD;} + .d2-4000015886 .fill-B5{fill:#EDF0FD;} + .d2-4000015886 .fill-B6{fill:#F7F8FE;} + .d2-4000015886 .fill-AA2{fill:#4A6FF3;} + .d2-4000015886 .fill-AA4{fill:#EDF0FD;} + .d2-4000015886 .fill-AA5{fill:#F7F8FE;} + .d2-4000015886 .fill-AB4{fill:#EDF0FD;} + .d2-4000015886 .fill-AB5{fill:#F7F8FE;} + .d2-4000015886 .stroke-N1{stroke:#0A0F25;} + .d2-4000015886 .stroke-N2{stroke:#676C7E;} + .d2-4000015886 .stroke-N3{stroke:#9499AB;} + .d2-4000015886 .stroke-N4{stroke:#CFD2DD;} + .d2-4000015886 .stroke-N5{stroke:#DEE1EB;} + .d2-4000015886 .stroke-N6{stroke:#EEF1F8;} + .d2-4000015886 .stroke-N7{stroke:#FFFFFF;} + .d2-4000015886 .stroke-B1{stroke:#0D32B2;} + .d2-4000015886 .stroke-B2{stroke:#0D32B2;} + .d2-4000015886 .stroke-B3{stroke:#E3E9FD;} + .d2-4000015886 .stroke-B4{stroke:#E3E9FD;} + .d2-4000015886 .stroke-B5{stroke:#EDF0FD;} + .d2-4000015886 .stroke-B6{stroke:#F7F8FE;} + .d2-4000015886 .stroke-AA2{stroke:#4A6FF3;} + .d2-4000015886 .stroke-AA4{stroke:#EDF0FD;} + .d2-4000015886 .stroke-AA5{stroke:#F7F8FE;} + .d2-4000015886 .stroke-AB4{stroke:#EDF0FD;} + .d2-4000015886 .stroke-AB5{stroke:#F7F8FE;} + .d2-4000015886 .background-color-N1{background-color:#0A0F25;} + .d2-4000015886 .background-color-N2{background-color:#676C7E;} + .d2-4000015886 .background-color-N3{background-color:#9499AB;} + .d2-4000015886 .background-color-N4{background-color:#CFD2DD;} + .d2-4000015886 .background-color-N5{background-color:#DEE1EB;} + .d2-4000015886 .background-color-N6{background-color:#EEF1F8;} + .d2-4000015886 .background-color-N7{background-color:#FFFFFF;} + .d2-4000015886 .background-color-B1{background-color:#0D32B2;} + .d2-4000015886 .background-color-B2{background-color:#0D32B2;} + .d2-4000015886 .background-color-B3{background-color:#E3E9FD;} + .d2-4000015886 .background-color-B4{background-color:#E3E9FD;} + .d2-4000015886 .background-color-B5{background-color:#EDF0FD;} + .d2-4000015886 .background-color-B6{background-color:#F7F8FE;} + .d2-4000015886 .background-color-AA2{background-color:#4A6FF3;} + .d2-4000015886 .background-color-AA4{background-color:#EDF0FD;} + .d2-4000015886 .background-color-AA5{background-color:#F7F8FE;} + .d2-4000015886 .background-color-AB4{background-color:#EDF0FD;} + .d2-4000015886 .background-color-AB5{background-color:#F7F8FE;} + .d2-4000015886 .color-N1{color:#0A0F25;} + .d2-4000015886 .color-N2{color:#676C7E;} + .d2-4000015886 .color-N3{color:#9499AB;} + .d2-4000015886 .color-N4{color:#CFD2DD;} + .d2-4000015886 .color-N5{color:#DEE1EB;} + .d2-4000015886 .color-N6{color:#EEF1F8;} + .d2-4000015886 .color-N7{color:#FFFFFF;} + .d2-4000015886 .color-B1{color:#0D32B2;} + .d2-4000015886 .color-B2{color:#0D32B2;} + .d2-4000015886 .color-B3{color:#E3E9FD;} + .d2-4000015886 .color-B4{color:#E3E9FD;} + .d2-4000015886 .color-B5{color:#EDF0FD;} + .d2-4000015886 .color-B6{color:#F7F8FE;} + .d2-4000015886 .color-AA2{color:#4A6FF3;} + .d2-4000015886 .color-AA4{color:#EDF0FD;} + .d2-4000015886 .color-AA5{color:#F7F8FE;} + .d2-4000015886 .color-AB4{color:#EDF0FD;} + .d2-4000015886 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker-d2-4000015886);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker-d2-4000015886);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright-d2-4000015886);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright-d2-4000015886);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright-d2-4000015886);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright-d2-4000015886);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark-d2-4000015886);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright-d2-4000015886);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright-d2-4000015886);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright-d2-4000015886);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright-d2-4000015886);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker-d2-4000015886);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark-d2-4000015886);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal-d2-4000015886);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal-d2-4000015886);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright-d2-4000015886);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright-d2-4000015886);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright-d2-4000015886);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>abcdabcab + diff --git a/e2etests/testdata/txtar/cycle-diagram/elk/board.exp.json b/e2etests/testdata/txtar/cycle-diagram/elk/board.exp.json index 6ff0b5c2d3..def0de8052 100644 --- a/e2etests/testdata/txtar/cycle-diagram/elk/board.exp.json +++ b/e2etests/testdata/txtar/cycle-diagram/elk/board.exp.json @@ -540,128 +540,248 @@ "link": "", "route": [ { - "x": 20.239999771118164, - "y": -220.6529998779297 + "x": 12, + "y": -188 }, { - "x": 25.239999771118164, - "y": -240.6529998779297 + "x": 17.235000610351562, + "y": -187.93099975585938 }, { - "x": 38.44499969482422, - "y": -239.61399841308594 + "x": 22.466999053955078, + "y": -187.72500610351562 }, { - "x": 51.57699966430664, - "y": -237.88499450683594 + "x": 27.69099998474121, + "y": -187.38299560546875 }, { - "x": 64.60099792480469, - "y": -235.4709930419922 + "x": 32.904998779296875, + "y": -186.9040069580078 }, { - "x": 77.48100280761719, - "y": -232.37899780273438 + "x": 38.10499954223633, + "y": -186.28799438476562 }, { - "x": 90.18099975585938, - "y": -228.61700439453125 + "x": 43.2859992980957, + "y": -185.53700256347656 }, { - "x": 102.66699981689453, - "y": -224.19500732421875 + "x": 48.446998596191406, + "y": -184.64999389648438 }, { - "x": 114.90399932861328, - "y": -219.1269989013672 + "x": 53.582000732421875, + "y": -183.62899780273438 }, { - "x": 126.85900115966797, - "y": -213.4239959716797 + "x": 58.68899917602539, + "y": -182.47300720214844 }, { - "x": 138.5, - "y": -207.10400390625 + "x": 63.76300048828125, + "y": -181.18499755859375 }, { - "x": 149.79299926757812, - "y": -200.18299865722656 + "x": 68.8030014038086, + "y": -179.76300048828125 }, { - "x": 160.70899963378906, - "y": -192.68099975585938 + "x": 73.8030014038086, + "y": -178.21099853515625 }, { - "x": 171.21800231933594, - "y": -184.61700439453125 + "x": 78.76100158691406, + "y": -176.5279998779297 }, { - "x": 181.2899932861328, - "y": -176.01499938964844 + "x": 83.6729965209961, + "y": -174.71600341796875 }, { - "x": 190.8979949951172, - "y": -166.8979949951172 + "x": 88.53600311279297, + "y": -172.77499389648438 }, { - "x": 200.01499938964844, - "y": -157.2899932861328 + "x": 93.34700012207031, + "y": -170.70899963378906 }, { - "x": 208.61700439453125, - "y": -147.21800231933594 + "x": 98.10199737548828, + "y": -168.51699829101562 }, { - "x": 216.68099975585938, - "y": -136.70899963378906 + "x": 102.7979965209961, + "y": -166.2010040283203 }, { - "x": 224.18299865722656, - "y": -125.79299926757812 + "x": 107.43099975585938, + "y": -163.76300048828125 }, { - "x": 231.10400390625, - "y": -114.5 + "x": 111.9990005493164, + "y": -161.2050018310547 }, { - "x": 237.4239959716797, - "y": -102.85900115966797 + "x": 116.4990005493164, + "y": -158.5279998779297 }, { - "x": 243.1269989013672, - "y": -90.90399932861328 + "x": 120.927001953125, + "y": -155.73399353027344 }, { - "x": 248.19500732421875, - "y": -78.66699981689453 + "x": 125.28099822998047, + "y": -152.8249969482422 }, { - "x": 252.61700439453125, - "y": -66.18099975585938 + "x": 129.5570068359375, + "y": -149.80299377441406 }, { - "x": 256.3789978027344, - "y": -53.48099899291992 + "x": 133.7519989013672, + "y": -146.6699981689453 }, { - "x": 259.47100830078125, - "y": -40.60100173950195 + "x": 137.86399841308594, + "y": -143.4290008544922 }, { - "x": 261.885009765625, - "y": -27.57699966430664 + "x": 141.88900756835938, + "y": -140.08099365234375 }, { - "x": 263.614013671875, - "y": -14.444999694824219 + "x": 145.8260040283203, + "y": -136.6280059814453 }, { - "x": 264.65301513671875, - "y": -1.2400000095367432 + "x": 149.6699981689453, + "y": -133.07400512695312 }, { - "x": 238.6529998779297, - "y": 5.758999824523926 + "x": 153.42100524902344, + "y": -129.42100524902344 + }, + { + "x": 157.07400512695312, + "y": -125.66999816894531 + }, + { + "x": 160.6280059814453, + "y": -121.82599639892578 + }, + { + "x": 164.08099365234375, + "y": -117.88899993896484 + }, + { + "x": 167.4290008544922, + "y": -113.86399841308594 + }, + { + "x": 170.6699981689453, + "y": -109.75199890136719 + }, + { + "x": 173.80299377441406, + "y": -105.55699920654297 + }, + { + "x": 176.8249969482422, + "y": -101.28099822998047 + }, + { + "x": 179.73399353027344, + "y": -96.927001953125 + }, + { + "x": 182.5279998779297, + "y": -92.4990005493164 + }, + { + "x": 185.2050018310547, + "y": -88 + }, + { + "x": 187.76300048828125, + "y": -83.43099975585938 + }, + { + "x": 190.2010040283203, + "y": -78.7979965209961 + }, + { + "x": 192.51699829101562, + "y": -74.10199737548828 + }, + { + "x": 194.70899963378906, + "y": -69.34700012207031 + }, + { + "x": 196.77499389648438, + "y": -64.53600311279297 + }, + { + "x": 198.71600341796875, + "y": -59.67300033569336 + }, + { + "x": 200.5279998779297, + "y": -54.76100158691406 + }, + { + "x": 202.21099853515625, + "y": -49.803001403808594 + }, + { + "x": 203.76300048828125, + "y": -44.803001403808594 + }, + { + "x": 205.18499755859375, + "y": -39.76300048828125 + }, + { + "x": 206.47300720214844, + "y": -34.68899917602539 + }, + { + "x": 207.62899780273438, + "y": -29.582000732421875 + }, + { + "x": 208.64999389648438, + "y": -24.44700050354004 + }, + { + "x": 209.53700256347656, + "y": -19.285999298095703 + }, + { + "x": 210.28799438476562, + "y": -14.104999542236328 + }, + { + "x": 210.9040069580078, + "y": -8.904999732971191 + }, + { + "x": 211.38299560546875, + "y": -3.690999984741211 + }, + { + "x": 211.72500610351562, + "y": 1.531999945640564 + }, + { + "x": 211.93099975585938, + "y": 6.763999938964844 + }, + { + "x": 212, + "y": 12 } ], "isCurve": true, @@ -696,128 +816,248 @@ "link": "", "route": [ { - "x": 238.6529998779297, - "y": 18.239999771118164 + "x": 212, + "y": 12 + }, + { + "x": 211.93099975585938, + "y": 17.235000610351562 + }, + { + "x": 211.72500610351562, + "y": 22.466999053955078 + }, + { + "x": 211.38299560546875, + "y": 27.69099998474121 + }, + { + "x": 210.9040069580078, + "y": 32.904998779296875 + }, + { + "x": 210.28799438476562, + "y": 38.10499954223633 + }, + { + "x": 209.53700256347656, + "y": 43.2859992980957 + }, + { + "x": 208.64999389648438, + "y": 48.446998596191406 + }, + { + "x": 207.62899780273438, + "y": 53.582000732421875 + }, + { + "x": 206.47300720214844, + "y": 58.68899917602539 + }, + { + "x": 205.18499755859375, + "y": 63.76300048828125 + }, + { + "x": 203.76300048828125, + "y": 68.8030014038086 + }, + { + "x": 202.21099853515625, + "y": 73.8030014038086 + }, + { + "x": 200.5279998779297, + "y": 78.76100158691406 + }, + { + "x": 198.71600341796875, + "y": 83.6729965209961 + }, + { + "x": 196.77499389648438, + "y": 88.53600311279297 + }, + { + "x": 194.70899963378906, + "y": 93.34700012207031 + }, + { + "x": 192.51699829101562, + "y": 98.10199737548828 + }, + { + "x": 190.2010040283203, + "y": 102.7979965209961 + }, + { + "x": 187.76300048828125, + "y": 107.43099975585938 + }, + { + "x": 185.2050018310547, + "y": 111.9990005493164 + }, + { + "x": 182.5279998779297, + "y": 116.4990005493164 + }, + { + "x": 179.73399353027344, + "y": 120.927001953125 + }, + { + "x": 176.8249969482422, + "y": 125.28099822998047 + }, + { + "x": 173.80299377441406, + "y": 129.5570068359375 + }, + { + "x": 170.6699981689453, + "y": 133.7519989013672 + }, + { + "x": 167.4290008544922, + "y": 137.86399841308594 }, { - "x": 264.65301513671875, - "y": 25.239999771118164 + "x": 164.08099365234375, + "y": 141.88900756835938 }, { - "x": 263.614013671875, - "y": 38.44499969482422 + "x": 160.6280059814453, + "y": 145.8260040283203 }, { - "x": 261.885009765625, - "y": 51.57699966430664 + "x": 157.07400512695312, + "y": 149.6699981689453 }, { - "x": 259.47100830078125, - "y": 64.60099792480469 + "x": 153.42100524902344, + "y": 153.42100524902344 }, { - "x": 256.3789978027344, - "y": 77.48100280761719 + "x": 149.6699981689453, + "y": 157.07400512695312 }, { - "x": 252.61700439453125, - "y": 90.18099975585938 + "x": 145.8260040283203, + "y": 160.6280059814453 }, { - "x": 248.19500732421875, - "y": 102.66699981689453 + "x": 141.88900756835938, + "y": 164.08099365234375 }, { - "x": 243.1269989013672, - "y": 114.90399932861328 + "x": 137.86399841308594, + "y": 167.4290008544922 }, { - "x": 237.4239959716797, - "y": 126.85900115966797 + "x": 133.7519989013672, + "y": 170.6699981689453 }, { - "x": 231.10400390625, - "y": 138.5 + "x": 129.5570068359375, + "y": 173.80299377441406 }, { - "x": 224.18299865722656, - "y": 149.79299926757812 + "x": 125.28099822998047, + "y": 176.8249969482422 }, { - "x": 216.68099975585938, - "y": 160.70899963378906 + "x": 120.927001953125, + "y": 179.73399353027344 }, { - "x": 208.61700439453125, - "y": 171.21800231933594 + "x": 116.4990005493164, + "y": 182.5279998779297 }, { - "x": 200.01499938964844, - "y": 181.2899932861328 + "x": 112, + "y": 185.2050018310547 }, { - "x": 190.8979949951172, - "y": 190.8979949951172 + "x": 107.43099975585938, + "y": 187.76300048828125 }, { - "x": 181.2899932861328, - "y": 200.01499938964844 + "x": 102.7979965209961, + "y": 190.2010040283203 }, { - "x": 171.21800231933594, - "y": 208.61700439453125 + "x": 98.10199737548828, + "y": 192.51699829101562 }, { - "x": 160.70899963378906, - "y": 216.68099975585938 + "x": 93.34700012207031, + "y": 194.70899963378906 }, { - "x": 149.79299926757812, - "y": 224.18299865722656 + "x": 88.53600311279297, + "y": 196.77499389648438 }, { - "x": 138.5, - "y": 231.10400390625 + "x": 83.6729965209961, + "y": 198.71600341796875 }, { - "x": 126.85900115966797, - "y": 237.4239959716797 + "x": 78.76100158691406, + "y": 200.5279998779297 }, { - "x": 114.90399932861328, - "y": 243.1269989013672 + "x": 73.8030014038086, + "y": 202.21099853515625 }, { - "x": 102.66699981689453, - "y": 248.19500732421875 + "x": 68.8030014038086, + "y": 203.76300048828125 }, { - "x": 90.18099975585938, - "y": 252.61700439453125 + "x": 63.76300048828125, + "y": 205.18499755859375 }, { - "x": 77.48100280761719, - "y": 256.3789978027344 + "x": 58.68899917602539, + "y": 206.47300720214844 }, { - "x": 64.60099792480469, - "y": 259.47100830078125 + "x": 53.582000732421875, + "y": 207.62899780273438 }, { - "x": 51.57699966430664, - "y": 261.885009765625 + "x": 48.446998596191406, + "y": 208.64999389648438 }, { - "x": 38.44499969482422, - "y": 263.614013671875 + "x": 43.2859992980957, + "y": 209.53700256347656 }, { - "x": 25.239999771118164, - "y": 264.65301513671875 + "x": 38.10499954223633, + "y": 210.28799438476562 }, { - "x": 20.239999771118164, - "y": 244.6529998779297 + "x": 32.904998779296875, + "y": 210.9040069580078 + }, + { + "x": 27.69099998474121, + "y": 211.38299560546875 + }, + { + "x": 22.466999053955078, + "y": 211.72500610351562 + }, + { + "x": 17.235000610351562, + "y": 211.93099975585938 + }, + { + "x": 12, + "y": 212 } ], "isCurve": true, @@ -852,128 +1092,248 @@ "link": "", "route": [ { - "x": 3.759000062942505, - "y": 244.6529998779297 + "x": 12, + "y": 212 + }, + { + "x": 6.763999938964844, + "y": 211.93099975585938 + }, + { + "x": 1.531999945640564, + "y": 211.72500610351562 + }, + { + "x": -3.690999984741211, + "y": 211.38299560546875 + }, + { + "x": -8.904999732971191, + "y": 210.9040069580078 + }, + { + "x": -14.104999542236328, + "y": 210.28799438476562 + }, + { + "x": -19.285999298095703, + "y": 209.53700256347656 + }, + { + "x": -24.44700050354004, + "y": 208.64999389648438 + }, + { + "x": -29.582000732421875, + "y": 207.62899780273438 + }, + { + "x": -34.68899917602539, + "y": 206.47300720214844 + }, + { + "x": -39.76300048828125, + "y": 205.18499755859375 + }, + { + "x": -44.803001403808594, + "y": 203.76300048828125 + }, + { + "x": -49.803001403808594, + "y": 202.21099853515625 + }, + { + "x": -54.76100158691406, + "y": 200.5279998779297 + }, + { + "x": -59.67300033569336, + "y": 198.71600341796875 + }, + { + "x": -64.53600311279297, + "y": 196.77499389648438 + }, + { + "x": -69.34700012207031, + "y": 194.70899963378906 + }, + { + "x": -74.10199737548828, + "y": 192.51699829101562 + }, + { + "x": -78.7979965209961, + "y": 190.2010040283203 + }, + { + "x": -83.43099975585938, + "y": 187.76300048828125 + }, + { + "x": -87.9990005493164, + "y": 185.2050018310547 + }, + { + "x": -92.4990005493164, + "y": 182.5279998779297 + }, + { + "x": -96.927001953125, + "y": 179.73399353027344 + }, + { + "x": -101.28099822998047, + "y": 176.8249969482422 + }, + { + "x": -105.55699920654297, + "y": 173.80299377441406 + }, + { + "x": -109.75199890136719, + "y": 170.6699981689453 + }, + { + "x": -113.86399841308594, + "y": 167.4290008544922 + }, + { + "x": -117.88899993896484, + "y": 164.08099365234375 + }, + { + "x": -121.82599639892578, + "y": 160.6280059814453 + }, + { + "x": -125.66999816894531, + "y": 157.07400512695312 + }, + { + "x": -129.42100524902344, + "y": 153.42100524902344 }, { - "x": -1.2400000095367432, - "y": 264.65301513671875 + "x": -133.07400512695312, + "y": 149.6699981689453 }, { - "x": -14.444999694824219, - "y": 263.614013671875 + "x": -136.6280059814453, + "y": 145.8260040283203 }, { - "x": -27.57699966430664, - "y": 261.885009765625 + "x": -140.08099365234375, + "y": 141.88900756835938 }, { - "x": -40.60100173950195, - "y": 259.47100830078125 + "x": -143.4290008544922, + "y": 137.86399841308594 }, { - "x": -53.48099899291992, - "y": 256.3789978027344 + "x": -146.6699981689453, + "y": 133.7519989013672 }, { - "x": -66.18099975585938, - "y": 252.61700439453125 + "x": -149.80299377441406, + "y": 129.5570068359375 }, { - "x": -78.66699981689453, - "y": 248.19500732421875 + "x": -152.8249969482422, + "y": 125.28099822998047 }, { - "x": -90.90399932861328, - "y": 243.1269989013672 + "x": -155.73399353027344, + "y": 120.927001953125 }, { - "x": -102.85900115966797, - "y": 237.4239959716797 + "x": -158.5279998779297, + "y": 116.4990005493164 }, { - "x": -114.4990005493164, - "y": 231.10400390625 + "x": -161.2050018310547, + "y": 112 }, { - "x": -125.79299926757812, - "y": 224.18299865722656 + "x": -163.76300048828125, + "y": 107.43099975585938 }, { - "x": -136.70899963378906, - "y": 216.68099975585938 + "x": -166.2010040283203, + "y": 102.7979965209961 }, { - "x": -147.21800231933594, - "y": 208.61700439453125 + "x": -168.51699829101562, + "y": 98.10199737548828 }, { - "x": -157.2899932861328, - "y": 200.01499938964844 + "x": -170.70899963378906, + "y": 93.34700012207031 }, { - "x": -166.8979949951172, - "y": 190.8979949951172 + "x": -172.77499389648438, + "y": 88.53600311279297 }, { - "x": -176.01499938964844, - "y": 181.2899932861328 + "x": -174.71600341796875, + "y": 83.6729965209961 }, { - "x": -184.61700439453125, - "y": 171.21800231933594 + "x": -176.5279998779297, + "y": 78.76100158691406 }, { - "x": -192.68099975585938, - "y": 160.70899963378906 + "x": -178.21099853515625, + "y": 73.8030014038086 }, { - "x": -200.18299865722656, - "y": 149.79299926757812 + "x": -179.76300048828125, + "y": 68.8030014038086 }, { - "x": -207.10400390625, - "y": 138.5 + "x": -181.18499755859375, + "y": 63.76300048828125 }, { - "x": -213.4239959716797, - "y": 126.85900115966797 + "x": -182.47300720214844, + "y": 58.68899917602539 }, { - "x": -219.1269989013672, - "y": 114.90399932861328 + "x": -183.62899780273438, + "y": 53.582000732421875 }, { - "x": -224.19500732421875, - "y": 102.66699981689453 + "x": -184.64999389648438, + "y": 48.446998596191406 }, { - "x": -228.61700439453125, - "y": 90.18099975585938 + "x": -185.53700256347656, + "y": 43.2859992980957 }, { - "x": -232.37899780273438, - "y": 77.48100280761719 + "x": -186.28799438476562, + "y": 38.10499954223633 }, { - "x": -235.4709930419922, - "y": 64.60099792480469 + "x": -186.9040069580078, + "y": 32.904998779296875 }, { - "x": -237.88499450683594, - "y": 51.57699966430664 + "x": -187.38299560546875, + "y": 27.69099998474121 }, { - "x": -239.61399841308594, - "y": 38.44499969482422 + "x": -187.72500610351562, + "y": 22.466999053955078 }, { - "x": -240.6529998779297, - "y": 25.239999771118164 + "x": -187.93099975585938, + "y": 17.235000610351562 }, { - "x": -214.6529998779297, - "y": 19.239999771118164 + "x": -188, + "y": 12 } ], "isCurve": true, @@ -1008,128 +1368,248 @@ "link": "", "route": [ { - "x": 496.14801025390625, - "y": -171.38299560546875 + "x": 485.5, + "y": -138 + }, + { + "x": 492.47900390625, + "y": -137.8780059814453 + }, + { + "x": 499.45098876953125, + "y": -137.51199340820312 + }, + { + "x": 506.4049987792969, + "y": -136.9040069580078 + }, + { + "x": 513.333984375, + "y": -136.05299377441406 + }, + { + "x": 520.22900390625, + "y": -134.96099853515625 + }, + { + "x": 527.0819702148438, + "y": -133.62899780273438 + }, + { + "x": 533.8839721679688, + "y": -132.0590057373047 + }, + { + "x": 540.6270141601562, + "y": -130.2519989013672 + }, + { + "x": 547.302978515625, + "y": -128.21099853515625 + }, + { + "x": 553.9039916992188, + "y": -125.93800354003906 + }, + { + "x": 560.4210205078125, + "y": -123.43599700927734 + }, + { + "x": 566.8469848632812, + "y": -120.70899963378906 + }, + { + "x": 573.1740112304688, + "y": -117.75800323486328 + }, + { + "x": 579.3939819335938, + "y": -114.58899688720703 + }, + { + "x": 585.5, + "y": -111.20500183105469 + }, + { + "x": 591.4829711914062, + "y": -107.60900115966797 + }, + { + "x": 597.3380126953125, + "y": -103.80699920654297 + }, + { + "x": 603.0570068359375, + "y": -99.8030014038086 + }, + { + "x": 608.6320190429688, + "y": -95.60199737548828 + }, + { + "x": 614.0570068359375, + "y": -91.20800018310547 + }, + { + "x": 619.3259887695312, + "y": -86.62799835205078 + }, + { + "x": 624.4310302734375, + "y": -81.86699676513672 }, { - "x": 503.14801025390625, - "y": -190.38299560546875 + "x": 629.3670043945312, + "y": -76.93099975585938 }, { - "x": 520.7100219726562, - "y": -188.53700256347656 + "x": 634.1279907226562, + "y": -71.82599639892578 }, { - "x": 538.1010131835938, - "y": -185.4709930419922 + "x": 638.7080078125, + "y": -66.55699920654297 }, { - "x": 555.2360229492188, - "y": -181.19900512695312 + "x": 643.1019897460938, + "y": -61.13199996948242 }, { - "x": 572.031005859375, - "y": -175.74200439453125 + "x": 647.302978515625, + "y": -55.55699920654297 }, { - "x": 588.4039916992188, - "y": -169.1269989013672 + "x": 651.3070068359375, + "y": -49.8380012512207 }, { - "x": 604.2760009765625, - "y": -161.38499450683594 + "x": 655.1090087890625, + "y": -43.983001708984375 }, { - "x": 619.5689697265625, - "y": -152.55599975585938 + "x": 658.7050170898438, + "y": -38 }, { - "x": 634.208984375, - "y": -142.68099975585938 + "x": 662.0889892578125, + "y": -31.893999099731445 }, { - "x": 648.125, - "y": -131.8090057373047 + "x": 665.2579956054688, + "y": -25.673999786376953 }, { - "x": 661.2479858398438, - "y": -119.99199676513672 + "x": 668.208984375, + "y": -19.347000122070312 }, { - "x": 673.5150146484375, - "y": -107.29000091552734 + "x": 670.9359741210938, + "y": -12.920999526977539 }, { - "x": 684.8660278320312, - "y": -93.76200103759766 + "x": 673.43798828125, + "y": -6.4039998054504395 }, { - "x": 695.2459716796875, - "y": -79.4749984741211 + "x": 675.7109985351562, + "y": 0.19599999487400055 }, { - "x": 704.60400390625, - "y": -64.5 + "x": 677.7520141601562, + "y": 6.872000217437744 }, { - "x": 712.8939819335938, - "y": -48.90700149536133 + "x": 679.5590209960938, + "y": 13.614999771118164 }, { - "x": 720.0770263671875, - "y": -32.775001525878906 + "x": 681.1290283203125, + "y": 20.41699981689453 }, { - "x": 726.1170043945312, - "y": -16.180999755859375 + "x": 682.4609985351562, + "y": 27.270000457763672 }, { - "x": 730.9840087890625, - "y": 0.7929999828338623 + "x": 683.552978515625, + "y": 34.165000915527344 }, { - "x": 734.656005859375, - "y": 18.066999435424805 + "x": 684.4039916992188, + "y": 41.09400177001953 }, { - "x": 737.114013671875, - "y": 35.55400085449219 + "x": 685.0120239257812, + "y": 48.04800033569336 }, { - "x": 738.344970703125, - "y": 53.16999816894531 + "x": 685.3779907226562, + "y": 55.02000045776367 }, { - "x": 738.344970703125, - "y": 70.8290023803711 + "x": 685.5, + "y": 61.999000549316406 }, { - "x": 737.114013671875, - "y": 88.44499969482422 + "x": 685.3779907226562, + "y": 68.97899627685547 }, { - "x": 734.656005859375, - "y": 105.93199920654297 + "x": 685.0120239257812, + "y": 75.95099639892578 }, { - "x": 730.9840087890625, - "y": 123.20600128173828 + "x": 684.4039916992188, + "y": 82.90499877929688 }, { - "x": 726.1170043945312, - "y": 140.18099975585938 + "x": 683.552978515625, + "y": 89.83399963378906 }, { - "x": 720.0770263671875, - "y": 156.77499389648438 + "x": 682.4609985351562, + "y": 96.72899627685547 }, { - "x": 712.8939819335938, - "y": 172.90699768066406 + "x": 681.1290283203125, + "y": 103.58200073242188 }, { - "x": 684.8939819335938, - "y": 166.90699768066406 + "x": 679.5590209960938, + "y": 110.38400268554688 + }, + { + "x": 677.7520141601562, + "y": 117.12699890136719 + }, + { + "x": 675.7109985351562, + "y": 123.8030014038086 + }, + { + "x": 673.43798828125, + "y": 130.4040069580078 + }, + { + "x": 670.9359741210938, + "y": 136.92100524902344 + }, + { + "x": 668.208984375, + "y": 143.3470001220703 + }, + { + "x": 665.2579956054688, + "y": 149.6739959716797 + }, + { + "x": 662.0889892578125, + "y": 155.8939971923828 + }, + { + "x": 658.7050170898438, + "y": 161.99899291992188 } ], "isCurve": true, @@ -1164,128 +1644,248 @@ "link": "", "route": [ { - "x": 685.2459716796875, - "y": 192.47500610351562 + "x": 658.7050170898438, + "y": 161.99899291992188 + }, + { + "x": 655.1090087890625, + "y": 167.98300170898438 + }, + { + "x": 651.3070068359375, + "y": 173.83799743652344 + }, + { + "x": 647.302978515625, + "y": 179.5570068359375 + }, + { + "x": 643.1019897460938, + "y": 185.1320037841797 + }, + { + "x": 638.7080078125, + "y": 190.5570068359375 + }, + { + "x": 634.1279907226562, + "y": 195.8260040283203 + }, + { + "x": 629.3670043945312, + "y": 200.93099975585938 + }, + { + "x": 624.4310302734375, + "y": 205.86700439453125 + }, + { + "x": 619.3259887695312, + "y": 210.6280059814453 + }, + { + "x": 614.0570068359375, + "y": 215.20799255371094 + }, + { + "x": 608.6320190429688, + "y": 219.6020050048828 + }, + { + "x": 603.0570068359375, + "y": 223.80299377441406 + }, + { + "x": 597.3380126953125, + "y": 227.8070068359375 + }, + { + "x": 591.4829711914062, + "y": 231.60899353027344 + }, + { + "x": 585.5, + "y": 235.2050018310547 }, { - "x": 695.2459716796875, - "y": 203.47500610351562 + "x": 579.3939819335938, + "y": 238.58900451660156 }, { - "x": 684.8660278320312, - "y": 217.76199340820312 + "x": 573.1740112304688, + "y": 241.75799560546875 }, { - "x": 673.5150146484375, - "y": 231.2899932861328 + "x": 566.8469848632812, + "y": 244.70899963378906 }, { - "x": 661.2479858398438, - "y": 243.99200439453125 + "x": 560.4210205078125, + "y": 247.43600463867188 }, { - "x": 648.125, - "y": 255.8090057373047 + "x": 553.9039916992188, + "y": 249.93800354003906 }, { - "x": 634.208984375, - "y": 266.6809997558594 + "x": 547.302978515625, + "y": 252.21099853515625 }, { - "x": 619.5689697265625, - "y": 276.5559997558594 + "x": 540.6270141601562, + "y": 254.2519989013672 }, { - "x": 604.2760009765625, - "y": 285.385009765625 + "x": 533.8839721679688, + "y": 256.0589904785156 }, { - "x": 588.4039916992188, - "y": 293.12701416015625 + "x": 527.0819702148438, + "y": 257.6289978027344 }, { - "x": 572.031005859375, - "y": 299.74200439453125 + "x": 520.22900390625, + "y": 258.96099853515625 }, { - "x": 555.2360229492188, - "y": 305.1990051269531 + "x": 513.333984375, + "y": 260.0530090332031 }, { - "x": 538.1010131835938, - "y": 309.47100830078125 + "x": 506.4049987792969, + "y": 260.90399169921875 }, { - "x": 520.7100219726562, - "y": 312.5369873046875 + "x": 499.45098876953125, + "y": 261.5119934082031 }, { - "x": 503.14801025390625, - "y": 314.38299560546875 + "x": 492.47900390625, + "y": 261.87799072265625 }, { "x": 485.5, - "y": 315 + "y": 262 + }, + { + "x": 478.5199890136719, + "y": 261.87799072265625 + }, + { + "x": 471.5480041503906, + "y": 261.5119934082031 + }, + { + "x": 464.593994140625, + "y": 260.90399169921875 + }, + { + "x": 457.6650085449219, + "y": 260.0530090332031 + }, + { + "x": 450.7699890136719, + "y": 258.96099853515625 + }, + { + "x": 443.9169921875, + "y": 257.6289978027344 + }, + { + "x": 437.114990234375, + "y": 256.0589904785156 + }, + { + "x": 430.37200927734375, + "y": 254.2519989013672 + }, + { + "x": 423.6960144042969, + "y": 252.21099853515625 + }, + { + "x": 417.0950012207031, + "y": 249.93800354003906 + }, + { + "x": 410.5780029296875, + "y": 247.43600463867188 }, { - "x": 467.85101318359375, - "y": 314.38299560546875 + "x": 404.1520080566406, + "y": 244.70899963378906 }, { - "x": 450.28900146484375, - "y": 312.5369873046875 + "x": 397.82501220703125, + "y": 241.75799560546875 }, { - "x": 432.89801025390625, - "y": 309.47100830078125 + "x": 391.6050109863281, + "y": 238.58900451660156 }, { - "x": 415.76300048828125, - "y": 305.1990051269531 + "x": 385.5, + "y": 235.2050018310547 }, { - "x": 398.9679870605469, - "y": 299.74200439453125 + "x": 379.5159912109375, + "y": 231.60899353027344 }, { - "x": 382.5950012207031, - "y": 293.12701416015625 + "x": 373.6610107421875, + "y": 227.8070068359375 }, { - "x": 366.7229919433594, - "y": 285.385009765625 + "x": 367.9419860839844, + "y": 223.80299377441406 }, { - "x": 351.42999267578125, - "y": 276.5559997558594 + "x": 362.36700439453125, + "y": 219.6020050048828 }, { - "x": 336.7900085449219, - "y": 266.6809997558594 + "x": 356.9419860839844, + "y": 215.20799255371094 }, { - "x": 322.8739929199219, - "y": 255.8090057373047 + "x": 351.6730041503906, + "y": 210.6280059814453 }, { - "x": 309.7510070800781, - "y": 243.99200439453125 + "x": 346.5679931640625, + "y": 205.86700439453125 }, { - "x": 297.4840087890625, - "y": 231.2899932861328 + "x": 341.6319885253906, + "y": 200.93099975585938 }, { - "x": 286.13299560546875, - "y": 217.76199340820312 + "x": 336.8710021972656, + "y": 195.8260040283203 }, { - "x": 275.75299072265625, - "y": 203.47500610351562 + "x": 332.2909851074219, + "y": 190.5570068359375 }, { - "x": 285.75299072265625, - "y": 192.47500610351562 + "x": 327.8970031738281, + "y": 185.1320037841797 + }, + { + "x": 323.6960144042969, + "y": 179.5570068359375 + }, + { + "x": 319.6919860839844, + "y": 173.83799743652344 + }, + { + "x": 315.8900146484375, + "y": 167.98300170898438 + }, + { + "x": 312.29400634765625, + "y": 162 } ], "isCurve": true, @@ -1320,128 +1920,248 @@ "link": "", "route": [ { - "x": 921.35498046875, - "y": -220.61399841308594 + "x": 904.9099731445312, + "y": -188 + }, + { + "x": 915.3770141601562, + "y": -187.72500610351562 + }, + { + "x": 925.8150024414062, + "y": -186.9040069580078 }, { - "x": 931.35498046875, - "y": -239.61399841308594 + "x": 936.197021484375, + "y": -185.53700256347656 }, { - "x": 957.510986328125, - "y": -235.4709930419922 + "x": 946.4920043945312, + "y": -183.62899780273438 }, { - "x": 983.0910034179688, - "y": -228.61700439453125 + "x": 956.6729736328125, + "y": -181.18499755859375 }, { - "x": 1007.8140258789062, - "y": -219.1269989013672 + "x": 966.7130126953125, + "y": -178.21099853515625 }, { - "x": 1031.4100341796875, - "y": -207.10400390625 + "x": 976.5830078125, + "y": -174.71600341796875 }, { - "x": 1053.6190185546875, - "y": -192.68099975585938 + "x": 986.2570190429688, + "y": -170.70899963378906 }, { - "x": 1074.199951171875, - "y": -176.01499938964844 + "x": 995.7080078125, + "y": -166.2010040283203 }, { - "x": 1092.925048828125, - "y": -157.2899932861328 + "x": 1004.9099731445312, + "y": -161.2050018310547 }, { - "x": 1109.5909423828125, - "y": -136.70899963378906 + "x": 1013.8369750976562, + "y": -155.73399353027344 }, { - "x": 1124.0140380859375, - "y": -114.5 + "x": 1022.4669799804688, + "y": -149.80299377441406 }, { - "x": 1136.0369873046875, - "y": -90.90399932861328 + "x": 1030.7740478515625, + "y": -143.4290008544922 }, { - "x": 1145.5269775390625, - "y": -66.18099975585938 + "x": 1038.7359619140625, + "y": -136.6280059814453 }, { - "x": 1152.3809814453125, - "y": -40.60100173950195 + "x": 1046.3310546875, + "y": -129.42100524902344 }, { - "x": 1156.5240478515625, - "y": -14.444999694824219 + "x": 1053.5389404296875, + "y": -121.82599639892578 }, { - "x": 1157.9100341796875, + "x": 1060.3389892578125, + "y": -113.86399841308594 + }, + { + "x": 1066.7130126953125, + "y": -105.55699920654297 + }, + { + "x": 1072.64404296875, + "y": -96.927001953125 + }, + { + "x": 1078.114990234375, + "y": -88 + }, + { + "x": 1083.1109619140625, + "y": -78.7979965209961 + }, + { + "x": 1087.6190185546875, + "y": -69.34700012207031 + }, + { + "x": 1091.6259765625, + "y": -59.67300033569336 + }, + { + "x": 1095.1209716796875, + "y": -49.803001403808594 + }, + { + "x": 1098.094970703125, + "y": -39.76300048828125 + }, + { + "x": 1100.5389404296875, + "y": -29.582000732421875 + }, + { + "x": 1102.447021484375, + "y": -19.285999298095703 + }, + { + "x": 1103.81396484375, + "y": -8.904999732971191 + }, + { + "x": 1104.635986328125, + "y": 1.531999945640564 + }, + { + "x": 1104.9100341796875, "y": 12 }, { - "x": 1156.5240478515625, - "y": 38.44499969482422 + "x": 1104.635986328125, + "y": 22.466999053955078 + }, + { + "x": 1103.81396484375, + "y": 32.904998779296875 + }, + { + "x": 1102.447021484375, + "y": 43.2859992980957 + }, + { + "x": 1100.5389404296875, + "y": 53.582000732421875 + }, + { + "x": 1098.094970703125, + "y": 63.76300048828125 + }, + { + "x": 1095.1209716796875, + "y": 73.8030014038086 + }, + { + "x": 1091.6259765625, + "y": 83.6729965209961 + }, + { + "x": 1087.6190185546875, + "y": 93.34700012207031 + }, + { + "x": 1083.1109619140625, + "y": 102.7979965209961 + }, + { + "x": 1078.114990234375, + "y": 111.9990005493164 + }, + { + "x": 1072.64404296875, + "y": 120.927001953125 + }, + { + "x": 1066.7130126953125, + "y": 129.5570068359375 + }, + { + "x": 1060.3389892578125, + "y": 137.86399841308594 + }, + { + "x": 1053.5389404296875, + "y": 145.8260040283203 + }, + { + "x": 1046.3310546875, + "y": 153.42100524902344 + }, + { + "x": 1038.7359619140625, + "y": 160.6280059814453 }, { - "x": 1152.3809814453125, - "y": 64.60099792480469 + "x": 1030.7740478515625, + "y": 167.4290008544922 }, { - "x": 1145.5269775390625, - "y": 90.18099975585938 + "x": 1022.4669799804688, + "y": 173.80299377441406 }, { - "x": 1136.0369873046875, - "y": 114.90399932861328 + "x": 1013.8369750976562, + "y": 179.73399353027344 }, { - "x": 1124.0140380859375, - "y": 138.49899291992188 + "x": 1004.9099731445312, + "y": 185.2050018310547 }, { - "x": 1109.5909423828125, - "y": 160.70899963378906 + "x": 995.7080078125, + "y": 190.2010040283203 }, { - "x": 1092.925048828125, - "y": 181.2899932861328 + "x": 986.2570190429688, + "y": 194.70899963378906 }, { - "x": 1074.199951171875, - "y": 200.01499938964844 + "x": 976.5830078125, + "y": 198.71600341796875 }, { - "x": 1053.6190185546875, - "y": 216.68099975585938 + "x": 966.7130126953125, + "y": 202.21099853515625 }, { - "x": 1031.4100341796875, - "y": 231.10400390625 + "x": 956.6729736328125, + "y": 205.18499755859375 }, { - "x": 1007.8140258789062, - "y": 243.1269989013672 + "x": 946.4920043945312, + "y": 207.62899780273438 }, { - "x": 983.0910034179688, - "y": 252.61700439453125 + "x": 936.197021484375, + "y": 209.53700256347656 }, { - "x": 957.510986328125, - "y": 259.47100830078125 + "x": 925.8150024414062, + "y": 210.9040069580078 }, { - "x": 931.35498046875, - "y": 263.614013671875 + "x": 915.3770141601562, + "y": 211.72500610351562 }, { - "x": 921.35498046875, - "y": 244.61399841308594 + "x": 904.9099731445312, + "y": 212 } ], "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 ac3081c7bb..7dcfbadbdf 100644 --- a/e2etests/testdata/txtar/cycle-diagram/elk/sketch.exp.svg +++ b/e2etests/testdata/txtar/cycle-diagram/elk/sketch.exp.svg @@ -1,9 +1,9 @@ -abcdabcab - + .d2-1797511336 .fill-N1{fill:#0A0F25;} + .d2-1797511336 .fill-N2{fill:#676C7E;} + .d2-1797511336 .fill-N3{fill:#9499AB;} + .d2-1797511336 .fill-N4{fill:#CFD2DD;} + .d2-1797511336 .fill-N5{fill:#DEE1EB;} + .d2-1797511336 .fill-N6{fill:#EEF1F8;} + .d2-1797511336 .fill-N7{fill:#FFFFFF;} + .d2-1797511336 .fill-B1{fill:#0D32B2;} + .d2-1797511336 .fill-B2{fill:#0D32B2;} + .d2-1797511336 .fill-B3{fill:#E3E9FD;} + .d2-1797511336 .fill-B4{fill:#E3E9FD;} + .d2-1797511336 .fill-B5{fill:#EDF0FD;} + .d2-1797511336 .fill-B6{fill:#F7F8FE;} + .d2-1797511336 .fill-AA2{fill:#4A6FF3;} + .d2-1797511336 .fill-AA4{fill:#EDF0FD;} + .d2-1797511336 .fill-AA5{fill:#F7F8FE;} + .d2-1797511336 .fill-AB4{fill:#EDF0FD;} + .d2-1797511336 .fill-AB5{fill:#F7F8FE;} + .d2-1797511336 .stroke-N1{stroke:#0A0F25;} + .d2-1797511336 .stroke-N2{stroke:#676C7E;} + .d2-1797511336 .stroke-N3{stroke:#9499AB;} + .d2-1797511336 .stroke-N4{stroke:#CFD2DD;} + .d2-1797511336 .stroke-N5{stroke:#DEE1EB;} + .d2-1797511336 .stroke-N6{stroke:#EEF1F8;} + .d2-1797511336 .stroke-N7{stroke:#FFFFFF;} + .d2-1797511336 .stroke-B1{stroke:#0D32B2;} + .d2-1797511336 .stroke-B2{stroke:#0D32B2;} + .d2-1797511336 .stroke-B3{stroke:#E3E9FD;} + .d2-1797511336 .stroke-B4{stroke:#E3E9FD;} + .d2-1797511336 .stroke-B5{stroke:#EDF0FD;} + .d2-1797511336 .stroke-B6{stroke:#F7F8FE;} + .d2-1797511336 .stroke-AA2{stroke:#4A6FF3;} + .d2-1797511336 .stroke-AA4{stroke:#EDF0FD;} + .d2-1797511336 .stroke-AA5{stroke:#F7F8FE;} + .d2-1797511336 .stroke-AB4{stroke:#EDF0FD;} + .d2-1797511336 .stroke-AB5{stroke:#F7F8FE;} + .d2-1797511336 .background-color-N1{background-color:#0A0F25;} + .d2-1797511336 .background-color-N2{background-color:#676C7E;} + .d2-1797511336 .background-color-N3{background-color:#9499AB;} + .d2-1797511336 .background-color-N4{background-color:#CFD2DD;} + .d2-1797511336 .background-color-N5{background-color:#DEE1EB;} + .d2-1797511336 .background-color-N6{background-color:#EEF1F8;} + .d2-1797511336 .background-color-N7{background-color:#FFFFFF;} + .d2-1797511336 .background-color-B1{background-color:#0D32B2;} + .d2-1797511336 .background-color-B2{background-color:#0D32B2;} + .d2-1797511336 .background-color-B3{background-color:#E3E9FD;} + .d2-1797511336 .background-color-B4{background-color:#E3E9FD;} + .d2-1797511336 .background-color-B5{background-color:#EDF0FD;} + .d2-1797511336 .background-color-B6{background-color:#F7F8FE;} + .d2-1797511336 .background-color-AA2{background-color:#4A6FF3;} + .d2-1797511336 .background-color-AA4{background-color:#EDF0FD;} + .d2-1797511336 .background-color-AA5{background-color:#F7F8FE;} + .d2-1797511336 .background-color-AB4{background-color:#EDF0FD;} + .d2-1797511336 .background-color-AB5{background-color:#F7F8FE;} + .d2-1797511336 .color-N1{color:#0A0F25;} + .d2-1797511336 .color-N2{color:#676C7E;} + .d2-1797511336 .color-N3{color:#9499AB;} + .d2-1797511336 .color-N4{color:#CFD2DD;} + .d2-1797511336 .color-N5{color:#DEE1EB;} + .d2-1797511336 .color-N6{color:#EEF1F8;} + .d2-1797511336 .color-N7{color:#FFFFFF;} + .d2-1797511336 .color-B1{color:#0D32B2;} + .d2-1797511336 .color-B2{color:#0D32B2;} + .d2-1797511336 .color-B3{color:#E3E9FD;} + .d2-1797511336 .color-B4{color:#E3E9FD;} + .d2-1797511336 .color-B5{color:#EDF0FD;} + .d2-1797511336 .color-B6{color:#F7F8FE;} + .d2-1797511336 .color-AA2{color:#4A6FF3;} + .d2-1797511336 .color-AA4{color:#EDF0FD;} + .d2-1797511336 .color-AA5{color:#F7F8FE;} + .d2-1797511336 .color-AB4{color:#EDF0FD;} + .d2-1797511336 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker-d2-1797511336);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker-d2-1797511336);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright-d2-1797511336);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright-d2-1797511336);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright-d2-1797511336);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright-d2-1797511336);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark-d2-1797511336);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright-d2-1797511336);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright-d2-1797511336);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright-d2-1797511336);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright-d2-1797511336);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker-d2-1797511336);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark-d2-1797511336);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal-d2-1797511336);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal-d2-1797511336);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright-d2-1797511336);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright-d2-1797511336);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright-d2-1797511336);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>abcdabcab + From 05a8e933790ee0e983b6c71f17ca79c5f57bffbd Mon Sep 17 00:00:00 2001 From: Mayank77maruti Date: Fri, 21 Feb 2025 17:12:10 +0000 Subject: [PATCH 03/73] iteration 2 --- d2layouts/d2cycle/layout.go | 220 ++++++++++++++++++++++++++++++++---- 1 file changed, 197 insertions(+), 23 deletions(-) diff --git a/d2layouts/d2cycle/layout.go b/d2layouts/d2cycle/layout.go index 43565df1ac..9dda6e9ca6 100644 --- a/d2layouts/d2cycle/layout.go +++ b/d2layouts/d2cycle/layout.go @@ -240,7 +240,6 @@ // } // } // } - package d2cycle import ( @@ -254,9 +253,9 @@ import ( ) const ( - MIN_RADIUS = 200 - PADDING = 20 - ARC_STEPS = 60 // High resolution for perfect circles + MIN_RADIUS = 200 + PADDING = 20 + ARC_STEPS = 60 // High resolution for perfect circles ) func Layout(ctx context.Context, g *d2graph.Graph, layout d2graph.LayoutGraph) error { @@ -286,8 +285,8 @@ func calculateBaseRadius(objects []*d2graph.Object) float64 { size := math.Max(obj.Width, obj.Height) maxSize = math.Max(maxSize, size) } - radius := (maxSize + 2*PADDING) / (2 * math.Sin(math.Pi/numNodes)) - return math.Max(radius, MIN_RADIUS) + minRadius := (maxSize/2 + PADDING) / math.Sin(math.Pi/numNodes) + return math.Max(minRadius, MIN_RADIUS) } func positionObjects(objects []*d2graph.Object, radius float64) { @@ -313,13 +312,13 @@ func createPerfectArc(edge *d2graph.Edge, baseRadius float64) { srcCenter := edge.Src.Center() dstCenter := edge.Dst.Center() - center := geo.NewPoint(0, 0) // Layout center + layoutCenter := geo.NewPoint(0, 0) // Calculate angles with proper wrapping - startAngle := math.Atan2(srcCenter.Y-center.Y, srcCenter.X-center.X) - endAngle := math.Atan2(dstCenter.Y-center.Y, dstCenter.X-center.X) + startAngle := math.Atan2(srcCenter.Y-layoutCenter.Y, srcCenter.X-layoutCenter.X) + endAngle := math.Atan2(dstCenter.Y-layoutCenter.Y, dstCenter.X-layoutCenter.X) - // Handle angle wrapping for shortest path + // Calculate angular distance taking shortest path angleDiff := endAngle - startAngle if angleDiff < 0 { angleDiff += 2 * math.Pi @@ -333,12 +332,12 @@ func createPerfectArc(edge *d2graph.Edge, baseRadius float64) { for i := 0; i <= ARC_STEPS; i++ { t := float64(i) / ARC_STEPS currentAngle := startAngle + t*angleDiff - x := center.X + baseRadius*math.Cos(currentAngle) - y := center.Y + baseRadius*math.Sin(currentAngle) + x := layoutCenter.X + baseRadius*math.Cos(currentAngle) + y := layoutCenter.Y + baseRadius*math.Sin(currentAngle) path = append(path, geo.NewPoint(x, y)) } - // Clip to shape boundaries while preserving arc + // Clip to shape boundaries while preserving arc properties edge.Route = path startIdx, endIdx := edge.TraceToShape(edge.Route, 0, len(edge.Route)-1) @@ -346,7 +345,7 @@ func createPerfectArc(edge *d2graph.Edge, baseRadius float64) { if startIdx < endIdx { edge.Route = edge.Route[startIdx : endIdx+1] - // Ensure minimum points for smooth rendering + // Ensure minimal points for smooth rendering if len(edge.Route) < 3 { edge.Route = []*geo.Point{path[0], path[len(path)-1]} } @@ -355,6 +354,28 @@ func createPerfectArc(edge *d2graph.Edge, baseRadius float64) { edge.IsCurve = true } +// Keep existing helper functions (positionLabelsIcons, boxContains, boxIntersections) +// Helper if your geo.Box doesn’t implement Contains() +func boxContains(b *geo.Box, p *geo.Point) bool { + // typical bounding-box check + return p.X >= b.TopLeft.X && + p.X <= b.TopLeft.X+b.Width && + p.Y >= b.TopLeft.Y && + p.Y <= b.TopLeft.Y+b.Height +} + +// Helper if your geo.Box doesn’t implement Intersections(geo.Segment) yet +func boxIntersections(b *geo.Box, seg geo.Segment) []*geo.Point { + // We'll assume d2's standard geo.Box has a built-in Intersections(*Segment) method. + // If not, implement manually. For example, checking each of the 4 edges: + // left, right, top, bottom + // For simplicity, if you do have b.Intersections(...) you can just do: + // return b.Intersections(seg) + return b.Intersections(seg) + // If you don't have that, you'd code the line-rect intersection yourself. +} + +// positionLabelsIcons is basically your logic that sets default label/icon positions if needed func positionLabelsIcons(obj *d2graph.Object) { // If there's an icon but no icon position, give it a default if obj.Icon != nil && obj.IconPosition == nil { @@ -371,6 +392,7 @@ func positionLabelsIcons(obj *d2graph.Object) { } } + // If there's a label but no label position, give it a default if obj.HasLabel() && obj.LabelPosition == nil { if len(obj.ChildrenArray) > 0 { obj.LabelPosition = go2.Pointer(label.OutsideTopCenter.String()) @@ -382,6 +404,7 @@ func positionLabelsIcons(obj *d2graph.Object) { obj.LabelPosition = go2.Pointer(label.InsideMiddleCenter.String()) } + // If the label is bigger than the shape, fallback to outside positions if float64(obj.LabelDimensions.Width) > obj.Width || float64(obj.LabelDimensions.Height) > obj.Height { if len(obj.ChildrenArray) > 0 { @@ -392,14 +415,165 @@ func positionLabelsIcons(obj *d2graph.Object) { } } } +// package d2cycle -func boxContains(b *geo.Box, p *geo.Point) bool { - return p.X >= b.TopLeft.X && - p.X <= b.TopLeft.X+b.Width && - p.Y >= b.TopLeft.Y && - p.Y <= b.TopLeft.Y+b.Height -} +// import ( +// "context" +// "math" -func boxIntersections(b *geo.Box, seg geo.Segment) []*geo.Point { - return b.Intersections(seg) -} \ No newline at end of file +// "oss.terrastruct.com/d2/d2graph" +// "oss.terrastruct.com/d2/lib/geo" +// "oss.terrastruct.com/d2/lib/label" +// "oss.terrastruct.com/util-go/go2" +// ) + +// const ( +// MIN_RADIUS = 200 +// PADDING = 20 +// ARC_STEPS = 60 // High resolution for perfect circles +// ) + +// func Layout(ctx context.Context, g *d2graph.Graph, layout d2graph.LayoutGraph) error { +// objects := g.Root.ChildrenArray +// if len(objects) == 0 { +// return nil +// } + +// for _, obj := range g.Objects { +// positionLabelsIcons(obj) +// } + +// baseRadius := calculateBaseRadius(objects) +// positionObjects(objects, baseRadius) + +// for _, edge := range g.Edges { +// createPerfectArc(edge, baseRadius) +// } + +// return nil +// } + +// func calculateBaseRadius(objects []*d2graph.Object) float64 { +// numNodes := float64(len(objects)) +// maxSize := 0.0 +// for _, obj := range objects { +// size := math.Max(obj.Width, obj.Height) +// maxSize = math.Max(maxSize, size) +// } +// radius := (maxSize + 2*PADDING) / (2 * math.Sin(math.Pi/numNodes)) +// return math.Max(radius, MIN_RADIUS) +// } + +// func positionObjects(objects []*d2graph.Object, radius float64) { +// numObjects := float64(len(objects)) +// angleOffset := -math.Pi / 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.Width/2, +// y-obj.Height/2, +// ) +// } +// } + +// func createPerfectArc(edge *d2graph.Edge, baseRadius float64) { +// if edge.Src == nil || edge.Dst == nil || edge.Src == edge.Dst { +// return +// } + +// srcCenter := edge.Src.Center() +// dstCenter := edge.Dst.Center() +// center := geo.NewPoint(0, 0) // Layout center + +// // Calculate angles with proper wrapping +// startAngle := math.Atan2(srcCenter.Y-center.Y, srcCenter.X-center.X) +// endAngle := math.Atan2(dstCenter.Y-center.Y, dstCenter.X-center.X) + +// // Handle angle wrapping for shortest path +// angleDiff := endAngle - startAngle +// if angleDiff < 0 { +// angleDiff += 2 * math.Pi +// } +// if angleDiff > math.Pi { +// angleDiff -= 2 * math.Pi +// } + +// // Generate perfect circular arc +// path := make([]*geo.Point, 0, ARC_STEPS+1) +// for i := 0; i <= ARC_STEPS; i++ { +// t := float64(i) / ARC_STEPS +// currentAngle := startAngle + t*angleDiff +// x := center.X + baseRadius*math.Cos(currentAngle) +// y := center.Y + baseRadius*math.Sin(currentAngle) +// path = append(path, geo.NewPoint(x, y)) +// } + +// // Clip to shape boundaries while preserving arc +// edge.Route = path +// startIdx, endIdx := edge.TraceToShape(edge.Route, 0, len(edge.Route)-1) + +// // Maintain smooth arc after clipping +// if startIdx < endIdx { +// edge.Route = edge.Route[startIdx : endIdx+1] + +// // Ensure minimum points for smooth rendering +// if len(edge.Route) < 3 { +// edge.Route = []*geo.Point{path[0], path[len(path)-1]} +// } +// } + +// edge.IsCurve = true +// } + +// func positionLabelsIcons(obj *d2graph.Object) { +// // If there's an icon but no icon position, give it a default +// if obj.Icon != nil && obj.IconPosition == nil { +// if len(obj.ChildrenArray) > 0 { +// obj.IconPosition = go2.Pointer(label.OutsideTopLeft.String()) +// if obj.LabelPosition == nil { +// obj.LabelPosition = go2.Pointer(label.OutsideTopRight.String()) +// return +// } +// } else if obj.SQLTable != nil || obj.Class != nil || obj.Language != "" { +// obj.IconPosition = go2.Pointer(label.OutsideTopLeft.String()) +// } else { +// obj.IconPosition = go2.Pointer(label.InsideMiddleCenter.String()) +// } +// } + +// if obj.HasLabel() && obj.LabelPosition == nil { +// if len(obj.ChildrenArray) > 0 { +// obj.LabelPosition = go2.Pointer(label.OutsideTopCenter.String()) +// } else if obj.HasOutsideBottomLabel() { +// obj.LabelPosition = go2.Pointer(label.OutsideBottomCenter.String()) +// } else if obj.Icon != nil { +// obj.LabelPosition = go2.Pointer(label.InsideTopCenter.String()) +// } else { +// obj.LabelPosition = go2.Pointer(label.InsideMiddleCenter.String()) +// } + +// if float64(obj.LabelDimensions.Width) > obj.Width || +// float64(obj.LabelDimensions.Height) > obj.Height { +// if len(obj.ChildrenArray) > 0 { +// obj.LabelPosition = go2.Pointer(label.OutsideTopCenter.String()) +// } else { +// obj.LabelPosition = go2.Pointer(label.OutsideBottomCenter.String()) +// } +// } +// } +// } + +// func boxContains(b *geo.Box, p *geo.Point) bool { +// return p.X >= b.TopLeft.X && +// p.X <= b.TopLeft.X+b.Width && +// p.Y >= b.TopLeft.Y && +// p.Y <= b.TopLeft.Y+b.Height +// } + +// func boxIntersections(b *geo.Box, seg geo.Segment) []*geo.Point { +// return b.Intersections(seg) +// } \ No newline at end of file From 495bac61ff0aabce636823bc4b77501a253fe486 Mon Sep 17 00:00:00 2001 From: Mayank77maruti Date: Fri, 21 Feb 2025 17:20:01 +0000 Subject: [PATCH 04/73] iteration 3 --- d2layouts/d2cycle/layout.go | 68 +- .../txtar/cycle-diagram/dagre/board.exp.json | 1440 ++++++++--------- .../txtar/cycle-diagram/dagre/sketch.exp.svg | 154 +- .../txtar/cycle-diagram/elk/board.exp.json | 1440 ++++++++--------- .../txtar/cycle-diagram/elk/sketch.exp.svg | 154 +- 5 files changed, 1625 insertions(+), 1631 deletions(-) diff --git a/d2layouts/d2cycle/layout.go b/d2layouts/d2cycle/layout.go index 9dda6e9ca6..e142c6cd28 100644 --- a/d2layouts/d2cycle/layout.go +++ b/d2layouts/d2cycle/layout.go @@ -255,7 +255,7 @@ import ( const ( MIN_RADIUS = 200 PADDING = 20 - ARC_STEPS = 60 // High resolution for perfect circles + ARC_STEPS = 60 ) func Layout(ctx context.Context, g *d2graph.Graph, layout d2graph.LayoutGraph) error { @@ -268,17 +268,19 @@ func Layout(ctx context.Context, g *d2graph.Graph, layout d2graph.LayoutGraph) e positionLabelsIcons(obj) } - baseRadius := calculateBaseRadius(objects) + // Calculate layout parameters + baseRadius, maxNodeSize := calculateLayoutParams(objects) positionObjects(objects, baseRadius) + // Create edges with boundary-perfect arcs for _, edge := range g.Edges { - createPerfectArc(edge, baseRadius) + createBoundaryArc(edge, baseRadius, maxNodeSize) } return nil } -func calculateBaseRadius(objects []*d2graph.Object) float64 { +func calculateLayoutParams(objects []*d2graph.Object) (float64, float64) { numNodes := float64(len(objects)) maxSize := 0.0 for _, obj := range objects { @@ -286,7 +288,7 @@ func calculateBaseRadius(objects []*d2graph.Object) float64 { maxSize = math.Max(maxSize, size) } minRadius := (maxSize/2 + PADDING) / math.Sin(math.Pi/numNodes) - return math.Max(minRadius, MIN_RADIUS) + return math.Max(minRadius, MIN_RADIUS), maxSize } func positionObjects(objects []*d2graph.Object, radius float64) { @@ -298,6 +300,7 @@ func positionObjects(objects []*d2graph.Object, radius float64) { x := radius * math.Cos(angle) y := radius * math.Sin(angle) + // Center object at calculated position obj.TopLeft = geo.NewPoint( x-obj.Width/2, y-obj.Height/2, @@ -305,21 +308,24 @@ func positionObjects(objects []*d2graph.Object, radius float64) { } } -func createPerfectArc(edge *d2graph.Edge, baseRadius float64) { +func createBoundaryArc(edge *d2graph.Edge, baseRadius, maxNodeSize float64) { if edge.Src == nil || edge.Dst == nil || edge.Src == edge.Dst { return } + // Calculate arc radius outside node boundaries + arcRadius := baseRadius + maxNodeSize/2 + PADDING + srcCenter := edge.Src.Center() dstCenter := edge.Dst.Center() layoutCenter := geo.NewPoint(0, 0) - // Calculate angles with proper wrapping + // Calculate angles with shortest path startAngle := math.Atan2(srcCenter.Y-layoutCenter.Y, srcCenter.X-layoutCenter.X) endAngle := math.Atan2(dstCenter.Y-layoutCenter.Y, dstCenter.X-layoutCenter.X) - - // Calculate angular distance taking shortest path angleDiff := endAngle - startAngle + + // Normalize angle difference if angleDiff < 0 { angleDiff += 2 * math.Pi } @@ -327,24 +333,23 @@ func createPerfectArc(edge *d2graph.Edge, baseRadius float64) { angleDiff -= 2 * math.Pi } - // Generate perfect circular arc + // Generate arc points path := make([]*geo.Point, 0, ARC_STEPS+1) for i := 0; i <= ARC_STEPS; i++ { t := float64(i) / ARC_STEPS - currentAngle := startAngle + t*angleDiff - x := layoutCenter.X + baseRadius*math.Cos(currentAngle) - y := layoutCenter.Y + baseRadius*math.Sin(currentAngle) + angle := startAngle + t*angleDiff + x := layoutCenter.X + arcRadius*math.Cos(angle) + y := layoutCenter.Y + arcRadius*math.Sin(angle) path = append(path, geo.NewPoint(x, y)) } - // Clip to shape boundaries while preserving arc properties + // Clip to actual node boundaries edge.Route = path startIdx, endIdx := edge.TraceToShape(edge.Route, 0, len(edge.Route)-1) // Maintain smooth arc after clipping if startIdx < endIdx { edge.Route = edge.Route[startIdx : endIdx+1] - // Ensure minimal points for smooth rendering if len(edge.Route) < 3 { edge.Route = []*geo.Point{path[0], path[len(path)-1]} @@ -354,28 +359,6 @@ func createPerfectArc(edge *d2graph.Edge, baseRadius float64) { edge.IsCurve = true } -// Keep existing helper functions (positionLabelsIcons, boxContains, boxIntersections) -// Helper if your geo.Box doesn’t implement Contains() -func boxContains(b *geo.Box, p *geo.Point) bool { - // typical bounding-box check - return p.X >= b.TopLeft.X && - p.X <= b.TopLeft.X+b.Width && - p.Y >= b.TopLeft.Y && - p.Y <= b.TopLeft.Y+b.Height -} - -// Helper if your geo.Box doesn’t implement Intersections(geo.Segment) yet -func boxIntersections(b *geo.Box, seg geo.Segment) []*geo.Point { - // We'll assume d2's standard geo.Box has a built-in Intersections(*Segment) method. - // If not, implement manually. For example, checking each of the 4 edges: - // left, right, top, bottom - // For simplicity, if you do have b.Intersections(...) you can just do: - // return b.Intersections(seg) - return b.Intersections(seg) - // If you don't have that, you'd code the line-rect intersection yourself. -} - -// positionLabelsIcons is basically your logic that sets default label/icon positions if needed func positionLabelsIcons(obj *d2graph.Object) { // If there's an icon but no icon position, give it a default if obj.Icon != nil && obj.IconPosition == nil { @@ -415,6 +398,17 @@ func positionLabelsIcons(obj *d2graph.Object) { } } } + +func boxContains(b *geo.Box, p *geo.Point) bool { + return p.X >= b.TopLeft.X && + p.X <= b.TopLeft.X+b.Width && + p.Y >= b.TopLeft.Y && + p.Y <= b.TopLeft.Y+b.Height +} + +func boxIntersections(b *geo.Box, seg geo.Segment) []*geo.Point { + return b.Intersections(seg) +} // package d2cycle // import ( diff --git a/e2etests/testdata/txtar/cycle-diagram/dagre/board.exp.json b/e2etests/testdata/txtar/cycle-diagram/dagre/board.exp.json index 5afda38eb0..0fcb4441f9 100644 --- a/e2etests/testdata/txtar/cycle-diagram/dagre/board.exp.json +++ b/e2etests/testdata/txtar/cycle-diagram/dagre/board.exp.json @@ -541,246 +541,246 @@ "route": [ { "x": 0, - "y": -200 + "y": -253 }, { - "x": 5.235000133514404, - "y": -199.93099975585938 + "x": 6.622000217437744, + "y": -252.91299438476562 }, { - "x": 10.467000007629395, - "y": -199.72500610351562 + "x": 13.239999771118164, + "y": -252.6529998779297 }, { - "x": 15.690999984741211, - "y": -199.38299560546875 + "x": 19.850000381469727, + "y": -252.22000122070312 }, { - "x": 20.905000686645508, - "y": -198.9040069580078 + "x": 26.44499969482422, + "y": -251.61399841308594 }, { - "x": 26.104999542236328, - "y": -198.28799438476562 + "x": 33.02299880981445, + "y": -250.8350067138672 }, { - "x": 31.285999298095703, - "y": -197.53700256347656 + "x": 39.57699966430664, + "y": -249.88499450683594 }, { - "x": 36.446998596191406, - "y": -196.64999389648438 + "x": 46.10499954223633, + "y": -248.76300048828125 }, { - "x": 41.582000732421875, - "y": -195.62899780273438 + "x": 52.60100173950195, + "y": -247.4709930419922 }, { - "x": 46.68899917602539, - "y": -194.47300720214844 + "x": 59.06100082397461, + "y": -246.00900268554688 }, { - "x": 51.76300048828125, - "y": -193.18499755859375 + "x": 65.48100280761719, + "y": -244.37899780273438 }, { - "x": 56.803001403808594, - "y": -191.76300048828125 + "x": 71.8550033569336, + "y": -242.58099365234375 }, { - "x": 61.803001403808594, - "y": -190.21099853515625 + "x": 78.18099975585938, + "y": -240.61700439453125 }, { - "x": 66.76100158691406, - "y": -188.5279998779297 + "x": 84.4530029296875, + "y": -238.48800659179688 }, { - "x": 71.6729965209961, - "y": -186.71600341796875 + "x": 90.66699981689453, + "y": -236.19500732421875 }, { - "x": 76.53600311279297, - "y": -184.77499389648438 + "x": 96.81800079345703, + "y": -233.74099731445312 }, { - "x": 81.34700012207031, - "y": -182.70899963378906 + "x": 102.90399932861328, + "y": -231.1269989013672 }, { - "x": 86.10199737548828, - "y": -180.51699829101562 + "x": 108.91899871826172, + "y": -228.35400390625 }, { - "x": 90.7979965209961, - "y": -178.2010040283203 + "x": 114.85900115966797, + "y": -225.4239959716797 }, { - "x": 95.43099975585938, - "y": -175.76300048828125 + "x": 120.72100067138672, + "y": -222.33999633789062 }, { - "x": 99.9990005493164, - "y": -173.2050018310547 + "x": 126.4990005493164, + "y": -219.10400390625 }, { - "x": 104.4990005493164, - "y": -170.5279998779297 + "x": 132.19200134277344, + "y": -215.7169952392578 }, { - "x": 108.927001953125, - "y": -167.73399353027344 + "x": 137.79299926757812, + "y": -212.18299865722656 }, { - "x": 113.28099822998047, - "y": -164.8249969482422 + "x": 143.3000030517578, + "y": -208.5030059814453 }, { - "x": 117.55699920654297, - "y": -161.80299377441406 + "x": 148.70899963378906, + "y": -204.68099975585938 }, { - "x": 121.75199890136719, - "y": -158.6699981689453 + "x": 154.01600646972656, + "y": -200.71800231933594 }, { - "x": 125.86399841308594, - "y": -155.4290008544922 + "x": 159.21800231933594, + "y": -196.61700439453125 }, { - "x": 129.88900756835938, - "y": -152.08099365234375 + "x": 164.30999755859375, + "y": -192.3820037841797 }, { - "x": 133.8260040283203, - "y": -148.6280059814453 + "x": 169.2899932861328, + "y": -188.01499938964844 }, { - "x": 137.6699981689453, - "y": -145.07400512695312 + "x": 174.1529998779297, + "y": -183.5189971923828 }, { - "x": 141.42100524902344, - "y": -141.42100524902344 + "x": 178.8979949951172, + "y": -178.8979949951172 }, { - "x": 145.07400512695312, - "y": -137.6699981689453 + "x": 183.5189971923828, + "y": -174.1529998779297 }, { - "x": 148.6280059814453, - "y": -133.8260040283203 + "x": 188.01499938964844, + "y": -169.2899932861328 }, { - "x": 152.08099365234375, - "y": -129.88900756835938 + "x": 192.3820037841797, + "y": -164.30999755859375 }, { - "x": 155.4290008544922, - "y": -125.86399841308594 + "x": 196.61700439453125, + "y": -159.21800231933594 }, { - "x": 158.6699981689453, - "y": -121.75199890136719 + "x": 200.71800231933594, + "y": -154.01600646972656 }, { - "x": 161.80299377441406, - "y": -117.55699920654297 + "x": 204.68099975585938, + "y": -148.70899963378906 }, { - "x": 164.8249969482422, - "y": -113.28099822998047 + "x": 208.5030059814453, + "y": -143.3000030517578 }, { - "x": 167.73399353027344, - "y": -108.927001953125 + "x": 212.18299865722656, + "y": -137.79299926757812 }, { - "x": 170.5279998779297, - "y": -104.4990005493164 + "x": 215.7169952392578, + "y": -132.19200134277344 }, { - "x": 173.2050018310547, - "y": -100 + "x": 219.10400390625, + "y": -126.5 }, { - "x": 175.76300048828125, - "y": -95.43099975585938 + "x": 222.33999633789062, + "y": -120.72100067138672 }, { - "x": 178.2010040283203, - "y": -90.7979965209961 + "x": 225.4239959716797, + "y": -114.85900115966797 }, { - "x": 180.51699829101562, - "y": -86.10199737548828 + "x": 228.35400390625, + "y": -108.91899871826172 }, { - "x": 182.70899963378906, - "y": -81.34700012207031 + "x": 231.1269989013672, + "y": -102.90399932861328 }, { - "x": 184.77499389648438, - "y": -76.53600311279297 + "x": 233.74099731445312, + "y": -96.81800079345703 }, { - "x": 186.71600341796875, - "y": -71.6729965209961 + "x": 236.19500732421875, + "y": -90.66699981689453 }, { - "x": 188.5279998779297, - "y": -66.76100158691406 + "x": 238.48800659179688, + "y": -84.4530029296875 }, { - "x": 190.21099853515625, - "y": -61.803001403808594 + "x": 240.61700439453125, + "y": -78.18099975585938 }, { - "x": 191.76300048828125, - "y": -56.803001403808594 + "x": 242.58099365234375, + "y": -71.8550033569336 }, { - "x": 193.18499755859375, - "y": -51.76300048828125 + "x": 244.37899780273438, + "y": -65.48100280761719 }, { - "x": 194.47300720214844, - "y": -46.68899917602539 + "x": 246.00900268554688, + "y": -59.06100082397461 }, { - "x": 195.62899780273438, - "y": -41.582000732421875 + "x": 247.4709930419922, + "y": -52.60100173950195 }, { - "x": 196.64999389648438, - "y": -36.446998596191406 + "x": 248.76300048828125, + "y": -46.10499954223633 }, { - "x": 197.53700256347656, - "y": -31.285999298095703 + "x": 249.88499450683594, + "y": -39.57699966430664 }, { - "x": 198.28799438476562, - "y": -26.104999542236328 + "x": 250.8350067138672, + "y": -33.02299880981445 }, { - "x": 198.9040069580078, - "y": -20.905000686645508 + "x": 251.61399841308594, + "y": -26.44499969482422 }, { - "x": 199.38299560546875, - "y": -15.690999984741211 + "x": 252.22000122070312, + "y": -19.850000381469727 }, { - "x": 199.72500610351562, - "y": -10.467000007629395 + "x": 252.6529998779297, + "y": -13.239999771118164 }, { - "x": 199.93099975585938, - "y": -5.235000133514404 + "x": 252.91299438476562, + "y": -6.622000217437744 }, { - "x": 200, + "x": 253, "y": 0 } ], @@ -816,248 +816,248 @@ "link": "", "route": [ { - "x": 200, + "x": 253, "y": 0 }, { - "x": 199.93099975585938, - "y": 5.235000133514404 + "x": 252.91299438476562, + "y": 6.622000217437744 }, { - "x": 199.72500610351562, - "y": 10.467000007629395 + "x": 252.6529998779297, + "y": 13.239999771118164 }, { - "x": 199.38299560546875, - "y": 15.690999984741211 + "x": 252.22000122070312, + "y": 19.850000381469727 }, { - "x": 198.9040069580078, - "y": 20.905000686645508 + "x": 251.61399841308594, + "y": 26.44499969482422 }, { - "x": 198.28799438476562, - "y": 26.104999542236328 + "x": 250.8350067138672, + "y": 33.02299880981445 }, { - "x": 197.53700256347656, - "y": 31.285999298095703 + "x": 249.88499450683594, + "y": 39.57699966430664 }, { - "x": 196.64999389648438, - "y": 36.446998596191406 + "x": 248.76300048828125, + "y": 46.10499954223633 }, { - "x": 195.62899780273438, - "y": 41.582000732421875 + "x": 247.4709930419922, + "y": 52.60100173950195 }, { - "x": 194.47300720214844, - "y": 46.68899917602539 + "x": 246.00900268554688, + "y": 59.06100082397461 }, { - "x": 193.18499755859375, - "y": 51.76300048828125 + "x": 244.37899780273438, + "y": 65.48100280761719 }, { - "x": 191.76300048828125, - "y": 56.803001403808594 + "x": 242.58099365234375, + "y": 71.8550033569336 }, { - "x": 190.21099853515625, - "y": 61.803001403808594 + "x": 240.61700439453125, + "y": 78.18099975585938 }, { - "x": 188.5279998779297, - "y": 66.76100158691406 + "x": 238.48800659179688, + "y": 84.4530029296875 }, { - "x": 186.71600341796875, - "y": 71.6729965209961 + "x": 236.19500732421875, + "y": 90.66699981689453 }, { - "x": 184.77499389648438, - "y": 76.53600311279297 + "x": 233.74099731445312, + "y": 96.81800079345703 }, { - "x": 182.70899963378906, - "y": 81.34700012207031 + "x": 231.1269989013672, + "y": 102.90399932861328 }, { - "x": 180.51699829101562, - "y": 86.10199737548828 + "x": 228.35400390625, + "y": 108.91899871826172 }, { - "x": 178.2010040283203, - "y": 90.7979965209961 + "x": 225.4239959716797, + "y": 114.85900115966797 }, { - "x": 175.76300048828125, - "y": 95.43099975585938 + "x": 222.33999633789062, + "y": 120.72100067138672 }, { - "x": 173.2050018310547, - "y": 99.9990005493164 + "x": 219.10400390625, + "y": 126.4990005493164 }, { - "x": 170.5279998779297, - "y": 104.4990005493164 + "x": 215.7169952392578, + "y": 132.19200134277344 }, { - "x": 167.73399353027344, - "y": 108.927001953125 + "x": 212.18299865722656, + "y": 137.79299926757812 }, { - "x": 164.8249969482422, - "y": 113.28099822998047 + "x": 208.5030059814453, + "y": 143.3000030517578 }, { - "x": 161.80299377441406, - "y": 117.55699920654297 + "x": 204.68099975585938, + "y": 148.70899963378906 }, { - "x": 158.6699981689453, - "y": 121.75199890136719 + "x": 200.71800231933594, + "y": 154.01600646972656 }, { - "x": 155.4290008544922, - "y": 125.86399841308594 + "x": 196.61700439453125, + "y": 159.21800231933594 }, { - "x": 152.08099365234375, - "y": 129.88900756835938 + "x": 192.3820037841797, + "y": 164.30999755859375 }, { - "x": 148.6280059814453, - "y": 133.8260040283203 + "x": 188.01499938964844, + "y": 169.2899932861328 }, { - "x": 145.07400512695312, - "y": 137.6699981689453 + "x": 183.5189971923828, + "y": 174.1529998779297 }, { - "x": 141.42100524902344, - "y": 141.42100524902344 + "x": 178.8979949951172, + "y": 178.8979949951172 }, { - "x": 137.6699981689453, - "y": 145.07400512695312 + "x": 174.1529998779297, + "y": 183.5189971923828 }, { - "x": 133.8260040283203, - "y": 148.6280059814453 + "x": 169.2899932861328, + "y": 188.01499938964844 }, { - "x": 129.88900756835938, - "y": 152.08099365234375 + "x": 164.30999755859375, + "y": 192.3820037841797 }, { - "x": 125.86399841308594, - "y": 155.4290008544922 + "x": 159.21800231933594, + "y": 196.61700439453125 }, { - "x": 121.75199890136719, - "y": 158.6699981689453 + "x": 154.01600646972656, + "y": 200.71800231933594 }, { - "x": 117.55699920654297, - "y": 161.80299377441406 + "x": 148.70899963378906, + "y": 204.68099975585938 }, { - "x": 113.28099822998047, - "y": 164.8249969482422 + "x": 143.3000030517578, + "y": 208.5030059814453 }, { - "x": 108.927001953125, - "y": 167.73399353027344 + "x": 137.79299926757812, + "y": 212.18299865722656 }, { - "x": 104.4990005493164, - "y": 170.5279998779297 + "x": 132.19200134277344, + "y": 215.7169952392578 }, { - "x": 100, - "y": 173.2050018310547 + "x": 126.5, + "y": 219.10400390625 }, { - "x": 95.43099975585938, - "y": 175.76300048828125 + "x": 120.72100067138672, + "y": 222.33999633789062 }, { - "x": 90.7979965209961, - "y": 178.2010040283203 + "x": 114.85900115966797, + "y": 225.4239959716797 }, { - "x": 86.10199737548828, - "y": 180.51699829101562 + "x": 108.91899871826172, + "y": 228.35400390625 }, { - "x": 81.34700012207031, - "y": 182.70899963378906 + "x": 102.90399932861328, + "y": 231.1269989013672 }, { - "x": 76.53600311279297, - "y": 184.77499389648438 + "x": 96.81800079345703, + "y": 233.74099731445312 }, { - "x": 71.6729965209961, - "y": 186.71600341796875 + "x": 90.66699981689453, + "y": 236.19500732421875 }, { - "x": 66.76100158691406, - "y": 188.5279998779297 + "x": 84.4530029296875, + "y": 238.48800659179688 }, { - "x": 61.803001403808594, - "y": 190.21099853515625 + "x": 78.18099975585938, + "y": 240.61700439453125 }, { - "x": 56.803001403808594, - "y": 191.76300048828125 + "x": 71.8550033569336, + "y": 242.58099365234375 }, { - "x": 51.76300048828125, - "y": 193.18499755859375 + "x": 65.48100280761719, + "y": 244.37899780273438 }, { - "x": 46.68899917602539, - "y": 194.47300720214844 + "x": 59.06100082397461, + "y": 246.00900268554688 }, { - "x": 41.582000732421875, - "y": 195.62899780273438 + "x": 52.60100173950195, + "y": 247.4709930419922 }, { - "x": 36.446998596191406, - "y": 196.64999389648438 + "x": 46.10499954223633, + "y": 248.76300048828125 }, { - "x": 31.285999298095703, - "y": 197.53700256347656 + "x": 39.57699966430664, + "y": 249.88499450683594 }, { - "x": 26.104999542236328, - "y": 198.28799438476562 + "x": 33.02299880981445, + "y": 250.8350067138672 }, { - "x": 20.905000686645508, - "y": 198.9040069580078 + "x": 26.44499969482422, + "y": 251.61399841308594 }, { - "x": 15.690999984741211, - "y": 199.38299560546875 + "x": 19.850000381469727, + "y": 252.22000122070312 }, { - "x": 10.467000007629395, - "y": 199.72500610351562 + "x": 13.239999771118164, + "y": 252.6529998779297 }, { - "x": 5.235000133514404, - "y": 199.93099975585938 + "x": 6.622000217437744, + "y": 252.91299438476562 }, { "x": 0, - "y": 200 + "y": 253 } ], "isCurve": true, @@ -1093,246 +1093,246 @@ "route": [ { "x": 0, - "y": 200 + "y": 253 }, { - "x": -5.235000133514404, - "y": 199.93099975585938 + "x": -6.622000217437744, + "y": 252.91299438476562 }, { - "x": -10.467000007629395, - "y": 199.72500610351562 + "x": -13.239999771118164, + "y": 252.6529998779297 }, { - "x": -15.690999984741211, - "y": 199.38299560546875 + "x": -19.850000381469727, + "y": 252.22000122070312 }, { - "x": -20.905000686645508, - "y": 198.9040069580078 + "x": -26.44499969482422, + "y": 251.61399841308594 }, { - "x": -26.104999542236328, - "y": 198.28799438476562 + "x": -33.02299880981445, + "y": 250.8350067138672 }, { - "x": -31.285999298095703, - "y": 197.53700256347656 + "x": -39.57699966430664, + "y": 249.88499450683594 }, { - "x": -36.446998596191406, - "y": 196.64999389648438 + "x": -46.10499954223633, + "y": 248.76300048828125 }, { - "x": -41.582000732421875, - "y": 195.62899780273438 + "x": -52.60100173950195, + "y": 247.4709930419922 }, { - "x": -46.68899917602539, - "y": 194.47300720214844 + "x": -59.06100082397461, + "y": 246.00900268554688 }, { - "x": -51.76300048828125, - "y": 193.18499755859375 + "x": -65.48100280761719, + "y": 244.37899780273438 }, { - "x": -56.803001403808594, - "y": 191.76300048828125 + "x": -71.8550033569336, + "y": 242.58099365234375 }, { - "x": -61.803001403808594, - "y": 190.21099853515625 + "x": -78.18099975585938, + "y": 240.61700439453125 }, { - "x": -66.76100158691406, - "y": 188.5279998779297 + "x": -84.4530029296875, + "y": 238.48800659179688 }, { - "x": -71.6729965209961, - "y": 186.71600341796875 + "x": -90.66699981689453, + "y": 236.19500732421875 }, { - "x": -76.53600311279297, - "y": 184.77499389648438 + "x": -96.81800079345703, + "y": 233.74099731445312 }, { - "x": -81.34700012207031, - "y": 182.70899963378906 + "x": -102.90399932861328, + "y": 231.1269989013672 }, { - "x": -86.10199737548828, - "y": 180.51699829101562 + "x": -108.91899871826172, + "y": 228.35400390625 }, { - "x": -90.7979965209961, - "y": 178.2010040283203 + "x": -114.85900115966797, + "y": 225.4239959716797 }, { - "x": -95.43099975585938, - "y": 175.76300048828125 + "x": -120.72100067138672, + "y": 222.33999633789062 }, { - "x": -99.9990005493164, - "y": 173.2050018310547 + "x": -126.4990005493164, + "y": 219.10400390625 }, { - "x": -104.4990005493164, - "y": 170.5279998779297 + "x": -132.19200134277344, + "y": 215.7169952392578 }, { - "x": -108.927001953125, - "y": 167.73399353027344 + "x": -137.79299926757812, + "y": 212.18299865722656 }, { - "x": -113.28099822998047, - "y": 164.8249969482422 + "x": -143.3000030517578, + "y": 208.5030059814453 }, { - "x": -117.55699920654297, - "y": 161.80299377441406 + "x": -148.70899963378906, + "y": 204.68099975585938 }, { - "x": -121.75199890136719, - "y": 158.6699981689453 + "x": -154.01600646972656, + "y": 200.71800231933594 }, { - "x": -125.86399841308594, - "y": 155.4290008544922 + "x": -159.21800231933594, + "y": 196.61700439453125 }, { - "x": -129.88900756835938, - "y": 152.08099365234375 + "x": -164.30999755859375, + "y": 192.3820037841797 }, { - "x": -133.8260040283203, - "y": 148.6280059814453 + "x": -169.2899932861328, + "y": 188.01499938964844 }, { - "x": -137.6699981689453, - "y": 145.07400512695312 + "x": -174.1529998779297, + "y": 183.5189971923828 }, { - "x": -141.42100524902344, - "y": 141.42100524902344 + "x": -178.8979949951172, + "y": 178.8979949951172 }, { - "x": -145.07400512695312, - "y": 137.6699981689453 + "x": -183.5189971923828, + "y": 174.1529998779297 }, { - "x": -148.6280059814453, - "y": 133.8260040283203 + "x": -188.01499938964844, + "y": 169.2899932861328 }, { - "x": -152.08099365234375, - "y": 129.88900756835938 + "x": -192.3820037841797, + "y": 164.30999755859375 }, { - "x": -155.4290008544922, - "y": 125.86399841308594 + "x": -196.61700439453125, + "y": 159.21800231933594 }, { - "x": -158.6699981689453, - "y": 121.75199890136719 + "x": -200.71800231933594, + "y": 154.01600646972656 }, { - "x": -161.80299377441406, - "y": 117.55699920654297 + "x": -204.68099975585938, + "y": 148.70899963378906 }, { - "x": -164.8249969482422, - "y": 113.28099822998047 + "x": -208.5030059814453, + "y": 143.3000030517578 }, { - "x": -167.73399353027344, - "y": 108.927001953125 + "x": -212.18299865722656, + "y": 137.79299926757812 }, { - "x": -170.5279998779297, - "y": 104.4990005493164 + "x": -215.7169952392578, + "y": 132.19200134277344 }, { - "x": -173.2050018310547, - "y": 100 + "x": -219.10400390625, + "y": 126.5 }, { - "x": -175.76300048828125, - "y": 95.43099975585938 + "x": -222.33999633789062, + "y": 120.72100067138672 }, { - "x": -178.2010040283203, - "y": 90.7979965209961 + "x": -225.4239959716797, + "y": 114.85900115966797 }, { - "x": -180.51699829101562, - "y": 86.10199737548828 + "x": -228.35400390625, + "y": 108.91899871826172 }, { - "x": -182.70899963378906, - "y": 81.34700012207031 + "x": -231.1269989013672, + "y": 102.90399932861328 }, { - "x": -184.77499389648438, - "y": 76.53600311279297 + "x": -233.74099731445312, + "y": 96.81800079345703 }, { - "x": -186.71600341796875, - "y": 71.6729965209961 + "x": -236.19500732421875, + "y": 90.66699981689453 }, { - "x": -188.5279998779297, - "y": 66.76100158691406 + "x": -238.48800659179688, + "y": 84.4530029296875 }, { - "x": -190.21099853515625, - "y": 61.803001403808594 + "x": -240.61700439453125, + "y": 78.18099975585938 }, { - "x": -191.76300048828125, - "y": 56.803001403808594 + "x": -242.58099365234375, + "y": 71.8550033569336 }, { - "x": -193.18499755859375, - "y": 51.76300048828125 + "x": -244.37899780273438, + "y": 65.48100280761719 }, { - "x": -194.47300720214844, - "y": 46.68899917602539 + "x": -246.00900268554688, + "y": 59.06100082397461 }, { - "x": -195.62899780273438, - "y": 41.582000732421875 + "x": -247.4709930419922, + "y": 52.60100173950195 }, { - "x": -196.64999389648438, - "y": 36.446998596191406 + "x": -248.76300048828125, + "y": 46.10499954223633 }, { - "x": -197.53700256347656, - "y": 31.285999298095703 + "x": -249.88499450683594, + "y": 39.57699966430664 }, { - "x": -198.28799438476562, - "y": 26.104999542236328 + "x": -250.8350067138672, + "y": 33.02299880981445 }, { - "x": -198.9040069580078, - "y": 20.905000686645508 + "x": -251.61399841308594, + "y": 26.44499969482422 }, { - "x": -199.38299560546875, - "y": 15.690999984741211 + "x": -252.22000122070312, + "y": 19.850000381469727 }, { - "x": -199.72500610351562, - "y": 10.467000007629395 + "x": -252.6529998779297, + "y": 13.239999771118164 }, { - "x": -199.93099975585938, - "y": 5.235000133514404 + "x": -252.91299438476562, + "y": 6.622000217437744 }, { - "x": -200, + "x": -253, "y": 0 } ], @@ -1369,247 +1369,247 @@ "route": [ { "x": 513, - "y": -150 + "y": -203 }, { - "x": 519.97900390625, - "y": -149.8780059814453 + "x": 521.8289794921875, + "y": -202.84500122070312 }, { - "x": 526.9509887695312, - "y": -149.51199340820312 + "x": 530.6480102539062, + "y": -202.38299560546875 }, { - "x": 533.905029296875, - "y": -148.9040069580078 + "x": 539.4450073242188, + "y": -201.61399841308594 }, { - "x": 540.833984375, - "y": -148.05299377441406 + "x": 548.2100219726562, + "y": -200.53700256347656 }, { - "x": 547.72900390625, - "y": -146.96099853515625 + "x": 556.9320068359375, + "y": -199.156005859375 }, { - "x": 554.5819702148438, - "y": -145.62899780273438 + "x": 565.6010131835938, + "y": -197.4709930419922 }, { - "x": 561.3839721679688, - "y": -144.0590057373047 + "x": 574.2059936523438, + "y": -195.48399353027344 }, { - "x": 568.1270141601562, - "y": -142.2519989013672 + "x": 582.7360229492188, + "y": -193.19900512695312 }, { - "x": 574.802978515625, - "y": -140.21099853515625 + "x": 591.1810302734375, + "y": -190.61700439453125 }, { - "x": 581.4039916992188, - "y": -137.93800354003906 + "x": 599.531005859375, + "y": -187.74200439453125 }, { - "x": 587.9210205078125, - "y": -135.43600463867188 + "x": 607.7750244140625, + "y": -184.57699584960938 }, { - "x": 594.3469848632812, - "y": -132.70899963378906 + "x": 615.9039916992188, + "y": -181.1269989013672 }, { - "x": 600.6740112304688, - "y": -129.75799560546875 + "x": 623.906982421875, + "y": -177.3939971923828 }, { - "x": 606.8939819335938, - "y": -126.58899688720703 + "x": 631.7760009765625, + "y": -173.38499450683594 }, { - "x": 613, - "y": -123.20500183105469 + "x": 639.5, + "y": -169.10400390625 }, { - "x": 618.9829711914062, - "y": -119.60900115966797 + "x": 647.0689697265625, + "y": -164.55599975585938 }, { - "x": 624.8380126953125, - "y": -115.80699920654297 + "x": 654.4749755859375, + "y": -159.74600219726562 }, { - "x": 630.5570068359375, - "y": -111.8030014038086 + "x": 661.708984375, + "y": -154.68099975585938 }, { - "x": 636.1320190429688, - "y": -107.60199737548828 + "x": 668.7620239257812, + "y": -149.36599731445312 }, { - "x": 641.5570068359375, - "y": -103.20800018310547 + "x": 675.625, + "y": -143.8090057373047 }, { - "x": 646.8259887695312, - "y": -98.62799835205078 + "x": 682.2899780273438, + "y": -138.01499938964844 }, { - "x": 651.9310302734375, - "y": -93.86699676513672 + "x": 688.7479858398438, + "y": -131.99200439453125 }, { - "x": 656.8670043945312, - "y": -88.93099975585938 + "x": 694.9920043945312, + "y": -125.74800109863281 }, { - "x": 661.6279907226562, - "y": -83.82599639892578 + "x": 701.0150146484375, + "y": -119.29000091552734 }, { - "x": 666.2080078125, - "y": -78.55699920654297 + "x": 706.8090209960938, + "y": -112.625 }, { - "x": 670.6019897460938, - "y": -73.13200378417969 + "x": 712.3660278320312, + "y": -105.76200103759766 }, { - "x": 674.802978515625, - "y": -67.55699920654297 + "x": 717.6810302734375, + "y": -98.70899963378906 }, { - "x": 678.8070068359375, - "y": -61.8380012512207 + "x": 722.7459716796875, + "y": -91.4749984741211 }, { - "x": 682.6090087890625, - "y": -55.983001708984375 + "x": 727.5560302734375, + "y": -84.06900024414062 }, { - "x": 686.2050170898438, - "y": -50 + "x": 732.10400390625, + "y": -76.5 }, { - "x": 689.5889892578125, - "y": -43.89400100708008 + "x": 736.385009765625, + "y": -68.7760009765625 }, { - "x": 692.7579956054688, - "y": -37.67399978637695 + "x": 740.3939819335938, + "y": -60.90700149536133 }, { - "x": 695.708984375, - "y": -31.347000122070312 + "x": 744.1270141601562, + "y": -52.90399932861328 }, { - "x": 698.4359741210938, - "y": -24.92099952697754 + "x": 747.5770263671875, + "y": -44.775001525878906 }, { - "x": 700.93798828125, - "y": -18.40399932861328 + "x": 750.7420043945312, + "y": -36.53099822998047 }, { - "x": 703.2109985351562, - "y": -11.803000450134277 + "x": 753.6170043945312, + "y": -28.180999755859375 }, { - "x": 705.2520141601562, - "y": -5.126999855041504 + "x": 756.198974609375, + "y": -19.736000061035156 }, { - "x": 707.0590209960938, - "y": 1.6150000095367432 + "x": 758.4840087890625, + "y": -11.206000328063965 }, { - "x": 708.6290283203125, - "y": 8.416999816894531 + "x": 760.4710083007812, + "y": -2.6010000705718994 }, { - "x": 709.9609985351562, - "y": 15.270000457763672 + "x": 762.156005859375, + "y": 6.066999912261963 }, { - "x": 711.052978515625, - "y": 22.165000915527344 + "x": 763.5369873046875, + "y": 14.788999557495117 }, { - "x": 711.9039916992188, - "y": 29.0939998626709 + "x": 764.614013671875, + "y": 23.554000854492188 }, { - "x": 712.5120239257812, - "y": 36.04800033569336 + "x": 765.3829956054688, + "y": 32.35100173950195 }, { - "x": 712.8779907226562, - "y": 43.02000045776367 + "x": 765.844970703125, + "y": 41.16999816894531 }, { - "x": 713, + "x": 766, "y": 50 }, { - "x": 712.8779907226562, - "y": 56.979000091552734 + "x": 765.844970703125, + "y": 58.82899856567383 }, { - "x": 712.5120239257812, - "y": 63.95100021362305 + "x": 765.3829956054688, + "y": 67.64800262451172 }, { - "x": 711.9039916992188, - "y": 70.90499877929688 + "x": 764.614013671875, + "y": 76.44499969482422 }, { - "x": 711.052978515625, - "y": 77.83399963378906 + "x": 763.5369873046875, + "y": 85.20999908447266 }, { - "x": 709.9609985351562, - "y": 84.72899627685547 + "x": 762.156005859375, + "y": 93.93199920654297 }, { - "x": 708.6290283203125, - "y": 91.58200073242188 + "x": 760.4710083007812, + "y": 102.60099792480469 }, { - "x": 707.0590209960938, - "y": 98.38400268554688 + "x": 758.4840087890625, + "y": 111.20600128173828 }, { - "x": 705.2520141601562, - "y": 105.12699890136719 + "x": 756.198974609375, + "y": 119.73600006103516 }, { - "x": 703.2109985351562, - "y": 111.8030014038086 + "x": 753.6170043945312, + "y": 128.18099975585938 }, { - "x": 700.93798828125, - "y": 118.40399932861328 + "x": 750.7420043945312, + "y": 136.531005859375 }, { - "x": 698.4359741210938, - "y": 124.9209976196289 + "x": 747.5770263671875, + "y": 144.77499389648438 }, { - "x": 695.708984375, - "y": 131.3470001220703 + "x": 744.1270141601562, + "y": 152.9040069580078 }, { - "x": 692.7579956054688, - "y": 137.6739959716797 + "x": 740.3939819335938, + "y": 160.90699768066406 }, { - "x": 689.5889892578125, - "y": 143.8939971923828 + "x": 736.385009765625, + "y": 168.7760009765625 }, { - "x": 686.2050170898438, - "y": 149.99899291992188 + "x": 732.10400390625, + "y": 176.49899291992188 } ], "isCurve": true, @@ -1644,248 +1644,248 @@ "link": "", "route": [ { - "x": 686.2050170898438, - "y": 149.99899291992188 + "x": 732.10400390625, + "y": 176.49899291992188 }, { - "x": 682.6090087890625, - "y": 155.98300170898438 + "x": 727.5560302734375, + "y": 184.06900024414062 }, { - "x": 678.8070068359375, - "y": 161.83799743652344 + "x": 722.7459716796875, + "y": 191.47500610351562 }, { - "x": 674.802978515625, - "y": 167.5570068359375 + "x": 717.6810302734375, + "y": 198.70899963378906 }, { - "x": 670.6019897460938, - "y": 173.1320037841797 + "x": 712.3660278320312, + "y": 205.76199340820312 }, { - "x": 666.2080078125, - "y": 178.5570068359375 + "x": 706.8090209960938, + "y": 212.625 }, { - "x": 661.6279907226562, - "y": 183.8260040283203 + "x": 701.0150146484375, + "y": 219.2899932861328 }, { - "x": 656.8670043945312, - "y": 188.93099975585938 + "x": 694.9920043945312, + "y": 225.7480010986328 }, { - "x": 651.9310302734375, - "y": 193.86700439453125 + "x": 688.7479858398438, + "y": 231.99200439453125 }, { - "x": 646.8259887695312, - "y": 198.6280059814453 + "x": 682.2899780273438, + "y": 238.01499938964844 }, { - "x": 641.5570068359375, - "y": 203.20799255371094 + "x": 675.625, + "y": 243.8090057373047 }, { - "x": 636.1320190429688, - "y": 207.6020050048828 + "x": 668.7620239257812, + "y": 249.36599731445312 }, { - "x": 630.5570068359375, - "y": 211.80299377441406 + "x": 661.708984375, + "y": 254.68099975585938 }, { - "x": 624.8380126953125, - "y": 215.8070068359375 + "x": 654.4749755859375, + "y": 259.7460021972656 }, { - "x": 618.9829711914062, - "y": 219.60899353027344 + "x": 647.0689697265625, + "y": 264.5559997558594 }, { - "x": 613, - "y": 223.2050018310547 + "x": 639.5, + "y": 269.10400390625 }, { - "x": 606.8939819335938, - "y": 226.58900451660156 + "x": 631.7760009765625, + "y": 273.385009765625 }, { - "x": 600.6740112304688, - "y": 229.75799560546875 + "x": 623.906982421875, + "y": 277.3940124511719 }, { - "x": 594.3469848632812, - "y": 232.70899963378906 + "x": 615.9039916992188, + "y": 281.12701416015625 }, { - "x": 587.9210205078125, - "y": 235.43600463867188 + "x": 607.7750244140625, + "y": 284.5769958496094 }, { - "x": 581.4039916992188, - "y": 237.93800354003906 + "x": 599.531005859375, + "y": 287.74200439453125 }, { - "x": 574.802978515625, - "y": 240.21099853515625 + "x": 591.1810302734375, + "y": 290.61700439453125 }, { - "x": 568.1270141601562, - "y": 242.2519989013672 + "x": 582.7360229492188, + "y": 293.1990051269531 }, { - "x": 561.3839721679688, - "y": 244.0590057373047 + "x": 574.2059936523438, + "y": 295.4840087890625 }, { - "x": 554.5819702148438, - "y": 245.62899780273438 + "x": 565.6010131835938, + "y": 297.47100830078125 }, { - "x": 547.72900390625, - "y": 246.96099853515625 + "x": 556.9320068359375, + "y": 299.156005859375 }, { - "x": 540.833984375, - "y": 248.05299377441406 + "x": 548.2100219726562, + "y": 300.5369873046875 }, { - "x": 533.905029296875, - "y": 248.9040069580078 + "x": 539.4450073242188, + "y": 301.614013671875 }, { - "x": 526.9509887695312, - "y": 249.51199340820312 + "x": 530.6480102539062, + "y": 302.38299560546875 }, { - "x": 519.97900390625, - "y": 249.8780059814453 + "x": 521.8289794921875, + "y": 302.8450012207031 }, { "x": 513, - "y": 250 + "y": 303 }, { - "x": 506.0199890136719, - "y": 249.8780059814453 + "x": 504.1700134277344, + "y": 302.8450012207031 }, { - "x": 499.0480041503906, - "y": 249.51199340820312 + "x": 495.35101318359375, + "y": 302.38299560546875 }, { - "x": 492.093994140625, - "y": 248.9040069580078 + "x": 486.5539855957031, + "y": 301.614013671875 }, { - "x": 485.1650085449219, - "y": 248.05299377441406 + "x": 477.78900146484375, + "y": 300.5369873046875 }, { - "x": 478.2699890136719, - "y": 246.96099853515625 + "x": 469.0669860839844, + "y": 299.156005859375 }, { - "x": 471.4169921875, - "y": 245.62899780273438 + "x": 460.39801025390625, + "y": 297.47100830078125 }, { - "x": 464.614990234375, - "y": 244.0590057373047 + "x": 451.7929992675781, + "y": 295.4840087890625 }, { - "x": 457.87200927734375, - "y": 242.2519989013672 + "x": 443.26300048828125, + "y": 293.1990051269531 }, { - "x": 451.1960144042969, - "y": 240.21099853515625 + "x": 434.8179931640625, + "y": 290.61700439453125 }, { - "x": 444.5950012207031, - "y": 237.93800354003906 + "x": 426.4679870605469, + "y": 287.74200439453125 }, { - "x": 438.0780029296875, - "y": 235.43600463867188 + "x": 418.2239990234375, + "y": 284.5769958496094 }, { - "x": 431.6520080566406, - "y": 232.70899963378906 + "x": 410.0950012207031, + "y": 281.12701416015625 }, { - "x": 425.32501220703125, - "y": 229.75799560546875 + "x": 402.0920104980469, + "y": 277.3940124511719 }, { - "x": 419.1050109863281, - "y": 226.58900451660156 + "x": 394.2229919433594, + "y": 273.385009765625 }, { - "x": 413, - "y": 223.2050018310547 + "x": 386.5, + "y": 269.10400390625 }, { - "x": 407.0159912109375, - "y": 219.60899353027344 + "x": 378.92999267578125, + "y": 264.5559997558594 }, { - "x": 401.1610107421875, - "y": 215.8070068359375 + "x": 371.52398681640625, + "y": 259.7460021972656 }, { - "x": 395.4419860839844, - "y": 211.80299377441406 + "x": 364.2900085449219, + "y": 254.68099975585938 }, { - "x": 389.86700439453125, - "y": 207.6020050048828 + "x": 357.23699951171875, + "y": 249.36599731445312 }, { - "x": 384.4419860839844, - "y": 203.20799255371094 + "x": 350.3739929199219, + "y": 243.8090057373047 }, { - "x": 379.1730041503906, - "y": 198.6280059814453 + "x": 343.7090148925781, + "y": 238.01499938964844 }, { - "x": 374.0679931640625, - "y": 193.86700439453125 + "x": 337.2510070800781, + "y": 231.99200439453125 }, { - "x": 369.1319885253906, - "y": 188.93099975585938 + "x": 331.0069885253906, + "y": 225.7480010986328 }, { - "x": 364.3710021972656, - "y": 183.8260040283203 + "x": 324.9840087890625, + "y": 219.2899932861328 }, { - "x": 359.7909851074219, - "y": 178.5570068359375 + "x": 319.19000244140625, + "y": 212.625 }, { - "x": 355.3970031738281, - "y": 173.1320037841797 + "x": 313.63299560546875, + "y": 205.76199340820312 }, { - "x": 351.1960144042969, - "y": 167.5570068359375 + "x": 308.3179931640625, + "y": 198.70899963378906 }, { - "x": 347.1919860839844, - "y": 161.83799743652344 + "x": 303.25299072265625, + "y": 191.47500610351562 }, { - "x": 343.3900146484375, - "y": 155.98300170898438 + "x": 298.4429931640625, + "y": 184.06900024414062 }, { - "x": 339.79400634765625, - "y": 150 + "x": 293.8949890136719, + "y": 176.5 } ], "isCurve": true, @@ -1921,247 +1921,247 @@ "route": [ { "x": 972, - "y": -200 + "y": -253 }, { - "x": 982.4669799804688, - "y": -199.72500610351562 + "x": 985.239990234375, + "y": -252.6529998779297 }, { - "x": 992.905029296875, - "y": -198.9040069580078 + "x": 998.4450073242188, + "y": -251.61399841308594 }, { - "x": 1003.2860107421875, - "y": -197.53700256347656 + "x": 1011.5770263671875, + "y": -249.88499450683594 }, { - "x": 1013.5819702148438, - "y": -195.62899780273438 + "x": 1024.6009521484375, + "y": -247.4709930419922 }, { - "x": 1023.7630004882812, - "y": -193.18499755859375 + "x": 1037.48095703125, + "y": -244.37899780273438 }, { - "x": 1033.802978515625, - "y": -190.21099853515625 + "x": 1050.1810302734375, + "y": -240.61700439453125 }, { - "x": 1043.6729736328125, - "y": -186.71600341796875 + "x": 1062.6669921875, + "y": -236.19500732421875 }, { - "x": 1053.3470458984375, - "y": -182.70899963378906 + "x": 1074.904052734375, + "y": -231.1269989013672 }, { - "x": 1062.7979736328125, - "y": -178.2010040283203 + "x": 1086.8590087890625, + "y": -225.4239959716797 }, { - "x": 1072, - "y": -173.2050018310547 + "x": 1098.5, + "y": -219.10400390625 }, { - "x": 1080.927001953125, - "y": -167.73399353027344 + "x": 1109.79296875, + "y": -212.18299865722656 }, { - "x": 1089.5570068359375, - "y": -161.80299377441406 + "x": 1120.708984375, + "y": -204.68099975585938 }, { - "x": 1097.864013671875, - "y": -155.4290008544922 + "x": 1131.218017578125, + "y": -196.61700439453125 }, { - "x": 1105.8260498046875, - "y": -148.6280059814453 + "x": 1141.2900390625, + "y": -188.01499938964844 }, { - "x": 1113.4210205078125, - "y": -141.42100524902344 + "x": 1150.89794921875, + "y": -178.8979949951172 }, { - "x": 1120.6280517578125, - "y": -133.8260040283203 + "x": 1160.0150146484375, + "y": -169.2899932861328 }, { - "x": 1127.428955078125, - "y": -125.86399841308594 + "x": 1168.616943359375, + "y": -159.21800231933594 }, { - "x": 1133.802978515625, - "y": -117.55699920654297 + "x": 1176.6810302734375, + "y": -148.70899963378906 }, { - "x": 1139.7340087890625, - "y": -108.927001953125 + "x": 1184.1829833984375, + "y": -137.79299926757812 }, { - "x": 1145.2049560546875, - "y": -100 + "x": 1191.10400390625, + "y": -126.5 }, { - "x": 1150.2010498046875, - "y": -90.7979965209961 + "x": 1197.4239501953125, + "y": -114.85900115966797 }, { - "x": 1154.708984375, - "y": -81.34700012207031 + "x": 1203.126953125, + "y": -102.90399932861328 }, { - "x": 1158.7159423828125, - "y": -71.6729965209961 + "x": 1208.1949462890625, + "y": -90.66699981689453 }, { - "x": 1162.2110595703125, - "y": -61.803001403808594 + "x": 1212.616943359375, + "y": -78.18099975585938 }, { - "x": 1165.18505859375, - "y": -51.76300048828125 + "x": 1216.3790283203125, + "y": -65.48100280761719 }, { - "x": 1167.6290283203125, - "y": -41.582000732421875 + "x": 1219.470947265625, + "y": -52.60100173950195 }, { - "x": 1169.5369873046875, - "y": -31.285999298095703 + "x": 1221.885009765625, + "y": -39.57699966430664 }, { - "x": 1170.904052734375, - "y": -20.905000686645508 + "x": 1223.614013671875, + "y": -26.44499969482422 }, { - "x": 1171.7249755859375, - "y": -10.467000007629395 + "x": 1224.6529541015625, + "y": -13.239999771118164 }, { - "x": 1172, + "x": 1225, "y": 0 }, { - "x": 1171.7249755859375, - "y": 10.467000007629395 + "x": 1224.6529541015625, + "y": 13.239999771118164 }, { - "x": 1170.904052734375, - "y": 20.905000686645508 + "x": 1223.614013671875, + "y": 26.44499969482422 }, { - "x": 1169.5369873046875, - "y": 31.285999298095703 + "x": 1221.885009765625, + "y": 39.57699966430664 }, { - "x": 1167.6290283203125, - "y": 41.582000732421875 + "x": 1219.470947265625, + "y": 52.60100173950195 }, { - "x": 1165.18505859375, - "y": 51.76300048828125 + "x": 1216.3790283203125, + "y": 65.48100280761719 }, { - "x": 1162.2110595703125, - "y": 61.803001403808594 + "x": 1212.616943359375, + "y": 78.18099975585938 }, { - "x": 1158.7159423828125, - "y": 71.6729965209961 + "x": 1208.1949462890625, + "y": 90.66699981689453 }, { - "x": 1154.708984375, - "y": 81.34700012207031 + "x": 1203.126953125, + "y": 102.90399932861328 }, { - "x": 1150.2010498046875, - "y": 90.7979965209961 + "x": 1197.4239501953125, + "y": 114.85900115966797 }, { - "x": 1145.2049560546875, - "y": 99.9990005493164 + "x": 1191.10400390625, + "y": 126.4990005493164 }, { - "x": 1139.7340087890625, - "y": 108.927001953125 + "x": 1184.1829833984375, + "y": 137.79299926757812 }, { - "x": 1133.802978515625, - "y": 117.55699920654297 + "x": 1176.6810302734375, + "y": 148.70899963378906 }, { - "x": 1127.428955078125, - "y": 125.86399841308594 + "x": 1168.616943359375, + "y": 159.21800231933594 }, { - "x": 1120.6280517578125, - "y": 133.8260040283203 + "x": 1160.0150146484375, + "y": 169.2899932861328 }, { - "x": 1113.4210205078125, - "y": 141.42100524902344 + "x": 1150.89794921875, + "y": 178.8979949951172 }, { - "x": 1105.8260498046875, - "y": 148.6280059814453 + "x": 1141.2900390625, + "y": 188.01499938964844 }, { - "x": 1097.864013671875, - "y": 155.4290008544922 + "x": 1131.218017578125, + "y": 196.61700439453125 }, { - "x": 1089.5570068359375, - "y": 161.80299377441406 + "x": 1120.708984375, + "y": 204.68099975585938 }, { - "x": 1080.927001953125, - "y": 167.73399353027344 + "x": 1109.79296875, + "y": 212.18299865722656 }, { - "x": 1072, - "y": 173.2050018310547 + "x": 1098.5, + "y": 219.10400390625 }, { - "x": 1062.7979736328125, - "y": 178.2010040283203 + "x": 1086.8590087890625, + "y": 225.4239959716797 }, { - "x": 1053.3470458984375, - "y": 182.70899963378906 + "x": 1074.904052734375, + "y": 231.1269989013672 }, { - "x": 1043.6729736328125, - "y": 186.71600341796875 + "x": 1062.6669921875, + "y": 236.19500732421875 }, { - "x": 1033.802978515625, - "y": 190.21099853515625 + "x": 1050.1810302734375, + "y": 240.61700439453125 }, { - "x": 1023.7630004882812, - "y": 193.18499755859375 + "x": 1037.48095703125, + "y": 244.37899780273438 }, { - "x": 1013.5819702148438, - "y": 195.62899780273438 + "x": 1024.6009521484375, + "y": 247.4709930419922 }, { - "x": 1003.2860107421875, - "y": 197.53700256347656 + "x": 1011.5770263671875, + "y": 249.88499450683594 }, { - "x": 992.905029296875, - "y": 198.9040069580078 + "x": 998.4450073242188, + "y": 251.61399841308594 }, { - "x": 982.4669799804688, - "y": 199.72500610351562 + "x": 985.239990234375, + "y": 252.6529998779297 }, { "x": 972, - "y": 200 + "y": 253 } ], "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 dc0dacddde..1da4a0d02b 100644 --- a/e2etests/testdata/txtar/cycle-diagram/dagre/sketch.exp.svg +++ b/e2etests/testdata/txtar/cycle-diagram/dagre/sketch.exp.svg @@ -1,9 +1,9 @@ -abcdabcab - + .d2-2319161779 .fill-N1{fill:#0A0F25;} + .d2-2319161779 .fill-N2{fill:#676C7E;} + .d2-2319161779 .fill-N3{fill:#9499AB;} + .d2-2319161779 .fill-N4{fill:#CFD2DD;} + .d2-2319161779 .fill-N5{fill:#DEE1EB;} + .d2-2319161779 .fill-N6{fill:#EEF1F8;} + .d2-2319161779 .fill-N7{fill:#FFFFFF;} + .d2-2319161779 .fill-B1{fill:#0D32B2;} + .d2-2319161779 .fill-B2{fill:#0D32B2;} + .d2-2319161779 .fill-B3{fill:#E3E9FD;} + .d2-2319161779 .fill-B4{fill:#E3E9FD;} + .d2-2319161779 .fill-B5{fill:#EDF0FD;} + .d2-2319161779 .fill-B6{fill:#F7F8FE;} + .d2-2319161779 .fill-AA2{fill:#4A6FF3;} + .d2-2319161779 .fill-AA4{fill:#EDF0FD;} + .d2-2319161779 .fill-AA5{fill:#F7F8FE;} + .d2-2319161779 .fill-AB4{fill:#EDF0FD;} + .d2-2319161779 .fill-AB5{fill:#F7F8FE;} + .d2-2319161779 .stroke-N1{stroke:#0A0F25;} + .d2-2319161779 .stroke-N2{stroke:#676C7E;} + .d2-2319161779 .stroke-N3{stroke:#9499AB;} + .d2-2319161779 .stroke-N4{stroke:#CFD2DD;} + .d2-2319161779 .stroke-N5{stroke:#DEE1EB;} + .d2-2319161779 .stroke-N6{stroke:#EEF1F8;} + .d2-2319161779 .stroke-N7{stroke:#FFFFFF;} + .d2-2319161779 .stroke-B1{stroke:#0D32B2;} + .d2-2319161779 .stroke-B2{stroke:#0D32B2;} + .d2-2319161779 .stroke-B3{stroke:#E3E9FD;} + .d2-2319161779 .stroke-B4{stroke:#E3E9FD;} + .d2-2319161779 .stroke-B5{stroke:#EDF0FD;} + .d2-2319161779 .stroke-B6{stroke:#F7F8FE;} + .d2-2319161779 .stroke-AA2{stroke:#4A6FF3;} + .d2-2319161779 .stroke-AA4{stroke:#EDF0FD;} + .d2-2319161779 .stroke-AA5{stroke:#F7F8FE;} + .d2-2319161779 .stroke-AB4{stroke:#EDF0FD;} + .d2-2319161779 .stroke-AB5{stroke:#F7F8FE;} + .d2-2319161779 .background-color-N1{background-color:#0A0F25;} + .d2-2319161779 .background-color-N2{background-color:#676C7E;} + .d2-2319161779 .background-color-N3{background-color:#9499AB;} + .d2-2319161779 .background-color-N4{background-color:#CFD2DD;} + .d2-2319161779 .background-color-N5{background-color:#DEE1EB;} + .d2-2319161779 .background-color-N6{background-color:#EEF1F8;} + .d2-2319161779 .background-color-N7{background-color:#FFFFFF;} + .d2-2319161779 .background-color-B1{background-color:#0D32B2;} + .d2-2319161779 .background-color-B2{background-color:#0D32B2;} + .d2-2319161779 .background-color-B3{background-color:#E3E9FD;} + .d2-2319161779 .background-color-B4{background-color:#E3E9FD;} + .d2-2319161779 .background-color-B5{background-color:#EDF0FD;} + .d2-2319161779 .background-color-B6{background-color:#F7F8FE;} + .d2-2319161779 .background-color-AA2{background-color:#4A6FF3;} + .d2-2319161779 .background-color-AA4{background-color:#EDF0FD;} + .d2-2319161779 .background-color-AA5{background-color:#F7F8FE;} + .d2-2319161779 .background-color-AB4{background-color:#EDF0FD;} + .d2-2319161779 .background-color-AB5{background-color:#F7F8FE;} + .d2-2319161779 .color-N1{color:#0A0F25;} + .d2-2319161779 .color-N2{color:#676C7E;} + .d2-2319161779 .color-N3{color:#9499AB;} + .d2-2319161779 .color-N4{color:#CFD2DD;} + .d2-2319161779 .color-N5{color:#DEE1EB;} + .d2-2319161779 .color-N6{color:#EEF1F8;} + .d2-2319161779 .color-N7{color:#FFFFFF;} + .d2-2319161779 .color-B1{color:#0D32B2;} + .d2-2319161779 .color-B2{color:#0D32B2;} + .d2-2319161779 .color-B3{color:#E3E9FD;} + .d2-2319161779 .color-B4{color:#E3E9FD;} + .d2-2319161779 .color-B5{color:#EDF0FD;} + .d2-2319161779 .color-B6{color:#F7F8FE;} + .d2-2319161779 .color-AA2{color:#4A6FF3;} + .d2-2319161779 .color-AA4{color:#EDF0FD;} + .d2-2319161779 .color-AA5{color:#F7F8FE;} + .d2-2319161779 .color-AB4{color:#EDF0FD;} + .d2-2319161779 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker-d2-2319161779);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker-d2-2319161779);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright-d2-2319161779);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright-d2-2319161779);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright-d2-2319161779);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright-d2-2319161779);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark-d2-2319161779);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright-d2-2319161779);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright-d2-2319161779);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright-d2-2319161779);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright-d2-2319161779);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker-d2-2319161779);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark-d2-2319161779);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal-d2-2319161779);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal-d2-2319161779);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright-d2-2319161779);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright-d2-2319161779);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright-d2-2319161779);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>abcdabcab + diff --git a/e2etests/testdata/txtar/cycle-diagram/elk/board.exp.json b/e2etests/testdata/txtar/cycle-diagram/elk/board.exp.json index def0de8052..9f52054958 100644 --- a/e2etests/testdata/txtar/cycle-diagram/elk/board.exp.json +++ b/e2etests/testdata/txtar/cycle-diagram/elk/board.exp.json @@ -541,246 +541,246 @@ "route": [ { "x": 12, - "y": -188 + "y": -241 }, { - "x": 17.235000610351562, - "y": -187.93099975585938 + "x": 18.621999740600586, + "y": -240.91299438476562 }, { - "x": 22.466999053955078, - "y": -187.72500610351562 + "x": 25.239999771118164, + "y": -240.6529998779297 }, { - "x": 27.69099998474121, - "y": -187.38299560546875 + "x": 31.850000381469727, + "y": -240.22000122070312 }, { - "x": 32.904998779296875, - "y": -186.9040069580078 + "x": 38.44499969482422, + "y": -239.61399841308594 }, { - "x": 38.10499954223633, - "y": -186.28799438476562 + "x": 45.02299880981445, + "y": -238.8350067138672 }, { - "x": 43.2859992980957, - "y": -185.53700256347656 + "x": 51.57699966430664, + "y": -237.88499450683594 }, { - "x": 48.446998596191406, - "y": -184.64999389648438 + "x": 58.10499954223633, + "y": -236.76300048828125 }, { - "x": 53.582000732421875, - "y": -183.62899780273438 + "x": 64.60099792480469, + "y": -235.4709930419922 }, { - "x": 58.68899917602539, - "y": -182.47300720214844 + "x": 71.06099700927734, + "y": -234.00900268554688 }, { - "x": 63.76300048828125, - "y": -181.18499755859375 + "x": 77.48100280761719, + "y": -232.37899780273438 }, { - "x": 68.8030014038086, - "y": -179.76300048828125 + "x": 83.8550033569336, + "y": -230.58099365234375 }, { - "x": 73.8030014038086, - "y": -178.21099853515625 + "x": 90.18099975585938, + "y": -228.61700439453125 }, { - "x": 78.76100158691406, - "y": -176.5279998779297 + "x": 96.4530029296875, + "y": -226.48800659179688 }, { - "x": 83.6729965209961, - "y": -174.71600341796875 + "x": 102.66699981689453, + "y": -224.19500732421875 }, { - "x": 88.53600311279297, - "y": -172.77499389648438 + "x": 108.81800079345703, + "y": -221.74099731445312 }, { - "x": 93.34700012207031, - "y": -170.70899963378906 + "x": 114.90399932861328, + "y": -219.1269989013672 }, { - "x": 98.10199737548828, - "y": -168.51699829101562 + "x": 120.91899871826172, + "y": -216.35400390625 }, { - "x": 102.7979965209961, - "y": -166.2010040283203 + "x": 126.85900115966797, + "y": -213.4239959716797 }, { - "x": 107.43099975585938, - "y": -163.76300048828125 + "x": 132.7209930419922, + "y": -210.33999633789062 }, { - "x": 111.9990005493164, - "y": -161.2050018310547 + "x": 138.5, + "y": -207.10400390625 }, { - "x": 116.4990005493164, - "y": -158.5279998779297 + "x": 144.19200134277344, + "y": -203.7169952392578 }, { - "x": 120.927001953125, - "y": -155.73399353027344 + "x": 149.79299926757812, + "y": -200.18299865722656 }, { - "x": 125.28099822998047, - "y": -152.8249969482422 + "x": 155.3000030517578, + "y": -196.5030059814453 }, { - "x": 129.5570068359375, - "y": -149.80299377441406 + "x": 160.70899963378906, + "y": -192.68099975585938 }, { - "x": 133.7519989013672, - "y": -146.6699981689453 + "x": 166.01600646972656, + "y": -188.71800231933594 }, { - "x": 137.86399841308594, - "y": -143.4290008544922 + "x": 171.21800231933594, + "y": -184.61700439453125 }, { - "x": 141.88900756835938, - "y": -140.08099365234375 + "x": 176.30999755859375, + "y": -180.3820037841797 }, { - "x": 145.8260040283203, - "y": -136.6280059814453 + "x": 181.2899932861328, + "y": -176.01499938964844 }, { - "x": 149.6699981689453, - "y": -133.07400512695312 + "x": 186.1529998779297, + "y": -171.5189971923828 }, { - "x": 153.42100524902344, - "y": -129.42100524902344 + "x": 190.8979949951172, + "y": -166.8979949951172 }, { - "x": 157.07400512695312, - "y": -125.66999816894531 + "x": 195.5189971923828, + "y": -162.1529998779297 }, { - "x": 160.6280059814453, - "y": -121.82599639892578 + "x": 200.01499938964844, + "y": -157.2899932861328 }, { - "x": 164.08099365234375, - "y": -117.88899993896484 + "x": 204.3820037841797, + "y": -152.30999755859375 }, { - "x": 167.4290008544922, - "y": -113.86399841308594 + "x": 208.61700439453125, + "y": -147.21800231933594 }, { - "x": 170.6699981689453, - "y": -109.75199890136719 + "x": 212.71800231933594, + "y": -142.01600646972656 }, { - "x": 173.80299377441406, - "y": -105.55699920654297 + "x": 216.68099975585938, + "y": -136.70899963378906 }, { - "x": 176.8249969482422, - "y": -101.28099822998047 + "x": 220.5030059814453, + "y": -131.3000030517578 }, { - "x": 179.73399353027344, - "y": -96.927001953125 + "x": 224.18299865722656, + "y": -125.79299926757812 }, { - "x": 182.5279998779297, - "y": -92.4990005493164 + "x": 227.7169952392578, + "y": -120.19200134277344 }, { - "x": 185.2050018310547, - "y": -88 + "x": 231.10400390625, + "y": -114.5 }, { - "x": 187.76300048828125, - "y": -83.43099975585938 + "x": 234.33999633789062, + "y": -108.72100067138672 }, { - "x": 190.2010040283203, - "y": -78.7979965209961 + "x": 237.4239959716797, + "y": -102.85900115966797 }, { - "x": 192.51699829101562, - "y": -74.10199737548828 + "x": 240.35400390625, + "y": -96.91899871826172 }, { - "x": 194.70899963378906, - "y": -69.34700012207031 + "x": 243.1269989013672, + "y": -90.90399932861328 }, { - "x": 196.77499389648438, - "y": -64.53600311279297 + "x": 245.74099731445312, + "y": -84.81800079345703 }, { - "x": 198.71600341796875, - "y": -59.67300033569336 + "x": 248.19500732421875, + "y": -78.66699981689453 }, { - "x": 200.5279998779297, - "y": -54.76100158691406 + "x": 250.48800659179688, + "y": -72.4530029296875 }, { - "x": 202.21099853515625, - "y": -49.803001403808594 + "x": 252.61700439453125, + "y": -66.18099975585938 }, { - "x": 203.76300048828125, - "y": -44.803001403808594 + "x": 254.58099365234375, + "y": -59.85499954223633 }, { - "x": 205.18499755859375, - "y": -39.76300048828125 + "x": 256.3789978027344, + "y": -53.48099899291992 }, { - "x": 206.47300720214844, - "y": -34.68899917602539 + "x": 258.0090026855469, + "y": -47.06100082397461 }, { - "x": 207.62899780273438, - "y": -29.582000732421875 + "x": 259.47100830078125, + "y": -40.60100173950195 }, { - "x": 208.64999389648438, - "y": -24.44700050354004 + "x": 260.76300048828125, + "y": -34.10499954223633 }, { - "x": 209.53700256347656, - "y": -19.285999298095703 + "x": 261.885009765625, + "y": -27.57699966430664 }, { - "x": 210.28799438476562, - "y": -14.104999542236328 + "x": 262.8349914550781, + "y": -21.023000717163086 }, { - "x": 210.9040069580078, - "y": -8.904999732971191 + "x": 263.614013671875, + "y": -14.444999694824219 }, { - "x": 211.38299560546875, - "y": -3.690999984741211 + "x": 264.2200012207031, + "y": -7.849999904632568 }, { - "x": 211.72500610351562, - "y": 1.531999945640564 + "x": 264.65301513671875, + "y": -1.2400000095367432 }, { - "x": 211.93099975585938, - "y": 6.763999938964844 + "x": 264.9129943847656, + "y": 5.376999855041504 }, { - "x": 212, + "x": 265, "y": 12 } ], @@ -816,248 +816,248 @@ "link": "", "route": [ { - "x": 212, + "x": 265, "y": 12 }, { - "x": 211.93099975585938, - "y": 17.235000610351562 + "x": 264.9129943847656, + "y": 18.621999740600586 }, { - "x": 211.72500610351562, - "y": 22.466999053955078 + "x": 264.65301513671875, + "y": 25.239999771118164 }, { - "x": 211.38299560546875, - "y": 27.69099998474121 + "x": 264.2200012207031, + "y": 31.850000381469727 }, { - "x": 210.9040069580078, - "y": 32.904998779296875 + "x": 263.614013671875, + "y": 38.44499969482422 }, { - "x": 210.28799438476562, - "y": 38.10499954223633 + "x": 262.8349914550781, + "y": 45.02299880981445 }, { - "x": 209.53700256347656, - "y": 43.2859992980957 + "x": 261.885009765625, + "y": 51.57699966430664 }, { - "x": 208.64999389648438, - "y": 48.446998596191406 + "x": 260.76300048828125, + "y": 58.10499954223633 }, { - "x": 207.62899780273438, - "y": 53.582000732421875 + "x": 259.47100830078125, + "y": 64.60099792480469 }, { - "x": 206.47300720214844, - "y": 58.68899917602539 + "x": 258.0090026855469, + "y": 71.06099700927734 }, { - "x": 205.18499755859375, - "y": 63.76300048828125 + "x": 256.3789978027344, + "y": 77.48100280761719 }, { - "x": 203.76300048828125, - "y": 68.8030014038086 + "x": 254.58099365234375, + "y": 83.8550033569336 }, { - "x": 202.21099853515625, - "y": 73.8030014038086 + "x": 252.61700439453125, + "y": 90.18099975585938 }, { - "x": 200.5279998779297, - "y": 78.76100158691406 + "x": 250.48800659179688, + "y": 96.4530029296875 }, { - "x": 198.71600341796875, - "y": 83.6729965209961 + "x": 248.19500732421875, + "y": 102.66699981689453 }, { - "x": 196.77499389648438, - "y": 88.53600311279297 + "x": 245.74099731445312, + "y": 108.81800079345703 }, { - "x": 194.70899963378906, - "y": 93.34700012207031 + "x": 243.1269989013672, + "y": 114.90399932861328 }, { - "x": 192.51699829101562, - "y": 98.10199737548828 + "x": 240.35400390625, + "y": 120.91899871826172 }, { - "x": 190.2010040283203, - "y": 102.7979965209961 + "x": 237.4239959716797, + "y": 126.85900115966797 }, { - "x": 187.76300048828125, - "y": 107.43099975585938 + "x": 234.33999633789062, + "y": 132.7209930419922 }, { - "x": 185.2050018310547, - "y": 111.9990005493164 + "x": 231.10400390625, + "y": 138.5 }, { - "x": 182.5279998779297, - "y": 116.4990005493164 + "x": 227.7169952392578, + "y": 144.19200134277344 }, { - "x": 179.73399353027344, - "y": 120.927001953125 + "x": 224.18299865722656, + "y": 149.79299926757812 }, { - "x": 176.8249969482422, - "y": 125.28099822998047 + "x": 220.5030059814453, + "y": 155.3000030517578 }, { - "x": 173.80299377441406, - "y": 129.5570068359375 + "x": 216.68099975585938, + "y": 160.70899963378906 }, { - "x": 170.6699981689453, - "y": 133.7519989013672 + "x": 212.71800231933594, + "y": 166.01600646972656 }, { - "x": 167.4290008544922, - "y": 137.86399841308594 + "x": 208.61700439453125, + "y": 171.21800231933594 }, { - "x": 164.08099365234375, - "y": 141.88900756835938 + "x": 204.3820037841797, + "y": 176.30999755859375 }, { - "x": 160.6280059814453, - "y": 145.8260040283203 + "x": 200.01499938964844, + "y": 181.2899932861328 }, { - "x": 157.07400512695312, - "y": 149.6699981689453 + "x": 195.5189971923828, + "y": 186.1529998779297 }, { - "x": 153.42100524902344, - "y": 153.42100524902344 + "x": 190.8979949951172, + "y": 190.8979949951172 }, { - "x": 149.6699981689453, - "y": 157.07400512695312 + "x": 186.1529998779297, + "y": 195.5189971923828 }, { - "x": 145.8260040283203, - "y": 160.6280059814453 + "x": 181.2899932861328, + "y": 200.01499938964844 }, { - "x": 141.88900756835938, - "y": 164.08099365234375 + "x": 176.30999755859375, + "y": 204.3820037841797 }, { - "x": 137.86399841308594, - "y": 167.4290008544922 + "x": 171.21800231933594, + "y": 208.61700439453125 }, { - "x": 133.7519989013672, - "y": 170.6699981689453 + "x": 166.01600646972656, + "y": 212.71800231933594 }, { - "x": 129.5570068359375, - "y": 173.80299377441406 + "x": 160.70899963378906, + "y": 216.68099975585938 }, { - "x": 125.28099822998047, - "y": 176.8249969482422 + "x": 155.3000030517578, + "y": 220.5030059814453 }, { - "x": 120.927001953125, - "y": 179.73399353027344 + "x": 149.79299926757812, + "y": 224.18299865722656 }, { - "x": 116.4990005493164, - "y": 182.5279998779297 + "x": 144.19200134277344, + "y": 227.7169952392578 }, { - "x": 112, - "y": 185.2050018310547 + "x": 138.5, + "y": 231.10400390625 }, { - "x": 107.43099975585938, - "y": 187.76300048828125 + "x": 132.7209930419922, + "y": 234.33999633789062 }, { - "x": 102.7979965209961, - "y": 190.2010040283203 + "x": 126.85900115966797, + "y": 237.4239959716797 }, { - "x": 98.10199737548828, - "y": 192.51699829101562 + "x": 120.91899871826172, + "y": 240.35400390625 }, { - "x": 93.34700012207031, - "y": 194.70899963378906 + "x": 114.90399932861328, + "y": 243.1269989013672 }, { - "x": 88.53600311279297, - "y": 196.77499389648438 + "x": 108.81800079345703, + "y": 245.74099731445312 }, { - "x": 83.6729965209961, - "y": 198.71600341796875 + "x": 102.66699981689453, + "y": 248.19500732421875 }, { - "x": 78.76100158691406, - "y": 200.5279998779297 + "x": 96.4530029296875, + "y": 250.48800659179688 }, { - "x": 73.8030014038086, - "y": 202.21099853515625 + "x": 90.18099975585938, + "y": 252.61700439453125 }, { - "x": 68.8030014038086, - "y": 203.76300048828125 + "x": 83.8550033569336, + "y": 254.58099365234375 }, { - "x": 63.76300048828125, - "y": 205.18499755859375 + "x": 77.48100280761719, + "y": 256.3789978027344 }, { - "x": 58.68899917602539, - "y": 206.47300720214844 + "x": 71.06099700927734, + "y": 258.0090026855469 }, { - "x": 53.582000732421875, - "y": 207.62899780273438 + "x": 64.60099792480469, + "y": 259.47100830078125 }, { - "x": 48.446998596191406, - "y": 208.64999389648438 + "x": 58.10499954223633, + "y": 260.76300048828125 }, { - "x": 43.2859992980957, - "y": 209.53700256347656 + "x": 51.57699966430664, + "y": 261.885009765625 }, { - "x": 38.10499954223633, - "y": 210.28799438476562 + "x": 45.02299880981445, + "y": 262.8349914550781 }, { - "x": 32.904998779296875, - "y": 210.9040069580078 + "x": 38.44499969482422, + "y": 263.614013671875 }, { - "x": 27.69099998474121, - "y": 211.38299560546875 + "x": 31.850000381469727, + "y": 264.2200012207031 }, { - "x": 22.466999053955078, - "y": 211.72500610351562 + "x": 25.239999771118164, + "y": 264.65301513671875 }, { - "x": 17.235000610351562, - "y": 211.93099975585938 + "x": 18.621999740600586, + "y": 264.9129943847656 }, { "x": 12, - "y": 212 + "y": 265 } ], "isCurve": true, @@ -1093,246 +1093,246 @@ "route": [ { "x": 12, - "y": 212 + "y": 265 }, { - "x": 6.763999938964844, - "y": 211.93099975585938 + "x": 5.376999855041504, + "y": 264.9129943847656 }, { - "x": 1.531999945640564, - "y": 211.72500610351562 + "x": -1.2400000095367432, + "y": 264.65301513671875 }, { - "x": -3.690999984741211, - "y": 211.38299560546875 + "x": -7.849999904632568, + "y": 264.2200012207031 }, { - "x": -8.904999732971191, - "y": 210.9040069580078 + "x": -14.444999694824219, + "y": 263.614013671875 }, { - "x": -14.104999542236328, - "y": 210.28799438476562 + "x": -21.023000717163086, + "y": 262.8349914550781 }, { - "x": -19.285999298095703, - "y": 209.53700256347656 + "x": -27.57699966430664, + "y": 261.885009765625 }, { - "x": -24.44700050354004, - "y": 208.64999389648438 + "x": -34.10499954223633, + "y": 260.76300048828125 }, { - "x": -29.582000732421875, - "y": 207.62899780273438 + "x": -40.60100173950195, + "y": 259.47100830078125 }, { - "x": -34.68899917602539, - "y": 206.47300720214844 + "x": -47.06100082397461, + "y": 258.0090026855469 }, { - "x": -39.76300048828125, - "y": 205.18499755859375 + "x": -53.48099899291992, + "y": 256.3789978027344 }, { - "x": -44.803001403808594, - "y": 203.76300048828125 + "x": -59.85499954223633, + "y": 254.58099365234375 }, { - "x": -49.803001403808594, - "y": 202.21099853515625 + "x": -66.18099975585938, + "y": 252.61700439453125 }, { - "x": -54.76100158691406, - "y": 200.5279998779297 + "x": -72.4530029296875, + "y": 250.48800659179688 }, { - "x": -59.67300033569336, - "y": 198.71600341796875 + "x": -78.66699981689453, + "y": 248.19500732421875 }, { - "x": -64.53600311279297, - "y": 196.77499389648438 + "x": -84.81800079345703, + "y": 245.74099731445312 }, { - "x": -69.34700012207031, - "y": 194.70899963378906 + "x": -90.90399932861328, + "y": 243.1269989013672 }, { - "x": -74.10199737548828, - "y": 192.51699829101562 + "x": -96.91899871826172, + "y": 240.35400390625 }, { - "x": -78.7979965209961, - "y": 190.2010040283203 + "x": -102.85900115966797, + "y": 237.4239959716797 }, { - "x": -83.43099975585938, - "y": 187.76300048828125 + "x": -108.72100067138672, + "y": 234.33999633789062 }, { - "x": -87.9990005493164, - "y": 185.2050018310547 + "x": -114.4990005493164, + "y": 231.10400390625 }, { - "x": -92.4990005493164, - "y": 182.5279998779297 + "x": -120.19200134277344, + "y": 227.7169952392578 }, { - "x": -96.927001953125, - "y": 179.73399353027344 + "x": -125.79299926757812, + "y": 224.18299865722656 }, { - "x": -101.28099822998047, - "y": 176.8249969482422 + "x": -131.3000030517578, + "y": 220.5030059814453 }, { - "x": -105.55699920654297, - "y": 173.80299377441406 + "x": -136.70899963378906, + "y": 216.68099975585938 }, { - "x": -109.75199890136719, - "y": 170.6699981689453 + "x": -142.01600646972656, + "y": 212.71800231933594 }, { - "x": -113.86399841308594, - "y": 167.4290008544922 + "x": -147.21800231933594, + "y": 208.61700439453125 }, { - "x": -117.88899993896484, - "y": 164.08099365234375 + "x": -152.30999755859375, + "y": 204.3820037841797 }, { - "x": -121.82599639892578, - "y": 160.6280059814453 + "x": -157.2899932861328, + "y": 200.01499938964844 }, { - "x": -125.66999816894531, - "y": 157.07400512695312 + "x": -162.1529998779297, + "y": 195.5189971923828 }, { - "x": -129.42100524902344, - "y": 153.42100524902344 + "x": -166.8979949951172, + "y": 190.8979949951172 }, { - "x": -133.07400512695312, - "y": 149.6699981689453 + "x": -171.5189971923828, + "y": 186.1529998779297 }, { - "x": -136.6280059814453, - "y": 145.8260040283203 + "x": -176.01499938964844, + "y": 181.2899932861328 }, { - "x": -140.08099365234375, - "y": 141.88900756835938 + "x": -180.3820037841797, + "y": 176.30999755859375 }, { - "x": -143.4290008544922, - "y": 137.86399841308594 + "x": -184.61700439453125, + "y": 171.21800231933594 }, { - "x": -146.6699981689453, - "y": 133.7519989013672 + "x": -188.71800231933594, + "y": 166.01600646972656 }, { - "x": -149.80299377441406, - "y": 129.5570068359375 + "x": -192.68099975585938, + "y": 160.70899963378906 }, { - "x": -152.8249969482422, - "y": 125.28099822998047 + "x": -196.5030059814453, + "y": 155.3000030517578 }, { - "x": -155.73399353027344, - "y": 120.927001953125 + "x": -200.18299865722656, + "y": 149.79299926757812 }, { - "x": -158.5279998779297, - "y": 116.4990005493164 + "x": -203.7169952392578, + "y": 144.19200134277344 }, { - "x": -161.2050018310547, - "y": 112 + "x": -207.10400390625, + "y": 138.5 }, { - "x": -163.76300048828125, - "y": 107.43099975585938 + "x": -210.33999633789062, + "y": 132.7209930419922 }, { - "x": -166.2010040283203, - "y": 102.7979965209961 + "x": -213.4239959716797, + "y": 126.85900115966797 }, { - "x": -168.51699829101562, - "y": 98.10199737548828 + "x": -216.35400390625, + "y": 120.91899871826172 }, { - "x": -170.70899963378906, - "y": 93.34700012207031 + "x": -219.1269989013672, + "y": 114.90399932861328 }, { - "x": -172.77499389648438, - "y": 88.53600311279297 + "x": -221.74099731445312, + "y": 108.81800079345703 }, { - "x": -174.71600341796875, - "y": 83.6729965209961 + "x": -224.19500732421875, + "y": 102.66699981689453 }, { - "x": -176.5279998779297, - "y": 78.76100158691406 + "x": -226.48800659179688, + "y": 96.4530029296875 }, { - "x": -178.21099853515625, - "y": 73.8030014038086 + "x": -228.61700439453125, + "y": 90.18099975585938 }, { - "x": -179.76300048828125, - "y": 68.8030014038086 + "x": -230.58099365234375, + "y": 83.8550033569336 }, { - "x": -181.18499755859375, - "y": 63.76300048828125 + "x": -232.37899780273438, + "y": 77.48100280761719 }, { - "x": -182.47300720214844, - "y": 58.68899917602539 + "x": -234.00900268554688, + "y": 71.06099700927734 }, { - "x": -183.62899780273438, - "y": 53.582000732421875 + "x": -235.4709930419922, + "y": 64.60099792480469 }, { - "x": -184.64999389648438, - "y": 48.446998596191406 + "x": -236.76300048828125, + "y": 58.10499954223633 }, { - "x": -185.53700256347656, - "y": 43.2859992980957 + "x": -237.88499450683594, + "y": 51.57699966430664 }, { - "x": -186.28799438476562, - "y": 38.10499954223633 + "x": -238.8350067138672, + "y": 45.02299880981445 }, { - "x": -186.9040069580078, - "y": 32.904998779296875 + "x": -239.61399841308594, + "y": 38.44499969482422 }, { - "x": -187.38299560546875, - "y": 27.69099998474121 + "x": -240.22000122070312, + "y": 31.850000381469727 }, { - "x": -187.72500610351562, - "y": 22.466999053955078 + "x": -240.6529998779297, + "y": 25.239999771118164 }, { - "x": -187.93099975585938, - "y": 17.235000610351562 + "x": -240.91299438476562, + "y": 18.621999740600586 }, { - "x": -188, + "x": -241, "y": 12 } ], @@ -1369,247 +1369,247 @@ "route": [ { "x": 485.5, - "y": -138 + "y": -191 }, { - "x": 492.47900390625, - "y": -137.8780059814453 + "x": 494.3290100097656, + "y": -190.84500122070312 }, { - "x": 499.45098876953125, - "y": -137.51199340820312 + "x": 503.14801025390625, + "y": -190.38299560546875 }, { - "x": 506.4049987792969, - "y": -136.9040069580078 + "x": 511.94500732421875, + "y": -189.61399841308594 }, { - "x": 513.333984375, - "y": -136.05299377441406 + "x": 520.7100219726562, + "y": -188.53700256347656 }, { - "x": 520.22900390625, - "y": -134.96099853515625 + "x": 529.4320068359375, + "y": -187.156005859375 }, { - "x": 527.0819702148438, - "y": -133.62899780273438 + "x": 538.1010131835938, + "y": -185.4709930419922 }, { - "x": 533.8839721679688, - "y": -132.0590057373047 + "x": 546.7059936523438, + "y": -183.48399353027344 }, { - "x": 540.6270141601562, - "y": -130.2519989013672 + "x": 555.2360229492188, + "y": -181.19900512695312 }, { - "x": 547.302978515625, - "y": -128.21099853515625 + "x": 563.6810302734375, + "y": -178.61700439453125 }, { - "x": 553.9039916992188, - "y": -125.93800354003906 + "x": 572.031005859375, + "y": -175.74200439453125 }, { - "x": 560.4210205078125, - "y": -123.43599700927734 + "x": 580.2750244140625, + "y": -172.57699584960938 }, { - "x": 566.8469848632812, - "y": -120.70899963378906 + "x": 588.4039916992188, + "y": -169.1269989013672 }, { - "x": 573.1740112304688, - "y": -117.75800323486328 + "x": 596.406982421875, + "y": -165.3939971923828 }, { - "x": 579.3939819335938, - "y": -114.58899688720703 + "x": 604.2760009765625, + "y": -161.38499450683594 }, { - "x": 585.5, - "y": -111.20500183105469 + "x": 612, + "y": -157.10400390625 }, { - "x": 591.4829711914062, - "y": -107.60900115966797 + "x": 619.5689697265625, + "y": -152.55599975585938 }, { - "x": 597.3380126953125, - "y": -103.80699920654297 + "x": 626.9749755859375, + "y": -147.74600219726562 }, { - "x": 603.0570068359375, - "y": -99.8030014038086 + "x": 634.208984375, + "y": -142.68099975585938 }, { - "x": 608.6320190429688, - "y": -95.60199737548828 + "x": 641.2620239257812, + "y": -137.36599731445312 }, { - "x": 614.0570068359375, - "y": -91.20800018310547 + "x": 648.125, + "y": -131.8090057373047 }, { - "x": 619.3259887695312, - "y": -86.62799835205078 + "x": 654.7899780273438, + "y": -126.01499938964844 }, { - "x": 624.4310302734375, - "y": -81.86699676513672 + "x": 661.2479858398438, + "y": -119.99199676513672 }, { - "x": 629.3670043945312, - "y": -76.93099975585938 + "x": 667.4920043945312, + "y": -113.74800109863281 }, { - "x": 634.1279907226562, - "y": -71.82599639892578 + "x": 673.5150146484375, + "y": -107.29000091552734 }, { - "x": 638.7080078125, - "y": -66.55699920654297 + "x": 679.3090209960938, + "y": -100.625 }, { - "x": 643.1019897460938, - "y": -61.13199996948242 + "x": 684.8660278320312, + "y": -93.76200103759766 }, { - "x": 647.302978515625, - "y": -55.55699920654297 + "x": 690.1810302734375, + "y": -86.70899963378906 }, { - "x": 651.3070068359375, - "y": -49.8380012512207 + "x": 695.2459716796875, + "y": -79.4749984741211 }, { - "x": 655.1090087890625, - "y": -43.983001708984375 + "x": 700.0560302734375, + "y": -72.06900024414062 }, { - "x": 658.7050170898438, - "y": -38 + "x": 704.60400390625, + "y": -64.5 }, { - "x": 662.0889892578125, - "y": -31.893999099731445 + "x": 708.885009765625, + "y": -56.7760009765625 }, { - "x": 665.2579956054688, - "y": -25.673999786376953 + "x": 712.8939819335938, + "y": -48.90700149536133 }, { - "x": 668.208984375, - "y": -19.347000122070312 + "x": 716.6270141601562, + "y": -40.90399932861328 }, { - "x": 670.9359741210938, - "y": -12.920999526977539 + "x": 720.0770263671875, + "y": -32.775001525878906 }, { - "x": 673.43798828125, - "y": -6.4039998054504395 + "x": 723.2420043945312, + "y": -24.5310001373291 }, { - "x": 675.7109985351562, - "y": 0.19599999487400055 + "x": 726.1170043945312, + "y": -16.180999755859375 }, { - "x": 677.7520141601562, - "y": 6.872000217437744 + "x": 728.698974609375, + "y": -7.736000061035156 }, { - "x": 679.5590209960938, - "y": 13.614999771118164 + "x": 730.9840087890625, + "y": 0.7929999828338623 }, { - "x": 681.1290283203125, - "y": 20.41699981689453 + "x": 732.9710083007812, + "y": 9.39799976348877 }, { - "x": 682.4609985351562, - "y": 27.270000457763672 + "x": 734.656005859375, + "y": 18.066999435424805 }, { - "x": 683.552978515625, - "y": 34.165000915527344 + "x": 736.0369873046875, + "y": 26.788999557495117 }, { - "x": 684.4039916992188, - "y": 41.09400177001953 + "x": 737.114013671875, + "y": 35.55400085449219 }, { - "x": 685.0120239257812, - "y": 48.04800033569336 + "x": 737.8829956054688, + "y": 44.35100173950195 }, { - "x": 685.3779907226562, - "y": 55.02000045776367 + "x": 738.344970703125, + "y": 53.16999816894531 }, { - "x": 685.5, + "x": 738.5, "y": 61.999000549316406 }, { - "x": 685.3779907226562, - "y": 68.97899627685547 + "x": 738.344970703125, + "y": 70.8290023803711 }, { - "x": 685.0120239257812, - "y": 75.95099639892578 + "x": 737.8829956054688, + "y": 79.64800262451172 }, { - "x": 684.4039916992188, - "y": 82.90499877929688 + "x": 737.114013671875, + "y": 88.44499969482422 }, { - "x": 683.552978515625, - "y": 89.83399963378906 + "x": 736.0369873046875, + "y": 97.20999908447266 }, { - "x": 682.4609985351562, - "y": 96.72899627685547 + "x": 734.656005859375, + "y": 105.93199920654297 }, { - "x": 681.1290283203125, - "y": 103.58200073242188 + "x": 732.9710083007812, + "y": 114.60099792480469 }, { - "x": 679.5590209960938, - "y": 110.38400268554688 + "x": 730.9840087890625, + "y": 123.20600128173828 }, { - "x": 677.7520141601562, - "y": 117.12699890136719 + "x": 728.698974609375, + "y": 131.73599243164062 }, { - "x": 675.7109985351562, - "y": 123.8030014038086 + "x": 726.1170043945312, + "y": 140.18099975585938 }, { - "x": 673.43798828125, - "y": 130.4040069580078 + "x": 723.2420043945312, + "y": 148.531005859375 }, { - "x": 670.9359741210938, - "y": 136.92100524902344 + "x": 720.0770263671875, + "y": 156.77499389648438 }, { - "x": 668.208984375, - "y": 143.3470001220703 + "x": 716.6270141601562, + "y": 164.9040069580078 }, { - "x": 665.2579956054688, - "y": 149.6739959716797 + "x": 712.8939819335938, + "y": 172.90699768066406 }, { - "x": 662.0889892578125, - "y": 155.8939971923828 + "x": 708.885009765625, + "y": 180.7760009765625 }, { - "x": 658.7050170898438, - "y": 161.99899291992188 + "x": 704.60400390625, + "y": 188.49899291992188 } ], "isCurve": true, @@ -1644,248 +1644,248 @@ "link": "", "route": [ { - "x": 658.7050170898438, - "y": 161.99899291992188 + "x": 704.60400390625, + "y": 188.49899291992188 }, { - "x": 655.1090087890625, - "y": 167.98300170898438 + "x": 700.0560302734375, + "y": 196.06900024414062 }, { - "x": 651.3070068359375, - "y": 173.83799743652344 + "x": 695.2459716796875, + "y": 203.47500610351562 }, { - "x": 647.302978515625, - "y": 179.5570068359375 + "x": 690.1810302734375, + "y": 210.70899963378906 }, { - "x": 643.1019897460938, - "y": 185.1320037841797 + "x": 684.8660278320312, + "y": 217.76199340820312 }, { - "x": 638.7080078125, - "y": 190.5570068359375 + "x": 679.3090209960938, + "y": 224.625 }, { - "x": 634.1279907226562, - "y": 195.8260040283203 + "x": 673.5150146484375, + "y": 231.2899932861328 }, { - "x": 629.3670043945312, - "y": 200.93099975585938 + "x": 667.4920043945312, + "y": 237.7480010986328 }, { - "x": 624.4310302734375, - "y": 205.86700439453125 + "x": 661.2479858398438, + "y": 243.99200439453125 }, { - "x": 619.3259887695312, - "y": 210.6280059814453 + "x": 654.7899780273438, + "y": 250.01499938964844 }, { - "x": 614.0570068359375, - "y": 215.20799255371094 + "x": 648.125, + "y": 255.8090057373047 }, { - "x": 608.6320190429688, - "y": 219.6020050048828 + "x": 641.2620239257812, + "y": 261.3659973144531 }, { - "x": 603.0570068359375, - "y": 223.80299377441406 + "x": 634.208984375, + "y": 266.6809997558594 }, { - "x": 597.3380126953125, - "y": 227.8070068359375 + "x": 626.9749755859375, + "y": 271.7460021972656 }, { - "x": 591.4829711914062, - "y": 231.60899353027344 + "x": 619.5689697265625, + "y": 276.5559997558594 }, { - "x": 585.5, - "y": 235.2050018310547 + "x": 612, + "y": 281.10400390625 }, { - "x": 579.3939819335938, - "y": 238.58900451660156 + "x": 604.2760009765625, + "y": 285.385009765625 }, { - "x": 573.1740112304688, - "y": 241.75799560546875 + "x": 596.406982421875, + "y": 289.3940124511719 }, { - "x": 566.8469848632812, - "y": 244.70899963378906 + "x": 588.4039916992188, + "y": 293.12701416015625 }, { - "x": 560.4210205078125, - "y": 247.43600463867188 + "x": 580.2750244140625, + "y": 296.5769958496094 }, { - "x": 553.9039916992188, - "y": 249.93800354003906 + "x": 572.031005859375, + "y": 299.74200439453125 }, { - "x": 547.302978515625, - "y": 252.21099853515625 + "x": 563.6810302734375, + "y": 302.61700439453125 }, { - "x": 540.6270141601562, - "y": 254.2519989013672 + "x": 555.2360229492188, + "y": 305.1990051269531 }, { - "x": 533.8839721679688, - "y": 256.0589904785156 + "x": 546.7059936523438, + "y": 307.4840087890625 }, { - "x": 527.0819702148438, - "y": 257.6289978027344 + "x": 538.1010131835938, + "y": 309.47100830078125 }, { - "x": 520.22900390625, - "y": 258.96099853515625 + "x": 529.4320068359375, + "y": 311.156005859375 }, { - "x": 513.333984375, - "y": 260.0530090332031 + "x": 520.7100219726562, + "y": 312.5369873046875 }, { - "x": 506.4049987792969, - "y": 260.90399169921875 + "x": 511.94500732421875, + "y": 313.614013671875 }, { - "x": 499.45098876953125, - "y": 261.5119934082031 + "x": 503.14801025390625, + "y": 314.38299560546875 }, { - "x": 492.47900390625, - "y": 261.87799072265625 + "x": 494.3290100097656, + "y": 314.8450012207031 }, { "x": 485.5, - "y": 262 + "y": 315 }, { - "x": 478.5199890136719, - "y": 261.87799072265625 + "x": 476.6700134277344, + "y": 314.8450012207031 }, { - "x": 471.5480041503906, - "y": 261.5119934082031 + "x": 467.85101318359375, + "y": 314.38299560546875 }, { - "x": 464.593994140625, - "y": 260.90399169921875 + "x": 459.0539855957031, + "y": 313.614013671875 }, { - "x": 457.6650085449219, - "y": 260.0530090332031 + "x": 450.28900146484375, + "y": 312.5369873046875 }, { - "x": 450.7699890136719, - "y": 258.96099853515625 + "x": 441.5669860839844, + "y": 311.156005859375 }, { - "x": 443.9169921875, - "y": 257.6289978027344 + "x": 432.89801025390625, + "y": 309.47100830078125 }, { - "x": 437.114990234375, - "y": 256.0589904785156 + "x": 424.2929992675781, + "y": 307.4840087890625 }, { - "x": 430.37200927734375, - "y": 254.2519989013672 + "x": 415.76300048828125, + "y": 305.1990051269531 }, { - "x": 423.6960144042969, - "y": 252.21099853515625 + "x": 407.3179931640625, + "y": 302.61700439453125 }, { - "x": 417.0950012207031, - "y": 249.93800354003906 + "x": 398.9679870605469, + "y": 299.74200439453125 }, { - "x": 410.5780029296875, - "y": 247.43600463867188 + "x": 390.7239990234375, + "y": 296.5769958496094 }, { - "x": 404.1520080566406, - "y": 244.70899963378906 + "x": 382.5950012207031, + "y": 293.12701416015625 }, { - "x": 397.82501220703125, - "y": 241.75799560546875 + "x": 374.5920104980469, + "y": 289.3940124511719 }, { - "x": 391.6050109863281, - "y": 238.58900451660156 + "x": 366.7229919433594, + "y": 285.385009765625 }, { - "x": 385.5, - "y": 235.2050018310547 + "x": 359, + "y": 281.10400390625 }, { - "x": 379.5159912109375, - "y": 231.60899353027344 + "x": 351.42999267578125, + "y": 276.5559997558594 }, { - "x": 373.6610107421875, - "y": 227.8070068359375 + "x": 344.02398681640625, + "y": 271.7460021972656 }, { - "x": 367.9419860839844, - "y": 223.80299377441406 + "x": 336.7900085449219, + "y": 266.6809997558594 }, { - "x": 362.36700439453125, - "y": 219.6020050048828 + "x": 329.73699951171875, + "y": 261.3659973144531 }, { - "x": 356.9419860839844, - "y": 215.20799255371094 + "x": 322.8739929199219, + "y": 255.8090057373047 }, { - "x": 351.6730041503906, - "y": 210.6280059814453 + "x": 316.2090148925781, + "y": 250.01499938964844 }, { - "x": 346.5679931640625, - "y": 205.86700439453125 + "x": 309.7510070800781, + "y": 243.99200439453125 }, { - "x": 341.6319885253906, - "y": 200.93099975585938 + "x": 303.5069885253906, + "y": 237.7480010986328 }, { - "x": 336.8710021972656, - "y": 195.8260040283203 + "x": 297.4840087890625, + "y": 231.2899932861328 }, { - "x": 332.2909851074219, - "y": 190.5570068359375 + "x": 291.69000244140625, + "y": 224.625 }, { - "x": 327.8970031738281, - "y": 185.1320037841797 + "x": 286.13299560546875, + "y": 217.76199340820312 }, { - "x": 323.6960144042969, - "y": 179.5570068359375 + "x": 280.8179931640625, + "y": 210.70899963378906 }, { - "x": 319.6919860839844, - "y": 173.83799743652344 + "x": 275.75299072265625, + "y": 203.47500610351562 }, { - "x": 315.8900146484375, - "y": 167.98300170898438 + "x": 270.9429931640625, + "y": 196.06900024414062 }, { - "x": 312.29400634765625, - "y": 162 + "x": 266.3949890136719, + "y": 188.5 } ], "isCurve": true, @@ -1921,247 +1921,247 @@ "route": [ { "x": 904.9099731445312, - "y": -188 + "y": -241 }, { - "x": 915.3770141601562, - "y": -187.72500610351562 + "x": 918.1510009765625, + "y": -240.6529998779297 }, { - "x": 925.8150024414062, - "y": -186.9040069580078 + "x": 931.35498046875, + "y": -239.61399841308594 }, { - "x": 936.197021484375, - "y": -185.53700256347656 + "x": 944.4879760742188, + "y": -237.88499450683594 }, { - "x": 946.4920043945312, - "y": -183.62899780273438 + "x": 957.510986328125, + "y": -235.4709930419922 }, { - "x": 956.6729736328125, - "y": -181.18499755859375 + "x": 970.3909912109375, + "y": -232.37899780273438 }, { - "x": 966.7130126953125, - "y": -178.21099853515625 + "x": 983.0910034179688, + "y": -228.61700439453125 }, { - "x": 976.5830078125, - "y": -174.71600341796875 + "x": 995.5770263671875, + "y": -224.19500732421875 }, { - "x": 986.2570190429688, - "y": -170.70899963378906 + "x": 1007.8140258789062, + "y": -219.1269989013672 }, { - "x": 995.7080078125, - "y": -166.2010040283203 + "x": 1019.7689819335938, + "y": -213.4239959716797 }, { - "x": 1004.9099731445312, - "y": -161.2050018310547 + "x": 1031.4100341796875, + "y": -207.10400390625 }, { - "x": 1013.8369750976562, - "y": -155.73399353027344 + "x": 1042.7030029296875, + "y": -200.18299865722656 }, { - "x": 1022.4669799804688, - "y": -149.80299377441406 + "x": 1053.6190185546875, + "y": -192.68099975585938 }, { - "x": 1030.7740478515625, - "y": -143.4290008544922 + "x": 1064.1280517578125, + "y": -184.61700439453125 }, { - "x": 1038.7359619140625, - "y": -136.6280059814453 + "x": 1074.199951171875, + "y": -176.01499938964844 }, { - "x": 1046.3310546875, - "y": -129.42100524902344 + "x": 1083.8079833984375, + "y": -166.8979949951172 }, { - "x": 1053.5389404296875, - "y": -121.82599639892578 + "x": 1092.925048828125, + "y": -157.2899932861328 }, { - "x": 1060.3389892578125, - "y": -113.86399841308594 + "x": 1101.5279541015625, + "y": -147.21800231933594 }, { - "x": 1066.7130126953125, - "y": -105.55699920654297 + "x": 1109.5909423828125, + "y": -136.70899963378906 }, { - "x": 1072.64404296875, - "y": -96.927001953125 + "x": 1117.093017578125, + "y": -125.79299926757812 }, { - "x": 1078.114990234375, - "y": -88 + "x": 1124.0140380859375, + "y": -114.5 }, { - "x": 1083.1109619140625, - "y": -78.7979965209961 + "x": 1130.333984375, + "y": -102.85900115966797 }, { - "x": 1087.6190185546875, - "y": -69.34700012207031 + "x": 1136.0369873046875, + "y": -90.90399932861328 }, { - "x": 1091.6259765625, - "y": -59.67300033569336 + "x": 1141.10595703125, + "y": -78.66699981689453 }, { - "x": 1095.1209716796875, - "y": -49.803001403808594 + "x": 1145.5269775390625, + "y": -66.18099975585938 }, { - "x": 1098.094970703125, - "y": -39.76300048828125 + "x": 1149.2889404296875, + "y": -53.48099899291992 }, { - "x": 1100.5389404296875, - "y": -29.582000732421875 + "x": 1152.3809814453125, + "y": -40.60100173950195 }, { - "x": 1102.447021484375, - "y": -19.285999298095703 + "x": 1154.7950439453125, + "y": -27.57699966430664 }, { - "x": 1103.81396484375, - "y": -8.904999732971191 + "x": 1156.5240478515625, + "y": -14.444999694824219 }, { - "x": 1104.635986328125, - "y": 1.531999945640564 + "x": 1157.56298828125, + "y": -1.2400000095367432 }, { - "x": 1104.9100341796875, + "x": 1157.9100341796875, "y": 12 }, { - "x": 1104.635986328125, - "y": 22.466999053955078 + "x": 1157.56298828125, + "y": 25.239999771118164 }, { - "x": 1103.81396484375, - "y": 32.904998779296875 + "x": 1156.5240478515625, + "y": 38.44499969482422 }, { - "x": 1102.447021484375, - "y": 43.2859992980957 + "x": 1154.7950439453125, + "y": 51.57699966430664 }, { - "x": 1100.5389404296875, - "y": 53.582000732421875 + "x": 1152.3809814453125, + "y": 64.60099792480469 }, { - "x": 1098.094970703125, - "y": 63.76300048828125 + "x": 1149.2889404296875, + "y": 77.48100280761719 }, { - "x": 1095.1209716796875, - "y": 73.8030014038086 + "x": 1145.5269775390625, + "y": 90.18099975585938 }, { - "x": 1091.6259765625, - "y": 83.6729965209961 + "x": 1141.10595703125, + "y": 102.66699981689453 }, { - "x": 1087.6190185546875, - "y": 93.34700012207031 + "x": 1136.0369873046875, + "y": 114.90399932861328 }, { - "x": 1083.1109619140625, - "y": 102.7979965209961 + "x": 1130.333984375, + "y": 126.85900115966797 }, { - "x": 1078.114990234375, - "y": 111.9990005493164 + "x": 1124.0140380859375, + "y": 138.49899291992188 }, { - "x": 1072.64404296875, - "y": 120.927001953125 + "x": 1117.093017578125, + "y": 149.79299926757812 }, { - "x": 1066.7130126953125, - "y": 129.5570068359375 + "x": 1109.5909423828125, + "y": 160.70899963378906 }, { - "x": 1060.3389892578125, - "y": 137.86399841308594 + "x": 1101.5279541015625, + "y": 171.21800231933594 }, { - "x": 1053.5389404296875, - "y": 145.8260040283203 + "x": 1092.925048828125, + "y": 181.2899932861328 }, { - "x": 1046.3310546875, - "y": 153.42100524902344 + "x": 1083.8079833984375, + "y": 190.8979949951172 }, { - "x": 1038.7359619140625, - "y": 160.6280059814453 + "x": 1074.199951171875, + "y": 200.01499938964844 }, { - "x": 1030.7740478515625, - "y": 167.4290008544922 + "x": 1064.1280517578125, + "y": 208.61700439453125 }, { - "x": 1022.4669799804688, - "y": 173.80299377441406 + "x": 1053.6190185546875, + "y": 216.68099975585938 }, { - "x": 1013.8369750976562, - "y": 179.73399353027344 + "x": 1042.7030029296875, + "y": 224.18299865722656 }, { - "x": 1004.9099731445312, - "y": 185.2050018310547 + "x": 1031.4100341796875, + "y": 231.10400390625 }, { - "x": 995.7080078125, - "y": 190.2010040283203 + "x": 1019.7689819335938, + "y": 237.4239959716797 }, { - "x": 986.2570190429688, - "y": 194.70899963378906 + "x": 1007.8140258789062, + "y": 243.1269989013672 }, { - "x": 976.5830078125, - "y": 198.71600341796875 + "x": 995.5770263671875, + "y": 248.19500732421875 }, { - "x": 966.7130126953125, - "y": 202.21099853515625 + "x": 983.0910034179688, + "y": 252.61700439453125 }, { - "x": 956.6729736328125, - "y": 205.18499755859375 + "x": 970.3909912109375, + "y": 256.3789978027344 }, { - "x": 946.4920043945312, - "y": 207.62899780273438 + "x": 957.510986328125, + "y": 259.47100830078125 }, { - "x": 936.197021484375, - "y": 209.53700256347656 + "x": 944.4879760742188, + "y": 261.885009765625 }, { - "x": 925.8150024414062, - "y": 210.9040069580078 + "x": 931.35498046875, + "y": 263.614013671875 }, { - "x": 915.3770141601562, - "y": 211.72500610351562 + "x": 918.1510009765625, + "y": 264.65301513671875 }, { "x": 904.9099731445312, - "y": 212 + "y": 265 } ], "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 7dcfbadbdf..89895e2c35 100644 --- a/e2etests/testdata/txtar/cycle-diagram/elk/sketch.exp.svg +++ b/e2etests/testdata/txtar/cycle-diagram/elk/sketch.exp.svg @@ -1,9 +1,9 @@ -abcdabcab - + .d2-3765465222 .fill-N1{fill:#0A0F25;} + .d2-3765465222 .fill-N2{fill:#676C7E;} + .d2-3765465222 .fill-N3{fill:#9499AB;} + .d2-3765465222 .fill-N4{fill:#CFD2DD;} + .d2-3765465222 .fill-N5{fill:#DEE1EB;} + .d2-3765465222 .fill-N6{fill:#EEF1F8;} + .d2-3765465222 .fill-N7{fill:#FFFFFF;} + .d2-3765465222 .fill-B1{fill:#0D32B2;} + .d2-3765465222 .fill-B2{fill:#0D32B2;} + .d2-3765465222 .fill-B3{fill:#E3E9FD;} + .d2-3765465222 .fill-B4{fill:#E3E9FD;} + .d2-3765465222 .fill-B5{fill:#EDF0FD;} + .d2-3765465222 .fill-B6{fill:#F7F8FE;} + .d2-3765465222 .fill-AA2{fill:#4A6FF3;} + .d2-3765465222 .fill-AA4{fill:#EDF0FD;} + .d2-3765465222 .fill-AA5{fill:#F7F8FE;} + .d2-3765465222 .fill-AB4{fill:#EDF0FD;} + .d2-3765465222 .fill-AB5{fill:#F7F8FE;} + .d2-3765465222 .stroke-N1{stroke:#0A0F25;} + .d2-3765465222 .stroke-N2{stroke:#676C7E;} + .d2-3765465222 .stroke-N3{stroke:#9499AB;} + .d2-3765465222 .stroke-N4{stroke:#CFD2DD;} + .d2-3765465222 .stroke-N5{stroke:#DEE1EB;} + .d2-3765465222 .stroke-N6{stroke:#EEF1F8;} + .d2-3765465222 .stroke-N7{stroke:#FFFFFF;} + .d2-3765465222 .stroke-B1{stroke:#0D32B2;} + .d2-3765465222 .stroke-B2{stroke:#0D32B2;} + .d2-3765465222 .stroke-B3{stroke:#E3E9FD;} + .d2-3765465222 .stroke-B4{stroke:#E3E9FD;} + .d2-3765465222 .stroke-B5{stroke:#EDF0FD;} + .d2-3765465222 .stroke-B6{stroke:#F7F8FE;} + .d2-3765465222 .stroke-AA2{stroke:#4A6FF3;} + .d2-3765465222 .stroke-AA4{stroke:#EDF0FD;} + .d2-3765465222 .stroke-AA5{stroke:#F7F8FE;} + .d2-3765465222 .stroke-AB4{stroke:#EDF0FD;} + .d2-3765465222 .stroke-AB5{stroke:#F7F8FE;} + .d2-3765465222 .background-color-N1{background-color:#0A0F25;} + .d2-3765465222 .background-color-N2{background-color:#676C7E;} + .d2-3765465222 .background-color-N3{background-color:#9499AB;} + .d2-3765465222 .background-color-N4{background-color:#CFD2DD;} + .d2-3765465222 .background-color-N5{background-color:#DEE1EB;} + .d2-3765465222 .background-color-N6{background-color:#EEF1F8;} + .d2-3765465222 .background-color-N7{background-color:#FFFFFF;} + .d2-3765465222 .background-color-B1{background-color:#0D32B2;} + .d2-3765465222 .background-color-B2{background-color:#0D32B2;} + .d2-3765465222 .background-color-B3{background-color:#E3E9FD;} + .d2-3765465222 .background-color-B4{background-color:#E3E9FD;} + .d2-3765465222 .background-color-B5{background-color:#EDF0FD;} + .d2-3765465222 .background-color-B6{background-color:#F7F8FE;} + .d2-3765465222 .background-color-AA2{background-color:#4A6FF3;} + .d2-3765465222 .background-color-AA4{background-color:#EDF0FD;} + .d2-3765465222 .background-color-AA5{background-color:#F7F8FE;} + .d2-3765465222 .background-color-AB4{background-color:#EDF0FD;} + .d2-3765465222 .background-color-AB5{background-color:#F7F8FE;} + .d2-3765465222 .color-N1{color:#0A0F25;} + .d2-3765465222 .color-N2{color:#676C7E;} + .d2-3765465222 .color-N3{color:#9499AB;} + .d2-3765465222 .color-N4{color:#CFD2DD;} + .d2-3765465222 .color-N5{color:#DEE1EB;} + .d2-3765465222 .color-N6{color:#EEF1F8;} + .d2-3765465222 .color-N7{color:#FFFFFF;} + .d2-3765465222 .color-B1{color:#0D32B2;} + .d2-3765465222 .color-B2{color:#0D32B2;} + .d2-3765465222 .color-B3{color:#E3E9FD;} + .d2-3765465222 .color-B4{color:#E3E9FD;} + .d2-3765465222 .color-B5{color:#EDF0FD;} + .d2-3765465222 .color-B6{color:#F7F8FE;} + .d2-3765465222 .color-AA2{color:#4A6FF3;} + .d2-3765465222 .color-AA4{color:#EDF0FD;} + .d2-3765465222 .color-AA5{color:#F7F8FE;} + .d2-3765465222 .color-AB4{color:#EDF0FD;} + .d2-3765465222 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker-d2-3765465222);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker-d2-3765465222);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright-d2-3765465222);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright-d2-3765465222);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright-d2-3765465222);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright-d2-3765465222);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark-d2-3765465222);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright-d2-3765465222);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright-d2-3765465222);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright-d2-3765465222);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright-d2-3765465222);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker-d2-3765465222);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark-d2-3765465222);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal-d2-3765465222);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal-d2-3765465222);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright-d2-3765465222);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright-d2-3765465222);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright-d2-3765465222);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>abcdabcab + From 80848665db88fbee7f0ff51a3ead4ea906d943e3 Mon Sep 17 00:00:00 2001 From: Mayank77maruti Date: Fri, 21 Feb 2025 17:29:24 +0000 Subject: [PATCH 05/73] iteration 4 --- d2layouts/d2cycle/layout.go | 597 ++----- .../txtar/cycle-diagram/dagre/board.exp.json | 1460 ++++------------- .../txtar/cycle-diagram/dagre/sketch.exp.svg | 154 +- .../txtar/cycle-diagram/elk/board.exp.json | 1460 ++++------------- .../txtar/cycle-diagram/elk/sketch.exp.svg | 154 +- 5 files changed, 878 insertions(+), 2947 deletions(-) diff --git a/d2layouts/d2cycle/layout.go b/d2layouts/d2cycle/layout.go index e142c6cd28..b8a2f964c0 100644 --- a/d2layouts/d2cycle/layout.go +++ b/d2layouts/d2cycle/layout.go @@ -1,245 +1,3 @@ -// package d2cycle - -// import ( -// "context" -// "math" - -// "oss.terrastruct.com/d2/d2graph" -// "oss.terrastruct.com/d2/lib/geo" -// "oss.terrastruct.com/d2/lib/label" -// "oss.terrastruct.com/util-go/go2" -// ) - -// const ( -// MIN_RADIUS = 200 -// PADDING = 20 -// MIN_SEGMENT_LEN = 10 -// ARC_STEPS = 30 // high resolution for smooth arcs -// ) - -// // Layout arranges nodes in a circle and routes edges with properly clipped arcs -// func Layout(ctx context.Context, g *d2graph.Graph, layout d2graph.LayoutGraph) error { -// objects := g.Root.ChildrenArray -// if len(objects) == 0 { -// return nil -// } - -// // Position labels and icons first -// for _, obj := range g.Objects { -// positionLabelsIcons(obj) -// } - -// // Calculate layout parameters -// nodeCircleRadius := calculateRadius(objects) -// maxNodeSize := 0.0 -// for _, obj := range objects { -// size := math.Max(obj.Width, obj.Height) -// maxNodeSize = math.Max(maxNodeSize, size) -// } - -// // Position nodes in circle -// positionObjects(objects, nodeCircleRadius) - -// // Create properly clipped edge arcs -// for _, edge := range g.Edges { -// createCircularArc(edge, nodeCircleRadius, maxNodeSize) -// } - -// return nil -// } - -// func calculateRadius(objects []*d2graph.Object) float64 { -// numObjects := float64(len(objects)) -// maxSize := 0.0 -// for _, obj := range objects { -// size := math.Max(obj.Width, obj.Height) -// maxSize = math.Max(maxSize, size) -// } -// minRadius := (maxSize/2 + PADDING) / math.Sin(math.Pi/numObjects) -// return math.Max(minRadius, MIN_RADIUS) -// } - -// func positionObjects(objects []*d2graph.Object, radius float64) { -// numObjects := float64(len(objects)) -// angleOffset := -math.Pi / 2 // Start at top - -// for i, obj := range objects { -// angle := angleOffset + (2*math.Pi*float64(i))/numObjects -// x := radius * math.Cos(angle) -// y := radius * math.Sin(angle) - -// // Center object at calculated position -// obj.TopLeft = geo.NewPoint( -// x-obj.Width/2, -// y-obj.Height/2, -// ) -// } -// } - -// func createCircularArc(edge *d2graph.Edge, nodeCircleRadius, maxNodeSize float64) { -// if edge.Src == nil || edge.Dst == nil { -// return -// } - -// srcCenter := edge.Src.Center() -// dstCenter := edge.Dst.Center() - -// // Calculate arc radius outside node circle -// arcRadius := nodeCircleRadius + maxNodeSize/2 + PADDING - -// // Calculate angles for arc endpoints -// srcAngle := math.Atan2(srcCenter.Y, srcCenter.X) -// dstAngle := math.Atan2(dstCenter.Y, dstCenter.X) -// if dstAngle < srcAngle { -// dstAngle += 2 * math.Pi -// } - -// // Generate arc path points -// path := make([]*geo.Point, 0, ARC_STEPS+1) -// for i := 0; i <= ARC_STEPS; i++ { -// t := float64(i) / ARC_STEPS -// angle := srcAngle + t*(dstAngle-srcAngle) -// x := arcRadius * math.Cos(angle) -// y := arcRadius * math.Sin(angle) -// path = append(path, geo.NewPoint(x, y)) -// } - -// // Set exact endpoints (will be clipped later) -// path[0] = srcCenter -// path[len(path)-1] = dstCenter - -// // Clip path to node borders -// edge.Route = path -// startIndex, endIndex := edge.TraceToShape(edge.Route, 0, len(edge.Route)-1) -// if startIndex < endIndex { -// edge.Route = edge.Route[startIndex : endIndex+1] -// } -// edge.IsCurve = true -// } - -// // clampPointOutsideBox walks forward from 'startIdx' until the path segment -// // leaves the bounding box. Then it sets path[startIdx] to the intersection. -// // If we never find it, we return (startIdx, path[startIdx]) meaning we can't clamp. -// func clampPointOutsideBox(box *geo.Box, path []*geo.Point, startIdx int) (int, *geo.Point) { -// if startIdx >= len(path)-1 { -// return startIdx, path[startIdx] -// } -// // If path[startIdx] is outside, no clamp needed -// if !boxContains(box, path[startIdx]) { -// return startIdx, path[startIdx] -// } - -// // Walk forward looking for outside -// for i := startIdx + 1; i < len(path); i++ { -// insideNext := boxContains(box, path[i]) -// if insideNext { -// // still inside -> keep going -// continue -// } -// // crossing from inside to outside between path[i-1], path[i] -// seg := geo.NewSegment(path[i-1], path[i]) -// inters := boxIntersections(box, *seg) -// if len(inters) > 0 { -// // use first intersection -// return i, inters[0] -// } -// // fallback => no intersection found -// return i, path[i] -// } -// // entire remainder is inside, so we can't clamp -// // Just return the end -// last := len(path) - 1 -// return last, path[last] -// } - -// // clampPointOutsideBoxReverse scans backward from endIdx while path[j] is in the box. -// // Once we find crossing (outside→inside), we return (j, intersection). -// func clampPointOutsideBoxReverse(box *geo.Box, path []*geo.Point, endIdx int) (int, *geo.Point) { -// if endIdx <= 0 { -// return endIdx, path[endIdx] -// } -// if !boxContains(box, path[endIdx]) { -// // already outside -// return endIdx, path[endIdx] -// } - -// for j := endIdx - 1; j >= 0; j-- { -// if boxContains(box, path[j]) { -// continue -// } -// // crossing from outside -> inside between path[j], path[j+1] -// seg := geo.NewSegment(path[j], path[j+1]) -// inters := boxIntersections(box, *seg) -// if len(inters) > 0 { -// return j, inters[0] -// } -// return j, path[j] -// } - -// // entire path inside -// return 0, path[0] -// } - -// // Helper if your geo.Box doesn’t implement Contains() -// func boxContains(b *geo.Box, p *geo.Point) bool { -// // typical bounding-box check -// return p.X >= b.TopLeft.X && -// p.X <= b.TopLeft.X+b.Width && -// p.Y >= b.TopLeft.Y && -// p.Y <= b.TopLeft.Y+b.Height -// } - -// // Helper if your geo.Box doesn’t implement Intersections(geo.Segment) yet -// func boxIntersections(b *geo.Box, seg geo.Segment) []*geo.Point { -// // We'll assume d2's standard geo.Box has a built-in Intersections(*Segment) method. -// // If not, implement manually. For example, checking each of the 4 edges: -// // left, right, top, bottom -// // For simplicity, if you do have b.Intersections(...) you can just do: -// // return b.Intersections(seg) -// return b.Intersections(seg) -// // If you don't have that, you'd code the line-rect intersection yourself. -// } - -// // positionLabelsIcons is basically your logic that sets default label/icon positions if needed -// func positionLabelsIcons(obj *d2graph.Object) { -// // If there's an icon but no icon position, give it a default -// if obj.Icon != nil && obj.IconPosition == nil { -// if len(obj.ChildrenArray) > 0 { -// obj.IconPosition = go2.Pointer(label.OutsideTopLeft.String()) -// if obj.LabelPosition == nil { -// obj.LabelPosition = go2.Pointer(label.OutsideTopRight.String()) -// return -// } -// } else if obj.SQLTable != nil || obj.Class != nil || obj.Language != "" { -// obj.IconPosition = go2.Pointer(label.OutsideTopLeft.String()) -// } else { -// obj.IconPosition = go2.Pointer(label.InsideMiddleCenter.String()) -// } -// } - -// // If there's a label but no label position, give it a default -// if obj.HasLabel() && obj.LabelPosition == nil { -// if len(obj.ChildrenArray) > 0 { -// obj.LabelPosition = go2.Pointer(label.OutsideTopCenter.String()) -// } else if obj.HasOutsideBottomLabel() { -// obj.LabelPosition = go2.Pointer(label.OutsideBottomCenter.String()) -// } else if obj.Icon != nil { -// obj.LabelPosition = go2.Pointer(label.InsideTopCenter.String()) -// } else { -// obj.LabelPosition = go2.Pointer(label.InsideMiddleCenter.String()) -// } - -// // If the label is bigger than the shape, fallback to outside positions -// if float64(obj.LabelDimensions.Width) > obj.Width || -// float64(obj.LabelDimensions.Height) > obj.Height { -// if len(obj.ChildrenArray) > 0 { -// obj.LabelPosition = go2.Pointer(label.OutsideTopCenter.String()) -// } else { -// obj.LabelPosition = go2.Pointer(label.OutsideBottomCenter.String()) -// } -// } -// } -// } package d2cycle import ( @@ -253,114 +11,188 @@ import ( ) const ( - MIN_RADIUS = 200 - PADDING = 20 - ARC_STEPS = 60 + MIN_RADIUS = 200 + PADDING = 20 + MIN_SEGMENT_LEN = 10 + ARC_STEPS = 30 // high resolution for smooth arcs ) +// Layout arranges nodes in a circle, ensures label/icon positions are set, +// then routes edges with arcs that get clipped at node borders. func Layout(ctx context.Context, g *d2graph.Graph, layout d2graph.LayoutGraph) error { objects := g.Root.ChildrenArray if len(objects) == 0 { return nil } + // Ensure every object that has label/icon also has a default position for _, obj := range g.Objects { positionLabelsIcons(obj) } - // Calculate layout parameters - baseRadius, maxNodeSize := calculateLayoutParams(objects) - positionObjects(objects, baseRadius) + // Arrange objects in a circle + radius := calculateRadius(objects) + positionObjects(objects, radius) - // Create edges with boundary-perfect arcs + // Create arcs for each edge for _, edge := range g.Edges { - createBoundaryArc(edge, baseRadius, maxNodeSize) + createCircularArc(edge) } return nil } -func calculateLayoutParams(objects []*d2graph.Object) (float64, float64) { - numNodes := float64(len(objects)) +func calculateRadius(objects []*d2graph.Object) float64 { + numObjects := float64(len(objects)) maxSize := 0.0 for _, obj := range objects { - size := math.Max(obj.Width, obj.Height) + size := math.Max(obj.Box.Width, obj.Box.Height) maxSize = math.Max(maxSize, size) } - minRadius := (maxSize/2 + PADDING) / math.Sin(math.Pi/numNodes) - return math.Max(minRadius, MIN_RADIUS), maxSize + // Ensure enough radius to fit all objects + minRadius := (maxSize/2.0 + PADDING) / math.Sin(math.Pi/numObjects) + return math.Max(minRadius, MIN_RADIUS) } func positionObjects(objects []*d2graph.Object, radius float64) { numObjects := float64(len(objects)) + // Offset so i=0 is top-center angleOffset := -math.Pi / 2 for i, obj := range objects { - angle := angleOffset + (2*math.Pi*float64(i))/numObjects + angle := angleOffset + (2 * math.Pi * float64(i) / numObjects) x := radius * math.Cos(angle) y := radius * math.Sin(angle) - - // Center object at calculated position + + // Center the box at (x, y) obj.TopLeft = geo.NewPoint( - x-obj.Width/2, - y-obj.Height/2, + x-obj.Box.Width/2, + y-obj.Box.Height/2, ) } } -func createBoundaryArc(edge *d2graph.Edge, baseRadius, maxNodeSize float64) { - if edge.Src == nil || edge.Dst == nil || edge.Src == edge.Dst { +// createCircularArc samples a smooth arc from center to center, +// then forces the endpoints onto each shape's border by clamping them +// using the box intersection helpers. +func createCircularArc(edge *d2graph.Edge) { + if edge.Src == nil || edge.Dst == nil { return } - // Calculate arc radius outside node boundaries - arcRadius := baseRadius + maxNodeSize/2 + PADDING - srcCenter := edge.Src.Center() dstCenter := edge.Dst.Center() - layoutCenter := geo.NewPoint(0, 0) - - // Calculate angles with shortest path - startAngle := math.Atan2(srcCenter.Y-layoutCenter.Y, srcCenter.X-layoutCenter.X) - endAngle := math.Atan2(dstCenter.Y-layoutCenter.Y, dstCenter.X-layoutCenter.X) - angleDiff := endAngle - startAngle - // Normalize angle difference - if angleDiff < 0 { - angleDiff += 2 * math.Pi - } - if angleDiff > math.Pi { - angleDiff -= 2 * math.Pi + // Compute angles from origin for both nodes + srcAngle := math.Atan2(srcCenter.Y, srcCenter.X) + dstAngle := math.Atan2(dstCenter.Y, dstCenter.X) + if dstAngle < srcAngle { + dstAngle += 2 * math.Pi } - // Generate arc points + arcRadius := math.Hypot(srcCenter.X, srcCenter.Y) + + // Sample points along the arc path := make([]*geo.Point, 0, ARC_STEPS+1) for i := 0; i <= ARC_STEPS; i++ { - t := float64(i) / ARC_STEPS - angle := startAngle + t*angleDiff - x := layoutCenter.X + arcRadius*math.Cos(angle) - y := layoutCenter.Y + arcRadius*math.Sin(angle) + t := float64(i) / float64(ARC_STEPS) + angle := srcAngle + t*(dstAngle-srcAngle) + x := arcRadius * math.Cos(angle) + y := arcRadius * math.Sin(angle) path = append(path, geo.NewPoint(x, y)) } + // Ensure endpoints start at the centers + path[0] = srcCenter + path[len(path)-1] = dstCenter + + // Clamp the start point to the boundary of the source node + startIndex, newSrc := clampPointOutsideBox(edge.Src.Box, path, 0) + // Clamp the end point to the boundary of the destination node + endIndex, newDst := clampPointOutsideBoxReverse(edge.Dst.Box, path, len(path)-1) - // Clip to actual node boundaries - edge.Route = path - startIdx, endIdx := edge.TraceToShape(edge.Route, 0, len(edge.Route)-1) + // Update the endpoints with the clamped intersection points + path[0] = newSrc + path[len(path)-1] = newDst - // Maintain smooth arc after clipping - if startIdx < endIdx { - edge.Route = edge.Route[startIdx : endIdx+1] - // Ensure minimal points for smooth rendering - if len(edge.Route) < 3 { - edge.Route = []*geo.Point{path[0], path[len(path)-1]} + // Update the route to only include the valid segment between the clamped indices + edge.Route = path[startIndex : endIndex+1] + edge.IsCurve = true +} + +// clampPointOutsideBox walks forward from 'startIdx' until the path segment +// leaves the bounding box. Then it sets path[startIdx] to the intersection. +// If no intersection is found, it returns the original point. +func clampPointOutsideBox(box *geo.Box, path []*geo.Point, startIdx int) (int, *geo.Point) { + if startIdx >= len(path)-1 { + return startIdx, path[startIdx] + } + // If the current point is already outside, no clamping is needed. + if !boxContains(box, path[startIdx]) { + return startIdx, path[startIdx] + } + + // Walk forward until we leave the box. + for i := startIdx + 1; i < len(path); i++ { + if boxContains(box, path[i]) { + continue } + // Crossing from inside to outside between path[i-1] and path[i] + seg := geo.NewSegment(path[i-1], path[i]) + inters := boxIntersections(box, *seg) + if len(inters) > 0 { + return i, inters[0] + } + // Fallback if no intersection found + return i, path[i] } - - edge.IsCurve = true + // If the entire remaining path is inside, return the last point. + last := len(path) - 1 + return last, path[last] +} + +// clampPointOutsideBoxReverse scans backward from endIdx while path[j] is in the box. +// When an outside-to-inside crossing is detected, it returns the intersection. +func clampPointOutsideBoxReverse(box *geo.Box, path []*geo.Point, endIdx int) (int, *geo.Point) { + if endIdx <= 0 { + return endIdx, path[endIdx] + } + if !boxContains(box, path[endIdx]) { + return endIdx, path[endIdx] + } + + for j := endIdx - 1; j >= 0; j-- { + if boxContains(box, path[j]) { + continue + } + // Crossing from outside to inside between path[j] and path[j+1] + seg := geo.NewSegment(path[j], path[j+1]) + inters := boxIntersections(box, *seg) + if len(inters) > 0 { + return j, inters[0] + } + return j, path[j] + } + // If the entire path is inside, return the first point. + return 0, path[0] +} + +// boxContains performs a typical bounding-box check. +func boxContains(b *geo.Box, p *geo.Point) bool { + return p.X >= b.TopLeft.X && + p.X <= b.TopLeft.X+b.Width && + p.Y >= b.TopLeft.Y && + p.Y <= b.TopLeft.Y+b.Height +} + +// boxIntersections returns the intersection points between a box and a segment. +// This assumes that geo.Box implements an Intersections method. +func boxIntersections(b *geo.Box, seg geo.Segment) []*geo.Point { + return b.Intersections(seg) } +// positionLabelsIcons sets default positions for icons and labels if not already specified. func positionLabelsIcons(obj *d2graph.Object) { - // If there's an icon but no icon position, give it a default + // Set default icon position if an icon exists and none is specified. if obj.Icon != nil && obj.IconPosition == nil { if len(obj.ChildrenArray) > 0 { obj.IconPosition = go2.Pointer(label.OutsideTopLeft.String()) @@ -375,7 +207,7 @@ func positionLabelsIcons(obj *d2graph.Object) { } } - // If there's a label but no label position, give it a default + // Set default label position if a label exists and none is specified. if obj.HasLabel() && obj.LabelPosition == nil { if len(obj.ChildrenArray) > 0 { obj.LabelPosition = go2.Pointer(label.OutsideTopCenter.String()) @@ -387,7 +219,7 @@ func positionLabelsIcons(obj *d2graph.Object) { obj.LabelPosition = go2.Pointer(label.InsideMiddleCenter.String()) } - // If the label is bigger than the shape, fallback to outside positions + // If the label dimensions exceed the object's size, fallback to an outside position. if float64(obj.LabelDimensions.Width) > obj.Width || float64(obj.LabelDimensions.Height) > obj.Height { if len(obj.ChildrenArray) > 0 { @@ -398,176 +230,3 @@ func positionLabelsIcons(obj *d2graph.Object) { } } } - -func boxContains(b *geo.Box, p *geo.Point) bool { - return p.X >= b.TopLeft.X && - p.X <= b.TopLeft.X+b.Width && - p.Y >= b.TopLeft.Y && - p.Y <= b.TopLeft.Y+b.Height -} - -func boxIntersections(b *geo.Box, seg geo.Segment) []*geo.Point { - return b.Intersections(seg) -} -// package d2cycle - -// import ( -// "context" -// "math" - -// "oss.terrastruct.com/d2/d2graph" -// "oss.terrastruct.com/d2/lib/geo" -// "oss.terrastruct.com/d2/lib/label" -// "oss.terrastruct.com/util-go/go2" -// ) - -// const ( -// MIN_RADIUS = 200 -// PADDING = 20 -// ARC_STEPS = 60 // High resolution for perfect circles -// ) - -// func Layout(ctx context.Context, g *d2graph.Graph, layout d2graph.LayoutGraph) error { -// objects := g.Root.ChildrenArray -// if len(objects) == 0 { -// return nil -// } - -// for _, obj := range g.Objects { -// positionLabelsIcons(obj) -// } - -// baseRadius := calculateBaseRadius(objects) -// positionObjects(objects, baseRadius) - -// for _, edge := range g.Edges { -// createPerfectArc(edge, baseRadius) -// } - -// return nil -// } - -// func calculateBaseRadius(objects []*d2graph.Object) float64 { -// numNodes := float64(len(objects)) -// maxSize := 0.0 -// for _, obj := range objects { -// size := math.Max(obj.Width, obj.Height) -// maxSize = math.Max(maxSize, size) -// } -// radius := (maxSize + 2*PADDING) / (2 * math.Sin(math.Pi/numNodes)) -// return math.Max(radius, MIN_RADIUS) -// } - -// func positionObjects(objects []*d2graph.Object, radius float64) { -// numObjects := float64(len(objects)) -// angleOffset := -math.Pi / 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.Width/2, -// y-obj.Height/2, -// ) -// } -// } - -// func createPerfectArc(edge *d2graph.Edge, baseRadius float64) { -// if edge.Src == nil || edge.Dst == nil || edge.Src == edge.Dst { -// return -// } - -// srcCenter := edge.Src.Center() -// dstCenter := edge.Dst.Center() -// center := geo.NewPoint(0, 0) // Layout center - -// // Calculate angles with proper wrapping -// startAngle := math.Atan2(srcCenter.Y-center.Y, srcCenter.X-center.X) -// endAngle := math.Atan2(dstCenter.Y-center.Y, dstCenter.X-center.X) - -// // Handle angle wrapping for shortest path -// angleDiff := endAngle - startAngle -// if angleDiff < 0 { -// angleDiff += 2 * math.Pi -// } -// if angleDiff > math.Pi { -// angleDiff -= 2 * math.Pi -// } - -// // Generate perfect circular arc -// path := make([]*geo.Point, 0, ARC_STEPS+1) -// for i := 0; i <= ARC_STEPS; i++ { -// t := float64(i) / ARC_STEPS -// currentAngle := startAngle + t*angleDiff -// x := center.X + baseRadius*math.Cos(currentAngle) -// y := center.Y + baseRadius*math.Sin(currentAngle) -// path = append(path, geo.NewPoint(x, y)) -// } - -// // Clip to shape boundaries while preserving arc -// edge.Route = path -// startIdx, endIdx := edge.TraceToShape(edge.Route, 0, len(edge.Route)-1) - -// // Maintain smooth arc after clipping -// if startIdx < endIdx { -// edge.Route = edge.Route[startIdx : endIdx+1] - -// // Ensure minimum points for smooth rendering -// if len(edge.Route) < 3 { -// edge.Route = []*geo.Point{path[0], path[len(path)-1]} -// } -// } - -// edge.IsCurve = true -// } - -// func positionLabelsIcons(obj *d2graph.Object) { -// // If there's an icon but no icon position, give it a default -// if obj.Icon != nil && obj.IconPosition == nil { -// if len(obj.ChildrenArray) > 0 { -// obj.IconPosition = go2.Pointer(label.OutsideTopLeft.String()) -// if obj.LabelPosition == nil { -// obj.LabelPosition = go2.Pointer(label.OutsideTopRight.String()) -// return -// } -// } else if obj.SQLTable != nil || obj.Class != nil || obj.Language != "" { -// obj.IconPosition = go2.Pointer(label.OutsideTopLeft.String()) -// } else { -// obj.IconPosition = go2.Pointer(label.InsideMiddleCenter.String()) -// } -// } - -// if obj.HasLabel() && obj.LabelPosition == nil { -// if len(obj.ChildrenArray) > 0 { -// obj.LabelPosition = go2.Pointer(label.OutsideTopCenter.String()) -// } else if obj.HasOutsideBottomLabel() { -// obj.LabelPosition = go2.Pointer(label.OutsideBottomCenter.String()) -// } else if obj.Icon != nil { -// obj.LabelPosition = go2.Pointer(label.InsideTopCenter.String()) -// } else { -// obj.LabelPosition = go2.Pointer(label.InsideMiddleCenter.String()) -// } - -// if float64(obj.LabelDimensions.Width) > obj.Width || -// float64(obj.LabelDimensions.Height) > obj.Height { -// if len(obj.ChildrenArray) > 0 { -// obj.LabelPosition = go2.Pointer(label.OutsideTopCenter.String()) -// } else { -// obj.LabelPosition = go2.Pointer(label.OutsideBottomCenter.String()) -// } -// } -// } -// } - -// func boxContains(b *geo.Box, p *geo.Point) bool { -// return p.X >= b.TopLeft.X && -// p.X <= b.TopLeft.X+b.Width && -// p.Y >= b.TopLeft.Y && -// p.Y <= b.TopLeft.Y+b.Height -// } - -// func boxIntersections(b *geo.Box, seg geo.Segment) []*geo.Point { -// return b.Intersections(seg) -// } \ 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 0fcb4441f9..104df56cce 100644 --- a/e2etests/testdata/txtar/cycle-diagram/dagre/board.exp.json +++ b/e2etests/testdata/txtar/cycle-diagram/dagre/board.exp.json @@ -540,248 +540,100 @@ "link": "", "route": [ { - "x": 0, - "y": -253 + "x": 31.285999298095703, + "y": -197.53700256347656 }, { - "x": 6.622000217437744, - "y": -252.91299438476562 + "x": 41.582000732421875, + "y": -195.62899780273438 }, { - "x": 13.239999771118164, - "y": -252.6529998779297 + "x": 51.76300048828125, + "y": -193.18499755859375 }, { - "x": 19.850000381469727, - "y": -252.22000122070312 + "x": 61.803001403808594, + "y": -190.21099853515625 }, { - "x": 26.44499969482422, - "y": -251.61399841308594 + "x": 71.6729965209961, + "y": -186.71600341796875 }, { - "x": 33.02299880981445, - "y": -250.8350067138672 + "x": 81.34700012207031, + "y": -182.70899963378906 }, { - "x": 39.57699966430664, - "y": -249.88499450683594 + "x": 90.7979965209961, + "y": -178.2010040283203 }, { - "x": 46.10499954223633, - "y": -248.76300048828125 + "x": 99.9990005493164, + "y": -173.2050018310547 }, { - "x": 52.60100173950195, - "y": -247.4709930419922 + "x": 108.927001953125, + "y": -167.73399353027344 }, { - "x": 59.06100082397461, - "y": -246.00900268554688 + "x": 117.55699920654297, + "y": -161.80299377441406 }, { - "x": 65.48100280761719, - "y": -244.37899780273438 + "x": 125.86399841308594, + "y": -155.4290008544922 }, { - "x": 71.8550033569336, - "y": -242.58099365234375 + "x": 133.8260040283203, + "y": -148.6280059814453 }, { - "x": 78.18099975585938, - "y": -240.61700439453125 + "x": 141.42100524902344, + "y": -141.42100524902344 }, { - "x": 84.4530029296875, - "y": -238.48800659179688 + "x": 148.6280059814453, + "y": -133.8260040283203 }, { - "x": 90.66699981689453, - "y": -236.19500732421875 + "x": 155.4290008544922, + "y": -125.86399841308594 }, { - "x": 96.81800079345703, - "y": -233.74099731445312 + "x": 161.80299377441406, + "y": -117.55699920654297 }, { - "x": 102.90399932861328, - "y": -231.1269989013672 + "x": 167.73399353027344, + "y": -108.927001953125 }, { - "x": 108.91899871826172, - "y": -228.35400390625 + "x": 173.2050018310547, + "y": -100 }, { - "x": 114.85900115966797, - "y": -225.4239959716797 + "x": 178.2010040283203, + "y": -90.7979965209961 }, { - "x": 120.72100067138672, - "y": -222.33999633789062 + "x": 182.70899963378906, + "y": -81.34700012207031 }, { - "x": 126.4990005493164, - "y": -219.10400390625 + "x": 186.71600341796875, + "y": -71.6729965209961 }, { - "x": 132.19200134277344, - "y": -215.7169952392578 + "x": 190.21099853515625, + "y": -61.803001403808594 }, { - "x": 137.79299926757812, - "y": -212.18299865722656 + "x": 193.18499755859375, + "y": -51.76300048828125 }, { - "x": 143.3000030517578, - "y": -208.5030059814453 - }, - { - "x": 148.70899963378906, - "y": -204.68099975585938 - }, - { - "x": 154.01600646972656, - "y": -200.71800231933594 - }, - { - "x": 159.21800231933594, - "y": -196.61700439453125 - }, - { - "x": 164.30999755859375, - "y": -192.3820037841797 - }, - { - "x": 169.2899932861328, - "y": -188.01499938964844 - }, - { - "x": 174.1529998779297, - "y": -183.5189971923828 - }, - { - "x": 178.8979949951172, - "y": -178.8979949951172 - }, - { - "x": 183.5189971923828, - "y": -174.1529998779297 - }, - { - "x": 188.01499938964844, - "y": -169.2899932861328 - }, - { - "x": 192.3820037841797, - "y": -164.30999755859375 - }, - { - "x": 196.61700439453125, - "y": -159.21800231933594 - }, - { - "x": 200.71800231933594, - "y": -154.01600646972656 - }, - { - "x": 204.68099975585938, - "y": -148.70899963378906 - }, - { - "x": 208.5030059814453, - "y": -143.3000030517578 - }, - { - "x": 212.18299865722656, - "y": -137.79299926757812 - }, - { - "x": 215.7169952392578, - "y": -132.19200134277344 - }, - { - "x": 219.10400390625, - "y": -126.5 - }, - { - "x": 222.33999633789062, - "y": -120.72100067138672 - }, - { - "x": 225.4239959716797, - "y": -114.85900115966797 - }, - { - "x": 228.35400390625, - "y": -108.91899871826172 - }, - { - "x": 231.1269989013672, - "y": -102.90399932861328 - }, - { - "x": 233.74099731445312, - "y": -96.81800079345703 - }, - { - "x": 236.19500732421875, - "y": -90.66699981689453 - }, - { - "x": 238.48800659179688, - "y": -84.4530029296875 - }, - { - "x": 240.61700439453125, - "y": -78.18099975585938 - }, - { - "x": 242.58099365234375, - "y": -71.8550033569336 - }, - { - "x": 244.37899780273438, - "y": -65.48100280761719 - }, - { - "x": 246.00900268554688, - "y": -59.06100082397461 - }, - { - "x": 247.4709930419922, - "y": -52.60100173950195 - }, - { - "x": 248.76300048828125, - "y": -46.10499954223633 - }, - { - "x": 249.88499450683594, - "y": -39.57699966430664 - }, - { - "x": 250.8350067138672, - "y": -33.02299880981445 - }, - { - "x": 251.61399841308594, - "y": -26.44499969482422 - }, - { - "x": 252.22000122070312, - "y": -19.850000381469727 - }, - { - "x": 252.6529998779297, - "y": -13.239999771118164 - }, - { - "x": 252.91299438476562, - "y": -6.622000217437744 - }, - { - "x": 253, - "y": 0 + "x": 195.62899780273438, + "y": -41.582000732421875 } ], "isCurve": true, @@ -816,248 +668,100 @@ "link": "", "route": [ { - "x": 253, - "y": 0 - }, - { - "x": 252.91299438476562, - "y": 6.622000217437744 - }, - { - "x": 252.6529998779297, - "y": 13.239999771118164 - }, - { - "x": 252.22000122070312, - "y": 19.850000381469727 - }, - { - "x": 251.61399841308594, - "y": 26.44499969482422 - }, - { - "x": 250.8350067138672, - "y": 33.02299880981445 - }, - { - "x": 249.88499450683594, - "y": 39.57699966430664 - }, - { - "x": 248.76300048828125, - "y": 46.10499954223633 - }, - { - "x": 247.4709930419922, - "y": 52.60100173950195 - }, - { - "x": 246.00900268554688, - "y": 59.06100082397461 - }, - { - "x": 244.37899780273438, - "y": 65.48100280761719 - }, - { - "x": 242.58099365234375, - "y": 71.8550033569336 - }, - { - "x": 240.61700439453125, - "y": 78.18099975585938 - }, - { - "x": 238.48800659179688, - "y": 84.4530029296875 - }, - { - "x": 236.19500732421875, - "y": 90.66699981689453 - }, - { - "x": 233.74099731445312, - "y": 96.81800079345703 - }, - { - "x": 231.1269989013672, - "y": 102.90399932861328 - }, - { - "x": 228.35400390625, - "y": 108.91899871826172 - }, - { - "x": 225.4239959716797, - "y": 114.85900115966797 - }, - { - "x": 222.33999633789062, - "y": 120.72100067138672 - }, - { - "x": 219.10400390625, - "y": 126.4990005493164 - }, - { - "x": 215.7169952392578, - "y": 132.19200134277344 - }, - { - "x": 212.18299865722656, - "y": 137.79299926757812 - }, - { - "x": 208.5030059814453, - "y": 143.3000030517578 - }, - { - "x": 204.68099975585938, - "y": 148.70899963378906 - }, - { - "x": 200.71800231933594, - "y": 154.01600646972656 - }, - { - "x": 196.61700439453125, - "y": 159.21800231933594 - }, - { - "x": 192.3820037841797, - "y": 164.30999755859375 + "x": 195.62899780273438, + "y": 41.582000732421875 }, { - "x": 188.01499938964844, - "y": 169.2899932861328 + "x": 193.18499755859375, + "y": 51.76300048828125 }, { - "x": 183.5189971923828, - "y": 174.1529998779297 + "x": 190.21099853515625, + "y": 61.803001403808594 }, { - "x": 178.8979949951172, - "y": 178.8979949951172 + "x": 186.71600341796875, + "y": 71.6729965209961 }, { - "x": 174.1529998779297, - "y": 183.5189971923828 + "x": 182.70899963378906, + "y": 81.34700012207031 }, { - "x": 169.2899932861328, - "y": 188.01499938964844 + "x": 178.2010040283203, + "y": 90.7979965209961 }, { - "x": 164.30999755859375, - "y": 192.3820037841797 + "x": 173.2050018310547, + "y": 99.9990005493164 }, { - "x": 159.21800231933594, - "y": 196.61700439453125 + "x": 167.73399353027344, + "y": 108.927001953125 }, { - "x": 154.01600646972656, - "y": 200.71800231933594 + "x": 161.80299377441406, + "y": 117.55699920654297 }, { - "x": 148.70899963378906, - "y": 204.68099975585938 + "x": 155.4290008544922, + "y": 125.86399841308594 }, { - "x": 143.3000030517578, - "y": 208.5030059814453 + "x": 148.6280059814453, + "y": 133.8260040283203 }, { - "x": 137.79299926757812, - "y": 212.18299865722656 + "x": 141.42100524902344, + "y": 141.42100524902344 }, { - "x": 132.19200134277344, - "y": 215.7169952392578 + "x": 133.8260040283203, + "y": 148.6280059814453 }, { - "x": 126.5, - "y": 219.10400390625 + "x": 125.86399841308594, + "y": 155.4290008544922 }, { - "x": 120.72100067138672, - "y": 222.33999633789062 + "x": 117.55699920654297, + "y": 161.80299377441406 }, { - "x": 114.85900115966797, - "y": 225.4239959716797 + "x": 108.927001953125, + "y": 167.73399353027344 }, { - "x": 108.91899871826172, - "y": 228.35400390625 + "x": 100, + "y": 173.2050018310547 }, { - "x": 102.90399932861328, - "y": 231.1269989013672 + "x": 90.7979965209961, + "y": 178.2010040283203 }, { - "x": 96.81800079345703, - "y": 233.74099731445312 + "x": 81.34700012207031, + "y": 182.70899963378906 }, { - "x": 90.66699981689453, - "y": 236.19500732421875 + "x": 71.6729965209961, + "y": 186.71600341796875 }, { - "x": 84.4530029296875, - "y": 238.48800659179688 + "x": 61.803001403808594, + "y": 190.21099853515625 }, { - "x": 78.18099975585938, - "y": 240.61700439453125 + "x": 51.76300048828125, + "y": 193.18499755859375 }, { - "x": 71.8550033569336, - "y": 242.58099365234375 + "x": 41.582000732421875, + "y": 195.62899780273438 }, { - "x": 65.48100280761719, - "y": 244.37899780273438 - }, - { - "x": 59.06100082397461, - "y": 246.00900268554688 - }, - { - "x": 52.60100173950195, - "y": 247.4709930419922 - }, - { - "x": 46.10499954223633, - "y": 248.76300048828125 - }, - { - "x": 39.57699966430664, - "y": 249.88499450683594 - }, - { - "x": 33.02299880981445, - "y": 250.8350067138672 - }, - { - "x": 26.44499969482422, - "y": 251.61399841308594 - }, - { - "x": 19.850000381469727, - "y": 252.22000122070312 - }, - { - "x": 13.239999771118164, - "y": 252.6529998779297 - }, - { - "x": 6.622000217437744, - "y": 252.91299438476562 - }, - { - "x": 0, - "y": 253 + "x": 31.285999298095703, + "y": 197.53700256347656 } ], "isCurve": true, @@ -1092,248 +796,100 @@ "link": "", "route": [ { - "x": 0, - "y": 253 - }, - { - "x": -6.622000217437744, - "y": 252.91299438476562 - }, - { - "x": -13.239999771118164, - "y": 252.6529998779297 - }, - { - "x": -19.850000381469727, - "y": 252.22000122070312 - }, - { - "x": -26.44499969482422, - "y": 251.61399841308594 - }, - { - "x": -33.02299880981445, - "y": 250.8350067138672 - }, - { - "x": -39.57699966430664, - "y": 249.88499450683594 - }, - { - "x": -46.10499954223633, - "y": 248.76300048828125 - }, - { - "x": -52.60100173950195, - "y": 247.4709930419922 - }, - { - "x": -59.06100082397461, - "y": 246.00900268554688 - }, - { - "x": -65.48100280761719, - "y": 244.37899780273438 - }, - { - "x": -71.8550033569336, - "y": 242.58099365234375 - }, - { - "x": -78.18099975585938, - "y": 240.61700439453125 - }, - { - "x": -84.4530029296875, - "y": 238.48800659179688 - }, - { - "x": -90.66699981689453, - "y": 236.19500732421875 - }, - { - "x": -96.81800079345703, - "y": 233.74099731445312 - }, - { - "x": -102.90399932861328, - "y": 231.1269989013672 - }, - { - "x": -108.91899871826172, - "y": 228.35400390625 - }, - { - "x": -114.85900115966797, - "y": 225.4239959716797 - }, - { - "x": -120.72100067138672, - "y": 222.33999633789062 - }, - { - "x": -126.4990005493164, - "y": 219.10400390625 - }, - { - "x": -132.19200134277344, - "y": 215.7169952392578 - }, - { - "x": -137.79299926757812, - "y": 212.18299865722656 - }, - { - "x": -143.3000030517578, - "y": 208.5030059814453 - }, - { - "x": -148.70899963378906, - "y": 204.68099975585938 - }, - { - "x": -154.01600646972656, - "y": 200.71800231933594 - }, - { - "x": -159.21800231933594, - "y": 196.61700439453125 - }, - { - "x": -164.30999755859375, - "y": 192.3820037841797 - }, - { - "x": -169.2899932861328, - "y": 188.01499938964844 - }, - { - "x": -174.1529998779297, - "y": 183.5189971923828 - }, - { - "x": -178.8979949951172, - "y": 178.8979949951172 - }, - { - "x": -183.5189971923828, - "y": 174.1529998779297 - }, - { - "x": -188.01499938964844, - "y": 169.2899932861328 - }, - { - "x": -192.3820037841797, - "y": 164.30999755859375 - }, - { - "x": -196.61700439453125, - "y": 159.21800231933594 + "x": -31.285999298095703, + "y": 197.53700256347656 }, { - "x": -200.71800231933594, - "y": 154.01600646972656 + "x": -41.582000732421875, + "y": 195.62899780273438 }, { - "x": -204.68099975585938, - "y": 148.70899963378906 + "x": -51.76300048828125, + "y": 193.18499755859375 }, { - "x": -208.5030059814453, - "y": 143.3000030517578 + "x": -61.803001403808594, + "y": 190.21099853515625 }, { - "x": -212.18299865722656, - "y": 137.79299926757812 + "x": -71.6729965209961, + "y": 186.71600341796875 }, { - "x": -215.7169952392578, - "y": 132.19200134277344 + "x": -81.34700012207031, + "y": 182.70899963378906 }, { - "x": -219.10400390625, - "y": 126.5 + "x": -90.7979965209961, + "y": 178.2010040283203 }, { - "x": -222.33999633789062, - "y": 120.72100067138672 + "x": -99.9990005493164, + "y": 173.2050018310547 }, { - "x": -225.4239959716797, - "y": 114.85900115966797 + "x": -108.927001953125, + "y": 167.73399353027344 }, { - "x": -228.35400390625, - "y": 108.91899871826172 + "x": -117.55699920654297, + "y": 161.80299377441406 }, { - "x": -231.1269989013672, - "y": 102.90399932861328 + "x": -125.86399841308594, + "y": 155.4290008544922 }, { - "x": -233.74099731445312, - "y": 96.81800079345703 + "x": -133.8260040283203, + "y": 148.6280059814453 }, { - "x": -236.19500732421875, - "y": 90.66699981689453 + "x": -141.42100524902344, + "y": 141.42100524902344 }, { - "x": -238.48800659179688, - "y": 84.4530029296875 + "x": -148.6280059814453, + "y": 133.8260040283203 }, { - "x": -240.61700439453125, - "y": 78.18099975585938 + "x": -155.4290008544922, + "y": 125.86399841308594 }, { - "x": -242.58099365234375, - "y": 71.8550033569336 + "x": -161.80299377441406, + "y": 117.55699920654297 }, { - "x": -244.37899780273438, - "y": 65.48100280761719 + "x": -167.73399353027344, + "y": 108.927001953125 }, { - "x": -246.00900268554688, - "y": 59.06100082397461 + "x": -173.2050018310547, + "y": 100 }, { - "x": -247.4709930419922, - "y": 52.60100173950195 + "x": -178.2010040283203, + "y": 90.7979965209961 }, { - "x": -248.76300048828125, - "y": 46.10499954223633 + "x": -182.70899963378906, + "y": 81.34700012207031 }, { - "x": -249.88499450683594, - "y": 39.57699966430664 + "x": -186.71600341796875, + "y": 71.6729965209961 }, { - "x": -250.8350067138672, - "y": 33.02299880981445 + "x": -190.21099853515625, + "y": 61.803001403808594 }, { - "x": -251.61399841308594, - "y": 26.44499969482422 + "x": -193.18499755859375, + "y": 51.76300048828125 }, { - "x": -252.22000122070312, - "y": 19.850000381469727 - }, - { - "x": -252.6529998779297, - "y": 13.239999771118164 - }, - { - "x": -252.91299438476562, - "y": 6.622000217437744 - }, - { - "x": -253, - "y": 0 + "x": -195.62899780273438, + "y": 41.582000732421875 } ], "isCurve": true, @@ -1368,248 +924,108 @@ "link": "", "route": [ { - "x": 513, - "y": -203 - }, - { - "x": 521.8289794921875, - "y": -202.84500122070312 - }, - { - "x": 530.6480102539062, - "y": -202.38299560546875 - }, - { - "x": 539.4450073242188, - "y": -201.61399841308594 - }, - { - "x": 548.2100219726562, - "y": -200.53700256347656 - }, - { - "x": 556.9320068359375, - "y": -199.156005859375 - }, - { - "x": 565.6010131835938, - "y": -197.4709930419922 - }, - { - "x": 574.2059936523438, - "y": -195.48399353027344 - }, - { - "x": 582.7360229492188, - "y": -193.19900512695312 - }, - { - "x": 591.1810302734375, - "y": -190.61700439453125 - }, - { - "x": 599.531005859375, - "y": -187.74200439453125 + "x": 540.833984375, + "y": -148.05299377441406 }, { - "x": 607.7750244140625, - "y": -184.57699584960938 + "x": 554.5819702148438, + "y": -145.62899780273438 }, { - "x": 615.9039916992188, - "y": -181.1269989013672 + "x": 568.1270141601562, + "y": -142.2519989013672 }, { - "x": 623.906982421875, - "y": -177.3939971923828 + "x": 581.4039916992188, + "y": -137.93800354003906 }, { - "x": 631.7760009765625, - "y": -173.38499450683594 + "x": 594.3469848632812, + "y": -132.70899963378906 }, { - "x": 639.5, - "y": -169.10400390625 + "x": 606.8939819335938, + "y": -126.58899688720703 }, { - "x": 647.0689697265625, - "y": -164.55599975585938 + "x": 618.9829711914062, + "y": -119.60900115966797 }, { - "x": 654.4749755859375, - "y": -159.74600219726562 + "x": 630.5570068359375, + "y": -111.8030014038086 }, { - "x": 661.708984375, - "y": -154.68099975585938 + "x": 641.5570068359375, + "y": -103.20800018310547 }, { - "x": 668.7620239257812, - "y": -149.36599731445312 + "x": 651.9310302734375, + "y": -93.86699676513672 }, { - "x": 675.625, - "y": -143.8090057373047 + "x": 661.6279907226562, + "y": -83.82599639892578 }, { - "x": 682.2899780273438, - "y": -138.01499938964844 + "x": 670.6019897460938, + "y": -73.13200378417969 }, { - "x": 688.7479858398438, - "y": -131.99200439453125 + "x": 678.8070068359375, + "y": -61.8380012512207 }, { - "x": 694.9920043945312, - "y": -125.74800109863281 + "x": 686.2050170898438, + "y": -50 }, { - "x": 701.0150146484375, - "y": -119.29000091552734 + "x": 692.7579956054688, + "y": -37.67399978637695 }, { - "x": 706.8090209960938, - "y": -112.625 + "x": 698.4359741210938, + "y": -24.92099952697754 }, { - "x": 712.3660278320312, - "y": -105.76200103759766 + "x": 703.2109985351562, + "y": -11.803000450134277 }, { - "x": 717.6810302734375, - "y": -98.70899963378906 + "x": 707.0590209960938, + "y": 1.6150000095367432 }, { - "x": 722.7459716796875, - "y": -91.4749984741211 + "x": 709.9609985351562, + "y": 15.270000457763672 }, { - "x": 727.5560302734375, - "y": -84.06900024414062 + "x": 711.9039916992188, + "y": 29.0939998626709 }, { - "x": 732.10400390625, - "y": -76.5 + "x": 712.8779907226562, + "y": 43.02000045776367 }, { - "x": 736.385009765625, - "y": -68.7760009765625 + "x": 712.8779907226562, + "y": 56.979000091552734 }, { - "x": 740.3939819335938, - "y": -60.90700149536133 + "x": 711.9039916992188, + "y": 70.90499877929688 }, { - "x": 744.1270141601562, - "y": -52.90399932861328 + "x": 709.9609985351562, + "y": 84.72899627685547 }, { - "x": 747.5770263671875, - "y": -44.775001525878906 + "x": 707.0590209960938, + "y": 98.38400268554688 }, { - "x": 750.7420043945312, - "y": -36.53099822998047 - }, - { - "x": 753.6170043945312, - "y": -28.180999755859375 - }, - { - "x": 756.198974609375, - "y": -19.736000061035156 - }, - { - "x": 758.4840087890625, - "y": -11.206000328063965 - }, - { - "x": 760.4710083007812, - "y": -2.6010000705718994 - }, - { - "x": 762.156005859375, - "y": 6.066999912261963 - }, - { - "x": 763.5369873046875, - "y": 14.788999557495117 - }, - { - "x": 764.614013671875, - "y": 23.554000854492188 - }, - { - "x": 765.3829956054688, - "y": 32.35100173950195 - }, - { - "x": 765.844970703125, - "y": 41.16999816894531 - }, - { - "x": 766, - "y": 50 - }, - { - "x": 765.844970703125, - "y": 58.82899856567383 - }, - { - "x": 765.3829956054688, - "y": 67.64800262451172 - }, - { - "x": 764.614013671875, - "y": 76.44499969482422 - }, - { - "x": 763.5369873046875, - "y": 85.20999908447266 - }, - { - "x": 762.156005859375, - "y": 93.93199920654297 - }, - { - "x": 760.4710083007812, - "y": 102.60099792480469 - }, - { - "x": 758.4840087890625, - "y": 111.20600128173828 - }, - { - "x": 756.198974609375, - "y": 119.73600006103516 - }, - { - "x": 753.6170043945312, - "y": 128.18099975585938 - }, - { - "x": 750.7420043945312, - "y": 136.531005859375 - }, - { - "x": 747.5770263671875, - "y": 144.77499389648438 - }, - { - "x": 744.1270141601562, - "y": 152.9040069580078 - }, - { - "x": 740.3939819335938, - "y": 160.90699768066406 - }, - { - "x": 736.385009765625, - "y": 168.7760009765625 - }, - { - "x": 732.10400390625, - "y": 176.49899291992188 + "x": 703.2109985351562, + "y": 111.8030014038086 } ], "isCurve": true, @@ -1644,248 +1060,104 @@ "link": "", "route": [ { - "x": 732.10400390625, - "y": 176.49899291992188 - }, - { - "x": 727.5560302734375, - "y": 184.06900024414062 - }, - { - "x": 722.7459716796875, - "y": 191.47500610351562 - }, - { - "x": 717.6810302734375, - "y": 198.70899963378906 - }, - { - "x": 712.3660278320312, - "y": 205.76199340820312 - }, - { - "x": 706.8090209960938, - "y": 212.625 - }, - { - "x": 701.0150146484375, - "y": 219.2899932861328 - }, - { - "x": 694.9920043945312, - "y": 225.7480010986328 - }, - { - "x": 688.7479858398438, - "y": 231.99200439453125 - }, - { - "x": 682.2899780273438, - "y": 238.01499938964844 - }, - { - "x": 675.625, - "y": 243.8090057373047 - }, - { - "x": 668.7620239257812, - "y": 249.36599731445312 - }, - { - "x": 661.708984375, - "y": 254.68099975585938 - }, - { - "x": 654.4749755859375, - "y": 259.7460021972656 - }, - { - "x": 647.0689697265625, - "y": 264.5559997558594 - }, - { - "x": 639.5, - "y": 269.10400390625 - }, - { - "x": 631.7760009765625, - "y": 273.385009765625 - }, - { - "x": 623.906982421875, - "y": 277.3940124511719 + "x": 661.6279907226562, + "y": 183.8260040283203 }, { - "x": 615.9039916992188, - "y": 281.12701416015625 + "x": 651.9310302734375, + "y": 193.86700439453125 }, { - "x": 607.7750244140625, - "y": 284.5769958496094 + "x": 641.5570068359375, + "y": 203.20799255371094 }, { - "x": 599.531005859375, - "y": 287.74200439453125 + "x": 630.5570068359375, + "y": 211.80299377441406 }, { - "x": 591.1810302734375, - "y": 290.61700439453125 + "x": 618.9829711914062, + "y": 219.60899353027344 }, { - "x": 582.7360229492188, - "y": 293.1990051269531 + "x": 606.8939819335938, + "y": 226.58900451660156 }, { - "x": 574.2059936523438, - "y": 295.4840087890625 + "x": 594.3469848632812, + "y": 232.70899963378906 }, { - "x": 565.6010131835938, - "y": 297.47100830078125 + "x": 581.4039916992188, + "y": 237.93800354003906 }, { - "x": 556.9320068359375, - "y": 299.156005859375 + "x": 568.1270141601562, + "y": 242.2519989013672 }, { - "x": 548.2100219726562, - "y": 300.5369873046875 + "x": 554.5819702148438, + "y": 245.62899780273438 }, { - "x": 539.4450073242188, - "y": 301.614013671875 + "x": 540.833984375, + "y": 248.05299377441406 }, { - "x": 530.6480102539062, - "y": 302.38299560546875 - }, - { - "x": 521.8289794921875, - "y": 302.8450012207031 + "x": 526.9509887695312, + "y": 249.51199340820312 }, { "x": 513, - "y": 303 - }, - { - "x": 504.1700134277344, - "y": 302.8450012207031 - }, - { - "x": 495.35101318359375, - "y": 302.38299560546875 - }, - { - "x": 486.5539855957031, - "y": 301.614013671875 - }, - { - "x": 477.78900146484375, - "y": 300.5369873046875 - }, - { - "x": 469.0669860839844, - "y": 299.156005859375 - }, - { - "x": 460.39801025390625, - "y": 297.47100830078125 - }, - { - "x": 451.7929992675781, - "y": 295.4840087890625 - }, - { - "x": 443.26300048828125, - "y": 293.1990051269531 + "y": 250 }, { - "x": 434.8179931640625, - "y": 290.61700439453125 + "x": 499.0480041503906, + "y": 249.51199340820312 }, { - "x": 426.4679870605469, - "y": 287.74200439453125 + "x": 485.1650085449219, + "y": 248.05299377441406 }, { - "x": 418.2239990234375, - "y": 284.5769958496094 + "x": 471.4169921875, + "y": 245.62899780273438 }, { - "x": 410.0950012207031, - "y": 281.12701416015625 + "x": 457.87200927734375, + "y": 242.2519989013672 }, { - "x": 402.0920104980469, - "y": 277.3940124511719 + "x": 444.5950012207031, + "y": 237.93800354003906 }, { - "x": 394.2229919433594, - "y": 273.385009765625 + "x": 431.6520080566406, + "y": 232.70899963378906 }, { - "x": 386.5, - "y": 269.10400390625 + "x": 419.1050109863281, + "y": 226.58900451660156 }, { - "x": 378.92999267578125, - "y": 264.5559997558594 + "x": 407.0159912109375, + "y": 219.60899353027344 }, { - "x": 371.52398681640625, - "y": 259.7460021972656 + "x": 395.4419860839844, + "y": 211.80299377441406 }, { - "x": 364.2900085449219, - "y": 254.68099975585938 + "x": 384.4419860839844, + "y": 203.20799255371094 }, { - "x": 357.23699951171875, - "y": 249.36599731445312 + "x": 374.0679931640625, + "y": 193.86700439453125 }, { - "x": 350.3739929199219, - "y": 243.8090057373047 - }, - { - "x": 343.7090148925781, - "y": 238.01499938964844 - }, - { - "x": 337.2510070800781, - "y": 231.99200439453125 - }, - { - "x": 331.0069885253906, - "y": 225.7480010986328 - }, - { - "x": 324.9840087890625, - "y": 219.2899932861328 - }, - { - "x": 319.19000244140625, - "y": 212.625 - }, - { - "x": 313.63299560546875, - "y": 205.76199340820312 - }, - { - "x": 308.3179931640625, - "y": 198.70899963378906 - }, - { - "x": 303.25299072265625, - "y": 191.47500610351562 - }, - { - "x": 298.4429931640625, - "y": 184.06900024414062 - }, - { - "x": 293.8949890136719, - "y": 176.5 + "x": 364.3710021972656, + "y": 183.8260040283203 } ], "isCurve": true, @@ -1920,248 +1192,112 @@ "link": "", "route": [ { - "x": 972, - "y": -253 - }, - { - "x": 985.239990234375, - "y": -252.6529998779297 - }, - { - "x": 998.4450073242188, - "y": -251.61399841308594 - }, - { - "x": 1011.5770263671875, - "y": -249.88499450683594 - }, - { - "x": 1024.6009521484375, - "y": -247.4709930419922 - }, - { - "x": 1037.48095703125, - "y": -244.37899780273438 - }, - { - "x": 1050.1810302734375, - "y": -240.61700439453125 - }, - { - "x": 1062.6669921875, - "y": -236.19500732421875 + "x": 1013.5819702148438, + "y": -195.62899780273438 }, { - "x": 1074.904052734375, - "y": -231.1269989013672 + "x": 1033.802978515625, + "y": -190.21099853515625 }, { - "x": 1086.8590087890625, - "y": -225.4239959716797 + "x": 1053.3470458984375, + "y": -182.70899963378906 }, { - "x": 1098.5, - "y": -219.10400390625 + "x": 1072, + "y": -173.2050018310547 }, { - "x": 1109.79296875, - "y": -212.18299865722656 + "x": 1089.5570068359375, + "y": -161.80299377441406 }, { - "x": 1120.708984375, - "y": -204.68099975585938 + "x": 1105.8260498046875, + "y": -148.6280059814453 }, { - "x": 1131.218017578125, - "y": -196.61700439453125 + "x": 1120.6280517578125, + "y": -133.8260040283203 }, { - "x": 1141.2900390625, - "y": -188.01499938964844 + "x": 1133.802978515625, + "y": -117.55699920654297 }, { - "x": 1150.89794921875, - "y": -178.8979949951172 + "x": 1145.2049560546875, + "y": -100 }, { - "x": 1160.0150146484375, - "y": -169.2899932861328 + "x": 1154.708984375, + "y": -81.34700012207031 }, { - "x": 1168.616943359375, - "y": -159.21800231933594 + "x": 1162.2110595703125, + "y": -61.803001403808594 }, { - "x": 1176.6810302734375, - "y": -148.70899963378906 + "x": 1167.6290283203125, + "y": -41.582000732421875 }, { - "x": 1184.1829833984375, - "y": -137.79299926757812 + "x": 1170.904052734375, + "y": -20.905000686645508 }, { - "x": 1191.10400390625, - "y": -126.5 - }, - { - "x": 1197.4239501953125, - "y": -114.85900115966797 - }, - { - "x": 1203.126953125, - "y": -102.90399932861328 - }, - { - "x": 1208.1949462890625, - "y": -90.66699981689453 - }, - { - "x": 1212.616943359375, - "y": -78.18099975585938 - }, - { - "x": 1216.3790283203125, - "y": -65.48100280761719 - }, - { - "x": 1219.470947265625, - "y": -52.60100173950195 - }, - { - "x": 1221.885009765625, - "y": -39.57699966430664 - }, - { - "x": 1223.614013671875, - "y": -26.44499969482422 - }, - { - "x": 1224.6529541015625, - "y": -13.239999771118164 - }, - { - "x": 1225, + "x": 1172, "y": 0 }, { - "x": 1224.6529541015625, - "y": 13.239999771118164 - }, - { - "x": 1223.614013671875, - "y": 26.44499969482422 - }, - { - "x": 1221.885009765625, - "y": 39.57699966430664 - }, - { - "x": 1219.470947265625, - "y": 52.60100173950195 - }, - { - "x": 1216.3790283203125, - "y": 65.48100280761719 - }, - { - "x": 1212.616943359375, - "y": 78.18099975585938 - }, - { - "x": 1208.1949462890625, - "y": 90.66699981689453 - }, - { - "x": 1203.126953125, - "y": 102.90399932861328 - }, - { - "x": 1197.4239501953125, - "y": 114.85900115966797 - }, - { - "x": 1191.10400390625, - "y": 126.4990005493164 - }, - { - "x": 1184.1829833984375, - "y": 137.79299926757812 - }, - { - "x": 1176.6810302734375, - "y": 148.70899963378906 - }, - { - "x": 1168.616943359375, - "y": 159.21800231933594 - }, - { - "x": 1160.0150146484375, - "y": 169.2899932861328 - }, - { - "x": 1150.89794921875, - "y": 178.8979949951172 - }, - { - "x": 1141.2900390625, - "y": 188.01499938964844 - }, - { - "x": 1131.218017578125, - "y": 196.61700439453125 - }, - { - "x": 1120.708984375, - "y": 204.68099975585938 + "x": 1170.904052734375, + "y": 20.905000686645508 }, { - "x": 1109.79296875, - "y": 212.18299865722656 + "x": 1167.6290283203125, + "y": 41.582000732421875 }, { - "x": 1098.5, - "y": 219.10400390625 + "x": 1162.2110595703125, + "y": 61.803001403808594 }, { - "x": 1086.8590087890625, - "y": 225.4239959716797 + "x": 1154.708984375, + "y": 81.34700012207031 }, { - "x": 1074.904052734375, - "y": 231.1269989013672 + "x": 1145.2049560546875, + "y": 99.9990005493164 }, { - "x": 1062.6669921875, - "y": 236.19500732421875 + "x": 1133.802978515625, + "y": 117.55699920654297 }, { - "x": 1050.1810302734375, - "y": 240.61700439453125 + "x": 1120.6280517578125, + "y": 133.8260040283203 }, { - "x": 1037.48095703125, - "y": 244.37899780273438 + "x": 1105.8260498046875, + "y": 148.6280059814453 }, { - "x": 1024.6009521484375, - "y": 247.4709930419922 + "x": 1089.5570068359375, + "y": 161.80299377441406 }, { - "x": 1011.5770263671875, - "y": 249.88499450683594 + "x": 1072, + "y": 173.2050018310547 }, { - "x": 998.4450073242188, - "y": 251.61399841308594 + "x": 1053.3470458984375, + "y": 182.70899963378906 }, { - "x": 985.239990234375, - "y": 252.6529998779297 + "x": 1033.802978515625, + "y": 190.21099853515625 }, { - "x": 972, - "y": 253 + "x": 1013.5819702148438, + "y": 195.62899780273438 } ], "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 1da4a0d02b..ecc9129818 100644 --- a/e2etests/testdata/txtar/cycle-diagram/dagre/sketch.exp.svg +++ b/e2etests/testdata/txtar/cycle-diagram/dagre/sketch.exp.svg @@ -1,9 +1,9 @@ -abcdabcab - + .d2-3480499724 .fill-N1{fill:#0A0F25;} + .d2-3480499724 .fill-N2{fill:#676C7E;} + .d2-3480499724 .fill-N3{fill:#9499AB;} + .d2-3480499724 .fill-N4{fill:#CFD2DD;} + .d2-3480499724 .fill-N5{fill:#DEE1EB;} + .d2-3480499724 .fill-N6{fill:#EEF1F8;} + .d2-3480499724 .fill-N7{fill:#FFFFFF;} + .d2-3480499724 .fill-B1{fill:#0D32B2;} + .d2-3480499724 .fill-B2{fill:#0D32B2;} + .d2-3480499724 .fill-B3{fill:#E3E9FD;} + .d2-3480499724 .fill-B4{fill:#E3E9FD;} + .d2-3480499724 .fill-B5{fill:#EDF0FD;} + .d2-3480499724 .fill-B6{fill:#F7F8FE;} + .d2-3480499724 .fill-AA2{fill:#4A6FF3;} + .d2-3480499724 .fill-AA4{fill:#EDF0FD;} + .d2-3480499724 .fill-AA5{fill:#F7F8FE;} + .d2-3480499724 .fill-AB4{fill:#EDF0FD;} + .d2-3480499724 .fill-AB5{fill:#F7F8FE;} + .d2-3480499724 .stroke-N1{stroke:#0A0F25;} + .d2-3480499724 .stroke-N2{stroke:#676C7E;} + .d2-3480499724 .stroke-N3{stroke:#9499AB;} + .d2-3480499724 .stroke-N4{stroke:#CFD2DD;} + .d2-3480499724 .stroke-N5{stroke:#DEE1EB;} + .d2-3480499724 .stroke-N6{stroke:#EEF1F8;} + .d2-3480499724 .stroke-N7{stroke:#FFFFFF;} + .d2-3480499724 .stroke-B1{stroke:#0D32B2;} + .d2-3480499724 .stroke-B2{stroke:#0D32B2;} + .d2-3480499724 .stroke-B3{stroke:#E3E9FD;} + .d2-3480499724 .stroke-B4{stroke:#E3E9FD;} + .d2-3480499724 .stroke-B5{stroke:#EDF0FD;} + .d2-3480499724 .stroke-B6{stroke:#F7F8FE;} + .d2-3480499724 .stroke-AA2{stroke:#4A6FF3;} + .d2-3480499724 .stroke-AA4{stroke:#EDF0FD;} + .d2-3480499724 .stroke-AA5{stroke:#F7F8FE;} + .d2-3480499724 .stroke-AB4{stroke:#EDF0FD;} + .d2-3480499724 .stroke-AB5{stroke:#F7F8FE;} + .d2-3480499724 .background-color-N1{background-color:#0A0F25;} + .d2-3480499724 .background-color-N2{background-color:#676C7E;} + .d2-3480499724 .background-color-N3{background-color:#9499AB;} + .d2-3480499724 .background-color-N4{background-color:#CFD2DD;} + .d2-3480499724 .background-color-N5{background-color:#DEE1EB;} + .d2-3480499724 .background-color-N6{background-color:#EEF1F8;} + .d2-3480499724 .background-color-N7{background-color:#FFFFFF;} + .d2-3480499724 .background-color-B1{background-color:#0D32B2;} + .d2-3480499724 .background-color-B2{background-color:#0D32B2;} + .d2-3480499724 .background-color-B3{background-color:#E3E9FD;} + .d2-3480499724 .background-color-B4{background-color:#E3E9FD;} + .d2-3480499724 .background-color-B5{background-color:#EDF0FD;} + .d2-3480499724 .background-color-B6{background-color:#F7F8FE;} + .d2-3480499724 .background-color-AA2{background-color:#4A6FF3;} + .d2-3480499724 .background-color-AA4{background-color:#EDF0FD;} + .d2-3480499724 .background-color-AA5{background-color:#F7F8FE;} + .d2-3480499724 .background-color-AB4{background-color:#EDF0FD;} + .d2-3480499724 .background-color-AB5{background-color:#F7F8FE;} + .d2-3480499724 .color-N1{color:#0A0F25;} + .d2-3480499724 .color-N2{color:#676C7E;} + .d2-3480499724 .color-N3{color:#9499AB;} + .d2-3480499724 .color-N4{color:#CFD2DD;} + .d2-3480499724 .color-N5{color:#DEE1EB;} + .d2-3480499724 .color-N6{color:#EEF1F8;} + .d2-3480499724 .color-N7{color:#FFFFFF;} + .d2-3480499724 .color-B1{color:#0D32B2;} + .d2-3480499724 .color-B2{color:#0D32B2;} + .d2-3480499724 .color-B3{color:#E3E9FD;} + .d2-3480499724 .color-B4{color:#E3E9FD;} + .d2-3480499724 .color-B5{color:#EDF0FD;} + .d2-3480499724 .color-B6{color:#F7F8FE;} + .d2-3480499724 .color-AA2{color:#4A6FF3;} + .d2-3480499724 .color-AA4{color:#EDF0FD;} + .d2-3480499724 .color-AA5{color:#F7F8FE;} + .d2-3480499724 .color-AB4{color:#EDF0FD;} + .d2-3480499724 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker-d2-3480499724);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker-d2-3480499724);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright-d2-3480499724);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright-d2-3480499724);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright-d2-3480499724);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright-d2-3480499724);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark-d2-3480499724);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright-d2-3480499724);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright-d2-3480499724);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright-d2-3480499724);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright-d2-3480499724);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker-d2-3480499724);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark-d2-3480499724);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal-d2-3480499724);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal-d2-3480499724);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright-d2-3480499724);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright-d2-3480499724);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright-d2-3480499724);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>abcdabcab + diff --git a/e2etests/testdata/txtar/cycle-diagram/elk/board.exp.json b/e2etests/testdata/txtar/cycle-diagram/elk/board.exp.json index 9f52054958..ad3f518e0c 100644 --- a/e2etests/testdata/txtar/cycle-diagram/elk/board.exp.json +++ b/e2etests/testdata/txtar/cycle-diagram/elk/board.exp.json @@ -540,248 +540,100 @@ "link": "", "route": [ { - "x": 12, - "y": -241 + "x": 43.2859992980957, + "y": -185.53700256347656 }, { - "x": 18.621999740600586, - "y": -240.91299438476562 + "x": 53.582000732421875, + "y": -183.62899780273438 }, { - "x": 25.239999771118164, - "y": -240.6529998779297 + "x": 63.76300048828125, + "y": -181.18499755859375 }, { - "x": 31.850000381469727, - "y": -240.22000122070312 + "x": 73.8030014038086, + "y": -178.21099853515625 }, { - "x": 38.44499969482422, - "y": -239.61399841308594 + "x": 83.6729965209961, + "y": -174.71600341796875 }, { - "x": 45.02299880981445, - "y": -238.8350067138672 + "x": 93.34700012207031, + "y": -170.70899963378906 }, { - "x": 51.57699966430664, - "y": -237.88499450683594 + "x": 102.7979965209961, + "y": -166.2010040283203 }, { - "x": 58.10499954223633, - "y": -236.76300048828125 + "x": 111.9990005493164, + "y": -161.2050018310547 }, { - "x": 64.60099792480469, - "y": -235.4709930419922 + "x": 120.927001953125, + "y": -155.73399353027344 }, { - "x": 71.06099700927734, - "y": -234.00900268554688 + "x": 129.5570068359375, + "y": -149.80299377441406 }, { - "x": 77.48100280761719, - "y": -232.37899780273438 + "x": 137.86399841308594, + "y": -143.4290008544922 }, { - "x": 83.8550033569336, - "y": -230.58099365234375 + "x": 145.8260040283203, + "y": -136.6280059814453 }, { - "x": 90.18099975585938, - "y": -228.61700439453125 + "x": 153.42100524902344, + "y": -129.42100524902344 }, { - "x": 96.4530029296875, - "y": -226.48800659179688 + "x": 160.6280059814453, + "y": -121.82599639892578 }, { - "x": 102.66699981689453, - "y": -224.19500732421875 + "x": 167.4290008544922, + "y": -113.86399841308594 }, { - "x": 108.81800079345703, - "y": -221.74099731445312 + "x": 173.80299377441406, + "y": -105.55699920654297 }, { - "x": 114.90399932861328, - "y": -219.1269989013672 + "x": 179.73399353027344, + "y": -96.927001953125 }, { - "x": 120.91899871826172, - "y": -216.35400390625 + "x": 185.2050018310547, + "y": -88 }, { - "x": 126.85900115966797, - "y": -213.4239959716797 + "x": 190.2010040283203, + "y": -78.7979965209961 }, { - "x": 132.7209930419922, - "y": -210.33999633789062 + "x": 194.70899963378906, + "y": -69.34700012207031 }, { - "x": 138.5, - "y": -207.10400390625 + "x": 198.71600341796875, + "y": -59.67300033569336 }, { - "x": 144.19200134277344, - "y": -203.7169952392578 + "x": 202.21099853515625, + "y": -49.803001403808594 }, { - "x": 149.79299926757812, - "y": -200.18299865722656 + "x": 205.18499755859375, + "y": -39.76300048828125 }, { - "x": 155.3000030517578, - "y": -196.5030059814453 - }, - { - "x": 160.70899963378906, - "y": -192.68099975585938 - }, - { - "x": 166.01600646972656, - "y": -188.71800231933594 - }, - { - "x": 171.21800231933594, - "y": -184.61700439453125 - }, - { - "x": 176.30999755859375, - "y": -180.3820037841797 - }, - { - "x": 181.2899932861328, - "y": -176.01499938964844 - }, - { - "x": 186.1529998779297, - "y": -171.5189971923828 - }, - { - "x": 190.8979949951172, - "y": -166.8979949951172 - }, - { - "x": 195.5189971923828, - "y": -162.1529998779297 - }, - { - "x": 200.01499938964844, - "y": -157.2899932861328 - }, - { - "x": 204.3820037841797, - "y": -152.30999755859375 - }, - { - "x": 208.61700439453125, - "y": -147.21800231933594 - }, - { - "x": 212.71800231933594, - "y": -142.01600646972656 - }, - { - "x": 216.68099975585938, - "y": -136.70899963378906 - }, - { - "x": 220.5030059814453, - "y": -131.3000030517578 - }, - { - "x": 224.18299865722656, - "y": -125.79299926757812 - }, - { - "x": 227.7169952392578, - "y": -120.19200134277344 - }, - { - "x": 231.10400390625, - "y": -114.5 - }, - { - "x": 234.33999633789062, - "y": -108.72100067138672 - }, - { - "x": 237.4239959716797, - "y": -102.85900115966797 - }, - { - "x": 240.35400390625, - "y": -96.91899871826172 - }, - { - "x": 243.1269989013672, - "y": -90.90399932861328 - }, - { - "x": 245.74099731445312, - "y": -84.81800079345703 - }, - { - "x": 248.19500732421875, - "y": -78.66699981689453 - }, - { - "x": 250.48800659179688, - "y": -72.4530029296875 - }, - { - "x": 252.61700439453125, - "y": -66.18099975585938 - }, - { - "x": 254.58099365234375, - "y": -59.85499954223633 - }, - { - "x": 256.3789978027344, - "y": -53.48099899291992 - }, - { - "x": 258.0090026855469, - "y": -47.06100082397461 - }, - { - "x": 259.47100830078125, - "y": -40.60100173950195 - }, - { - "x": 260.76300048828125, - "y": -34.10499954223633 - }, - { - "x": 261.885009765625, - "y": -27.57699966430664 - }, - { - "x": 262.8349914550781, - "y": -21.023000717163086 - }, - { - "x": 263.614013671875, - "y": -14.444999694824219 - }, - { - "x": 264.2200012207031, - "y": -7.849999904632568 - }, - { - "x": 264.65301513671875, - "y": -1.2400000095367432 - }, - { - "x": 264.9129943847656, - "y": 5.376999855041504 - }, - { - "x": 265, - "y": 12 + "x": 207.62899780273438, + "y": -29.582000732421875 } ], "isCurve": true, @@ -816,248 +668,100 @@ "link": "", "route": [ { - "x": 265, - "y": 12 - }, - { - "x": 264.9129943847656, - "y": 18.621999740600586 - }, - { - "x": 264.65301513671875, - "y": 25.239999771118164 - }, - { - "x": 264.2200012207031, - "y": 31.850000381469727 - }, - { - "x": 263.614013671875, - "y": 38.44499969482422 - }, - { - "x": 262.8349914550781, - "y": 45.02299880981445 - }, - { - "x": 261.885009765625, - "y": 51.57699966430664 - }, - { - "x": 260.76300048828125, - "y": 58.10499954223633 - }, - { - "x": 259.47100830078125, - "y": 64.60099792480469 - }, - { - "x": 258.0090026855469, - "y": 71.06099700927734 - }, - { - "x": 256.3789978027344, - "y": 77.48100280761719 - }, - { - "x": 254.58099365234375, - "y": 83.8550033569336 - }, - { - "x": 252.61700439453125, - "y": 90.18099975585938 - }, - { - "x": 250.48800659179688, - "y": 96.4530029296875 - }, - { - "x": 248.19500732421875, - "y": 102.66699981689453 - }, - { - "x": 245.74099731445312, - "y": 108.81800079345703 - }, - { - "x": 243.1269989013672, - "y": 114.90399932861328 - }, - { - "x": 240.35400390625, - "y": 120.91899871826172 - }, - { - "x": 237.4239959716797, - "y": 126.85900115966797 - }, - { - "x": 234.33999633789062, - "y": 132.7209930419922 - }, - { - "x": 231.10400390625, - "y": 138.5 - }, - { - "x": 227.7169952392578, - "y": 144.19200134277344 - }, - { - "x": 224.18299865722656, - "y": 149.79299926757812 - }, - { - "x": 220.5030059814453, - "y": 155.3000030517578 - }, - { - "x": 216.68099975585938, - "y": 160.70899963378906 - }, - { - "x": 212.71800231933594, - "y": 166.01600646972656 - }, - { - "x": 208.61700439453125, - "y": 171.21800231933594 - }, - { - "x": 204.3820037841797, - "y": 176.30999755859375 + "x": 207.62899780273438, + "y": 53.582000732421875 }, { - "x": 200.01499938964844, - "y": 181.2899932861328 + "x": 205.18499755859375, + "y": 63.76300048828125 }, { - "x": 195.5189971923828, - "y": 186.1529998779297 + "x": 202.21099853515625, + "y": 73.8030014038086 }, { - "x": 190.8979949951172, - "y": 190.8979949951172 + "x": 198.71600341796875, + "y": 83.6729965209961 }, { - "x": 186.1529998779297, - "y": 195.5189971923828 + "x": 194.70899963378906, + "y": 93.34700012207031 }, { - "x": 181.2899932861328, - "y": 200.01499938964844 + "x": 190.2010040283203, + "y": 102.7979965209961 }, { - "x": 176.30999755859375, - "y": 204.3820037841797 + "x": 185.2050018310547, + "y": 111.9990005493164 }, { - "x": 171.21800231933594, - "y": 208.61700439453125 + "x": 179.73399353027344, + "y": 120.927001953125 }, { - "x": 166.01600646972656, - "y": 212.71800231933594 + "x": 173.80299377441406, + "y": 129.5570068359375 }, { - "x": 160.70899963378906, - "y": 216.68099975585938 + "x": 167.4290008544922, + "y": 137.86399841308594 }, { - "x": 155.3000030517578, - "y": 220.5030059814453 + "x": 160.6280059814453, + "y": 145.8260040283203 }, { - "x": 149.79299926757812, - "y": 224.18299865722656 + "x": 153.42100524902344, + "y": 153.42100524902344 }, { - "x": 144.19200134277344, - "y": 227.7169952392578 + "x": 145.8260040283203, + "y": 160.6280059814453 }, { - "x": 138.5, - "y": 231.10400390625 + "x": 137.86399841308594, + "y": 167.4290008544922 }, { - "x": 132.7209930419922, - "y": 234.33999633789062 + "x": 129.5570068359375, + "y": 173.80299377441406 }, { - "x": 126.85900115966797, - "y": 237.4239959716797 + "x": 120.927001953125, + "y": 179.73399353027344 }, { - "x": 120.91899871826172, - "y": 240.35400390625 + "x": 112, + "y": 185.2050018310547 }, { - "x": 114.90399932861328, - "y": 243.1269989013672 + "x": 102.7979965209961, + "y": 190.2010040283203 }, { - "x": 108.81800079345703, - "y": 245.74099731445312 + "x": 93.34700012207031, + "y": 194.70899963378906 }, { - "x": 102.66699981689453, - "y": 248.19500732421875 + "x": 83.6729965209961, + "y": 198.71600341796875 }, { - "x": 96.4530029296875, - "y": 250.48800659179688 + "x": 73.8030014038086, + "y": 202.21099853515625 }, { - "x": 90.18099975585938, - "y": 252.61700439453125 + "x": 63.76300048828125, + "y": 205.18499755859375 }, { - "x": 83.8550033569336, - "y": 254.58099365234375 + "x": 53.582000732421875, + "y": 207.62899780273438 }, { - "x": 77.48100280761719, - "y": 256.3789978027344 - }, - { - "x": 71.06099700927734, - "y": 258.0090026855469 - }, - { - "x": 64.60099792480469, - "y": 259.47100830078125 - }, - { - "x": 58.10499954223633, - "y": 260.76300048828125 - }, - { - "x": 51.57699966430664, - "y": 261.885009765625 - }, - { - "x": 45.02299880981445, - "y": 262.8349914550781 - }, - { - "x": 38.44499969482422, - "y": 263.614013671875 - }, - { - "x": 31.850000381469727, - "y": 264.2200012207031 - }, - { - "x": 25.239999771118164, - "y": 264.65301513671875 - }, - { - "x": 18.621999740600586, - "y": 264.9129943847656 - }, - { - "x": 12, - "y": 265 + "x": 43.2859992980957, + "y": 209.53700256347656 } ], "isCurve": true, @@ -1092,248 +796,100 @@ "link": "", "route": [ { - "x": 12, - "y": 265 - }, - { - "x": 5.376999855041504, - "y": 264.9129943847656 - }, - { - "x": -1.2400000095367432, - "y": 264.65301513671875 - }, - { - "x": -7.849999904632568, - "y": 264.2200012207031 - }, - { - "x": -14.444999694824219, - "y": 263.614013671875 - }, - { - "x": -21.023000717163086, - "y": 262.8349914550781 - }, - { - "x": -27.57699966430664, - "y": 261.885009765625 - }, - { - "x": -34.10499954223633, - "y": 260.76300048828125 - }, - { - "x": -40.60100173950195, - "y": 259.47100830078125 - }, - { - "x": -47.06100082397461, - "y": 258.0090026855469 - }, - { - "x": -53.48099899291992, - "y": 256.3789978027344 - }, - { - "x": -59.85499954223633, - "y": 254.58099365234375 - }, - { - "x": -66.18099975585938, - "y": 252.61700439453125 - }, - { - "x": -72.4530029296875, - "y": 250.48800659179688 - }, - { - "x": -78.66699981689453, - "y": 248.19500732421875 - }, - { - "x": -84.81800079345703, - "y": 245.74099731445312 - }, - { - "x": -90.90399932861328, - "y": 243.1269989013672 - }, - { - "x": -96.91899871826172, - "y": 240.35400390625 - }, - { - "x": -102.85900115966797, - "y": 237.4239959716797 - }, - { - "x": -108.72100067138672, - "y": 234.33999633789062 - }, - { - "x": -114.4990005493164, - "y": 231.10400390625 - }, - { - "x": -120.19200134277344, - "y": 227.7169952392578 - }, - { - "x": -125.79299926757812, - "y": 224.18299865722656 - }, - { - "x": -131.3000030517578, - "y": 220.5030059814453 - }, - { - "x": -136.70899963378906, - "y": 216.68099975585938 - }, - { - "x": -142.01600646972656, - "y": 212.71800231933594 - }, - { - "x": -147.21800231933594, - "y": 208.61700439453125 - }, - { - "x": -152.30999755859375, - "y": 204.3820037841797 - }, - { - "x": -157.2899932861328, - "y": 200.01499938964844 - }, - { - "x": -162.1529998779297, - "y": 195.5189971923828 - }, - { - "x": -166.8979949951172, - "y": 190.8979949951172 - }, - { - "x": -171.5189971923828, - "y": 186.1529998779297 - }, - { - "x": -176.01499938964844, - "y": 181.2899932861328 - }, - { - "x": -180.3820037841797, - "y": 176.30999755859375 - }, - { - "x": -184.61700439453125, - "y": 171.21800231933594 + "x": -19.285999298095703, + "y": 209.53700256347656 }, { - "x": -188.71800231933594, - "y": 166.01600646972656 + "x": -29.582000732421875, + "y": 207.62899780273438 }, { - "x": -192.68099975585938, - "y": 160.70899963378906 + "x": -39.76300048828125, + "y": 205.18499755859375 }, { - "x": -196.5030059814453, - "y": 155.3000030517578 + "x": -49.803001403808594, + "y": 202.21099853515625 }, { - "x": -200.18299865722656, - "y": 149.79299926757812 + "x": -59.67300033569336, + "y": 198.71600341796875 }, { - "x": -203.7169952392578, - "y": 144.19200134277344 + "x": -69.34700012207031, + "y": 194.70899963378906 }, { - "x": -207.10400390625, - "y": 138.5 + "x": -78.7979965209961, + "y": 190.2010040283203 }, { - "x": -210.33999633789062, - "y": 132.7209930419922 + "x": -87.9990005493164, + "y": 185.2050018310547 }, { - "x": -213.4239959716797, - "y": 126.85900115966797 + "x": -96.927001953125, + "y": 179.73399353027344 }, { - "x": -216.35400390625, - "y": 120.91899871826172 + "x": -105.55699920654297, + "y": 173.80299377441406 }, { - "x": -219.1269989013672, - "y": 114.90399932861328 + "x": -113.86399841308594, + "y": 167.4290008544922 }, { - "x": -221.74099731445312, - "y": 108.81800079345703 + "x": -121.82599639892578, + "y": 160.6280059814453 }, { - "x": -224.19500732421875, - "y": 102.66699981689453 + "x": -129.42100524902344, + "y": 153.42100524902344 }, { - "x": -226.48800659179688, - "y": 96.4530029296875 + "x": -136.6280059814453, + "y": 145.8260040283203 }, { - "x": -228.61700439453125, - "y": 90.18099975585938 + "x": -143.4290008544922, + "y": 137.86399841308594 }, { - "x": -230.58099365234375, - "y": 83.8550033569336 + "x": -149.80299377441406, + "y": 129.5570068359375 }, { - "x": -232.37899780273438, - "y": 77.48100280761719 + "x": -155.73399353027344, + "y": 120.927001953125 }, { - "x": -234.00900268554688, - "y": 71.06099700927734 + "x": -161.2050018310547, + "y": 112 }, { - "x": -235.4709930419922, - "y": 64.60099792480469 + "x": -166.2010040283203, + "y": 102.7979965209961 }, { - "x": -236.76300048828125, - "y": 58.10499954223633 + "x": -170.70899963378906, + "y": 93.34700012207031 }, { - "x": -237.88499450683594, - "y": 51.57699966430664 + "x": -174.71600341796875, + "y": 83.6729965209961 }, { - "x": -238.8350067138672, - "y": 45.02299880981445 + "x": -178.21099853515625, + "y": 73.8030014038086 }, { - "x": -239.61399841308594, - "y": 38.44499969482422 + "x": -181.18499755859375, + "y": 63.76300048828125 }, { - "x": -240.22000122070312, - "y": 31.850000381469727 - }, - { - "x": -240.6529998779297, - "y": 25.239999771118164 - }, - { - "x": -240.91299438476562, - "y": 18.621999740600586 - }, - { - "x": -241, - "y": 12 + "x": -183.62899780273438, + "y": 53.582000732421875 } ], "isCurve": true, @@ -1368,248 +924,108 @@ "link": "", "route": [ { - "x": 485.5, - "y": -191 - }, - { - "x": 494.3290100097656, - "y": -190.84500122070312 - }, - { - "x": 503.14801025390625, - "y": -190.38299560546875 - }, - { - "x": 511.94500732421875, - "y": -189.61399841308594 - }, - { - "x": 520.7100219726562, - "y": -188.53700256347656 - }, - { - "x": 529.4320068359375, - "y": -187.156005859375 - }, - { - "x": 538.1010131835938, - "y": -185.4709930419922 - }, - { - "x": 546.7059936523438, - "y": -183.48399353027344 - }, - { - "x": 555.2360229492188, - "y": -181.19900512695312 - }, - { - "x": 563.6810302734375, - "y": -178.61700439453125 - }, - { - "x": 572.031005859375, - "y": -175.74200439453125 + "x": 513.333984375, + "y": -136.05299377441406 }, { - "x": 580.2750244140625, - "y": -172.57699584960938 + "x": 527.0819702148438, + "y": -133.62899780273438 }, { - "x": 588.4039916992188, - "y": -169.1269989013672 + "x": 540.6270141601562, + "y": -130.2519989013672 }, { - "x": 596.406982421875, - "y": -165.3939971923828 + "x": 553.9039916992188, + "y": -125.93800354003906 }, { - "x": 604.2760009765625, - "y": -161.38499450683594 + "x": 566.8469848632812, + "y": -120.70899963378906 }, { - "x": 612, - "y": -157.10400390625 + "x": 579.3939819335938, + "y": -114.58899688720703 }, { - "x": 619.5689697265625, - "y": -152.55599975585938 + "x": 591.4829711914062, + "y": -107.60900115966797 }, { - "x": 626.9749755859375, - "y": -147.74600219726562 + "x": 603.0570068359375, + "y": -99.8030014038086 }, { - "x": 634.208984375, - "y": -142.68099975585938 + "x": 614.0570068359375, + "y": -91.20800018310547 }, { - "x": 641.2620239257812, - "y": -137.36599731445312 + "x": 624.4310302734375, + "y": -81.86699676513672 }, { - "x": 648.125, - "y": -131.8090057373047 + "x": 634.1279907226562, + "y": -71.82599639892578 }, { - "x": 654.7899780273438, - "y": -126.01499938964844 + "x": 643.1019897460938, + "y": -61.13199996948242 }, { - "x": 661.2479858398438, - "y": -119.99199676513672 + "x": 651.3070068359375, + "y": -49.8380012512207 }, { - "x": 667.4920043945312, - "y": -113.74800109863281 + "x": 658.7050170898438, + "y": -38 }, { - "x": 673.5150146484375, - "y": -107.29000091552734 + "x": 665.2579956054688, + "y": -25.673999786376953 }, { - "x": 679.3090209960938, - "y": -100.625 + "x": 670.9359741210938, + "y": -12.920999526977539 }, { - "x": 684.8660278320312, - "y": -93.76200103759766 + "x": 675.7109985351562, + "y": 0.19599999487400055 }, { - "x": 690.1810302734375, - "y": -86.70899963378906 + "x": 679.5590209960938, + "y": 13.614999771118164 }, { - "x": 695.2459716796875, - "y": -79.4749984741211 + "x": 682.4609985351562, + "y": 27.270000457763672 }, { - "x": 700.0560302734375, - "y": -72.06900024414062 + "x": 684.4039916992188, + "y": 41.09400177001953 }, { - "x": 704.60400390625, - "y": -64.5 + "x": 685.3779907226562, + "y": 55.02000045776367 }, { - "x": 708.885009765625, - "y": -56.7760009765625 + "x": 685.3779907226562, + "y": 68.97899627685547 }, { - "x": 712.8939819335938, - "y": -48.90700149536133 + "x": 684.4039916992188, + "y": 82.90499877929688 }, { - "x": 716.6270141601562, - "y": -40.90399932861328 + "x": 682.4609985351562, + "y": 96.72899627685547 }, { - "x": 720.0770263671875, - "y": -32.775001525878906 + "x": 679.5590209960938, + "y": 110.38400268554688 }, { - "x": 723.2420043945312, - "y": -24.5310001373291 - }, - { - "x": 726.1170043945312, - "y": -16.180999755859375 - }, - { - "x": 728.698974609375, - "y": -7.736000061035156 - }, - { - "x": 730.9840087890625, - "y": 0.7929999828338623 - }, - { - "x": 732.9710083007812, - "y": 9.39799976348877 - }, - { - "x": 734.656005859375, - "y": 18.066999435424805 - }, - { - "x": 736.0369873046875, - "y": 26.788999557495117 - }, - { - "x": 737.114013671875, - "y": 35.55400085449219 - }, - { - "x": 737.8829956054688, - "y": 44.35100173950195 - }, - { - "x": 738.344970703125, - "y": 53.16999816894531 - }, - { - "x": 738.5, - "y": 61.999000549316406 - }, - { - "x": 738.344970703125, - "y": 70.8290023803711 - }, - { - "x": 737.8829956054688, - "y": 79.64800262451172 - }, - { - "x": 737.114013671875, - "y": 88.44499969482422 - }, - { - "x": 736.0369873046875, - "y": 97.20999908447266 - }, - { - "x": 734.656005859375, - "y": 105.93199920654297 - }, - { - "x": 732.9710083007812, - "y": 114.60099792480469 - }, - { - "x": 730.9840087890625, - "y": 123.20600128173828 - }, - { - "x": 728.698974609375, - "y": 131.73599243164062 - }, - { - "x": 726.1170043945312, - "y": 140.18099975585938 - }, - { - "x": 723.2420043945312, - "y": 148.531005859375 - }, - { - "x": 720.0770263671875, - "y": 156.77499389648438 - }, - { - "x": 716.6270141601562, - "y": 164.9040069580078 - }, - { - "x": 712.8939819335938, - "y": 172.90699768066406 - }, - { - "x": 708.885009765625, - "y": 180.7760009765625 - }, - { - "x": 704.60400390625, - "y": 188.49899291992188 + "x": 675.7109985351562, + "y": 123.8030014038086 } ], "isCurve": true, @@ -1644,248 +1060,104 @@ "link": "", "route": [ { - "x": 704.60400390625, - "y": 188.49899291992188 - }, - { - "x": 700.0560302734375, - "y": 196.06900024414062 - }, - { - "x": 695.2459716796875, - "y": 203.47500610351562 - }, - { - "x": 690.1810302734375, - "y": 210.70899963378906 - }, - { - "x": 684.8660278320312, - "y": 217.76199340820312 - }, - { - "x": 679.3090209960938, - "y": 224.625 - }, - { - "x": 673.5150146484375, - "y": 231.2899932861328 - }, - { - "x": 667.4920043945312, - "y": 237.7480010986328 - }, - { - "x": 661.2479858398438, - "y": 243.99200439453125 - }, - { - "x": 654.7899780273438, - "y": 250.01499938964844 - }, - { - "x": 648.125, - "y": 255.8090057373047 - }, - { - "x": 641.2620239257812, - "y": 261.3659973144531 - }, - { - "x": 634.208984375, - "y": 266.6809997558594 - }, - { - "x": 626.9749755859375, - "y": 271.7460021972656 - }, - { - "x": 619.5689697265625, - "y": 276.5559997558594 - }, - { - "x": 612, - "y": 281.10400390625 - }, - { - "x": 604.2760009765625, - "y": 285.385009765625 - }, - { - "x": 596.406982421875, - "y": 289.3940124511719 + "x": 634.1279907226562, + "y": 195.8260040283203 }, { - "x": 588.4039916992188, - "y": 293.12701416015625 + "x": 624.4310302734375, + "y": 205.86700439453125 }, { - "x": 580.2750244140625, - "y": 296.5769958496094 + "x": 614.0570068359375, + "y": 215.20799255371094 }, { - "x": 572.031005859375, - "y": 299.74200439453125 + "x": 603.0570068359375, + "y": 223.80299377441406 }, { - "x": 563.6810302734375, - "y": 302.61700439453125 + "x": 591.4829711914062, + "y": 231.60899353027344 }, { - "x": 555.2360229492188, - "y": 305.1990051269531 + "x": 579.3939819335938, + "y": 238.58900451660156 }, { - "x": 546.7059936523438, - "y": 307.4840087890625 + "x": 566.8469848632812, + "y": 244.70899963378906 }, { - "x": 538.1010131835938, - "y": 309.47100830078125 + "x": 553.9039916992188, + "y": 249.93800354003906 }, { - "x": 529.4320068359375, - "y": 311.156005859375 + "x": 540.6270141601562, + "y": 254.2519989013672 }, { - "x": 520.7100219726562, - "y": 312.5369873046875 + "x": 527.0819702148438, + "y": 257.6289978027344 }, { - "x": 511.94500732421875, - "y": 313.614013671875 + "x": 513.333984375, + "y": 260.0530090332031 }, { - "x": 503.14801025390625, - "y": 314.38299560546875 - }, - { - "x": 494.3290100097656, - "y": 314.8450012207031 + "x": 499.45098876953125, + "y": 261.5119934082031 }, { "x": 485.5, - "y": 315 - }, - { - "x": 476.6700134277344, - "y": 314.8450012207031 - }, - { - "x": 467.85101318359375, - "y": 314.38299560546875 - }, - { - "x": 459.0539855957031, - "y": 313.614013671875 - }, - { - "x": 450.28900146484375, - "y": 312.5369873046875 - }, - { - "x": 441.5669860839844, - "y": 311.156005859375 - }, - { - "x": 432.89801025390625, - "y": 309.47100830078125 - }, - { - "x": 424.2929992675781, - "y": 307.4840087890625 - }, - { - "x": 415.76300048828125, - "y": 305.1990051269531 + "y": 262 }, { - "x": 407.3179931640625, - "y": 302.61700439453125 + "x": 471.5480041503906, + "y": 261.5119934082031 }, { - "x": 398.9679870605469, - "y": 299.74200439453125 + "x": 457.6650085449219, + "y": 260.0530090332031 }, { - "x": 390.7239990234375, - "y": 296.5769958496094 + "x": 443.9169921875, + "y": 257.6289978027344 }, { - "x": 382.5950012207031, - "y": 293.12701416015625 + "x": 430.37200927734375, + "y": 254.2519989013672 }, { - "x": 374.5920104980469, - "y": 289.3940124511719 + "x": 417.0950012207031, + "y": 249.93800354003906 }, { - "x": 366.7229919433594, - "y": 285.385009765625 + "x": 404.1520080566406, + "y": 244.70899963378906 }, { - "x": 359, - "y": 281.10400390625 + "x": 391.6050109863281, + "y": 238.58900451660156 }, { - "x": 351.42999267578125, - "y": 276.5559997558594 + "x": 379.5159912109375, + "y": 231.60899353027344 }, { - "x": 344.02398681640625, - "y": 271.7460021972656 + "x": 367.9419860839844, + "y": 223.80299377441406 }, { - "x": 336.7900085449219, - "y": 266.6809997558594 + "x": 356.9419860839844, + "y": 215.20799255371094 }, { - "x": 329.73699951171875, - "y": 261.3659973144531 + "x": 346.5679931640625, + "y": 205.86700439453125 }, { - "x": 322.8739929199219, - "y": 255.8090057373047 - }, - { - "x": 316.2090148925781, - "y": 250.01499938964844 - }, - { - "x": 309.7510070800781, - "y": 243.99200439453125 - }, - { - "x": 303.5069885253906, - "y": 237.7480010986328 - }, - { - "x": 297.4840087890625, - "y": 231.2899932861328 - }, - { - "x": 291.69000244140625, - "y": 224.625 - }, - { - "x": 286.13299560546875, - "y": 217.76199340820312 - }, - { - "x": 280.8179931640625, - "y": 210.70899963378906 - }, - { - "x": 275.75299072265625, - "y": 203.47500610351562 - }, - { - "x": 270.9429931640625, - "y": 196.06900024414062 - }, - { - "x": 266.3949890136719, - "y": 188.5 + "x": 336.8710021972656, + "y": 195.8260040283203 } ], "isCurve": true, @@ -1920,248 +1192,112 @@ "link": "", "route": [ { - "x": 904.9099731445312, - "y": -241 - }, - { - "x": 918.1510009765625, - "y": -240.6529998779297 - }, - { - "x": 931.35498046875, - "y": -239.61399841308594 - }, - { - "x": 944.4879760742188, - "y": -237.88499450683594 - }, - { - "x": 957.510986328125, - "y": -235.4709930419922 - }, - { - "x": 970.3909912109375, - "y": -232.37899780273438 - }, - { - "x": 983.0910034179688, - "y": -228.61700439453125 - }, - { - "x": 995.5770263671875, - "y": -224.19500732421875 + "x": 946.4920043945312, + "y": -183.62899780273438 }, { - "x": 1007.8140258789062, - "y": -219.1269989013672 + "x": 966.7130126953125, + "y": -178.21099853515625 }, { - "x": 1019.7689819335938, - "y": -213.4239959716797 + "x": 986.2570190429688, + "y": -170.70899963378906 }, { - "x": 1031.4100341796875, - "y": -207.10400390625 + "x": 1004.9099731445312, + "y": -161.2050018310547 }, { - "x": 1042.7030029296875, - "y": -200.18299865722656 + "x": 1022.4669799804688, + "y": -149.80299377441406 }, { - "x": 1053.6190185546875, - "y": -192.68099975585938 + "x": 1038.7359619140625, + "y": -136.6280059814453 }, { - "x": 1064.1280517578125, - "y": -184.61700439453125 + "x": 1053.5389404296875, + "y": -121.82599639892578 }, { - "x": 1074.199951171875, - "y": -176.01499938964844 + "x": 1066.7130126953125, + "y": -105.55699920654297 }, { - "x": 1083.8079833984375, - "y": -166.8979949951172 + "x": 1078.114990234375, + "y": -88 }, { - "x": 1092.925048828125, - "y": -157.2899932861328 + "x": 1087.6190185546875, + "y": -69.34700012207031 }, { - "x": 1101.5279541015625, - "y": -147.21800231933594 + "x": 1095.1209716796875, + "y": -49.803001403808594 }, { - "x": 1109.5909423828125, - "y": -136.70899963378906 + "x": 1100.5389404296875, + "y": -29.582000732421875 }, { - "x": 1117.093017578125, - "y": -125.79299926757812 + "x": 1103.81396484375, + "y": -8.904999732971191 }, { - "x": 1124.0140380859375, - "y": -114.5 - }, - { - "x": 1130.333984375, - "y": -102.85900115966797 - }, - { - "x": 1136.0369873046875, - "y": -90.90399932861328 - }, - { - "x": 1141.10595703125, - "y": -78.66699981689453 - }, - { - "x": 1145.5269775390625, - "y": -66.18099975585938 - }, - { - "x": 1149.2889404296875, - "y": -53.48099899291992 - }, - { - "x": 1152.3809814453125, - "y": -40.60100173950195 - }, - { - "x": 1154.7950439453125, - "y": -27.57699966430664 - }, - { - "x": 1156.5240478515625, - "y": -14.444999694824219 - }, - { - "x": 1157.56298828125, - "y": -1.2400000095367432 - }, - { - "x": 1157.9100341796875, + "x": 1104.9100341796875, "y": 12 }, { - "x": 1157.56298828125, - "y": 25.239999771118164 - }, - { - "x": 1156.5240478515625, - "y": 38.44499969482422 - }, - { - "x": 1154.7950439453125, - "y": 51.57699966430664 - }, - { - "x": 1152.3809814453125, - "y": 64.60099792480469 - }, - { - "x": 1149.2889404296875, - "y": 77.48100280761719 - }, - { - "x": 1145.5269775390625, - "y": 90.18099975585938 - }, - { - "x": 1141.10595703125, - "y": 102.66699981689453 - }, - { - "x": 1136.0369873046875, - "y": 114.90399932861328 - }, - { - "x": 1130.333984375, - "y": 126.85900115966797 - }, - { - "x": 1124.0140380859375, - "y": 138.49899291992188 - }, - { - "x": 1117.093017578125, - "y": 149.79299926757812 - }, - { - "x": 1109.5909423828125, - "y": 160.70899963378906 - }, - { - "x": 1101.5279541015625, - "y": 171.21800231933594 - }, - { - "x": 1092.925048828125, - "y": 181.2899932861328 - }, - { - "x": 1083.8079833984375, - "y": 190.8979949951172 - }, - { - "x": 1074.199951171875, - "y": 200.01499938964844 - }, - { - "x": 1064.1280517578125, - "y": 208.61700439453125 - }, - { - "x": 1053.6190185546875, - "y": 216.68099975585938 + "x": 1103.81396484375, + "y": 32.904998779296875 }, { - "x": 1042.7030029296875, - "y": 224.18299865722656 + "x": 1100.5389404296875, + "y": 53.582000732421875 }, { - "x": 1031.4100341796875, - "y": 231.10400390625 + "x": 1095.1209716796875, + "y": 73.8030014038086 }, { - "x": 1019.7689819335938, - "y": 237.4239959716797 + "x": 1087.6190185546875, + "y": 93.34700012207031 }, { - "x": 1007.8140258789062, - "y": 243.1269989013672 + "x": 1078.114990234375, + "y": 111.9990005493164 }, { - "x": 995.5770263671875, - "y": 248.19500732421875 + "x": 1066.7130126953125, + "y": 129.5570068359375 }, { - "x": 983.0910034179688, - "y": 252.61700439453125 + "x": 1053.5389404296875, + "y": 145.8260040283203 }, { - "x": 970.3909912109375, - "y": 256.3789978027344 + "x": 1038.7359619140625, + "y": 160.6280059814453 }, { - "x": 957.510986328125, - "y": 259.47100830078125 + "x": 1022.4669799804688, + "y": 173.80299377441406 }, { - "x": 944.4879760742188, - "y": 261.885009765625 + "x": 1004.9099731445312, + "y": 185.2050018310547 }, { - "x": 931.35498046875, - "y": 263.614013671875 + "x": 986.2570190429688, + "y": 194.70899963378906 }, { - "x": 918.1510009765625, - "y": 264.65301513671875 + "x": 966.7130126953125, + "y": 202.21099853515625 }, { - "x": 904.9099731445312, - "y": 265 + "x": 946.4920043945312, + "y": 207.62899780273438 } ], "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 89895e2c35..f5afaee6a7 100644 --- a/e2etests/testdata/txtar/cycle-diagram/elk/sketch.exp.svg +++ b/e2etests/testdata/txtar/cycle-diagram/elk/sketch.exp.svg @@ -1,9 +1,9 @@ -abcdabcab - + .d2-2409080064 .fill-N1{fill:#0A0F25;} + .d2-2409080064 .fill-N2{fill:#676C7E;} + .d2-2409080064 .fill-N3{fill:#9499AB;} + .d2-2409080064 .fill-N4{fill:#CFD2DD;} + .d2-2409080064 .fill-N5{fill:#DEE1EB;} + .d2-2409080064 .fill-N6{fill:#EEF1F8;} + .d2-2409080064 .fill-N7{fill:#FFFFFF;} + .d2-2409080064 .fill-B1{fill:#0D32B2;} + .d2-2409080064 .fill-B2{fill:#0D32B2;} + .d2-2409080064 .fill-B3{fill:#E3E9FD;} + .d2-2409080064 .fill-B4{fill:#E3E9FD;} + .d2-2409080064 .fill-B5{fill:#EDF0FD;} + .d2-2409080064 .fill-B6{fill:#F7F8FE;} + .d2-2409080064 .fill-AA2{fill:#4A6FF3;} + .d2-2409080064 .fill-AA4{fill:#EDF0FD;} + .d2-2409080064 .fill-AA5{fill:#F7F8FE;} + .d2-2409080064 .fill-AB4{fill:#EDF0FD;} + .d2-2409080064 .fill-AB5{fill:#F7F8FE;} + .d2-2409080064 .stroke-N1{stroke:#0A0F25;} + .d2-2409080064 .stroke-N2{stroke:#676C7E;} + .d2-2409080064 .stroke-N3{stroke:#9499AB;} + .d2-2409080064 .stroke-N4{stroke:#CFD2DD;} + .d2-2409080064 .stroke-N5{stroke:#DEE1EB;} + .d2-2409080064 .stroke-N6{stroke:#EEF1F8;} + .d2-2409080064 .stroke-N7{stroke:#FFFFFF;} + .d2-2409080064 .stroke-B1{stroke:#0D32B2;} + .d2-2409080064 .stroke-B2{stroke:#0D32B2;} + .d2-2409080064 .stroke-B3{stroke:#E3E9FD;} + .d2-2409080064 .stroke-B4{stroke:#E3E9FD;} + .d2-2409080064 .stroke-B5{stroke:#EDF0FD;} + .d2-2409080064 .stroke-B6{stroke:#F7F8FE;} + .d2-2409080064 .stroke-AA2{stroke:#4A6FF3;} + .d2-2409080064 .stroke-AA4{stroke:#EDF0FD;} + .d2-2409080064 .stroke-AA5{stroke:#F7F8FE;} + .d2-2409080064 .stroke-AB4{stroke:#EDF0FD;} + .d2-2409080064 .stroke-AB5{stroke:#F7F8FE;} + .d2-2409080064 .background-color-N1{background-color:#0A0F25;} + .d2-2409080064 .background-color-N2{background-color:#676C7E;} + .d2-2409080064 .background-color-N3{background-color:#9499AB;} + .d2-2409080064 .background-color-N4{background-color:#CFD2DD;} + .d2-2409080064 .background-color-N5{background-color:#DEE1EB;} + .d2-2409080064 .background-color-N6{background-color:#EEF1F8;} + .d2-2409080064 .background-color-N7{background-color:#FFFFFF;} + .d2-2409080064 .background-color-B1{background-color:#0D32B2;} + .d2-2409080064 .background-color-B2{background-color:#0D32B2;} + .d2-2409080064 .background-color-B3{background-color:#E3E9FD;} + .d2-2409080064 .background-color-B4{background-color:#E3E9FD;} + .d2-2409080064 .background-color-B5{background-color:#EDF0FD;} + .d2-2409080064 .background-color-B6{background-color:#F7F8FE;} + .d2-2409080064 .background-color-AA2{background-color:#4A6FF3;} + .d2-2409080064 .background-color-AA4{background-color:#EDF0FD;} + .d2-2409080064 .background-color-AA5{background-color:#F7F8FE;} + .d2-2409080064 .background-color-AB4{background-color:#EDF0FD;} + .d2-2409080064 .background-color-AB5{background-color:#F7F8FE;} + .d2-2409080064 .color-N1{color:#0A0F25;} + .d2-2409080064 .color-N2{color:#676C7E;} + .d2-2409080064 .color-N3{color:#9499AB;} + .d2-2409080064 .color-N4{color:#CFD2DD;} + .d2-2409080064 .color-N5{color:#DEE1EB;} + .d2-2409080064 .color-N6{color:#EEF1F8;} + .d2-2409080064 .color-N7{color:#FFFFFF;} + .d2-2409080064 .color-B1{color:#0D32B2;} + .d2-2409080064 .color-B2{color:#0D32B2;} + .d2-2409080064 .color-B3{color:#E3E9FD;} + .d2-2409080064 .color-B4{color:#E3E9FD;} + .d2-2409080064 .color-B5{color:#EDF0FD;} + .d2-2409080064 .color-B6{color:#F7F8FE;} + .d2-2409080064 .color-AA2{color:#4A6FF3;} + .d2-2409080064 .color-AA4{color:#EDF0FD;} + .d2-2409080064 .color-AA5{color:#F7F8FE;} + .d2-2409080064 .color-AB4{color:#EDF0FD;} + .d2-2409080064 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker-d2-2409080064);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker-d2-2409080064);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright-d2-2409080064);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright-d2-2409080064);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright-d2-2409080064);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright-d2-2409080064);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark-d2-2409080064);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright-d2-2409080064);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright-d2-2409080064);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright-d2-2409080064);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright-d2-2409080064);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker-d2-2409080064);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark-d2-2409080064);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal-d2-2409080064);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal-d2-2409080064);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright-d2-2409080064);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright-d2-2409080064);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright-d2-2409080064);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>abcdabcab + From 509a344277d4c1d6e543f4ae98dc097a5b26847d Mon Sep 17 00:00:00 2001 From: Mayank77maruti Date: Fri, 21 Feb 2025 17:31:43 +0000 Subject: [PATCH 06/73] iteration 5 --- d2layouts/d2cycle/layout.go | 41 ++----------------------------------- 1 file changed, 2 insertions(+), 39 deletions(-) diff --git a/d2layouts/d2cycle/layout.go b/d2layouts/d2cycle/layout.go index b8a2f964c0..559bd0b3a4 100644 --- a/d2layouts/d2cycle/layout.go +++ b/d2layouts/d2cycle/layout.go @@ -14,27 +14,22 @@ const ( MIN_RADIUS = 200 PADDING = 20 MIN_SEGMENT_LEN = 10 - ARC_STEPS = 30 // high resolution for smooth arcs + ARC_STEPS = 30 ) -// Layout arranges nodes in a circle, ensures label/icon positions are set, -// then routes edges with arcs that get clipped at node borders. func Layout(ctx context.Context, g *d2graph.Graph, layout d2graph.LayoutGraph) error { objects := g.Root.ChildrenArray if len(objects) == 0 { return nil } - // Ensure every object that has label/icon also has a default position for _, obj := range g.Objects { positionLabelsIcons(obj) } - // Arrange objects in a circle radius := calculateRadius(objects) positionObjects(objects, radius) - // Create arcs for each edge for _, edge := range g.Edges { createCircularArc(edge) } @@ -49,22 +44,19 @@ func calculateRadius(objects []*d2graph.Object) float64 { size := math.Max(obj.Box.Width, obj.Box.Height) maxSize = math.Max(maxSize, size) } - // Ensure enough radius to fit all objects minRadius := (maxSize/2.0 + PADDING) / math.Sin(math.Pi/numObjects) return math.Max(minRadius, MIN_RADIUS) } func positionObjects(objects []*d2graph.Object, radius float64) { numObjects := float64(len(objects)) - // Offset so i=0 is top-center angleOffset := -math.Pi / 2 for i, obj := range objects { - angle := angleOffset + (2 * math.Pi * float64(i) / numObjects) + angle := angleOffset + (2*math.Pi*float64(i)/numObjects) x := radius * math.Cos(angle) y := radius * math.Sin(angle) - // Center the box at (x, y) obj.TopLeft = geo.NewPoint( x-obj.Box.Width/2, y-obj.Box.Height/2, @@ -72,9 +64,6 @@ func positionObjects(objects []*d2graph.Object, radius float64) { } } -// createCircularArc samples a smooth arc from center to center, -// then forces the endpoints onto each shape's border by clamping them -// using the box intersection helpers. func createCircularArc(edge *d2graph.Edge) { if edge.Src == nil || edge.Dst == nil { return @@ -83,7 +72,6 @@ func createCircularArc(edge *d2graph.Edge) { srcCenter := edge.Src.Center() dstCenter := edge.Dst.Center() - // Compute angles from origin for both nodes srcAngle := math.Atan2(srcCenter.Y, srcCenter.X) dstAngle := math.Atan2(dstCenter.Y, dstCenter.X) if dstAngle < srcAngle { @@ -92,7 +80,6 @@ func createCircularArc(edge *d2graph.Edge) { arcRadius := math.Hypot(srcCenter.X, srcCenter.Y) - // Sample points along the arc path := make([]*geo.Point, 0, ARC_STEPS+1) for i := 0; i <= ARC_STEPS; i++ { t := float64(i) / float64(ARC_STEPS) @@ -101,57 +88,42 @@ func createCircularArc(edge *d2graph.Edge) { y := arcRadius * math.Sin(angle) path = append(path, geo.NewPoint(x, y)) } - // Ensure endpoints start at the centers path[0] = srcCenter path[len(path)-1] = dstCenter - // Clamp the start point to the boundary of the source node startIndex, newSrc := clampPointOutsideBox(edge.Src.Box, path, 0) - // Clamp the end point to the boundary of the destination node endIndex, newDst := clampPointOutsideBoxReverse(edge.Dst.Box, path, len(path)-1) - // Update the endpoints with the clamped intersection points path[0] = newSrc path[len(path)-1] = newDst - // Update the route to only include the valid segment between the clamped indices edge.Route = path[startIndex : endIndex+1] edge.IsCurve = true } -// clampPointOutsideBox walks forward from 'startIdx' until the path segment -// leaves the bounding box. Then it sets path[startIdx] to the intersection. -// If no intersection is found, it returns the original point. func clampPointOutsideBox(box *geo.Box, path []*geo.Point, startIdx int) (int, *geo.Point) { if startIdx >= len(path)-1 { return startIdx, path[startIdx] } - // If the current point is already outside, no clamping is needed. if !boxContains(box, path[startIdx]) { return startIdx, path[startIdx] } - // Walk forward until we leave the box. for i := startIdx + 1; i < len(path); i++ { if boxContains(box, path[i]) { continue } - // Crossing from inside to outside between path[i-1] and path[i] seg := geo.NewSegment(path[i-1], path[i]) inters := boxIntersections(box, *seg) if len(inters) > 0 { return i, inters[0] } - // Fallback if no intersection found return i, path[i] } - // If the entire remaining path is inside, return the last point. last := len(path) - 1 return last, path[last] } -// clampPointOutsideBoxReverse scans backward from endIdx while path[j] is in the box. -// When an outside-to-inside crossing is detected, it returns the intersection. func clampPointOutsideBoxReverse(box *geo.Box, path []*geo.Point, endIdx int) (int, *geo.Point) { if endIdx <= 0 { return endIdx, path[endIdx] @@ -164,7 +136,6 @@ func clampPointOutsideBoxReverse(box *geo.Box, path []*geo.Point, endIdx int) (i if boxContains(box, path[j]) { continue } - // Crossing from outside to inside between path[j] and path[j+1] seg := geo.NewSegment(path[j], path[j+1]) inters := boxIntersections(box, *seg) if len(inters) > 0 { @@ -172,11 +143,9 @@ func clampPointOutsideBoxReverse(box *geo.Box, path []*geo.Point, endIdx int) (i } return j, path[j] } - // If the entire path is inside, return the first point. return 0, path[0] } -// boxContains performs a typical bounding-box check. func boxContains(b *geo.Box, p *geo.Point) bool { return p.X >= b.TopLeft.X && p.X <= b.TopLeft.X+b.Width && @@ -184,15 +153,11 @@ func boxContains(b *geo.Box, p *geo.Point) bool { p.Y <= b.TopLeft.Y+b.Height } -// boxIntersections returns the intersection points between a box and a segment. -// This assumes that geo.Box implements an Intersections method. func boxIntersections(b *geo.Box, seg geo.Segment) []*geo.Point { return b.Intersections(seg) } -// positionLabelsIcons sets default positions for icons and labels if not already specified. func positionLabelsIcons(obj *d2graph.Object) { - // Set default icon position if an icon exists and none is specified. if obj.Icon != nil && obj.IconPosition == nil { if len(obj.ChildrenArray) > 0 { obj.IconPosition = go2.Pointer(label.OutsideTopLeft.String()) @@ -207,7 +172,6 @@ func positionLabelsIcons(obj *d2graph.Object) { } } - // Set default label position if a label exists and none is specified. if obj.HasLabel() && obj.LabelPosition == nil { if len(obj.ChildrenArray) > 0 { obj.LabelPosition = go2.Pointer(label.OutsideTopCenter.String()) @@ -219,7 +183,6 @@ func positionLabelsIcons(obj *d2graph.Object) { obj.LabelPosition = go2.Pointer(label.InsideMiddleCenter.String()) } - // If the label dimensions exceed the object's size, fallback to an outside position. if float64(obj.LabelDimensions.Width) > obj.Width || float64(obj.LabelDimensions.Height) > obj.Height { if len(obj.ChildrenArray) > 0 { From 04825458a8a4a211a110e616ea4ed3ba7840fd13 Mon Sep 17 00:00:00 2001 From: Mayank77maruti Date: Fri, 21 Feb 2025 17:38:14 +0000 Subject: [PATCH 07/73] iteration 6 --- d2layouts/d2cycle/layout.go | 257 ++++++++++++++++++++++++++++++------ 1 file changed, 218 insertions(+), 39 deletions(-) diff --git a/d2layouts/d2cycle/layout.go b/d2layouts/d2cycle/layout.go index 559bd0b3a4..89d9602ec0 100644 --- a/d2layouts/d2cycle/layout.go +++ b/d2layouts/d2cycle/layout.go @@ -1,3 +1,199 @@ +// package d2cycle + +// import ( +// "context" +// "math" + +// "oss.terrastruct.com/d2/d2graph" +// "oss.terrastruct.com/d2/lib/geo" +// "oss.terrastruct.com/d2/lib/label" +// "oss.terrastruct.com/util-go/go2" +// ) + +// const ( +// MIN_RADIUS = 200 +// PADDING = 20 +// MIN_SEGMENT_LEN = 10 +// ARC_STEPS = 30 +// ) + +// func Layout(ctx context.Context, g *d2graph.Graph, layout d2graph.LayoutGraph) error { +// objects := g.Root.ChildrenArray +// if len(objects) == 0 { +// return nil +// } + +// for _, obj := range g.Objects { +// positionLabelsIcons(obj) +// } + +// radius := calculateRadius(objects) +// positionObjects(objects, radius) + +// for _, edge := range g.Edges { +// createCircularArc(edge) +// } + +// return nil +// } + +// func calculateRadius(objects []*d2graph.Object) float64 { +// numObjects := float64(len(objects)) +// maxSize := 0.0 +// for _, obj := range objects { +// size := math.Max(obj.Box.Width, obj.Box.Height) +// maxSize = math.Max(maxSize, size) +// } +// minRadius := (maxSize/2.0 + PADDING) / math.Sin(math.Pi/numObjects) +// return math.Max(minRadius, MIN_RADIUS) +// } + +// func positionObjects(objects []*d2graph.Object, radius float64) { +// numObjects := float64(len(objects)) +// angleOffset := -math.Pi / 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, +// ) +// } +// } + +// func createCircularArc(edge *d2graph.Edge) { +// if edge.Src == nil || edge.Dst == nil { +// return +// } + +// srcCenter := edge.Src.Center() +// dstCenter := edge.Dst.Center() + +// srcAngle := math.Atan2(srcCenter.Y, srcCenter.X) +// dstAngle := math.Atan2(dstCenter.Y, dstCenter.X) +// if dstAngle < srcAngle { +// dstAngle += 2 * math.Pi +// } + +// arcRadius := math.Hypot(srcCenter.X, srcCenter.Y) + +// path := make([]*geo.Point, 0, ARC_STEPS+1) +// 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) +// path = append(path, geo.NewPoint(x, y)) +// } +// path[0] = srcCenter +// path[len(path)-1] = dstCenter + +// startIndex, newSrc := clampPointOutsideBox(edge.Src.Box, path, 0) +// endIndex, newDst := clampPointOutsideBoxReverse(edge.Dst.Box, path, len(path)-1) + +// path[0] = newSrc +// path[len(path)-1] = newDst + +// edge.Route = path[startIndex : endIndex+1] +// edge.IsCurve = true +// } + +// func clampPointOutsideBox(box *geo.Box, path []*geo.Point, startIdx int) (int, *geo.Point) { +// if startIdx >= len(path)-1 { +// return startIdx, path[startIdx] +// } +// if !boxContains(box, path[startIdx]) { +// return startIdx, path[startIdx] +// } + +// for i := startIdx + 1; i < len(path); i++ { +// if boxContains(box, path[i]) { +// continue +// } +// seg := geo.NewSegment(path[i-1], path[i]) +// inters := boxIntersections(box, *seg) +// if len(inters) > 0 { +// return i, inters[0] +// } +// return i, path[i] +// } +// last := len(path) - 1 +// return last, path[last] +// } + +// func clampPointOutsideBoxReverse(box *geo.Box, path []*geo.Point, endIdx int) (int, *geo.Point) { +// if endIdx <= 0 { +// return endIdx, path[endIdx] +// } +// if !boxContains(box, path[endIdx]) { +// return endIdx, path[endIdx] +// } + +// for j := endIdx - 1; j >= 0; j-- { +// if boxContains(box, path[j]) { +// continue +// } +// seg := geo.NewSegment(path[j], path[j+1]) +// inters := boxIntersections(box, *seg) +// if len(inters) > 0 { +// return j, inters[0] +// } +// return j, path[j] +// } +// return 0, path[0] +// } + +// func boxContains(b *geo.Box, p *geo.Point) bool { +// return p.X >= b.TopLeft.X && +// p.X <= b.TopLeft.X+b.Width && +// p.Y >= b.TopLeft.Y && +// p.Y <= b.TopLeft.Y+b.Height +// } + +// func boxIntersections(b *geo.Box, seg geo.Segment) []*geo.Point { +// return b.Intersections(seg) +// } + +// func positionLabelsIcons(obj *d2graph.Object) { +// if obj.Icon != nil && obj.IconPosition == nil { +// if len(obj.ChildrenArray) > 0 { +// obj.IconPosition = go2.Pointer(label.OutsideTopLeft.String()) +// if obj.LabelPosition == nil { +// obj.LabelPosition = go2.Pointer(label.OutsideTopRight.String()) +// return +// } +// } else if obj.SQLTable != nil || obj.Class != nil || obj.Language != "" { +// obj.IconPosition = go2.Pointer(label.OutsideTopLeft.String()) +// } else { +// obj.IconPosition = go2.Pointer(label.InsideMiddleCenter.String()) +// } +// } + +// if obj.HasLabel() && obj.LabelPosition == nil { +// if len(obj.ChildrenArray) > 0 { +// obj.LabelPosition = go2.Pointer(label.OutsideTopCenter.String()) +// } else if obj.HasOutsideBottomLabel() { +// obj.LabelPosition = go2.Pointer(label.OutsideBottomCenter.String()) +// } else if obj.Icon != nil { +// obj.LabelPosition = go2.Pointer(label.InsideTopCenter.String()) +// } else { +// obj.LabelPosition = go2.Pointer(label.InsideMiddleCenter.String()) +// } + +// if float64(obj.LabelDimensions.Width) > obj.Width || +// float64(obj.LabelDimensions.Height) > obj.Height { +// if len(obj.ChildrenArray) > 0 { +// obj.LabelPosition = go2.Pointer(label.OutsideTopCenter.String()) +// } else { +// obj.LabelPosition = go2.Pointer(label.OutsideBottomCenter.String()) +// } +// } +// } +// } + package d2cycle import ( @@ -22,18 +218,14 @@ func Layout(ctx context.Context, g *d2graph.Graph, layout d2graph.LayoutGraph) e if len(objects) == 0 { return nil } - for _, obj := range g.Objects { positionLabelsIcons(obj) } - radius := calculateRadius(objects) positionObjects(objects, radius) - for _, edge := range g.Edges { createCircularArc(edge) } - return nil } @@ -51,16 +243,11 @@ func calculateRadius(objects []*d2graph.Object) float64 { func positionObjects(objects []*d2graph.Object, radius float64) { numObjects := float64(len(objects)) angleOffset := -math.Pi / 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, - ) + obj.TopLeft = geo.NewPoint(x-obj.Box.Width/2, y-obj.Box.Height/2) } } @@ -68,18 +255,14 @@ func createCircularArc(edge *d2graph.Edge) { if edge.Src == nil || edge.Dst == nil { return } - srcCenter := edge.Src.Center() dstCenter := edge.Dst.Center() - srcAngle := math.Atan2(srcCenter.Y, srcCenter.X) dstAngle := math.Atan2(dstCenter.Y, dstCenter.X) if dstAngle < srcAngle { dstAngle += 2 * math.Pi } - arcRadius := math.Hypot(srcCenter.X, srcCenter.Y) - path := make([]*geo.Point, 0, ARC_STEPS+1) for i := 0; i <= ARC_STEPS; i++ { t := float64(i) / float64(ARC_STEPS) @@ -90,13 +273,10 @@ func createCircularArc(edge *d2graph.Edge) { } path[0] = srcCenter path[len(path)-1] = dstCenter - startIndex, newSrc := clampPointOutsideBox(edge.Src.Box, path, 0) endIndex, newDst := clampPointOutsideBoxReverse(edge.Dst.Box, path, len(path)-1) - path[0] = newSrc path[len(path)-1] = newDst - edge.Route = path[startIndex : endIndex+1] edge.IsCurve = true } @@ -108,17 +288,12 @@ func clampPointOutsideBox(box *geo.Box, path []*geo.Point, startIdx int) (int, * if !boxContains(box, path[startIdx]) { return startIdx, path[startIdx] } - for i := startIdx + 1; i < len(path); i++ { if boxContains(box, path[i]) { continue } - seg := geo.NewSegment(path[i-1], path[i]) - inters := boxIntersections(box, *seg) - if len(inters) > 0 { - return i, inters[0] - } - return i, path[i] + intersection := refineIntersection(box, path[i-1], path[i]) + return i, intersection } last := len(path) - 1 return last, path[last] @@ -131,26 +306,33 @@ func clampPointOutsideBoxReverse(box *geo.Box, path []*geo.Point, endIdx int) (i if !boxContains(box, path[endIdx]) { return endIdx, path[endIdx] } - for j := endIdx - 1; j >= 0; j-- { if boxContains(box, path[j]) { continue } - seg := geo.NewSegment(path[j], path[j+1]) - inters := boxIntersections(box, *seg) - if len(inters) > 0 { - return j, inters[0] - } - return j, path[j] + intersection := refineIntersection(box, path[j], path[j+1]) + return j, intersection } return 0, path[0] } +func refineIntersection(box *geo.Box, pInside, pOutside *geo.Point) *geo.Point { + const epsilon = 0.001 + a := pInside + b := pOutside + for math.Hypot(b.X-a.X, b.Y-a.Y) > epsilon { + mid := geo.NewPoint((a.X+b.X)/2, (a.Y+b.Y)/2) + if boxContains(box, mid) { + a = mid + } else { + b = mid + } + } + return geo.NewPoint((a.X+b.X)/2, (a.Y+b.Y)/2) +} + func boxContains(b *geo.Box, p *geo.Point) bool { - return p.X >= b.TopLeft.X && - p.X <= b.TopLeft.X+b.Width && - p.Y >= b.TopLeft.Y && - p.Y <= b.TopLeft.Y+b.Height + return p.X >= b.TopLeft.X && p.X <= b.TopLeft.X+b.Width && p.Y >= b.TopLeft.Y && p.Y <= b.TopLeft.Y+b.Height } func boxIntersections(b *geo.Box, seg geo.Segment) []*geo.Point { @@ -171,7 +353,6 @@ func positionLabelsIcons(obj *d2graph.Object) { obj.IconPosition = go2.Pointer(label.InsideMiddleCenter.String()) } } - if obj.HasLabel() && obj.LabelPosition == nil { if len(obj.ChildrenArray) > 0 { obj.LabelPosition = go2.Pointer(label.OutsideTopCenter.String()) @@ -182,9 +363,7 @@ func positionLabelsIcons(obj *d2graph.Object) { } else { obj.LabelPosition = go2.Pointer(label.InsideMiddleCenter.String()) } - - if float64(obj.LabelDimensions.Width) > obj.Width || - float64(obj.LabelDimensions.Height) > obj.Height { + if float64(obj.LabelDimensions.Width) > obj.Width || float64(obj.LabelDimensions.Height) > obj.Height { if len(obj.ChildrenArray) > 0 { obj.LabelPosition = go2.Pointer(label.OutsideTopCenter.String()) } else { From 9daef7f8900575a789f163cff0e092eb135be90e Mon Sep 17 00:00:00 2001 From: Mayank77maruti Date: Fri, 21 Feb 2025 17:40:17 +0000 Subject: [PATCH 08/73] iteration 6 --- d2layouts/d2cycle/layout.go | 202 +++++++++++++++++++++++++++++++++++- 1 file changed, 197 insertions(+), 5 deletions(-) diff --git a/d2layouts/d2cycle/layout.go b/d2layouts/d2cycle/layout.go index 89d9602ec0..9ddc418fb5 100644 --- a/d2layouts/d2cycle/layout.go +++ b/d2layouts/d2cycle/layout.go @@ -194,6 +194,184 @@ // } // } +// package d2cycle + +// import ( +// "context" +// "math" + +// "oss.terrastruct.com/d2/d2graph" +// "oss.terrastruct.com/d2/lib/geo" +// "oss.terrastruct.com/d2/lib/label" +// "oss.terrastruct.com/util-go/go2" +// ) + +// const ( +// MIN_RADIUS = 200 +// PADDING = 20 +// MIN_SEGMENT_LEN = 10 +// ARC_STEPS = 30 +// ) + +// func Layout(ctx context.Context, g *d2graph.Graph, layout d2graph.LayoutGraph) error { +// objects := g.Root.ChildrenArray +// if len(objects) == 0 { +// return nil +// } +// for _, obj := range g.Objects { +// positionLabelsIcons(obj) +// } +// radius := calculateRadius(objects) +// positionObjects(objects, radius) +// for _, edge := range g.Edges { +// createCircularArc(edge) +// } +// return nil +// } + +// func calculateRadius(objects []*d2graph.Object) float64 { +// numObjects := float64(len(objects)) +// maxSize := 0.0 +// for _, obj := range objects { +// size := math.Max(obj.Box.Width, obj.Box.Height) +// maxSize = math.Max(maxSize, size) +// } +// minRadius := (maxSize/2.0 + PADDING) / math.Sin(math.Pi/numObjects) +// return math.Max(minRadius, MIN_RADIUS) +// } + +// func positionObjects(objects []*d2graph.Object, radius float64) { +// numObjects := float64(len(objects)) +// angleOffset := -math.Pi / 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) +// } +// } + +// func createCircularArc(edge *d2graph.Edge) { +// if edge.Src == nil || edge.Dst == nil { +// return +// } +// srcCenter := edge.Src.Center() +// dstCenter := edge.Dst.Center() +// srcAngle := math.Atan2(srcCenter.Y, srcCenter.X) +// dstAngle := math.Atan2(dstCenter.Y, dstCenter.X) +// if dstAngle < srcAngle { +// dstAngle += 2 * math.Pi +// } +// arcRadius := math.Hypot(srcCenter.X, srcCenter.Y) +// path := make([]*geo.Point, 0, ARC_STEPS+1) +// 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) +// path = append(path, geo.NewPoint(x, y)) +// } +// path[0] = srcCenter +// path[len(path)-1] = dstCenter +// startIndex, newSrc := clampPointOutsideBox(edge.Src.Box, path, 0) +// endIndex, newDst := clampPointOutsideBoxReverse(edge.Dst.Box, path, len(path)-1) +// path[0] = newSrc +// path[len(path)-1] = newDst +// edge.Route = path[startIndex : endIndex+1] +// edge.IsCurve = true +// } + +// func clampPointOutsideBox(box *geo.Box, path []*geo.Point, startIdx int) (int, *geo.Point) { +// if startIdx >= len(path)-1 { +// return startIdx, path[startIdx] +// } +// if !boxContains(box, path[startIdx]) { +// return startIdx, path[startIdx] +// } +// for i := startIdx + 1; i < len(path); i++ { +// if boxContains(box, path[i]) { +// continue +// } +// intersection := refineIntersection(box, path[i-1], path[i]) +// return i, intersection +// } +// last := len(path) - 1 +// return last, path[last] +// } + +// func clampPointOutsideBoxReverse(box *geo.Box, path []*geo.Point, endIdx int) (int, *geo.Point) { +// if endIdx <= 0 { +// return endIdx, path[endIdx] +// } +// if !boxContains(box, path[endIdx]) { +// return endIdx, path[endIdx] +// } +// for j := endIdx - 1; j >= 0; j-- { +// if boxContains(box, path[j]) { +// continue +// } +// intersection := refineIntersection(box, path[j], path[j+1]) +// return j, intersection +// } +// return 0, path[0] +// } + +// func refineIntersection(box *geo.Box, pInside, pOutside *geo.Point) *geo.Point { +// const epsilon = 0.001 +// a := pInside +// b := pOutside +// for math.Hypot(b.X-a.X, b.Y-a.Y) > epsilon { +// mid := geo.NewPoint((a.X+b.X)/2, (a.Y+b.Y)/2) +// if boxContains(box, mid) { +// a = mid +// } else { +// b = mid +// } +// } +// return geo.NewPoint((a.X+b.X)/2, (a.Y+b.Y)/2) +// } + +// func boxContains(b *geo.Box, p *geo.Point) bool { +// return p.X >= b.TopLeft.X && p.X <= b.TopLeft.X+b.Width && p.Y >= b.TopLeft.Y && p.Y <= b.TopLeft.Y+b.Height +// } + +// func boxIntersections(b *geo.Box, seg geo.Segment) []*geo.Point { +// return b.Intersections(seg) +// } + +// func positionLabelsIcons(obj *d2graph.Object) { +// if obj.Icon != nil && obj.IconPosition == nil { +// if len(obj.ChildrenArray) > 0 { +// obj.IconPosition = go2.Pointer(label.OutsideTopLeft.String()) +// if obj.LabelPosition == nil { +// obj.LabelPosition = go2.Pointer(label.OutsideTopRight.String()) +// return +// } +// } else if obj.SQLTable != nil || obj.Class != nil || obj.Language != "" { +// obj.IconPosition = go2.Pointer(label.OutsideTopLeft.String()) +// } else { +// obj.IconPosition = go2.Pointer(label.InsideMiddleCenter.String()) +// } +// } +// if obj.HasLabel() && obj.LabelPosition == nil { +// if len(obj.ChildrenArray) > 0 { +// obj.LabelPosition = go2.Pointer(label.OutsideTopCenter.String()) +// } else if obj.HasOutsideBottomLabel() { +// obj.LabelPosition = go2.Pointer(label.OutsideBottomCenter.String()) +// } else if obj.Icon != nil { +// obj.LabelPosition = go2.Pointer(label.InsideTopCenter.String()) +// } else { +// obj.LabelPosition = go2.Pointer(label.InsideMiddleCenter.String()) +// } +// if float64(obj.LabelDimensions.Width) > obj.Width || float64(obj.LabelDimensions.Height) > obj.Height { +// if len(obj.ChildrenArray) > 0 { +// obj.LabelPosition = go2.Pointer(label.OutsideTopCenter.String()) +// } else { +// obj.LabelPosition = go2.Pointer(label.OutsideBottomCenter.String()) +// } +// } +// } +// } package d2cycle import ( @@ -292,7 +470,7 @@ func clampPointOutsideBox(box *geo.Box, path []*geo.Point, startIdx int) (int, * if boxContains(box, path[i]) { continue } - intersection := refineIntersection(box, path[i-1], path[i]) + intersection := getIntersectionPoint(box, path[i-1], path[i]) return i, intersection } last := len(path) - 1 @@ -310,14 +488,23 @@ func clampPointOutsideBoxReverse(box *geo.Box, path []*geo.Point, endIdx int) (i if boxContains(box, path[j]) { continue } - intersection := refineIntersection(box, path[j], path[j+1]) + intersection := getIntersectionPoint(box, path[j], path[j+1]) return j, intersection } return 0, path[0] } +func getIntersectionPoint(box *geo.Box, pInside, pOutside *geo.Point) *geo.Point { + seg := geo.NewSegment(pInside, pOutside) + inters := boxIntersections(box, *seg) + if len(inters) > 0 { + return inters[0] + } + return refineIntersection(box, pInside, pOutside) +} + func refineIntersection(box *geo.Box, pInside, pOutside *geo.Point) *geo.Point { - const epsilon = 0.001 + const epsilon = 1e-6 a := pInside b := pOutside for math.Hypot(b.X-a.X, b.Y-a.Y) > epsilon { @@ -332,7 +519,10 @@ func refineIntersection(box *geo.Box, pInside, pOutside *geo.Point) *geo.Point { } func boxContains(b *geo.Box, p *geo.Point) bool { - return p.X >= b.TopLeft.X && p.X <= b.TopLeft.X+b.Width && p.Y >= b.TopLeft.Y && p.Y <= b.TopLeft.Y+b.Height + return p.X >= b.TopLeft.X && + p.X <= b.TopLeft.X+b.Width && + p.Y >= b.TopLeft.Y && + p.Y <= b.TopLeft.Y+b.Height } func boxIntersections(b *geo.Box, seg geo.Segment) []*geo.Point { @@ -363,7 +553,8 @@ func positionLabelsIcons(obj *d2graph.Object) { } else { obj.LabelPosition = go2.Pointer(label.InsideMiddleCenter.String()) } - if float64(obj.LabelDimensions.Width) > obj.Width || float64(obj.LabelDimensions.Height) > obj.Height { + if float64(obj.LabelDimensions.Width) > obj.Width || + float64(obj.LabelDimensions.Height) > obj.Height { if len(obj.ChildrenArray) > 0 { obj.LabelPosition = go2.Pointer(label.OutsideTopCenter.String()) } else { @@ -372,3 +563,4 @@ func positionLabelsIcons(obj *d2graph.Object) { } } } + From 77f88df4831c88bbf28242e0f7b29c7a3d0171f5 Mon Sep 17 00:00:00 2001 From: Mayank77maruti Date: Fri, 21 Feb 2025 17:41:31 +0000 Subject: [PATCH 09/73] iteration 7 --- d2layouts/d2cycle/layout.go | 594 ++++++++++++------------------------ 1 file changed, 202 insertions(+), 392 deletions(-) diff --git a/d2layouts/d2cycle/layout.go b/d2layouts/d2cycle/layout.go index 9ddc418fb5..c9af2bde9a 100644 --- a/d2layouts/d2cycle/layout.go +++ b/d2layouts/d2cycle/layout.go @@ -1,377 +1,3 @@ -// package d2cycle - -// import ( -// "context" -// "math" - -// "oss.terrastruct.com/d2/d2graph" -// "oss.terrastruct.com/d2/lib/geo" -// "oss.terrastruct.com/d2/lib/label" -// "oss.terrastruct.com/util-go/go2" -// ) - -// const ( -// MIN_RADIUS = 200 -// PADDING = 20 -// MIN_SEGMENT_LEN = 10 -// ARC_STEPS = 30 -// ) - -// func Layout(ctx context.Context, g *d2graph.Graph, layout d2graph.LayoutGraph) error { -// objects := g.Root.ChildrenArray -// if len(objects) == 0 { -// return nil -// } - -// for _, obj := range g.Objects { -// positionLabelsIcons(obj) -// } - -// radius := calculateRadius(objects) -// positionObjects(objects, radius) - -// for _, edge := range g.Edges { -// createCircularArc(edge) -// } - -// return nil -// } - -// func calculateRadius(objects []*d2graph.Object) float64 { -// numObjects := float64(len(objects)) -// maxSize := 0.0 -// for _, obj := range objects { -// size := math.Max(obj.Box.Width, obj.Box.Height) -// maxSize = math.Max(maxSize, size) -// } -// minRadius := (maxSize/2.0 + PADDING) / math.Sin(math.Pi/numObjects) -// return math.Max(minRadius, MIN_RADIUS) -// } - -// func positionObjects(objects []*d2graph.Object, radius float64) { -// numObjects := float64(len(objects)) -// angleOffset := -math.Pi / 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, -// ) -// } -// } - -// func createCircularArc(edge *d2graph.Edge) { -// if edge.Src == nil || edge.Dst == nil { -// return -// } - -// srcCenter := edge.Src.Center() -// dstCenter := edge.Dst.Center() - -// srcAngle := math.Atan2(srcCenter.Y, srcCenter.X) -// dstAngle := math.Atan2(dstCenter.Y, dstCenter.X) -// if dstAngle < srcAngle { -// dstAngle += 2 * math.Pi -// } - -// arcRadius := math.Hypot(srcCenter.X, srcCenter.Y) - -// path := make([]*geo.Point, 0, ARC_STEPS+1) -// 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) -// path = append(path, geo.NewPoint(x, y)) -// } -// path[0] = srcCenter -// path[len(path)-1] = dstCenter - -// startIndex, newSrc := clampPointOutsideBox(edge.Src.Box, path, 0) -// endIndex, newDst := clampPointOutsideBoxReverse(edge.Dst.Box, path, len(path)-1) - -// path[0] = newSrc -// path[len(path)-1] = newDst - -// edge.Route = path[startIndex : endIndex+1] -// edge.IsCurve = true -// } - -// func clampPointOutsideBox(box *geo.Box, path []*geo.Point, startIdx int) (int, *geo.Point) { -// if startIdx >= len(path)-1 { -// return startIdx, path[startIdx] -// } -// if !boxContains(box, path[startIdx]) { -// return startIdx, path[startIdx] -// } - -// for i := startIdx + 1; i < len(path); i++ { -// if boxContains(box, path[i]) { -// continue -// } -// seg := geo.NewSegment(path[i-1], path[i]) -// inters := boxIntersections(box, *seg) -// if len(inters) > 0 { -// return i, inters[0] -// } -// return i, path[i] -// } -// last := len(path) - 1 -// return last, path[last] -// } - -// func clampPointOutsideBoxReverse(box *geo.Box, path []*geo.Point, endIdx int) (int, *geo.Point) { -// if endIdx <= 0 { -// return endIdx, path[endIdx] -// } -// if !boxContains(box, path[endIdx]) { -// return endIdx, path[endIdx] -// } - -// for j := endIdx - 1; j >= 0; j-- { -// if boxContains(box, path[j]) { -// continue -// } -// seg := geo.NewSegment(path[j], path[j+1]) -// inters := boxIntersections(box, *seg) -// if len(inters) > 0 { -// return j, inters[0] -// } -// return j, path[j] -// } -// return 0, path[0] -// } - -// func boxContains(b *geo.Box, p *geo.Point) bool { -// return p.X >= b.TopLeft.X && -// p.X <= b.TopLeft.X+b.Width && -// p.Y >= b.TopLeft.Y && -// p.Y <= b.TopLeft.Y+b.Height -// } - -// func boxIntersections(b *geo.Box, seg geo.Segment) []*geo.Point { -// return b.Intersections(seg) -// } - -// func positionLabelsIcons(obj *d2graph.Object) { -// if obj.Icon != nil && obj.IconPosition == nil { -// if len(obj.ChildrenArray) > 0 { -// obj.IconPosition = go2.Pointer(label.OutsideTopLeft.String()) -// if obj.LabelPosition == nil { -// obj.LabelPosition = go2.Pointer(label.OutsideTopRight.String()) -// return -// } -// } else if obj.SQLTable != nil || obj.Class != nil || obj.Language != "" { -// obj.IconPosition = go2.Pointer(label.OutsideTopLeft.String()) -// } else { -// obj.IconPosition = go2.Pointer(label.InsideMiddleCenter.String()) -// } -// } - -// if obj.HasLabel() && obj.LabelPosition == nil { -// if len(obj.ChildrenArray) > 0 { -// obj.LabelPosition = go2.Pointer(label.OutsideTopCenter.String()) -// } else if obj.HasOutsideBottomLabel() { -// obj.LabelPosition = go2.Pointer(label.OutsideBottomCenter.String()) -// } else if obj.Icon != nil { -// obj.LabelPosition = go2.Pointer(label.InsideTopCenter.String()) -// } else { -// obj.LabelPosition = go2.Pointer(label.InsideMiddleCenter.String()) -// } - -// if float64(obj.LabelDimensions.Width) > obj.Width || -// float64(obj.LabelDimensions.Height) > obj.Height { -// if len(obj.ChildrenArray) > 0 { -// obj.LabelPosition = go2.Pointer(label.OutsideTopCenter.String()) -// } else { -// obj.LabelPosition = go2.Pointer(label.OutsideBottomCenter.String()) -// } -// } -// } -// } - -// package d2cycle - -// import ( -// "context" -// "math" - -// "oss.terrastruct.com/d2/d2graph" -// "oss.terrastruct.com/d2/lib/geo" -// "oss.terrastruct.com/d2/lib/label" -// "oss.terrastruct.com/util-go/go2" -// ) - -// const ( -// MIN_RADIUS = 200 -// PADDING = 20 -// MIN_SEGMENT_LEN = 10 -// ARC_STEPS = 30 -// ) - -// func Layout(ctx context.Context, g *d2graph.Graph, layout d2graph.LayoutGraph) error { -// objects := g.Root.ChildrenArray -// if len(objects) == 0 { -// return nil -// } -// for _, obj := range g.Objects { -// positionLabelsIcons(obj) -// } -// radius := calculateRadius(objects) -// positionObjects(objects, radius) -// for _, edge := range g.Edges { -// createCircularArc(edge) -// } -// return nil -// } - -// func calculateRadius(objects []*d2graph.Object) float64 { -// numObjects := float64(len(objects)) -// maxSize := 0.0 -// for _, obj := range objects { -// size := math.Max(obj.Box.Width, obj.Box.Height) -// maxSize = math.Max(maxSize, size) -// } -// minRadius := (maxSize/2.0 + PADDING) / math.Sin(math.Pi/numObjects) -// return math.Max(minRadius, MIN_RADIUS) -// } - -// func positionObjects(objects []*d2graph.Object, radius float64) { -// numObjects := float64(len(objects)) -// angleOffset := -math.Pi / 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) -// } -// } - -// func createCircularArc(edge *d2graph.Edge) { -// if edge.Src == nil || edge.Dst == nil { -// return -// } -// srcCenter := edge.Src.Center() -// dstCenter := edge.Dst.Center() -// srcAngle := math.Atan2(srcCenter.Y, srcCenter.X) -// dstAngle := math.Atan2(dstCenter.Y, dstCenter.X) -// if dstAngle < srcAngle { -// dstAngle += 2 * math.Pi -// } -// arcRadius := math.Hypot(srcCenter.X, srcCenter.Y) -// path := make([]*geo.Point, 0, ARC_STEPS+1) -// 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) -// path = append(path, geo.NewPoint(x, y)) -// } -// path[0] = srcCenter -// path[len(path)-1] = dstCenter -// startIndex, newSrc := clampPointOutsideBox(edge.Src.Box, path, 0) -// endIndex, newDst := clampPointOutsideBoxReverse(edge.Dst.Box, path, len(path)-1) -// path[0] = newSrc -// path[len(path)-1] = newDst -// edge.Route = path[startIndex : endIndex+1] -// edge.IsCurve = true -// } - -// func clampPointOutsideBox(box *geo.Box, path []*geo.Point, startIdx int) (int, *geo.Point) { -// if startIdx >= len(path)-1 { -// return startIdx, path[startIdx] -// } -// if !boxContains(box, path[startIdx]) { -// return startIdx, path[startIdx] -// } -// for i := startIdx + 1; i < len(path); i++ { -// if boxContains(box, path[i]) { -// continue -// } -// intersection := refineIntersection(box, path[i-1], path[i]) -// return i, intersection -// } -// last := len(path) - 1 -// return last, path[last] -// } - -// func clampPointOutsideBoxReverse(box *geo.Box, path []*geo.Point, endIdx int) (int, *geo.Point) { -// if endIdx <= 0 { -// return endIdx, path[endIdx] -// } -// if !boxContains(box, path[endIdx]) { -// return endIdx, path[endIdx] -// } -// for j := endIdx - 1; j >= 0; j-- { -// if boxContains(box, path[j]) { -// continue -// } -// intersection := refineIntersection(box, path[j], path[j+1]) -// return j, intersection -// } -// return 0, path[0] -// } - -// func refineIntersection(box *geo.Box, pInside, pOutside *geo.Point) *geo.Point { -// const epsilon = 0.001 -// a := pInside -// b := pOutside -// for math.Hypot(b.X-a.X, b.Y-a.Y) > epsilon { -// mid := geo.NewPoint((a.X+b.X)/2, (a.Y+b.Y)/2) -// if boxContains(box, mid) { -// a = mid -// } else { -// b = mid -// } -// } -// return geo.NewPoint((a.X+b.X)/2, (a.Y+b.Y)/2) -// } - -// func boxContains(b *geo.Box, p *geo.Point) bool { -// return p.X >= b.TopLeft.X && p.X <= b.TopLeft.X+b.Width && p.Y >= b.TopLeft.Y && p.Y <= b.TopLeft.Y+b.Height -// } - -// func boxIntersections(b *geo.Box, seg geo.Segment) []*geo.Point { -// return b.Intersections(seg) -// } - -// func positionLabelsIcons(obj *d2graph.Object) { -// if obj.Icon != nil && obj.IconPosition == nil { -// if len(obj.ChildrenArray) > 0 { -// obj.IconPosition = go2.Pointer(label.OutsideTopLeft.String()) -// if obj.LabelPosition == nil { -// obj.LabelPosition = go2.Pointer(label.OutsideTopRight.String()) -// return -// } -// } else if obj.SQLTable != nil || obj.Class != nil || obj.Language != "" { -// obj.IconPosition = go2.Pointer(label.OutsideTopLeft.String()) -// } else { -// obj.IconPosition = go2.Pointer(label.InsideMiddleCenter.String()) -// } -// } -// if obj.HasLabel() && obj.LabelPosition == nil { -// if len(obj.ChildrenArray) > 0 { -// obj.LabelPosition = go2.Pointer(label.OutsideTopCenter.String()) -// } else if obj.HasOutsideBottomLabel() { -// obj.LabelPosition = go2.Pointer(label.OutsideBottomCenter.String()) -// } else if obj.Icon != nil { -// obj.LabelPosition = go2.Pointer(label.InsideTopCenter.String()) -// } else { -// obj.LabelPosition = go2.Pointer(label.InsideMiddleCenter.String()) -// } -// if float64(obj.LabelDimensions.Width) > obj.Width || float64(obj.LabelDimensions.Height) > obj.Height { -// if len(obj.ChildrenArray) > 0 { -// obj.LabelPosition = go2.Pointer(label.OutsideTopCenter.String()) -// } else { -// obj.LabelPosition = go2.Pointer(label.OutsideBottomCenter.String()) -// } -// } -// } -// } package d2cycle import ( @@ -396,14 +22,18 @@ func Layout(ctx context.Context, g *d2graph.Graph, layout d2graph.LayoutGraph) e if len(objects) == 0 { return nil } + for _, obj := range g.Objects { positionLabelsIcons(obj) } + radius := calculateRadius(objects) positionObjects(objects, radius) + for _, edge := range g.Edges { createCircularArc(edge) } + return nil } @@ -421,11 +51,16 @@ func calculateRadius(objects []*d2graph.Object) float64 { func positionObjects(objects []*d2graph.Object, radius float64) { numObjects := float64(len(objects)) angleOffset := -math.Pi / 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) + + obj.TopLeft = geo.NewPoint( + x-obj.Box.Width/2, + y-obj.Box.Height/2, + ) } } @@ -433,14 +68,18 @@ func createCircularArc(edge *d2graph.Edge) { if edge.Src == nil || edge.Dst == nil { return } + srcCenter := edge.Src.Center() dstCenter := edge.Dst.Center() + srcAngle := math.Atan2(srcCenter.Y, srcCenter.X) dstAngle := math.Atan2(dstCenter.Y, dstCenter.X) if dstAngle < srcAngle { dstAngle += 2 * math.Pi } + arcRadius := math.Hypot(srcCenter.X, srcCenter.Y) + path := make([]*geo.Point, 0, ARC_STEPS+1) for i := 0; i <= ARC_STEPS; i++ { t := float64(i) / float64(ARC_STEPS) @@ -451,10 +90,13 @@ func createCircularArc(edge *d2graph.Edge) { } path[0] = srcCenter path[len(path)-1] = dstCenter + startIndex, newSrc := clampPointOutsideBox(edge.Src.Box, path, 0) endIndex, newDst := clampPointOutsideBoxReverse(edge.Dst.Box, path, len(path)-1) + path[0] = newSrc path[len(path)-1] = newDst + edge.Route = path[startIndex : endIndex+1] edge.IsCurve = true } @@ -466,12 +108,17 @@ func clampPointOutsideBox(box *geo.Box, path []*geo.Point, startIdx int) (int, * if !boxContains(box, path[startIdx]) { return startIdx, path[startIdx] } + for i := startIdx + 1; i < len(path); i++ { if boxContains(box, path[i]) { continue } - intersection := getIntersectionPoint(box, path[i-1], path[i]) - return i, intersection + seg := geo.NewSegment(path[i-1], path[i]) + inters := boxIntersections(box, *seg) + if len(inters) > 0 { + return i, inters[0] + } + return i, path[i] } last := len(path) - 1 return last, path[last] @@ -484,27 +131,193 @@ func clampPointOutsideBoxReverse(box *geo.Box, path []*geo.Point, endIdx int) (i if !boxContains(box, path[endIdx]) { return endIdx, path[endIdx] } + for j := endIdx - 1; j >= 0; j-- { if boxContains(box, path[j]) { continue } - intersection := getIntersectionPoint(box, path[j], path[j+1]) - return j, intersection + seg := geo.NewSegment(path[j], path[j+1]) + inters := boxIntersections(box, *seg) + if len(inters) > 0 { + return j, inters[0] + } + return j, path[j] } return 0, path[0] } -func getIntersectionPoint(box *geo.Box, pInside, pOutside *geo.Point) *geo.Point { - seg := geo.NewSegment(pInside, pOutside) - inters := boxIntersections(box, *seg) - if len(inters) > 0 { - return inters[0] +func boxContains(b *geo.Box, p *geo.Point) bool { + return p.X >= b.TopLeft.X && + p.X <= b.TopLeft.X+b.Width && + p.Y >= b.TopLeft.Y && + p.Y <= b.TopLeft.Y+b.Height +} + +func boxIntersections(b *geo.Box, seg geo.Segment) []*geo.Point { + return b.Intersections(seg) +} + +func positionLabelsIcons(obj *d2graph.Object) { + if obj.Icon != nil && obj.IconPosition == nil { + if len(obj.ChildrenArray) > 0 { + obj.IconPosition = go2.Pointer(label.OutsideTopLeft.String()) + if obj.LabelPosition == nil { + obj.LabelPosition = go2.Pointer(label.OutsideTopRight.String()) + return + } + } else if obj.SQLTable != nil || obj.Class != nil || obj.Language != "" { + obj.IconPosition = go2.Pointer(label.OutsideTopLeft.String()) + } else { + obj.IconPosition = go2.Pointer(label.InsideMiddleCenter.String()) + } + } + + if obj.HasLabel() && obj.LabelPosition == nil { + if len(obj.ChildrenArray) > 0 { + obj.LabelPosition = go2.Pointer(label.OutsideTopCenter.String()) + } else if obj.HasOutsideBottomLabel() { + obj.LabelPosition = go2.Pointer(label.OutsideBottomCenter.String()) + } else if obj.Icon != nil { + obj.LabelPosition = go2.Pointer(label.InsideTopCenter.String()) + } else { + obj.LabelPosition = go2.Pointer(label.InsideMiddleCenter.String()) + } + + if float64(obj.LabelDimensions.Width) > obj.Width || + float64(obj.LabelDimensions.Height) > obj.Height { + if len(obj.ChildrenArray) > 0 { + obj.LabelPosition = go2.Pointer(label.OutsideTopCenter.String()) + } else { + obj.LabelPosition = go2.Pointer(label.OutsideBottomCenter.String()) + } + } + } +} + +package d2cycle + +import ( + "context" + "math" + + "oss.terrastruct.com/d2/d2graph" + "oss.terrastruct.com/d2/lib/geo" + "oss.terrastruct.com/d2/lib/label" + "oss.terrastruct.com/util-go/go2" +) + +const ( + MIN_RADIUS = 200 + PADDING = 20 + MIN_SEGMENT_LEN = 10 + ARC_STEPS = 30 +) + +func Layout(ctx context.Context, g *d2graph.Graph, layout d2graph.LayoutGraph) error { + objects := g.Root.ChildrenArray + if len(objects) == 0 { + return nil + } + for _, obj := range g.Objects { + positionLabelsIcons(obj) + } + radius := calculateRadius(objects) + positionObjects(objects, radius) + for _, edge := range g.Edges { + createCircularArc(edge) + } + return nil +} + +func calculateRadius(objects []*d2graph.Object) float64 { + numObjects := float64(len(objects)) + maxSize := 0.0 + for _, obj := range objects { + size := math.Max(obj.Box.Width, obj.Box.Height) + maxSize = math.Max(maxSize, size) + } + minRadius := (maxSize/2.0 + PADDING) / math.Sin(math.Pi/numObjects) + return math.Max(minRadius, MIN_RADIUS) +} + +func positionObjects(objects []*d2graph.Object, radius float64) { + numObjects := float64(len(objects)) + angleOffset := -math.Pi / 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) + } +} + +func createCircularArc(edge *d2graph.Edge) { + if edge.Src == nil || edge.Dst == nil { + return + } + srcCenter := edge.Src.Center() + dstCenter := edge.Dst.Center() + srcAngle := math.Atan2(srcCenter.Y, srcCenter.X) + dstAngle := math.Atan2(dstCenter.Y, dstCenter.X) + if dstAngle < srcAngle { + dstAngle += 2 * math.Pi + } + arcRadius := math.Hypot(srcCenter.X, srcCenter.Y) + path := make([]*geo.Point, 0, ARC_STEPS+1) + 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) + path = append(path, geo.NewPoint(x, y)) + } + path[0] = srcCenter + path[len(path)-1] = dstCenter + startIndex, newSrc := clampPointOutsideBox(edge.Src.Box, path, 0) + endIndex, newDst := clampPointOutsideBoxReverse(edge.Dst.Box, path, len(path)-1) + path[0] = newSrc + path[len(path)-1] = newDst + edge.Route = path[startIndex : endIndex+1] + edge.IsCurve = true +} + +func clampPointOutsideBox(box *geo.Box, path []*geo.Point, startIdx int) (int, *geo.Point) { + if startIdx >= len(path)-1 { + return startIdx, path[startIdx] + } + if !boxContains(box, path[startIdx]) { + return startIdx, path[startIdx] + } + for i := startIdx + 1; i < len(path); i++ { + if boxContains(box, path[i]) { + continue + } + intersection := refineIntersection(box, path[i-1], path[i]) + return i, intersection + } + last := len(path) - 1 + return last, path[last] +} + +func clampPointOutsideBoxReverse(box *geo.Box, path []*geo.Point, endIdx int) (int, *geo.Point) { + if endIdx <= 0 { + return endIdx, path[endIdx] + } + if !boxContains(box, path[endIdx]) { + return endIdx, path[endIdx] + } + for j := endIdx - 1; j >= 0; j-- { + if boxContains(box, path[j]) { + continue + } + intersection := refineIntersection(box, path[j], path[j+1]) + return j, intersection } - return refineIntersection(box, pInside, pOutside) + return 0, path[0] } func refineIntersection(box *geo.Box, pInside, pOutside *geo.Point) *geo.Point { - const epsilon = 1e-6 + const epsilon = 0.001 a := pInside b := pOutside for math.Hypot(b.X-a.X, b.Y-a.Y) > epsilon { @@ -519,10 +332,7 @@ func refineIntersection(box *geo.Box, pInside, pOutside *geo.Point) *geo.Point { } func boxContains(b *geo.Box, p *geo.Point) bool { - return p.X >= b.TopLeft.X && - p.X <= b.TopLeft.X+b.Width && - p.Y >= b.TopLeft.Y && - p.Y <= b.TopLeft.Y+b.Height + return p.X >= b.TopLeft.X && p.X <= b.TopLeft.X+b.Width && p.Y >= b.TopLeft.Y && p.Y <= b.TopLeft.Y+b.Height } func boxIntersections(b *geo.Box, seg geo.Segment) []*geo.Point { @@ -553,8 +363,7 @@ func positionLabelsIcons(obj *d2graph.Object) { } else { obj.LabelPosition = go2.Pointer(label.InsideMiddleCenter.String()) } - if float64(obj.LabelDimensions.Width) > obj.Width || - float64(obj.LabelDimensions.Height) > obj.Height { + if float64(obj.LabelDimensions.Width) > obj.Width || float64(obj.LabelDimensions.Height) > obj.Height { if len(obj.ChildrenArray) > 0 { obj.LabelPosition = go2.Pointer(label.OutsideTopCenter.String()) } else { @@ -564,3 +373,4 @@ func positionLabelsIcons(obj *d2graph.Object) { } } + From 42c2a1f9a43d471332d475ffe7d628ee814780fd Mon Sep 17 00:00:00 2001 From: Mayank77maruti Date: Fri, 21 Feb 2025 17:42:25 +0000 Subject: [PATCH 10/73] iteration 7 --- d2layouts/d2cycle/layout.go | 181 ------------------------------------ 1 file changed, 181 deletions(-) diff --git a/d2layouts/d2cycle/layout.go b/d2layouts/d2cycle/layout.go index c9af2bde9a..559bd0b3a4 100644 --- a/d2layouts/d2cycle/layout.go +++ b/d2layouts/d2cycle/layout.go @@ -193,184 +193,3 @@ func positionLabelsIcons(obj *d2graph.Object) { } } } - -package d2cycle - -import ( - "context" - "math" - - "oss.terrastruct.com/d2/d2graph" - "oss.terrastruct.com/d2/lib/geo" - "oss.terrastruct.com/d2/lib/label" - "oss.terrastruct.com/util-go/go2" -) - -const ( - MIN_RADIUS = 200 - PADDING = 20 - MIN_SEGMENT_LEN = 10 - ARC_STEPS = 30 -) - -func Layout(ctx context.Context, g *d2graph.Graph, layout d2graph.LayoutGraph) error { - objects := g.Root.ChildrenArray - if len(objects) == 0 { - return nil - } - for _, obj := range g.Objects { - positionLabelsIcons(obj) - } - radius := calculateRadius(objects) - positionObjects(objects, radius) - for _, edge := range g.Edges { - createCircularArc(edge) - } - return nil -} - -func calculateRadius(objects []*d2graph.Object) float64 { - numObjects := float64(len(objects)) - maxSize := 0.0 - for _, obj := range objects { - size := math.Max(obj.Box.Width, obj.Box.Height) - maxSize = math.Max(maxSize, size) - } - minRadius := (maxSize/2.0 + PADDING) / math.Sin(math.Pi/numObjects) - return math.Max(minRadius, MIN_RADIUS) -} - -func positionObjects(objects []*d2graph.Object, radius float64) { - numObjects := float64(len(objects)) - angleOffset := -math.Pi / 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) - } -} - -func createCircularArc(edge *d2graph.Edge) { - if edge.Src == nil || edge.Dst == nil { - return - } - srcCenter := edge.Src.Center() - dstCenter := edge.Dst.Center() - srcAngle := math.Atan2(srcCenter.Y, srcCenter.X) - dstAngle := math.Atan2(dstCenter.Y, dstCenter.X) - if dstAngle < srcAngle { - dstAngle += 2 * math.Pi - } - arcRadius := math.Hypot(srcCenter.X, srcCenter.Y) - path := make([]*geo.Point, 0, ARC_STEPS+1) - 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) - path = append(path, geo.NewPoint(x, y)) - } - path[0] = srcCenter - path[len(path)-1] = dstCenter - startIndex, newSrc := clampPointOutsideBox(edge.Src.Box, path, 0) - endIndex, newDst := clampPointOutsideBoxReverse(edge.Dst.Box, path, len(path)-1) - path[0] = newSrc - path[len(path)-1] = newDst - edge.Route = path[startIndex : endIndex+1] - edge.IsCurve = true -} - -func clampPointOutsideBox(box *geo.Box, path []*geo.Point, startIdx int) (int, *geo.Point) { - if startIdx >= len(path)-1 { - return startIdx, path[startIdx] - } - if !boxContains(box, path[startIdx]) { - return startIdx, path[startIdx] - } - for i := startIdx + 1; i < len(path); i++ { - if boxContains(box, path[i]) { - continue - } - intersection := refineIntersection(box, path[i-1], path[i]) - return i, intersection - } - last := len(path) - 1 - return last, path[last] -} - -func clampPointOutsideBoxReverse(box *geo.Box, path []*geo.Point, endIdx int) (int, *geo.Point) { - if endIdx <= 0 { - return endIdx, path[endIdx] - } - if !boxContains(box, path[endIdx]) { - return endIdx, path[endIdx] - } - for j := endIdx - 1; j >= 0; j-- { - if boxContains(box, path[j]) { - continue - } - intersection := refineIntersection(box, path[j], path[j+1]) - return j, intersection - } - return 0, path[0] -} - -func refineIntersection(box *geo.Box, pInside, pOutside *geo.Point) *geo.Point { - const epsilon = 0.001 - a := pInside - b := pOutside - for math.Hypot(b.X-a.X, b.Y-a.Y) > epsilon { - mid := geo.NewPoint((a.X+b.X)/2, (a.Y+b.Y)/2) - if boxContains(box, mid) { - a = mid - } else { - b = mid - } - } - return geo.NewPoint((a.X+b.X)/2, (a.Y+b.Y)/2) -} - -func boxContains(b *geo.Box, p *geo.Point) bool { - return p.X >= b.TopLeft.X && p.X <= b.TopLeft.X+b.Width && p.Y >= b.TopLeft.Y && p.Y <= b.TopLeft.Y+b.Height -} - -func boxIntersections(b *geo.Box, seg geo.Segment) []*geo.Point { - return b.Intersections(seg) -} - -func positionLabelsIcons(obj *d2graph.Object) { - if obj.Icon != nil && obj.IconPosition == nil { - if len(obj.ChildrenArray) > 0 { - obj.IconPosition = go2.Pointer(label.OutsideTopLeft.String()) - if obj.LabelPosition == nil { - obj.LabelPosition = go2.Pointer(label.OutsideTopRight.String()) - return - } - } else if obj.SQLTable != nil || obj.Class != nil || obj.Language != "" { - obj.IconPosition = go2.Pointer(label.OutsideTopLeft.String()) - } else { - obj.IconPosition = go2.Pointer(label.InsideMiddleCenter.String()) - } - } - if obj.HasLabel() && obj.LabelPosition == nil { - if len(obj.ChildrenArray) > 0 { - obj.LabelPosition = go2.Pointer(label.OutsideTopCenter.String()) - } else if obj.HasOutsideBottomLabel() { - obj.LabelPosition = go2.Pointer(label.OutsideBottomCenter.String()) - } else if obj.Icon != nil { - obj.LabelPosition = go2.Pointer(label.InsideTopCenter.String()) - } else { - obj.LabelPosition = go2.Pointer(label.InsideMiddleCenter.String()) - } - if float64(obj.LabelDimensions.Width) > obj.Width || float64(obj.LabelDimensions.Height) > obj.Height { - if len(obj.ChildrenArray) > 0 { - obj.LabelPosition = go2.Pointer(label.OutsideTopCenter.String()) - } else { - obj.LabelPosition = go2.Pointer(label.OutsideBottomCenter.String()) - } - } - } -} - - From 6722e3f21ee451542b22a49ffe4db6c61bc7bc0f Mon Sep 17 00:00:00 2001 From: Mayank Mohapatra <125661248+Mayank77maruti@users.noreply.github.com> Date: Fri, 21 Feb 2025 19:10:29 +0000 Subject: [PATCH 11/73] test 1 --- d2layouts/d2cycle/layout.go | 18 +- .../txtar/cycle-diagram/dagre/board.exp.json | 660 ++++++++++-------- .../txtar/cycle-diagram/dagre/sketch.exp.svg | 154 ++-- .../txtar/cycle-diagram/elk/board.exp.json | 660 ++++++++++-------- .../txtar/cycle-diagram/elk/sketch.exp.svg | 154 ++-- 5 files changed, 892 insertions(+), 754 deletions(-) diff --git a/d2layouts/d2cycle/layout.go b/d2layouts/d2cycle/layout.go index 559bd0b3a4..dbdebf2b81 100644 --- a/d2layouts/d2cycle/layout.go +++ b/d2layouts/d2cycle/layout.go @@ -30,8 +30,20 @@ func Layout(ctx context.Context, g *d2graph.Graph, layout d2graph.LayoutGraph) e radius := calculateRadius(objects) positionObjects(objects, radius) + // Calculate max projection for all objects to adjust the arc radius + maxProjection := 0.0 + for _, obj := range objects { + center := obj.Center() + theta := math.Atan2(center.Y, center.X) + projection := (obj.Width/2)*math.Cos(theta) + (obj.Height/2)*math.Sin(theta) + if projection > maxProjection { + maxProjection = projection + } + } + arcRadius := radius + maxProjection + for _, edge := range g.Edges { - createCircularArc(edge) + createCircularArc(edge, arcRadius) } return nil @@ -64,7 +76,7 @@ func positionObjects(objects []*d2graph.Object, radius float64) { } } -func createCircularArc(edge *d2graph.Edge) { +func createCircularArc(edge *d2graph.Edge, arcRadius float64) { if edge.Src == nil || edge.Dst == nil { return } @@ -78,8 +90,6 @@ func createCircularArc(edge *d2graph.Edge) { dstAngle += 2 * math.Pi } - arcRadius := math.Hypot(srcCenter.X, srcCenter.Y) - path := make([]*geo.Point, 0, ARC_STEPS+1) for i := 0; i <= ARC_STEPS; i++ { t := float64(i) / float64(ARC_STEPS) diff --git a/e2etests/testdata/txtar/cycle-diagram/dagre/board.exp.json b/e2etests/testdata/txtar/cycle-diagram/dagre/board.exp.json index 104df56cce..49d4ecca31 100644 --- a/e2etests/testdata/txtar/cycle-diagram/dagre/board.exp.json +++ b/e2etests/testdata/txtar/cycle-diagram/dagre/board.exp.json @@ -540,100 +540,112 @@ "link": "", "route": [ { - "x": 31.285999298095703, - "y": -197.53700256347656 + "x": 36.44900131225586, + "y": -230.13099670410156 }, { - "x": 41.582000732421875, - "y": -195.62899780273438 + "x": 48.44300079345703, + "y": -227.9080047607422 }, { - "x": 51.76300048828125, - "y": -193.18499755859375 + "x": 60.30400085449219, + "y": -225.05999755859375 }, { - "x": 61.803001403808594, - "y": -190.21099853515625 + "x": 72, + "y": -221.5959930419922 }, { - "x": 71.6729965209961, - "y": -186.71600341796875 + "x": 83.4990005493164, + "y": -217.5240020751953 }, { - "x": 81.34700012207031, - "y": -182.70899963378906 + "x": 94.76899719238281, + "y": -212.8560028076172 }, { - "x": 90.7979965209961, - "y": -178.2010040283203 + "x": 105.77899932861328, + "y": -207.60400390625 }, { - "x": 99.9990005493164, - "y": -173.2050018310547 + "x": 116.4990005493164, + "y": -201.7830047607422 }, { - "x": 108.927001953125, - "y": -167.73399353027344 + "x": 126.9000015258789, + "y": -195.41000366210938 }, { - "x": 117.55699920654297, - "y": -161.80299377441406 + "x": 136.9530029296875, + "y": -188.5 }, { - "x": 125.86399841308594, - "y": -155.4290008544922 + "x": 146.63099670410156, + "y": -181.0749969482422 }, { - "x": 133.8260040283203, - "y": -148.6280059814453 + "x": 155.90699768066406, + "y": -173.15199279785156 }, { - "x": 141.42100524902344, - "y": -141.42100524902344 + "x": 164.7550048828125, + "y": -164.7550048828125 }, { - "x": 148.6280059814453, - "y": -133.8260040283203 + "x": 173.15199279785156, + "y": -155.90699768066406 }, { - "x": 155.4290008544922, - "y": -125.86399841308594 + "x": 181.0749969482422, + "y": -146.63099670410156 }, { - "x": 161.80299377441406, - "y": -117.55699920654297 + "x": 188.5, + "y": -136.9530029296875 }, { - "x": 167.73399353027344, - "y": -108.927001953125 + "x": 195.41000366210938, + "y": -126.9000015258789 }, { - "x": 173.2050018310547, - "y": -100 + "x": 201.7830047607422, + "y": -116.5 }, { - "x": 178.2010040283203, - "y": -90.7979965209961 + "x": 207.60400390625, + "y": -105.77899932861328 }, { - "x": 182.70899963378906, - "y": -81.34700012207031 + "x": 212.8560028076172, + "y": -94.76899719238281 }, { - "x": 186.71600341796875, - "y": -71.6729965209961 + "x": 217.5240020751953, + "y": -83.4990005493164 }, { - "x": 190.21099853515625, - "y": -61.803001403808594 + "x": 221.5959930419922, + "y": -72 }, { - "x": 193.18499755859375, - "y": -51.76300048828125 + "x": 225.05999755859375, + "y": -60.30400085449219 }, { - "x": 195.62899780273438, - "y": -41.582000732421875 + "x": 227.9080047607422, + "y": -48.44300079345703 + }, + { + "x": 230.13099670410156, + "y": -36.44900131225586 + }, + { + "x": 231.72300720214844, + "y": -24.354999542236328 + }, + { + "x": 232.67999267578125, + "y": -12.194000244140625 } ], "isCurve": true, @@ -668,100 +680,112 @@ "link": "", "route": [ { - "x": 195.62899780273438, - "y": 41.582000732421875 + "x": 232.67999267578125, + "y": 12.194000244140625 + }, + { + "x": 231.72300720214844, + "y": 24.354999542236328 }, { - "x": 193.18499755859375, - "y": 51.76300048828125 + "x": 230.13099670410156, + "y": 36.44900131225586 }, { - "x": 190.21099853515625, - "y": 61.803001403808594 + "x": 227.9080047607422, + "y": 48.44300079345703 }, { - "x": 186.71600341796875, - "y": 71.6729965209961 + "x": 225.05999755859375, + "y": 60.30400085449219 }, { - "x": 182.70899963378906, - "y": 81.34700012207031 + "x": 221.5959930419922, + "y": 72 }, { - "x": 178.2010040283203, - "y": 90.7979965209961 + "x": 217.5240020751953, + "y": 83.4990005493164 }, { - "x": 173.2050018310547, - "y": 99.9990005493164 + "x": 212.8560028076172, + "y": 94.76899719238281 }, { - "x": 167.73399353027344, - "y": 108.927001953125 + "x": 207.60400390625, + "y": 105.77899932861328 }, { - "x": 161.80299377441406, - "y": 117.55699920654297 + "x": 201.7830047607422, + "y": 116.4990005493164 }, { - "x": 155.4290008544922, - "y": 125.86399841308594 + "x": 195.41000366210938, + "y": 126.9000015258789 }, { - "x": 148.6280059814453, - "y": 133.8260040283203 + "x": 188.5, + "y": 136.9530029296875 }, { - "x": 141.42100524902344, - "y": 141.42100524902344 + "x": 181.0749969482422, + "y": 146.63099670410156 }, { - "x": 133.8260040283203, - "y": 148.6280059814453 + "x": 173.15199279785156, + "y": 155.90699768066406 }, { - "x": 125.86399841308594, - "y": 155.4290008544922 + "x": 164.7550048828125, + "y": 164.7550048828125 }, { - "x": 117.55699920654297, - "y": 161.80299377441406 + "x": 155.90699768066406, + "y": 173.15199279785156 }, { - "x": 108.927001953125, - "y": 167.73399353027344 + "x": 146.63099670410156, + "y": 181.0749969482422 }, { - "x": 100, - "y": 173.2050018310547 + "x": 136.9530029296875, + "y": 188.5 }, { - "x": 90.7979965209961, - "y": 178.2010040283203 + "x": 126.9000015258789, + "y": 195.41000366210938 }, { - "x": 81.34700012207031, - "y": 182.70899963378906 + "x": 116.5, + "y": 201.7830047607422 }, { - "x": 71.6729965209961, - "y": 186.71600341796875 + "x": 105.77899932861328, + "y": 207.60400390625 }, { - "x": 61.803001403808594, - "y": 190.21099853515625 + "x": 94.76899719238281, + "y": 212.8560028076172 }, { - "x": 51.76300048828125, - "y": 193.18499755859375 + "x": 83.4990005493164, + "y": 217.5240020751953 }, { - "x": 41.582000732421875, - "y": 195.62899780273438 + "x": 72, + "y": 221.5959930419922 }, { - "x": 31.285999298095703, - "y": 197.53700256347656 + "x": 60.30400085449219, + "y": 225.05999755859375 + }, + { + "x": 48.44300079345703, + "y": 227.9080047607422 + }, + { + "x": 36.44900131225586, + "y": 230.13099670410156 } ], "isCurve": true, @@ -796,100 +820,112 @@ "link": "", "route": [ { - "x": -31.285999298095703, - "y": 197.53700256347656 + "x": -36.44900131225586, + "y": 230.13099670410156 + }, + { + "x": -48.44300079345703, + "y": 227.9080047607422 + }, + { + "x": -60.30400085449219, + "y": 225.05999755859375 }, { - "x": -41.582000732421875, - "y": 195.62899780273438 + "x": -72, + "y": 221.5959930419922 }, { - "x": -51.76300048828125, - "y": 193.18499755859375 + "x": -83.4990005493164, + "y": 217.5240020751953 }, { - "x": -61.803001403808594, - "y": 190.21099853515625 + "x": -94.76899719238281, + "y": 212.8560028076172 }, { - "x": -71.6729965209961, - "y": 186.71600341796875 + "x": -105.77899932861328, + "y": 207.60400390625 }, { - "x": -81.34700012207031, - "y": 182.70899963378906 + "x": -116.4990005493164, + "y": 201.7830047607422 }, { - "x": -90.7979965209961, - "y": 178.2010040283203 + "x": -126.9000015258789, + "y": 195.41000366210938 }, { - "x": -99.9990005493164, - "y": 173.2050018310547 + "x": -136.9530029296875, + "y": 188.5 }, { - "x": -108.927001953125, - "y": 167.73399353027344 + "x": -146.63099670410156, + "y": 181.0749969482422 }, { - "x": -117.55699920654297, - "y": 161.80299377441406 + "x": -155.90699768066406, + "y": 173.15199279785156 }, { - "x": -125.86399841308594, - "y": 155.4290008544922 + "x": -164.7550048828125, + "y": 164.7550048828125 }, { - "x": -133.8260040283203, - "y": 148.6280059814453 + "x": -173.15199279785156, + "y": 155.90699768066406 }, { - "x": -141.42100524902344, - "y": 141.42100524902344 + "x": -181.0749969482422, + "y": 146.63099670410156 }, { - "x": -148.6280059814453, - "y": 133.8260040283203 + "x": -188.5, + "y": 136.9530029296875 }, { - "x": -155.4290008544922, - "y": 125.86399841308594 + "x": -195.41000366210938, + "y": 126.9000015258789 }, { - "x": -161.80299377441406, - "y": 117.55699920654297 + "x": -201.7830047607422, + "y": 116.5 }, { - "x": -167.73399353027344, - "y": 108.927001953125 + "x": -207.60400390625, + "y": 105.77899932861328 }, { - "x": -173.2050018310547, - "y": 100 + "x": -212.8560028076172, + "y": 94.76899719238281 }, { - "x": -178.2010040283203, - "y": 90.7979965209961 + "x": -217.5240020751953, + "y": 83.4990005493164 }, { - "x": -182.70899963378906, - "y": 81.34700012207031 + "x": -221.5959930419922, + "y": 72 }, { - "x": -186.71600341796875, - "y": 71.6729965209961 + "x": -225.05999755859375, + "y": 60.30400085449219 }, { - "x": -190.21099853515625, - "y": 61.803001403808594 + "x": -227.9080047607422, + "y": 48.44300079345703 }, { - "x": -193.18499755859375, - "y": 51.76300048828125 + "x": -230.13099670410156, + "y": 36.44900131225586 }, { - "x": -195.62899780273438, - "y": 41.582000732421875 + "x": -231.72300720214844, + "y": 24.354999542236328 + }, + { + "x": -232.67999267578125, + "y": 12.194000244140625 } ], "isCurve": true, @@ -924,108 +960,120 @@ "link": "", "route": [ { - "x": 540.833984375, - "y": -148.05299377441406 + "x": 529.7030029296875, + "y": -188.86599731445312 + }, + { + "x": 546.323974609375, + "y": -187.11900329589844 + }, + { + "x": 562.7839965820312, + "y": -184.2169952392578 + }, + { + "x": 579.0009765625, + "y": -180.17300415039062 }, { - "x": 554.5819702148438, - "y": -145.62899780273438 + "x": 594.89599609375, + "y": -175.00900268554688 }, { - "x": 568.1270141601562, - "y": -142.2519989013672 + "x": 610.3920288085938, + "y": -168.7480010986328 }, { - "x": 581.4039916992188, - "y": -137.93800354003906 + "x": 625.4140014648438, + "y": -161.42100524902344 }, { - "x": 594.3469848632812, - "y": -132.70899963378906 + "x": 639.8880004882812, + "y": -153.06399536132812 }, { - "x": 606.8939819335938, - "y": -126.58899688720703 + "x": 653.7440185546875, + "y": -143.71800231933594 }, { - "x": 618.9829711914062, - "y": -119.60900115966797 + "x": 666.9149780273438, + "y": -133.4290008544922 }, { - "x": 630.5570068359375, - "y": -111.8030014038086 + "x": 679.3350219726562, + "y": -122.24500274658203 }, { - "x": 641.5570068359375, - "y": -103.20800018310547 + "x": 690.9450073242188, + "y": -110.2229995727539 }, { - "x": 651.9310302734375, - "y": -93.86699676513672 + "x": 701.68798828125, + "y": -97.41899871826172 }, { - "x": 661.6279907226562, - "y": -83.82599639892578 + "x": 711.5120239257812, + "y": -83.89800262451172 }, { - "x": 670.6019897460938, - "y": -73.13200378417969 + "x": 720.3690185546875, + "y": -69.7239990234375 }, { - "x": 678.8070068359375, - "y": -61.8380012512207 + "x": 728.2150268554688, + "y": -54.96699905395508 }, { - "x": 686.2050170898438, - "y": -50 + "x": 735.0130004882812, + "y": -39.69900131225586 }, { - "x": 692.7579956054688, - "y": -37.67399978637695 + "x": 740.72998046875, + "y": -23.993999481201172 }, { - "x": 698.4359741210938, - "y": -24.92099952697754 + "x": 745.3359985351562, + "y": -7.927999973297119 }, { - "x": 703.2109985351562, - "y": -11.803000450134277 + "x": 748.8109741210938, + "y": 8.420000076293945 }, { - "x": 707.0590209960938, - "y": 1.6150000095367432 + "x": 751.1370239257812, + "y": 24.969999313354492 }, { - "x": 709.9609985351562, - "y": 15.270000457763672 + "x": 752.302978515625, + "y": 41.643001556396484 }, { - "x": 711.9039916992188, - "y": 29.0939998626709 + "x": 752.302978515625, + "y": 58.35599899291992 }, { - "x": 712.8779907226562, - "y": 43.02000045776367 + "x": 751.1370239257812, + "y": 75.02899932861328 }, { - "x": 712.8779907226562, - "y": 56.979000091552734 + "x": 748.8109741210938, + "y": 91.5790023803711 }, { - "x": 711.9039916992188, - "y": 70.90499877929688 + "x": 745.3359985351562, + "y": 107.9280014038086 }, { - "x": 709.9609985351562, - "y": 84.72899627685547 + "x": 740.72998046875, + "y": 123.99400329589844 }, { - "x": 707.0590209960938, - "y": 98.38400268554688 + "x": 735.0130004882812, + "y": 139.69900512695312 }, { - "x": 703.2109985351562, - "y": 111.8030014038086 + "x": 728.2150268554688, + "y": 154.9669952392578 } ], "isCurve": true, @@ -1060,104 +1108,120 @@ "link": "", "route": [ { - "x": 661.6279907226562, - "y": 183.8260040283203 + "x": 711.5120239257812, + "y": 183.8979949951172 }, { - "x": 651.9310302734375, - "y": 193.86700439453125 + "x": 701.68798828125, + "y": 197.41900634765625 }, { - "x": 641.5570068359375, - "y": 203.20799255371094 + "x": 690.9450073242188, + "y": 210.22300720214844 }, { - "x": 630.5570068359375, - "y": 211.80299377441406 + "x": 679.3350219726562, + "y": 222.2449951171875 }, { - "x": 618.9829711914062, - "y": 219.60899353027344 + "x": 666.9149780273438, + "y": 233.4290008544922 }, { - "x": 606.8939819335938, - "y": 226.58900451660156 + "x": 653.7440185546875, + "y": 243.71800231933594 }, { - "x": 594.3469848632812, - "y": 232.70899963378906 + "x": 639.8880004882812, + "y": 253.06399536132812 }, { - "x": 581.4039916992188, - "y": 237.93800354003906 + "x": 625.4140014648438, + "y": 261.4209899902344 }, { - "x": 568.1270141601562, - "y": 242.2519989013672 + "x": 610.3920288085938, + "y": 268.74798583984375 }, { - "x": 554.5819702148438, - "y": 245.62899780273438 + "x": 594.89599609375, + "y": 275.0090026855469 }, { - "x": 540.833984375, - "y": 248.05299377441406 + "x": 579.0009765625, + "y": 280.1730041503906 }, { - "x": 526.9509887695312, - "y": 249.51199340820312 + "x": 562.7839965820312, + "y": 284.2170104980469 + }, + { + "x": 546.323974609375, + "y": 287.1189880371094 + }, + { + "x": 529.7030029296875, + "y": 288.8659973144531 }, { "x": 513, - "y": 250 + "y": 289.4490051269531 + }, + { + "x": 496.2959899902344, + "y": 288.8659973144531 + }, + { + "x": 479.67498779296875, + "y": 287.1189880371094 }, { - "x": 499.0480041503906, - "y": 249.51199340820312 + "x": 463.2149963378906, + "y": 284.2170104980469 }, { - "x": 485.1650085449219, - "y": 248.05299377441406 + "x": 446.99798583984375, + "y": 280.1730041503906 }, { - "x": 471.4169921875, - "y": 245.62899780273438 + "x": 431.1029968261719, + "y": 275.0090026855469 }, { - "x": 457.87200927734375, - "y": 242.2519989013672 + "x": 415.60699462890625, + "y": 268.74798583984375 }, { - "x": 444.5950012207031, - "y": 237.93800354003906 + "x": 400.5849914550781, + "y": 261.4209899902344 }, { - "x": 431.6520080566406, - "y": 232.70899963378906 + "x": 386.1109924316406, + "y": 253.06399536132812 }, { - "x": 419.1050109863281, - "y": 226.58900451660156 + "x": 372.2550048828125, + "y": 243.71800231933594 }, { - "x": 407.0159912109375, - "y": 219.60899353027344 + "x": 359.0840148925781, + "y": 233.4290008544922 }, { - "x": 395.4419860839844, - "y": 211.80299377441406 + "x": 346.66400146484375, + "y": 222.2449951171875 }, { - "x": 384.4419860839844, - "y": 203.20799255371094 + "x": 335.0539855957031, + "y": 210.22300720214844 }, { - "x": 374.0679931640625, - "y": 193.86700439453125 + "x": 324.3110046386719, + "y": 197.41900634765625 }, { - "x": 364.3710021972656, - "y": 183.8260040283203 + "x": 314.48699951171875, + "y": 183.8979949951172 } ], "isCurve": true, @@ -1192,112 +1256,112 @@ "link": "", "route": [ { - "x": 1013.5819702148438, - "y": -195.62899780273438 + "x": 1020.4429931640625, + "y": -227.9080047607422 }, { - "x": 1033.802978515625, - "y": -190.21099853515625 + "x": 1044, + "y": -221.5959930419922 }, { - "x": 1053.3470458984375, - "y": -182.70899963378906 + "x": 1066.76904296875, + "y": -212.8560028076172 }, { - "x": 1072, - "y": -173.2050018310547 + "x": 1088.5, + "y": -201.7830047607422 }, { - "x": 1089.5570068359375, - "y": -161.80299377441406 + "x": 1108.9530029296875, + "y": -188.5 }, { - "x": 1105.8260498046875, - "y": -148.6280059814453 + "x": 1127.906982421875, + "y": -173.15199279785156 }, { - "x": 1120.6280517578125, - "y": -133.8260040283203 + "x": 1145.1519775390625, + "y": -155.90699768066406 }, { - "x": 1133.802978515625, - "y": -117.55699920654297 + "x": 1160.5, + "y": -136.9530029296875 }, { - "x": 1145.2049560546875, - "y": -100 + "x": 1173.782958984375, + "y": -116.5 }, { - "x": 1154.708984375, - "y": -81.34700012207031 + "x": 1184.85595703125, + "y": -94.76899719238281 }, { - "x": 1162.2110595703125, - "y": -61.803001403808594 + "x": 1193.595947265625, + "y": -72 }, { - "x": 1167.6290283203125, - "y": -41.582000732421875 + "x": 1199.907958984375, + "y": -48.44300079345703 }, { - "x": 1170.904052734375, - "y": -20.905000686645508 + "x": 1203.7230224609375, + "y": -24.354999542236328 }, { - "x": 1172, + "x": 1205, "y": 0 }, { - "x": 1170.904052734375, - "y": 20.905000686645508 + "x": 1203.7230224609375, + "y": 24.354999542236328 }, { - "x": 1167.6290283203125, - "y": 41.582000732421875 + "x": 1199.907958984375, + "y": 48.44300079345703 }, { - "x": 1162.2110595703125, - "y": 61.803001403808594 + "x": 1193.595947265625, + "y": 72 }, { - "x": 1154.708984375, - "y": 81.34700012207031 + "x": 1184.85595703125, + "y": 94.76899719238281 }, { - "x": 1145.2049560546875, - "y": 99.9990005493164 + "x": 1173.782958984375, + "y": 116.4990005493164 }, { - "x": 1133.802978515625, - "y": 117.55699920654297 + "x": 1160.5, + "y": 136.9530029296875 }, { - "x": 1120.6280517578125, - "y": 133.8260040283203 + "x": 1145.1519775390625, + "y": 155.90699768066406 }, { - "x": 1105.8260498046875, - "y": 148.6280059814453 + "x": 1127.906982421875, + "y": 173.15199279785156 }, { - "x": 1089.5570068359375, - "y": 161.80299377441406 + "x": 1108.9530029296875, + "y": 188.5 }, { - "x": 1072, - "y": 173.2050018310547 + "x": 1088.5, + "y": 201.7830047607422 }, { - "x": 1053.3470458984375, - "y": 182.70899963378906 + "x": 1066.76904296875, + "y": 212.8560028076172 }, { - "x": 1033.802978515625, - "y": 190.21099853515625 + "x": 1044, + "y": 221.5959930419922 }, { - "x": 1013.5819702148438, - "y": 195.62899780273438 + "x": 1020.4429931640625, + "y": 227.9080047607422 } ], "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 ecc9129818..fbf5f78c42 100644 --- a/e2etests/testdata/txtar/cycle-diagram/dagre/sketch.exp.svg +++ b/e2etests/testdata/txtar/cycle-diagram/dagre/sketch.exp.svg @@ -1,9 +1,9 @@ -abcdabcab - + .d2-3765219362 .fill-N1{fill:#0A0F25;} + .d2-3765219362 .fill-N2{fill:#676C7E;} + .d2-3765219362 .fill-N3{fill:#9499AB;} + .d2-3765219362 .fill-N4{fill:#CFD2DD;} + .d2-3765219362 .fill-N5{fill:#DEE1EB;} + .d2-3765219362 .fill-N6{fill:#EEF1F8;} + .d2-3765219362 .fill-N7{fill:#FFFFFF;} + .d2-3765219362 .fill-B1{fill:#0D32B2;} + .d2-3765219362 .fill-B2{fill:#0D32B2;} + .d2-3765219362 .fill-B3{fill:#E3E9FD;} + .d2-3765219362 .fill-B4{fill:#E3E9FD;} + .d2-3765219362 .fill-B5{fill:#EDF0FD;} + .d2-3765219362 .fill-B6{fill:#F7F8FE;} + .d2-3765219362 .fill-AA2{fill:#4A6FF3;} + .d2-3765219362 .fill-AA4{fill:#EDF0FD;} + .d2-3765219362 .fill-AA5{fill:#F7F8FE;} + .d2-3765219362 .fill-AB4{fill:#EDF0FD;} + .d2-3765219362 .fill-AB5{fill:#F7F8FE;} + .d2-3765219362 .stroke-N1{stroke:#0A0F25;} + .d2-3765219362 .stroke-N2{stroke:#676C7E;} + .d2-3765219362 .stroke-N3{stroke:#9499AB;} + .d2-3765219362 .stroke-N4{stroke:#CFD2DD;} + .d2-3765219362 .stroke-N5{stroke:#DEE1EB;} + .d2-3765219362 .stroke-N6{stroke:#EEF1F8;} + .d2-3765219362 .stroke-N7{stroke:#FFFFFF;} + .d2-3765219362 .stroke-B1{stroke:#0D32B2;} + .d2-3765219362 .stroke-B2{stroke:#0D32B2;} + .d2-3765219362 .stroke-B3{stroke:#E3E9FD;} + .d2-3765219362 .stroke-B4{stroke:#E3E9FD;} + .d2-3765219362 .stroke-B5{stroke:#EDF0FD;} + .d2-3765219362 .stroke-B6{stroke:#F7F8FE;} + .d2-3765219362 .stroke-AA2{stroke:#4A6FF3;} + .d2-3765219362 .stroke-AA4{stroke:#EDF0FD;} + .d2-3765219362 .stroke-AA5{stroke:#F7F8FE;} + .d2-3765219362 .stroke-AB4{stroke:#EDF0FD;} + .d2-3765219362 .stroke-AB5{stroke:#F7F8FE;} + .d2-3765219362 .background-color-N1{background-color:#0A0F25;} + .d2-3765219362 .background-color-N2{background-color:#676C7E;} + .d2-3765219362 .background-color-N3{background-color:#9499AB;} + .d2-3765219362 .background-color-N4{background-color:#CFD2DD;} + .d2-3765219362 .background-color-N5{background-color:#DEE1EB;} + .d2-3765219362 .background-color-N6{background-color:#EEF1F8;} + .d2-3765219362 .background-color-N7{background-color:#FFFFFF;} + .d2-3765219362 .background-color-B1{background-color:#0D32B2;} + .d2-3765219362 .background-color-B2{background-color:#0D32B2;} + .d2-3765219362 .background-color-B3{background-color:#E3E9FD;} + .d2-3765219362 .background-color-B4{background-color:#E3E9FD;} + .d2-3765219362 .background-color-B5{background-color:#EDF0FD;} + .d2-3765219362 .background-color-B6{background-color:#F7F8FE;} + .d2-3765219362 .background-color-AA2{background-color:#4A6FF3;} + .d2-3765219362 .background-color-AA4{background-color:#EDF0FD;} + .d2-3765219362 .background-color-AA5{background-color:#F7F8FE;} + .d2-3765219362 .background-color-AB4{background-color:#EDF0FD;} + .d2-3765219362 .background-color-AB5{background-color:#F7F8FE;} + .d2-3765219362 .color-N1{color:#0A0F25;} + .d2-3765219362 .color-N2{color:#676C7E;} + .d2-3765219362 .color-N3{color:#9499AB;} + .d2-3765219362 .color-N4{color:#CFD2DD;} + .d2-3765219362 .color-N5{color:#DEE1EB;} + .d2-3765219362 .color-N6{color:#EEF1F8;} + .d2-3765219362 .color-N7{color:#FFFFFF;} + .d2-3765219362 .color-B1{color:#0D32B2;} + .d2-3765219362 .color-B2{color:#0D32B2;} + .d2-3765219362 .color-B3{color:#E3E9FD;} + .d2-3765219362 .color-B4{color:#E3E9FD;} + .d2-3765219362 .color-B5{color:#EDF0FD;} + .d2-3765219362 .color-B6{color:#F7F8FE;} + .d2-3765219362 .color-AA2{color:#4A6FF3;} + .d2-3765219362 .color-AA4{color:#EDF0FD;} + .d2-3765219362 .color-AA5{color:#F7F8FE;} + .d2-3765219362 .color-AB4{color:#EDF0FD;} + .d2-3765219362 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker-d2-3765219362);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker-d2-3765219362);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright-d2-3765219362);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright-d2-3765219362);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright-d2-3765219362);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright-d2-3765219362);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark-d2-3765219362);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright-d2-3765219362);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright-d2-3765219362);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright-d2-3765219362);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright-d2-3765219362);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker-d2-3765219362);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark-d2-3765219362);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal-d2-3765219362);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal-d2-3765219362);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright-d2-3765219362);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright-d2-3765219362);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright-d2-3765219362);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>abcdabcab + diff --git a/e2etests/testdata/txtar/cycle-diagram/elk/board.exp.json b/e2etests/testdata/txtar/cycle-diagram/elk/board.exp.json index ad3f518e0c..60093062f8 100644 --- a/e2etests/testdata/txtar/cycle-diagram/elk/board.exp.json +++ b/e2etests/testdata/txtar/cycle-diagram/elk/board.exp.json @@ -540,100 +540,112 @@ "link": "", "route": [ { - "x": 43.2859992980957, - "y": -185.53700256347656 + "x": 48.44900131225586, + "y": -218.13099670410156 }, { - "x": 53.582000732421875, - "y": -183.62899780273438 + "x": 60.44300079345703, + "y": -215.9080047607422 }, { - "x": 63.76300048828125, - "y": -181.18499755859375 + "x": 72.30400085449219, + "y": -213.05999755859375 }, { - "x": 73.8030014038086, - "y": -178.21099853515625 + "x": 84, + "y": -209.5959930419922 }, { - "x": 83.6729965209961, - "y": -174.71600341796875 + "x": 95.4990005493164, + "y": -205.5240020751953 }, { - "x": 93.34700012207031, - "y": -170.70899963378906 + "x": 106.76899719238281, + "y": -200.8560028076172 }, { - "x": 102.7979965209961, - "y": -166.2010040283203 + "x": 117.77899932861328, + "y": -195.60400390625 }, { - "x": 111.9990005493164, - "y": -161.2050018310547 + "x": 128.5, + "y": -189.7830047607422 }, { - "x": 120.927001953125, - "y": -155.73399353027344 + "x": 138.89999389648438, + "y": -183.41000366210938 }, { - "x": 129.5570068359375, - "y": -149.80299377441406 + "x": 148.9530029296875, + "y": -176.5 }, { - "x": 137.86399841308594, - "y": -143.4290008544922 + "x": 158.63099670410156, + "y": -169.0749969482422 }, { - "x": 145.8260040283203, - "y": -136.6280059814453 + "x": 167.90699768066406, + "y": -161.15199279785156 }, { - "x": 153.42100524902344, - "y": -129.42100524902344 + "x": 176.7550048828125, + "y": -152.7550048828125 }, { - "x": 160.6280059814453, - "y": -121.82599639892578 + "x": 185.15199279785156, + "y": -143.90699768066406 }, { - "x": 167.4290008544922, - "y": -113.86399841308594 + "x": 193.0749969482422, + "y": -134.63099670410156 }, { - "x": 173.80299377441406, - "y": -105.55699920654297 + "x": 200.5, + "y": -124.9530029296875 }, { - "x": 179.73399353027344, - "y": -96.927001953125 + "x": 207.41000366210938, + "y": -114.9000015258789 }, { - "x": 185.2050018310547, - "y": -88 + "x": 213.7830047607422, + "y": -104.5 }, { - "x": 190.2010040283203, - "y": -78.7979965209961 + "x": 219.60400390625, + "y": -93.77899932861328 }, { - "x": 194.70899963378906, - "y": -69.34700012207031 + "x": 224.8560028076172, + "y": -82.76899719238281 }, { - "x": 198.71600341796875, - "y": -59.67300033569336 + "x": 229.5240020751953, + "y": -71.4990005493164 }, { - "x": 202.21099853515625, - "y": -49.803001403808594 + "x": 233.5959930419922, + "y": -60 }, { - "x": 205.18499755859375, - "y": -39.76300048828125 + "x": 237.05999755859375, + "y": -48.30400085449219 }, { - "x": 207.62899780273438, - "y": -29.582000732421875 + "x": 239.9080047607422, + "y": -36.44300079345703 + }, + { + "x": 242.13099670410156, + "y": -24.448999404907227 + }, + { + "x": 243.72300720214844, + "y": -12.354999542236328 + }, + { + "x": 244.67999267578125, + "y": -0.1940000057220459 } ], "isCurve": true, @@ -668,100 +680,112 @@ "link": "", "route": [ { - "x": 207.62899780273438, - "y": 53.582000732421875 + "x": 244.67999267578125, + "y": 24.194000244140625 + }, + { + "x": 243.72300720214844, + "y": 36.35499954223633 }, { - "x": 205.18499755859375, - "y": 63.76300048828125 + "x": 242.13099670410156, + "y": 48.44900131225586 }, { - "x": 202.21099853515625, - "y": 73.8030014038086 + "x": 239.9080047607422, + "y": 60.44300079345703 }, { - "x": 198.71600341796875, - "y": 83.6729965209961 + "x": 237.05999755859375, + "y": 72.30400085449219 }, { - "x": 194.70899963378906, - "y": 93.34700012207031 + "x": 233.5959930419922, + "y": 84 }, { - "x": 190.2010040283203, - "y": 102.7979965209961 + "x": 229.5240020751953, + "y": 95.4990005493164 }, { - "x": 185.2050018310547, - "y": 111.9990005493164 + "x": 224.8560028076172, + "y": 106.76899719238281 }, { - "x": 179.73399353027344, - "y": 120.927001953125 + "x": 219.60400390625, + "y": 117.77899932861328 }, { - "x": 173.80299377441406, - "y": 129.5570068359375 + "x": 213.7830047607422, + "y": 128.5 }, { - "x": 167.4290008544922, - "y": 137.86399841308594 + "x": 207.41000366210938, + "y": 138.89999389648438 }, { - "x": 160.6280059814453, - "y": 145.8260040283203 + "x": 200.5, + "y": 148.9530029296875 }, { - "x": 153.42100524902344, - "y": 153.42100524902344 + "x": 193.0749969482422, + "y": 158.63099670410156 }, { - "x": 145.8260040283203, - "y": 160.6280059814453 + "x": 185.15199279785156, + "y": 167.90699768066406 }, { - "x": 137.86399841308594, - "y": 167.4290008544922 + "x": 176.7550048828125, + "y": 176.7550048828125 }, { - "x": 129.5570068359375, - "y": 173.80299377441406 + "x": 167.90699768066406, + "y": 185.15199279785156 }, { - "x": 120.927001953125, - "y": 179.73399353027344 + "x": 158.63099670410156, + "y": 193.0749969482422 }, { - "x": 112, - "y": 185.2050018310547 + "x": 148.9530029296875, + "y": 200.5 }, { - "x": 102.7979965209961, - "y": 190.2010040283203 + "x": 138.89999389648438, + "y": 207.41000366210938 }, { - "x": 93.34700012207031, - "y": 194.70899963378906 + "x": 128.5, + "y": 213.7830047607422 }, { - "x": 83.6729965209961, - "y": 198.71600341796875 + "x": 117.77899932861328, + "y": 219.60400390625 }, { - "x": 73.8030014038086, - "y": 202.21099853515625 + "x": 106.76899719238281, + "y": 224.8560028076172 }, { - "x": 63.76300048828125, - "y": 205.18499755859375 + "x": 95.4990005493164, + "y": 229.5240020751953 }, { - "x": 53.582000732421875, - "y": 207.62899780273438 + "x": 84, + "y": 233.5959930419922 }, { - "x": 43.2859992980957, - "y": 209.53700256347656 + "x": 72.30400085449219, + "y": 237.05999755859375 + }, + { + "x": 60.44300079345703, + "y": 239.9080047607422 + }, + { + "x": 48.44900131225586, + "y": 242.13099670410156 } ], "isCurve": true, @@ -796,100 +820,112 @@ "link": "", "route": [ { - "x": -19.285999298095703, - "y": 209.53700256347656 + "x": -24.448999404907227, + "y": 242.13099670410156 + }, + { + "x": -36.44300079345703, + "y": 239.9080047607422 + }, + { + "x": -48.30400085449219, + "y": 237.05999755859375 }, { - "x": -29.582000732421875, - "y": 207.62899780273438 + "x": -60, + "y": 233.5959930419922 }, { - "x": -39.76300048828125, - "y": 205.18499755859375 + "x": -71.4990005493164, + "y": 229.5240020751953 }, { - "x": -49.803001403808594, - "y": 202.21099853515625 + "x": -82.76899719238281, + "y": 224.8560028076172 }, { - "x": -59.67300033569336, - "y": 198.71600341796875 + "x": -93.77899932861328, + "y": 219.60400390625 }, { - "x": -69.34700012207031, - "y": 194.70899963378906 + "x": -104.4990005493164, + "y": 213.7830047607422 }, { - "x": -78.7979965209961, - "y": 190.2010040283203 + "x": -114.9000015258789, + "y": 207.41000366210938 }, { - "x": -87.9990005493164, - "y": 185.2050018310547 + "x": -124.9530029296875, + "y": 200.5 }, { - "x": -96.927001953125, - "y": 179.73399353027344 + "x": -134.63099670410156, + "y": 193.0749969482422 }, { - "x": -105.55699920654297, - "y": 173.80299377441406 + "x": -143.90699768066406, + "y": 185.15199279785156 }, { - "x": -113.86399841308594, - "y": 167.4290008544922 + "x": -152.7550048828125, + "y": 176.7550048828125 }, { - "x": -121.82599639892578, - "y": 160.6280059814453 + "x": -161.15199279785156, + "y": 167.90699768066406 }, { - "x": -129.42100524902344, - "y": 153.42100524902344 + "x": -169.0749969482422, + "y": 158.63099670410156 }, { - "x": -136.6280059814453, - "y": 145.8260040283203 + "x": -176.5, + "y": 148.9530029296875 }, { - "x": -143.4290008544922, - "y": 137.86399841308594 + "x": -183.41000366210938, + "y": 138.89999389648438 }, { - "x": -149.80299377441406, - "y": 129.5570068359375 + "x": -189.7830047607422, + "y": 128.5 }, { - "x": -155.73399353027344, - "y": 120.927001953125 + "x": -195.60400390625, + "y": 117.77899932861328 }, { - "x": -161.2050018310547, - "y": 112 + "x": -200.8560028076172, + "y": 106.76899719238281 }, { - "x": -166.2010040283203, - "y": 102.7979965209961 + "x": -205.5240020751953, + "y": 95.4990005493164 }, { - "x": -170.70899963378906, - "y": 93.34700012207031 + "x": -209.5959930419922, + "y": 84 }, { - "x": -174.71600341796875, - "y": 83.6729965209961 + "x": -213.05999755859375, + "y": 72.30400085449219 }, { - "x": -178.21099853515625, - "y": 73.8030014038086 + "x": -215.9080047607422, + "y": 60.44300079345703 }, { - "x": -181.18499755859375, - "y": 63.76300048828125 + "x": -218.13099670410156, + "y": 48.44900131225586 }, { - "x": -183.62899780273438, - "y": 53.582000732421875 + "x": -219.72300720214844, + "y": 36.35499954223633 + }, + { + "x": -220.67999267578125, + "y": 24.194000244140625 } ], "isCurve": true, @@ -924,108 +960,120 @@ "link": "", "route": [ { - "x": 513.333984375, - "y": -136.05299377441406 + "x": 502.2030029296875, + "y": -176.86599731445312 + }, + { + "x": 518.823974609375, + "y": -175.11900329589844 + }, + { + "x": 535.2839965820312, + "y": -172.2169952392578 + }, + { + "x": 551.5009765625, + "y": -168.17300415039062 }, { - "x": 527.0819702148438, - "y": -133.62899780273438 + "x": 567.39599609375, + "y": -163.00900268554688 }, { - "x": 540.6270141601562, - "y": -130.2519989013672 + "x": 582.8920288085938, + "y": -156.7480010986328 }, { - "x": 553.9039916992188, - "y": -125.93800354003906 + "x": 597.9140014648438, + "y": -149.42100524902344 }, { - "x": 566.8469848632812, - "y": -120.70899963378906 + "x": 612.3880004882812, + "y": -141.06399536132812 }, { - "x": 579.3939819335938, - "y": -114.58899688720703 + "x": 626.2440185546875, + "y": -131.71800231933594 }, { - "x": 591.4829711914062, - "y": -107.60900115966797 + "x": 639.4149780273438, + "y": -121.42900085449219 }, { - "x": 603.0570068359375, - "y": -99.8030014038086 + "x": 651.8350219726562, + "y": -110.24500274658203 }, { - "x": 614.0570068359375, - "y": -91.20800018310547 + "x": 663.4450073242188, + "y": -98.2229995727539 }, { - "x": 624.4310302734375, - "y": -81.86699676513672 + "x": 674.18798828125, + "y": -85.41899871826172 }, { - "x": 634.1279907226562, - "y": -71.82599639892578 + "x": 684.0120239257812, + "y": -71.89800262451172 }, { - "x": 643.1019897460938, - "y": -61.13199996948242 + "x": 692.8690185546875, + "y": -57.7239990234375 }, { - "x": 651.3070068359375, - "y": -49.8380012512207 + "x": 700.7150268554688, + "y": -42.96699905395508 }, { - "x": 658.7050170898438, - "y": -38 + "x": 707.5130004882812, + "y": -27.698999404907227 }, { - "x": 665.2579956054688, - "y": -25.673999786376953 + "x": 713.22998046875, + "y": -11.994000434875488 }, { - "x": 670.9359741210938, - "y": -12.920999526977539 + "x": 717.8359985351562, + "y": 4.071000099182129 }, { - "x": 675.7109985351562, - "y": 0.19599999487400055 + "x": 721.3109741210938, + "y": 20.420000076293945 }, { - "x": 679.5590209960938, - "y": 13.614999771118164 + "x": 723.6370239257812, + "y": 36.970001220703125 }, { - "x": 682.4609985351562, - "y": 27.270000457763672 + "x": 724.802978515625, + "y": 53.643001556396484 }, { - "x": 684.4039916992188, - "y": 41.09400177001953 + "x": 724.802978515625, + "y": 70.35600280761719 }, { - "x": 685.3779907226562, - "y": 55.02000045776367 + "x": 723.6370239257812, + "y": 87.02899932861328 }, { - "x": 685.3779907226562, - "y": 68.97899627685547 + "x": 721.3109741210938, + "y": 103.5790023803711 }, { - "x": 684.4039916992188, - "y": 82.90499877929688 + "x": 717.8359985351562, + "y": 119.9280014038086 }, { - "x": 682.4609985351562, - "y": 96.72899627685547 + "x": 713.22998046875, + "y": 135.99400329589844 }, { - "x": 679.5590209960938, - "y": 110.38400268554688 + "x": 707.5130004882812, + "y": 151.69900512695312 }, { - "x": 675.7109985351562, - "y": 123.8030014038086 + "x": 700.7150268554688, + "y": 166.9669952392578 } ], "isCurve": true, @@ -1060,104 +1108,120 @@ "link": "", "route": [ { - "x": 634.1279907226562, - "y": 195.8260040283203 + "x": 684.0120239257812, + "y": 195.8979949951172 }, { - "x": 624.4310302734375, - "y": 205.86700439453125 + "x": 674.18798828125, + "y": 209.41900634765625 }, { - "x": 614.0570068359375, - "y": 215.20799255371094 + "x": 663.4450073242188, + "y": 222.22300720214844 }, { - "x": 603.0570068359375, - "y": 223.80299377441406 + "x": 651.8350219726562, + "y": 234.2449951171875 }, { - "x": 591.4829711914062, - "y": 231.60899353027344 + "x": 639.4149780273438, + "y": 245.4290008544922 }, { - "x": 579.3939819335938, - "y": 238.58900451660156 + "x": 626.2440185546875, + "y": 255.71800231933594 }, { - "x": 566.8469848632812, - "y": 244.70899963378906 + "x": 612.3880004882812, + "y": 265.0639953613281 }, { - "x": 553.9039916992188, - "y": 249.93800354003906 + "x": 597.9140014648438, + "y": 273.4209899902344 }, { - "x": 540.6270141601562, - "y": 254.2519989013672 + "x": 582.8920288085938, + "y": 280.74798583984375 }, { - "x": 527.0819702148438, - "y": 257.6289978027344 + "x": 567.39599609375, + "y": 287.0090026855469 }, { - "x": 513.333984375, - "y": 260.0530090332031 + "x": 551.5009765625, + "y": 292.1730041503906 }, { - "x": 499.45098876953125, - "y": 261.5119934082031 + "x": 535.2839965820312, + "y": 296.2170104980469 + }, + { + "x": 518.823974609375, + "y": 299.1189880371094 + }, + { + "x": 502.2030029296875, + "y": 300.8659973144531 }, { "x": 485.5, - "y": 262 + "y": 301.4490051269531 + }, + { + "x": 468.7959899902344, + "y": 300.8659973144531 + }, + { + "x": 452.17498779296875, + "y": 299.1189880371094 }, { - "x": 471.5480041503906, - "y": 261.5119934082031 + "x": 435.7149963378906, + "y": 296.2170104980469 }, { - "x": 457.6650085449219, - "y": 260.0530090332031 + "x": 419.49798583984375, + "y": 292.1730041503906 }, { - "x": 443.9169921875, - "y": 257.6289978027344 + "x": 403.6029968261719, + "y": 287.0090026855469 }, { - "x": 430.37200927734375, - "y": 254.2519989013672 + "x": 388.10699462890625, + "y": 280.74798583984375 }, { - "x": 417.0950012207031, - "y": 249.93800354003906 + "x": 373.0849914550781, + "y": 273.4209899902344 }, { - "x": 404.1520080566406, - "y": 244.70899963378906 + "x": 358.6109924316406, + "y": 265.0639953613281 }, { - "x": 391.6050109863281, - "y": 238.58900451660156 + "x": 344.7550048828125, + "y": 255.71800231933594 }, { - "x": 379.5159912109375, - "y": 231.60899353027344 + "x": 331.5840148925781, + "y": 245.4290008544922 }, { - "x": 367.9419860839844, - "y": 223.80299377441406 + "x": 319.16400146484375, + "y": 234.2449951171875 }, { - "x": 356.9419860839844, - "y": 215.20799255371094 + "x": 307.5539855957031, + "y": 222.22300720214844 }, { - "x": 346.5679931640625, - "y": 205.86700439453125 + "x": 296.8110046386719, + "y": 209.41900634765625 }, { - "x": 336.8710021972656, - "y": 195.8260040283203 + "x": 286.98699951171875, + "y": 195.8979949951172 } ], "isCurve": true, @@ -1192,112 +1256,112 @@ "link": "", "route": [ { - "x": 946.4920043945312, - "y": -183.62899780273438 + "x": 953.35302734375, + "y": -215.9080047607422 }, { - "x": 966.7130126953125, - "y": -178.21099853515625 + "x": 976.9110107421875, + "y": -209.5959930419922 }, { - "x": 986.2570190429688, - "y": -170.70899963378906 + "x": 999.6790161132812, + "y": -200.8560028076172 }, { - "x": 1004.9099731445312, - "y": -161.2050018310547 + "x": 1021.4099731445312, + "y": -189.7830047607422 }, { - "x": 1022.4669799804688, - "y": -149.80299377441406 + "x": 1041.864013671875, + "y": -176.5 }, { - "x": 1038.7359619140625, - "y": -136.6280059814453 + "x": 1060.8170166015625, + "y": -161.15199279785156 }, { - "x": 1053.5389404296875, - "y": -121.82599639892578 + "x": 1078.06201171875, + "y": -143.90699768066406 }, { - "x": 1066.7130126953125, - "y": -105.55699920654297 + "x": 1093.4110107421875, + "y": -124.9530029296875 }, { - "x": 1078.114990234375, - "y": -88 + "x": 1106.6939697265625, + "y": -104.5 }, { - "x": 1087.6190185546875, - "y": -69.34700012207031 + "x": 1117.7659912109375, + "y": -82.76899719238281 }, { - "x": 1095.1209716796875, - "y": -49.803001403808594 + "x": 1126.5059814453125, + "y": -60 }, { - "x": 1100.5389404296875, - "y": -29.582000732421875 + "x": 1132.8179931640625, + "y": -36.44300079345703 }, { - "x": 1103.81396484375, - "y": -8.904999732971191 + "x": 1136.633056640625, + "y": -12.354999542236328 }, { - "x": 1104.9100341796875, + "x": 1137.9100341796875, "y": 12 }, { - "x": 1103.81396484375, - "y": 32.904998779296875 + "x": 1136.633056640625, + "y": 36.35499954223633 }, { - "x": 1100.5389404296875, - "y": 53.582000732421875 + "x": 1132.8179931640625, + "y": 60.44300079345703 }, { - "x": 1095.1209716796875, - "y": 73.8030014038086 + "x": 1126.5059814453125, + "y": 84 }, { - "x": 1087.6190185546875, - "y": 93.34700012207031 + "x": 1117.7659912109375, + "y": 106.76899719238281 }, { - "x": 1078.114990234375, - "y": 111.9990005493164 + "x": 1106.6939697265625, + "y": 128.49899291992188 }, { - "x": 1066.7130126953125, - "y": 129.5570068359375 + "x": 1093.4110107421875, + "y": 148.9530029296875 }, { - "x": 1053.5389404296875, - "y": 145.8260040283203 + "x": 1078.06201171875, + "y": 167.90699768066406 }, { - "x": 1038.7359619140625, - "y": 160.6280059814453 + "x": 1060.8170166015625, + "y": 185.15199279785156 }, { - "x": 1022.4669799804688, - "y": 173.80299377441406 + "x": 1041.864013671875, + "y": 200.5 }, { - "x": 1004.9099731445312, - "y": 185.2050018310547 + "x": 1021.4099731445312, + "y": 213.7830047607422 }, { - "x": 986.2570190429688, - "y": 194.70899963378906 + "x": 999.6790161132812, + "y": 224.8560028076172 }, { - "x": 966.7130126953125, - "y": 202.21099853515625 + "x": 976.9110107421875, + "y": 233.5959930419922 }, { - "x": 946.4920043945312, - "y": 207.62899780273438 + "x": 953.35302734375, + "y": 239.9080047607422 } ], "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 f5afaee6a7..40824648c5 100644 --- a/e2etests/testdata/txtar/cycle-diagram/elk/sketch.exp.svg +++ b/e2etests/testdata/txtar/cycle-diagram/elk/sketch.exp.svg @@ -1,9 +1,9 @@ -abcdabcab - + .d2-921212404 .fill-N1{fill:#0A0F25;} + .d2-921212404 .fill-N2{fill:#676C7E;} + .d2-921212404 .fill-N3{fill:#9499AB;} + .d2-921212404 .fill-N4{fill:#CFD2DD;} + .d2-921212404 .fill-N5{fill:#DEE1EB;} + .d2-921212404 .fill-N6{fill:#EEF1F8;} + .d2-921212404 .fill-N7{fill:#FFFFFF;} + .d2-921212404 .fill-B1{fill:#0D32B2;} + .d2-921212404 .fill-B2{fill:#0D32B2;} + .d2-921212404 .fill-B3{fill:#E3E9FD;} + .d2-921212404 .fill-B4{fill:#E3E9FD;} + .d2-921212404 .fill-B5{fill:#EDF0FD;} + .d2-921212404 .fill-B6{fill:#F7F8FE;} + .d2-921212404 .fill-AA2{fill:#4A6FF3;} + .d2-921212404 .fill-AA4{fill:#EDF0FD;} + .d2-921212404 .fill-AA5{fill:#F7F8FE;} + .d2-921212404 .fill-AB4{fill:#EDF0FD;} + .d2-921212404 .fill-AB5{fill:#F7F8FE;} + .d2-921212404 .stroke-N1{stroke:#0A0F25;} + .d2-921212404 .stroke-N2{stroke:#676C7E;} + .d2-921212404 .stroke-N3{stroke:#9499AB;} + .d2-921212404 .stroke-N4{stroke:#CFD2DD;} + .d2-921212404 .stroke-N5{stroke:#DEE1EB;} + .d2-921212404 .stroke-N6{stroke:#EEF1F8;} + .d2-921212404 .stroke-N7{stroke:#FFFFFF;} + .d2-921212404 .stroke-B1{stroke:#0D32B2;} + .d2-921212404 .stroke-B2{stroke:#0D32B2;} + .d2-921212404 .stroke-B3{stroke:#E3E9FD;} + .d2-921212404 .stroke-B4{stroke:#E3E9FD;} + .d2-921212404 .stroke-B5{stroke:#EDF0FD;} + .d2-921212404 .stroke-B6{stroke:#F7F8FE;} + .d2-921212404 .stroke-AA2{stroke:#4A6FF3;} + .d2-921212404 .stroke-AA4{stroke:#EDF0FD;} + .d2-921212404 .stroke-AA5{stroke:#F7F8FE;} + .d2-921212404 .stroke-AB4{stroke:#EDF0FD;} + .d2-921212404 .stroke-AB5{stroke:#F7F8FE;} + .d2-921212404 .background-color-N1{background-color:#0A0F25;} + .d2-921212404 .background-color-N2{background-color:#676C7E;} + .d2-921212404 .background-color-N3{background-color:#9499AB;} + .d2-921212404 .background-color-N4{background-color:#CFD2DD;} + .d2-921212404 .background-color-N5{background-color:#DEE1EB;} + .d2-921212404 .background-color-N6{background-color:#EEF1F8;} + .d2-921212404 .background-color-N7{background-color:#FFFFFF;} + .d2-921212404 .background-color-B1{background-color:#0D32B2;} + .d2-921212404 .background-color-B2{background-color:#0D32B2;} + .d2-921212404 .background-color-B3{background-color:#E3E9FD;} + .d2-921212404 .background-color-B4{background-color:#E3E9FD;} + .d2-921212404 .background-color-B5{background-color:#EDF0FD;} + .d2-921212404 .background-color-B6{background-color:#F7F8FE;} + .d2-921212404 .background-color-AA2{background-color:#4A6FF3;} + .d2-921212404 .background-color-AA4{background-color:#EDF0FD;} + .d2-921212404 .background-color-AA5{background-color:#F7F8FE;} + .d2-921212404 .background-color-AB4{background-color:#EDF0FD;} + .d2-921212404 .background-color-AB5{background-color:#F7F8FE;} + .d2-921212404 .color-N1{color:#0A0F25;} + .d2-921212404 .color-N2{color:#676C7E;} + .d2-921212404 .color-N3{color:#9499AB;} + .d2-921212404 .color-N4{color:#CFD2DD;} + .d2-921212404 .color-N5{color:#DEE1EB;} + .d2-921212404 .color-N6{color:#EEF1F8;} + .d2-921212404 .color-N7{color:#FFFFFF;} + .d2-921212404 .color-B1{color:#0D32B2;} + .d2-921212404 .color-B2{color:#0D32B2;} + .d2-921212404 .color-B3{color:#E3E9FD;} + .d2-921212404 .color-B4{color:#E3E9FD;} + .d2-921212404 .color-B5{color:#EDF0FD;} + .d2-921212404 .color-B6{color:#F7F8FE;} + .d2-921212404 .color-AA2{color:#4A6FF3;} + .d2-921212404 .color-AA4{color:#EDF0FD;} + .d2-921212404 .color-AA5{color:#F7F8FE;} + .d2-921212404 .color-AB4{color:#EDF0FD;} + .d2-921212404 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker-d2-921212404);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker-d2-921212404);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright-d2-921212404);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright-d2-921212404);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright-d2-921212404);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright-d2-921212404);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark-d2-921212404);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright-d2-921212404);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright-d2-921212404);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright-d2-921212404);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright-d2-921212404);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker-d2-921212404);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark-d2-921212404);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal-d2-921212404);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal-d2-921212404);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright-d2-921212404);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright-d2-921212404);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright-d2-921212404);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>abcdabcab + From 79d013d05ef775c47019ceda7b376a490e57b521 Mon Sep 17 00:00:00 2001 From: Mayank Mohapatra <125661248+Mayank77maruti@users.noreply.github.com> Date: Fri, 21 Feb 2025 19:12:20 +0000 Subject: [PATCH 12/73] test 2 --- d2layouts/d2cycle/layout.go | 18 +- .../txtar/cycle-diagram/dagre/board.exp.json | 660 ++++++++---------- .../txtar/cycle-diagram/dagre/sketch.exp.svg | 154 ++-- .../txtar/cycle-diagram/elk/board.exp.json | 660 ++++++++---------- .../txtar/cycle-diagram/elk/sketch.exp.svg | 154 ++-- 5 files changed, 754 insertions(+), 892 deletions(-) diff --git a/d2layouts/d2cycle/layout.go b/d2layouts/d2cycle/layout.go index dbdebf2b81..559bd0b3a4 100644 --- a/d2layouts/d2cycle/layout.go +++ b/d2layouts/d2cycle/layout.go @@ -30,20 +30,8 @@ func Layout(ctx context.Context, g *d2graph.Graph, layout d2graph.LayoutGraph) e radius := calculateRadius(objects) positionObjects(objects, radius) - // Calculate max projection for all objects to adjust the arc radius - maxProjection := 0.0 - for _, obj := range objects { - center := obj.Center() - theta := math.Atan2(center.Y, center.X) - projection := (obj.Width/2)*math.Cos(theta) + (obj.Height/2)*math.Sin(theta) - if projection > maxProjection { - maxProjection = projection - } - } - arcRadius := radius + maxProjection - for _, edge := range g.Edges { - createCircularArc(edge, arcRadius) + createCircularArc(edge) } return nil @@ -76,7 +64,7 @@ func positionObjects(objects []*d2graph.Object, radius float64) { } } -func createCircularArc(edge *d2graph.Edge, arcRadius float64) { +func createCircularArc(edge *d2graph.Edge) { if edge.Src == nil || edge.Dst == nil { return } @@ -90,6 +78,8 @@ func createCircularArc(edge *d2graph.Edge, arcRadius float64) { dstAngle += 2 * math.Pi } + arcRadius := math.Hypot(srcCenter.X, srcCenter.Y) + path := make([]*geo.Point, 0, ARC_STEPS+1) for i := 0; i <= ARC_STEPS; i++ { t := float64(i) / float64(ARC_STEPS) diff --git a/e2etests/testdata/txtar/cycle-diagram/dagre/board.exp.json b/e2etests/testdata/txtar/cycle-diagram/dagre/board.exp.json index 49d4ecca31..104df56cce 100644 --- a/e2etests/testdata/txtar/cycle-diagram/dagre/board.exp.json +++ b/e2etests/testdata/txtar/cycle-diagram/dagre/board.exp.json @@ -540,112 +540,100 @@ "link": "", "route": [ { - "x": 36.44900131225586, - "y": -230.13099670410156 + "x": 31.285999298095703, + "y": -197.53700256347656 }, { - "x": 48.44300079345703, - "y": -227.9080047607422 + "x": 41.582000732421875, + "y": -195.62899780273438 }, { - "x": 60.30400085449219, - "y": -225.05999755859375 + "x": 51.76300048828125, + "y": -193.18499755859375 }, { - "x": 72, - "y": -221.5959930419922 + "x": 61.803001403808594, + "y": -190.21099853515625 }, { - "x": 83.4990005493164, - "y": -217.5240020751953 + "x": 71.6729965209961, + "y": -186.71600341796875 }, { - "x": 94.76899719238281, - "y": -212.8560028076172 + "x": 81.34700012207031, + "y": -182.70899963378906 }, { - "x": 105.77899932861328, - "y": -207.60400390625 + "x": 90.7979965209961, + "y": -178.2010040283203 }, { - "x": 116.4990005493164, - "y": -201.7830047607422 + "x": 99.9990005493164, + "y": -173.2050018310547 }, { - "x": 126.9000015258789, - "y": -195.41000366210938 + "x": 108.927001953125, + "y": -167.73399353027344 }, { - "x": 136.9530029296875, - "y": -188.5 + "x": 117.55699920654297, + "y": -161.80299377441406 }, { - "x": 146.63099670410156, - "y": -181.0749969482422 + "x": 125.86399841308594, + "y": -155.4290008544922 }, { - "x": 155.90699768066406, - "y": -173.15199279785156 + "x": 133.8260040283203, + "y": -148.6280059814453 }, { - "x": 164.7550048828125, - "y": -164.7550048828125 + "x": 141.42100524902344, + "y": -141.42100524902344 }, { - "x": 173.15199279785156, - "y": -155.90699768066406 + "x": 148.6280059814453, + "y": -133.8260040283203 }, { - "x": 181.0749969482422, - "y": -146.63099670410156 + "x": 155.4290008544922, + "y": -125.86399841308594 }, { - "x": 188.5, - "y": -136.9530029296875 + "x": 161.80299377441406, + "y": -117.55699920654297 }, { - "x": 195.41000366210938, - "y": -126.9000015258789 + "x": 167.73399353027344, + "y": -108.927001953125 }, { - "x": 201.7830047607422, - "y": -116.5 + "x": 173.2050018310547, + "y": -100 }, { - "x": 207.60400390625, - "y": -105.77899932861328 + "x": 178.2010040283203, + "y": -90.7979965209961 }, { - "x": 212.8560028076172, - "y": -94.76899719238281 + "x": 182.70899963378906, + "y": -81.34700012207031 }, { - "x": 217.5240020751953, - "y": -83.4990005493164 + "x": 186.71600341796875, + "y": -71.6729965209961 }, { - "x": 221.5959930419922, - "y": -72 + "x": 190.21099853515625, + "y": -61.803001403808594 }, { - "x": 225.05999755859375, - "y": -60.30400085449219 + "x": 193.18499755859375, + "y": -51.76300048828125 }, { - "x": 227.9080047607422, - "y": -48.44300079345703 - }, - { - "x": 230.13099670410156, - "y": -36.44900131225586 - }, - { - "x": 231.72300720214844, - "y": -24.354999542236328 - }, - { - "x": 232.67999267578125, - "y": -12.194000244140625 + "x": 195.62899780273438, + "y": -41.582000732421875 } ], "isCurve": true, @@ -680,112 +668,100 @@ "link": "", "route": [ { - "x": 232.67999267578125, - "y": 12.194000244140625 - }, - { - "x": 231.72300720214844, - "y": 24.354999542236328 + "x": 195.62899780273438, + "y": 41.582000732421875 }, { - "x": 230.13099670410156, - "y": 36.44900131225586 + "x": 193.18499755859375, + "y": 51.76300048828125 }, { - "x": 227.9080047607422, - "y": 48.44300079345703 + "x": 190.21099853515625, + "y": 61.803001403808594 }, { - "x": 225.05999755859375, - "y": 60.30400085449219 + "x": 186.71600341796875, + "y": 71.6729965209961 }, { - "x": 221.5959930419922, - "y": 72 + "x": 182.70899963378906, + "y": 81.34700012207031 }, { - "x": 217.5240020751953, - "y": 83.4990005493164 + "x": 178.2010040283203, + "y": 90.7979965209961 }, { - "x": 212.8560028076172, - "y": 94.76899719238281 + "x": 173.2050018310547, + "y": 99.9990005493164 }, { - "x": 207.60400390625, - "y": 105.77899932861328 + "x": 167.73399353027344, + "y": 108.927001953125 }, { - "x": 201.7830047607422, - "y": 116.4990005493164 + "x": 161.80299377441406, + "y": 117.55699920654297 }, { - "x": 195.41000366210938, - "y": 126.9000015258789 + "x": 155.4290008544922, + "y": 125.86399841308594 }, { - "x": 188.5, - "y": 136.9530029296875 + "x": 148.6280059814453, + "y": 133.8260040283203 }, { - "x": 181.0749969482422, - "y": 146.63099670410156 + "x": 141.42100524902344, + "y": 141.42100524902344 }, { - "x": 173.15199279785156, - "y": 155.90699768066406 + "x": 133.8260040283203, + "y": 148.6280059814453 }, { - "x": 164.7550048828125, - "y": 164.7550048828125 + "x": 125.86399841308594, + "y": 155.4290008544922 }, { - "x": 155.90699768066406, - "y": 173.15199279785156 + "x": 117.55699920654297, + "y": 161.80299377441406 }, { - "x": 146.63099670410156, - "y": 181.0749969482422 + "x": 108.927001953125, + "y": 167.73399353027344 }, { - "x": 136.9530029296875, - "y": 188.5 + "x": 100, + "y": 173.2050018310547 }, { - "x": 126.9000015258789, - "y": 195.41000366210938 + "x": 90.7979965209961, + "y": 178.2010040283203 }, { - "x": 116.5, - "y": 201.7830047607422 + "x": 81.34700012207031, + "y": 182.70899963378906 }, { - "x": 105.77899932861328, - "y": 207.60400390625 + "x": 71.6729965209961, + "y": 186.71600341796875 }, { - "x": 94.76899719238281, - "y": 212.8560028076172 + "x": 61.803001403808594, + "y": 190.21099853515625 }, { - "x": 83.4990005493164, - "y": 217.5240020751953 + "x": 51.76300048828125, + "y": 193.18499755859375 }, { - "x": 72, - "y": 221.5959930419922 + "x": 41.582000732421875, + "y": 195.62899780273438 }, { - "x": 60.30400085449219, - "y": 225.05999755859375 - }, - { - "x": 48.44300079345703, - "y": 227.9080047607422 - }, - { - "x": 36.44900131225586, - "y": 230.13099670410156 + "x": 31.285999298095703, + "y": 197.53700256347656 } ], "isCurve": true, @@ -820,112 +796,100 @@ "link": "", "route": [ { - "x": -36.44900131225586, - "y": 230.13099670410156 - }, - { - "x": -48.44300079345703, - "y": 227.9080047607422 - }, - { - "x": -60.30400085449219, - "y": 225.05999755859375 + "x": -31.285999298095703, + "y": 197.53700256347656 }, { - "x": -72, - "y": 221.5959930419922 + "x": -41.582000732421875, + "y": 195.62899780273438 }, { - "x": -83.4990005493164, - "y": 217.5240020751953 + "x": -51.76300048828125, + "y": 193.18499755859375 }, { - "x": -94.76899719238281, - "y": 212.8560028076172 + "x": -61.803001403808594, + "y": 190.21099853515625 }, { - "x": -105.77899932861328, - "y": 207.60400390625 + "x": -71.6729965209961, + "y": 186.71600341796875 }, { - "x": -116.4990005493164, - "y": 201.7830047607422 + "x": -81.34700012207031, + "y": 182.70899963378906 }, { - "x": -126.9000015258789, - "y": 195.41000366210938 + "x": -90.7979965209961, + "y": 178.2010040283203 }, { - "x": -136.9530029296875, - "y": 188.5 + "x": -99.9990005493164, + "y": 173.2050018310547 }, { - "x": -146.63099670410156, - "y": 181.0749969482422 + "x": -108.927001953125, + "y": 167.73399353027344 }, { - "x": -155.90699768066406, - "y": 173.15199279785156 + "x": -117.55699920654297, + "y": 161.80299377441406 }, { - "x": -164.7550048828125, - "y": 164.7550048828125 + "x": -125.86399841308594, + "y": 155.4290008544922 }, { - "x": -173.15199279785156, - "y": 155.90699768066406 + "x": -133.8260040283203, + "y": 148.6280059814453 }, { - "x": -181.0749969482422, - "y": 146.63099670410156 + "x": -141.42100524902344, + "y": 141.42100524902344 }, { - "x": -188.5, - "y": 136.9530029296875 + "x": -148.6280059814453, + "y": 133.8260040283203 }, { - "x": -195.41000366210938, - "y": 126.9000015258789 + "x": -155.4290008544922, + "y": 125.86399841308594 }, { - "x": -201.7830047607422, - "y": 116.5 + "x": -161.80299377441406, + "y": 117.55699920654297 }, { - "x": -207.60400390625, - "y": 105.77899932861328 + "x": -167.73399353027344, + "y": 108.927001953125 }, { - "x": -212.8560028076172, - "y": 94.76899719238281 + "x": -173.2050018310547, + "y": 100 }, { - "x": -217.5240020751953, - "y": 83.4990005493164 + "x": -178.2010040283203, + "y": 90.7979965209961 }, { - "x": -221.5959930419922, - "y": 72 + "x": -182.70899963378906, + "y": 81.34700012207031 }, { - "x": -225.05999755859375, - "y": 60.30400085449219 + "x": -186.71600341796875, + "y": 71.6729965209961 }, { - "x": -227.9080047607422, - "y": 48.44300079345703 + "x": -190.21099853515625, + "y": 61.803001403808594 }, { - "x": -230.13099670410156, - "y": 36.44900131225586 + "x": -193.18499755859375, + "y": 51.76300048828125 }, { - "x": -231.72300720214844, - "y": 24.354999542236328 - }, - { - "x": -232.67999267578125, - "y": 12.194000244140625 + "x": -195.62899780273438, + "y": 41.582000732421875 } ], "isCurve": true, @@ -960,120 +924,108 @@ "link": "", "route": [ { - "x": 529.7030029296875, - "y": -188.86599731445312 - }, - { - "x": 546.323974609375, - "y": -187.11900329589844 - }, - { - "x": 562.7839965820312, - "y": -184.2169952392578 - }, - { - "x": 579.0009765625, - "y": -180.17300415039062 + "x": 540.833984375, + "y": -148.05299377441406 }, { - "x": 594.89599609375, - "y": -175.00900268554688 + "x": 554.5819702148438, + "y": -145.62899780273438 }, { - "x": 610.3920288085938, - "y": -168.7480010986328 + "x": 568.1270141601562, + "y": -142.2519989013672 }, { - "x": 625.4140014648438, - "y": -161.42100524902344 + "x": 581.4039916992188, + "y": -137.93800354003906 }, { - "x": 639.8880004882812, - "y": -153.06399536132812 + "x": 594.3469848632812, + "y": -132.70899963378906 }, { - "x": 653.7440185546875, - "y": -143.71800231933594 + "x": 606.8939819335938, + "y": -126.58899688720703 }, { - "x": 666.9149780273438, - "y": -133.4290008544922 + "x": 618.9829711914062, + "y": -119.60900115966797 }, { - "x": 679.3350219726562, - "y": -122.24500274658203 + "x": 630.5570068359375, + "y": -111.8030014038086 }, { - "x": 690.9450073242188, - "y": -110.2229995727539 + "x": 641.5570068359375, + "y": -103.20800018310547 }, { - "x": 701.68798828125, - "y": -97.41899871826172 + "x": 651.9310302734375, + "y": -93.86699676513672 }, { - "x": 711.5120239257812, - "y": -83.89800262451172 + "x": 661.6279907226562, + "y": -83.82599639892578 }, { - "x": 720.3690185546875, - "y": -69.7239990234375 + "x": 670.6019897460938, + "y": -73.13200378417969 }, { - "x": 728.2150268554688, - "y": -54.96699905395508 + "x": 678.8070068359375, + "y": -61.8380012512207 }, { - "x": 735.0130004882812, - "y": -39.69900131225586 + "x": 686.2050170898438, + "y": -50 }, { - "x": 740.72998046875, - "y": -23.993999481201172 + "x": 692.7579956054688, + "y": -37.67399978637695 }, { - "x": 745.3359985351562, - "y": -7.927999973297119 + "x": 698.4359741210938, + "y": -24.92099952697754 }, { - "x": 748.8109741210938, - "y": 8.420000076293945 + "x": 703.2109985351562, + "y": -11.803000450134277 }, { - "x": 751.1370239257812, - "y": 24.969999313354492 + "x": 707.0590209960938, + "y": 1.6150000095367432 }, { - "x": 752.302978515625, - "y": 41.643001556396484 + "x": 709.9609985351562, + "y": 15.270000457763672 }, { - "x": 752.302978515625, - "y": 58.35599899291992 + "x": 711.9039916992188, + "y": 29.0939998626709 }, { - "x": 751.1370239257812, - "y": 75.02899932861328 + "x": 712.8779907226562, + "y": 43.02000045776367 }, { - "x": 748.8109741210938, - "y": 91.5790023803711 + "x": 712.8779907226562, + "y": 56.979000091552734 }, { - "x": 745.3359985351562, - "y": 107.9280014038086 + "x": 711.9039916992188, + "y": 70.90499877929688 }, { - "x": 740.72998046875, - "y": 123.99400329589844 + "x": 709.9609985351562, + "y": 84.72899627685547 }, { - "x": 735.0130004882812, - "y": 139.69900512695312 + "x": 707.0590209960938, + "y": 98.38400268554688 }, { - "x": 728.2150268554688, - "y": 154.9669952392578 + "x": 703.2109985351562, + "y": 111.8030014038086 } ], "isCurve": true, @@ -1108,120 +1060,104 @@ "link": "", "route": [ { - "x": 711.5120239257812, - "y": 183.8979949951172 + "x": 661.6279907226562, + "y": 183.8260040283203 }, { - "x": 701.68798828125, - "y": 197.41900634765625 + "x": 651.9310302734375, + "y": 193.86700439453125 }, { - "x": 690.9450073242188, - "y": 210.22300720214844 + "x": 641.5570068359375, + "y": 203.20799255371094 }, { - "x": 679.3350219726562, - "y": 222.2449951171875 + "x": 630.5570068359375, + "y": 211.80299377441406 }, { - "x": 666.9149780273438, - "y": 233.4290008544922 + "x": 618.9829711914062, + "y": 219.60899353027344 }, { - "x": 653.7440185546875, - "y": 243.71800231933594 + "x": 606.8939819335938, + "y": 226.58900451660156 }, { - "x": 639.8880004882812, - "y": 253.06399536132812 + "x": 594.3469848632812, + "y": 232.70899963378906 }, { - "x": 625.4140014648438, - "y": 261.4209899902344 + "x": 581.4039916992188, + "y": 237.93800354003906 }, { - "x": 610.3920288085938, - "y": 268.74798583984375 + "x": 568.1270141601562, + "y": 242.2519989013672 }, { - "x": 594.89599609375, - "y": 275.0090026855469 + "x": 554.5819702148438, + "y": 245.62899780273438 }, { - "x": 579.0009765625, - "y": 280.1730041503906 + "x": 540.833984375, + "y": 248.05299377441406 }, { - "x": 562.7839965820312, - "y": 284.2170104980469 - }, - { - "x": 546.323974609375, - "y": 287.1189880371094 - }, - { - "x": 529.7030029296875, - "y": 288.8659973144531 + "x": 526.9509887695312, + "y": 249.51199340820312 }, { "x": 513, - "y": 289.4490051269531 - }, - { - "x": 496.2959899902344, - "y": 288.8659973144531 - }, - { - "x": 479.67498779296875, - "y": 287.1189880371094 + "y": 250 }, { - "x": 463.2149963378906, - "y": 284.2170104980469 + "x": 499.0480041503906, + "y": 249.51199340820312 }, { - "x": 446.99798583984375, - "y": 280.1730041503906 + "x": 485.1650085449219, + "y": 248.05299377441406 }, { - "x": 431.1029968261719, - "y": 275.0090026855469 + "x": 471.4169921875, + "y": 245.62899780273438 }, { - "x": 415.60699462890625, - "y": 268.74798583984375 + "x": 457.87200927734375, + "y": 242.2519989013672 }, { - "x": 400.5849914550781, - "y": 261.4209899902344 + "x": 444.5950012207031, + "y": 237.93800354003906 }, { - "x": 386.1109924316406, - "y": 253.06399536132812 + "x": 431.6520080566406, + "y": 232.70899963378906 }, { - "x": 372.2550048828125, - "y": 243.71800231933594 + "x": 419.1050109863281, + "y": 226.58900451660156 }, { - "x": 359.0840148925781, - "y": 233.4290008544922 + "x": 407.0159912109375, + "y": 219.60899353027344 }, { - "x": 346.66400146484375, - "y": 222.2449951171875 + "x": 395.4419860839844, + "y": 211.80299377441406 }, { - "x": 335.0539855957031, - "y": 210.22300720214844 + "x": 384.4419860839844, + "y": 203.20799255371094 }, { - "x": 324.3110046386719, - "y": 197.41900634765625 + "x": 374.0679931640625, + "y": 193.86700439453125 }, { - "x": 314.48699951171875, - "y": 183.8979949951172 + "x": 364.3710021972656, + "y": 183.8260040283203 } ], "isCurve": true, @@ -1256,112 +1192,112 @@ "link": "", "route": [ { - "x": 1020.4429931640625, - "y": -227.9080047607422 + "x": 1013.5819702148438, + "y": -195.62899780273438 }, { - "x": 1044, - "y": -221.5959930419922 + "x": 1033.802978515625, + "y": -190.21099853515625 }, { - "x": 1066.76904296875, - "y": -212.8560028076172 + "x": 1053.3470458984375, + "y": -182.70899963378906 }, { - "x": 1088.5, - "y": -201.7830047607422 + "x": 1072, + "y": -173.2050018310547 }, { - "x": 1108.9530029296875, - "y": -188.5 + "x": 1089.5570068359375, + "y": -161.80299377441406 }, { - "x": 1127.906982421875, - "y": -173.15199279785156 + "x": 1105.8260498046875, + "y": -148.6280059814453 }, { - "x": 1145.1519775390625, - "y": -155.90699768066406 + "x": 1120.6280517578125, + "y": -133.8260040283203 }, { - "x": 1160.5, - "y": -136.9530029296875 + "x": 1133.802978515625, + "y": -117.55699920654297 }, { - "x": 1173.782958984375, - "y": -116.5 + "x": 1145.2049560546875, + "y": -100 }, { - "x": 1184.85595703125, - "y": -94.76899719238281 + "x": 1154.708984375, + "y": -81.34700012207031 }, { - "x": 1193.595947265625, - "y": -72 + "x": 1162.2110595703125, + "y": -61.803001403808594 }, { - "x": 1199.907958984375, - "y": -48.44300079345703 + "x": 1167.6290283203125, + "y": -41.582000732421875 }, { - "x": 1203.7230224609375, - "y": -24.354999542236328 + "x": 1170.904052734375, + "y": -20.905000686645508 }, { - "x": 1205, + "x": 1172, "y": 0 }, { - "x": 1203.7230224609375, - "y": 24.354999542236328 + "x": 1170.904052734375, + "y": 20.905000686645508 }, { - "x": 1199.907958984375, - "y": 48.44300079345703 + "x": 1167.6290283203125, + "y": 41.582000732421875 }, { - "x": 1193.595947265625, - "y": 72 + "x": 1162.2110595703125, + "y": 61.803001403808594 }, { - "x": 1184.85595703125, - "y": 94.76899719238281 + "x": 1154.708984375, + "y": 81.34700012207031 }, { - "x": 1173.782958984375, - "y": 116.4990005493164 + "x": 1145.2049560546875, + "y": 99.9990005493164 }, { - "x": 1160.5, - "y": 136.9530029296875 + "x": 1133.802978515625, + "y": 117.55699920654297 }, { - "x": 1145.1519775390625, - "y": 155.90699768066406 + "x": 1120.6280517578125, + "y": 133.8260040283203 }, { - "x": 1127.906982421875, - "y": 173.15199279785156 + "x": 1105.8260498046875, + "y": 148.6280059814453 }, { - "x": 1108.9530029296875, - "y": 188.5 + "x": 1089.5570068359375, + "y": 161.80299377441406 }, { - "x": 1088.5, - "y": 201.7830047607422 + "x": 1072, + "y": 173.2050018310547 }, { - "x": 1066.76904296875, - "y": 212.8560028076172 + "x": 1053.3470458984375, + "y": 182.70899963378906 }, { - "x": 1044, - "y": 221.5959930419922 + "x": 1033.802978515625, + "y": 190.21099853515625 }, { - "x": 1020.4429931640625, - "y": 227.9080047607422 + "x": 1013.5819702148438, + "y": 195.62899780273438 } ], "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 fbf5f78c42..ecc9129818 100644 --- a/e2etests/testdata/txtar/cycle-diagram/dagre/sketch.exp.svg +++ b/e2etests/testdata/txtar/cycle-diagram/dagre/sketch.exp.svg @@ -1,9 +1,9 @@ -abcdabcab - + .d2-3480499724 .fill-N1{fill:#0A0F25;} + .d2-3480499724 .fill-N2{fill:#676C7E;} + .d2-3480499724 .fill-N3{fill:#9499AB;} + .d2-3480499724 .fill-N4{fill:#CFD2DD;} + .d2-3480499724 .fill-N5{fill:#DEE1EB;} + .d2-3480499724 .fill-N6{fill:#EEF1F8;} + .d2-3480499724 .fill-N7{fill:#FFFFFF;} + .d2-3480499724 .fill-B1{fill:#0D32B2;} + .d2-3480499724 .fill-B2{fill:#0D32B2;} + .d2-3480499724 .fill-B3{fill:#E3E9FD;} + .d2-3480499724 .fill-B4{fill:#E3E9FD;} + .d2-3480499724 .fill-B5{fill:#EDF0FD;} + .d2-3480499724 .fill-B6{fill:#F7F8FE;} + .d2-3480499724 .fill-AA2{fill:#4A6FF3;} + .d2-3480499724 .fill-AA4{fill:#EDF0FD;} + .d2-3480499724 .fill-AA5{fill:#F7F8FE;} + .d2-3480499724 .fill-AB4{fill:#EDF0FD;} + .d2-3480499724 .fill-AB5{fill:#F7F8FE;} + .d2-3480499724 .stroke-N1{stroke:#0A0F25;} + .d2-3480499724 .stroke-N2{stroke:#676C7E;} + .d2-3480499724 .stroke-N3{stroke:#9499AB;} + .d2-3480499724 .stroke-N4{stroke:#CFD2DD;} + .d2-3480499724 .stroke-N5{stroke:#DEE1EB;} + .d2-3480499724 .stroke-N6{stroke:#EEF1F8;} + .d2-3480499724 .stroke-N7{stroke:#FFFFFF;} + .d2-3480499724 .stroke-B1{stroke:#0D32B2;} + .d2-3480499724 .stroke-B2{stroke:#0D32B2;} + .d2-3480499724 .stroke-B3{stroke:#E3E9FD;} + .d2-3480499724 .stroke-B4{stroke:#E3E9FD;} + .d2-3480499724 .stroke-B5{stroke:#EDF0FD;} + .d2-3480499724 .stroke-B6{stroke:#F7F8FE;} + .d2-3480499724 .stroke-AA2{stroke:#4A6FF3;} + .d2-3480499724 .stroke-AA4{stroke:#EDF0FD;} + .d2-3480499724 .stroke-AA5{stroke:#F7F8FE;} + .d2-3480499724 .stroke-AB4{stroke:#EDF0FD;} + .d2-3480499724 .stroke-AB5{stroke:#F7F8FE;} + .d2-3480499724 .background-color-N1{background-color:#0A0F25;} + .d2-3480499724 .background-color-N2{background-color:#676C7E;} + .d2-3480499724 .background-color-N3{background-color:#9499AB;} + .d2-3480499724 .background-color-N4{background-color:#CFD2DD;} + .d2-3480499724 .background-color-N5{background-color:#DEE1EB;} + .d2-3480499724 .background-color-N6{background-color:#EEF1F8;} + .d2-3480499724 .background-color-N7{background-color:#FFFFFF;} + .d2-3480499724 .background-color-B1{background-color:#0D32B2;} + .d2-3480499724 .background-color-B2{background-color:#0D32B2;} + .d2-3480499724 .background-color-B3{background-color:#E3E9FD;} + .d2-3480499724 .background-color-B4{background-color:#E3E9FD;} + .d2-3480499724 .background-color-B5{background-color:#EDF0FD;} + .d2-3480499724 .background-color-B6{background-color:#F7F8FE;} + .d2-3480499724 .background-color-AA2{background-color:#4A6FF3;} + .d2-3480499724 .background-color-AA4{background-color:#EDF0FD;} + .d2-3480499724 .background-color-AA5{background-color:#F7F8FE;} + .d2-3480499724 .background-color-AB4{background-color:#EDF0FD;} + .d2-3480499724 .background-color-AB5{background-color:#F7F8FE;} + .d2-3480499724 .color-N1{color:#0A0F25;} + .d2-3480499724 .color-N2{color:#676C7E;} + .d2-3480499724 .color-N3{color:#9499AB;} + .d2-3480499724 .color-N4{color:#CFD2DD;} + .d2-3480499724 .color-N5{color:#DEE1EB;} + .d2-3480499724 .color-N6{color:#EEF1F8;} + .d2-3480499724 .color-N7{color:#FFFFFF;} + .d2-3480499724 .color-B1{color:#0D32B2;} + .d2-3480499724 .color-B2{color:#0D32B2;} + .d2-3480499724 .color-B3{color:#E3E9FD;} + .d2-3480499724 .color-B4{color:#E3E9FD;} + .d2-3480499724 .color-B5{color:#EDF0FD;} + .d2-3480499724 .color-B6{color:#F7F8FE;} + .d2-3480499724 .color-AA2{color:#4A6FF3;} + .d2-3480499724 .color-AA4{color:#EDF0FD;} + .d2-3480499724 .color-AA5{color:#F7F8FE;} + .d2-3480499724 .color-AB4{color:#EDF0FD;} + .d2-3480499724 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker-d2-3480499724);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker-d2-3480499724);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright-d2-3480499724);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright-d2-3480499724);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright-d2-3480499724);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright-d2-3480499724);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark-d2-3480499724);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright-d2-3480499724);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright-d2-3480499724);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright-d2-3480499724);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright-d2-3480499724);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker-d2-3480499724);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark-d2-3480499724);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal-d2-3480499724);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal-d2-3480499724);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright-d2-3480499724);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright-d2-3480499724);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright-d2-3480499724);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>abcdabcab + diff --git a/e2etests/testdata/txtar/cycle-diagram/elk/board.exp.json b/e2etests/testdata/txtar/cycle-diagram/elk/board.exp.json index 60093062f8..ad3f518e0c 100644 --- a/e2etests/testdata/txtar/cycle-diagram/elk/board.exp.json +++ b/e2etests/testdata/txtar/cycle-diagram/elk/board.exp.json @@ -540,112 +540,100 @@ "link": "", "route": [ { - "x": 48.44900131225586, - "y": -218.13099670410156 + "x": 43.2859992980957, + "y": -185.53700256347656 }, { - "x": 60.44300079345703, - "y": -215.9080047607422 + "x": 53.582000732421875, + "y": -183.62899780273438 }, { - "x": 72.30400085449219, - "y": -213.05999755859375 + "x": 63.76300048828125, + "y": -181.18499755859375 }, { - "x": 84, - "y": -209.5959930419922 + "x": 73.8030014038086, + "y": -178.21099853515625 }, { - "x": 95.4990005493164, - "y": -205.5240020751953 + "x": 83.6729965209961, + "y": -174.71600341796875 }, { - "x": 106.76899719238281, - "y": -200.8560028076172 + "x": 93.34700012207031, + "y": -170.70899963378906 }, { - "x": 117.77899932861328, - "y": -195.60400390625 + "x": 102.7979965209961, + "y": -166.2010040283203 }, { - "x": 128.5, - "y": -189.7830047607422 + "x": 111.9990005493164, + "y": -161.2050018310547 }, { - "x": 138.89999389648438, - "y": -183.41000366210938 + "x": 120.927001953125, + "y": -155.73399353027344 }, { - "x": 148.9530029296875, - "y": -176.5 + "x": 129.5570068359375, + "y": -149.80299377441406 }, { - "x": 158.63099670410156, - "y": -169.0749969482422 + "x": 137.86399841308594, + "y": -143.4290008544922 }, { - "x": 167.90699768066406, - "y": -161.15199279785156 + "x": 145.8260040283203, + "y": -136.6280059814453 }, { - "x": 176.7550048828125, - "y": -152.7550048828125 + "x": 153.42100524902344, + "y": -129.42100524902344 }, { - "x": 185.15199279785156, - "y": -143.90699768066406 + "x": 160.6280059814453, + "y": -121.82599639892578 }, { - "x": 193.0749969482422, - "y": -134.63099670410156 + "x": 167.4290008544922, + "y": -113.86399841308594 }, { - "x": 200.5, - "y": -124.9530029296875 + "x": 173.80299377441406, + "y": -105.55699920654297 }, { - "x": 207.41000366210938, - "y": -114.9000015258789 + "x": 179.73399353027344, + "y": -96.927001953125 }, { - "x": 213.7830047607422, - "y": -104.5 + "x": 185.2050018310547, + "y": -88 }, { - "x": 219.60400390625, - "y": -93.77899932861328 + "x": 190.2010040283203, + "y": -78.7979965209961 }, { - "x": 224.8560028076172, - "y": -82.76899719238281 + "x": 194.70899963378906, + "y": -69.34700012207031 }, { - "x": 229.5240020751953, - "y": -71.4990005493164 + "x": 198.71600341796875, + "y": -59.67300033569336 }, { - "x": 233.5959930419922, - "y": -60 + "x": 202.21099853515625, + "y": -49.803001403808594 }, { - "x": 237.05999755859375, - "y": -48.30400085449219 + "x": 205.18499755859375, + "y": -39.76300048828125 }, { - "x": 239.9080047607422, - "y": -36.44300079345703 - }, - { - "x": 242.13099670410156, - "y": -24.448999404907227 - }, - { - "x": 243.72300720214844, - "y": -12.354999542236328 - }, - { - "x": 244.67999267578125, - "y": -0.1940000057220459 + "x": 207.62899780273438, + "y": -29.582000732421875 } ], "isCurve": true, @@ -680,112 +668,100 @@ "link": "", "route": [ { - "x": 244.67999267578125, - "y": 24.194000244140625 - }, - { - "x": 243.72300720214844, - "y": 36.35499954223633 + "x": 207.62899780273438, + "y": 53.582000732421875 }, { - "x": 242.13099670410156, - "y": 48.44900131225586 + "x": 205.18499755859375, + "y": 63.76300048828125 }, { - "x": 239.9080047607422, - "y": 60.44300079345703 + "x": 202.21099853515625, + "y": 73.8030014038086 }, { - "x": 237.05999755859375, - "y": 72.30400085449219 + "x": 198.71600341796875, + "y": 83.6729965209961 }, { - "x": 233.5959930419922, - "y": 84 + "x": 194.70899963378906, + "y": 93.34700012207031 }, { - "x": 229.5240020751953, - "y": 95.4990005493164 + "x": 190.2010040283203, + "y": 102.7979965209961 }, { - "x": 224.8560028076172, - "y": 106.76899719238281 + "x": 185.2050018310547, + "y": 111.9990005493164 }, { - "x": 219.60400390625, - "y": 117.77899932861328 + "x": 179.73399353027344, + "y": 120.927001953125 }, { - "x": 213.7830047607422, - "y": 128.5 + "x": 173.80299377441406, + "y": 129.5570068359375 }, { - "x": 207.41000366210938, - "y": 138.89999389648438 + "x": 167.4290008544922, + "y": 137.86399841308594 }, { - "x": 200.5, - "y": 148.9530029296875 + "x": 160.6280059814453, + "y": 145.8260040283203 }, { - "x": 193.0749969482422, - "y": 158.63099670410156 + "x": 153.42100524902344, + "y": 153.42100524902344 }, { - "x": 185.15199279785156, - "y": 167.90699768066406 + "x": 145.8260040283203, + "y": 160.6280059814453 }, { - "x": 176.7550048828125, - "y": 176.7550048828125 + "x": 137.86399841308594, + "y": 167.4290008544922 }, { - "x": 167.90699768066406, - "y": 185.15199279785156 + "x": 129.5570068359375, + "y": 173.80299377441406 }, { - "x": 158.63099670410156, - "y": 193.0749969482422 + "x": 120.927001953125, + "y": 179.73399353027344 }, { - "x": 148.9530029296875, - "y": 200.5 + "x": 112, + "y": 185.2050018310547 }, { - "x": 138.89999389648438, - "y": 207.41000366210938 + "x": 102.7979965209961, + "y": 190.2010040283203 }, { - "x": 128.5, - "y": 213.7830047607422 + "x": 93.34700012207031, + "y": 194.70899963378906 }, { - "x": 117.77899932861328, - "y": 219.60400390625 + "x": 83.6729965209961, + "y": 198.71600341796875 }, { - "x": 106.76899719238281, - "y": 224.8560028076172 + "x": 73.8030014038086, + "y": 202.21099853515625 }, { - "x": 95.4990005493164, - "y": 229.5240020751953 + "x": 63.76300048828125, + "y": 205.18499755859375 }, { - "x": 84, - "y": 233.5959930419922 + "x": 53.582000732421875, + "y": 207.62899780273438 }, { - "x": 72.30400085449219, - "y": 237.05999755859375 - }, - { - "x": 60.44300079345703, - "y": 239.9080047607422 - }, - { - "x": 48.44900131225586, - "y": 242.13099670410156 + "x": 43.2859992980957, + "y": 209.53700256347656 } ], "isCurve": true, @@ -820,112 +796,100 @@ "link": "", "route": [ { - "x": -24.448999404907227, - "y": 242.13099670410156 - }, - { - "x": -36.44300079345703, - "y": 239.9080047607422 - }, - { - "x": -48.30400085449219, - "y": 237.05999755859375 + "x": -19.285999298095703, + "y": 209.53700256347656 }, { - "x": -60, - "y": 233.5959930419922 + "x": -29.582000732421875, + "y": 207.62899780273438 }, { - "x": -71.4990005493164, - "y": 229.5240020751953 + "x": -39.76300048828125, + "y": 205.18499755859375 }, { - "x": -82.76899719238281, - "y": 224.8560028076172 + "x": -49.803001403808594, + "y": 202.21099853515625 }, { - "x": -93.77899932861328, - "y": 219.60400390625 + "x": -59.67300033569336, + "y": 198.71600341796875 }, { - "x": -104.4990005493164, - "y": 213.7830047607422 + "x": -69.34700012207031, + "y": 194.70899963378906 }, { - "x": -114.9000015258789, - "y": 207.41000366210938 + "x": -78.7979965209961, + "y": 190.2010040283203 }, { - "x": -124.9530029296875, - "y": 200.5 + "x": -87.9990005493164, + "y": 185.2050018310547 }, { - "x": -134.63099670410156, - "y": 193.0749969482422 + "x": -96.927001953125, + "y": 179.73399353027344 }, { - "x": -143.90699768066406, - "y": 185.15199279785156 + "x": -105.55699920654297, + "y": 173.80299377441406 }, { - "x": -152.7550048828125, - "y": 176.7550048828125 + "x": -113.86399841308594, + "y": 167.4290008544922 }, { - "x": -161.15199279785156, - "y": 167.90699768066406 + "x": -121.82599639892578, + "y": 160.6280059814453 }, { - "x": -169.0749969482422, - "y": 158.63099670410156 + "x": -129.42100524902344, + "y": 153.42100524902344 }, { - "x": -176.5, - "y": 148.9530029296875 + "x": -136.6280059814453, + "y": 145.8260040283203 }, { - "x": -183.41000366210938, - "y": 138.89999389648438 + "x": -143.4290008544922, + "y": 137.86399841308594 }, { - "x": -189.7830047607422, - "y": 128.5 + "x": -149.80299377441406, + "y": 129.5570068359375 }, { - "x": -195.60400390625, - "y": 117.77899932861328 + "x": -155.73399353027344, + "y": 120.927001953125 }, { - "x": -200.8560028076172, - "y": 106.76899719238281 + "x": -161.2050018310547, + "y": 112 }, { - "x": -205.5240020751953, - "y": 95.4990005493164 + "x": -166.2010040283203, + "y": 102.7979965209961 }, { - "x": -209.5959930419922, - "y": 84 + "x": -170.70899963378906, + "y": 93.34700012207031 }, { - "x": -213.05999755859375, - "y": 72.30400085449219 + "x": -174.71600341796875, + "y": 83.6729965209961 }, { - "x": -215.9080047607422, - "y": 60.44300079345703 + "x": -178.21099853515625, + "y": 73.8030014038086 }, { - "x": -218.13099670410156, - "y": 48.44900131225586 + "x": -181.18499755859375, + "y": 63.76300048828125 }, { - "x": -219.72300720214844, - "y": 36.35499954223633 - }, - { - "x": -220.67999267578125, - "y": 24.194000244140625 + "x": -183.62899780273438, + "y": 53.582000732421875 } ], "isCurve": true, @@ -960,120 +924,108 @@ "link": "", "route": [ { - "x": 502.2030029296875, - "y": -176.86599731445312 - }, - { - "x": 518.823974609375, - "y": -175.11900329589844 - }, - { - "x": 535.2839965820312, - "y": -172.2169952392578 - }, - { - "x": 551.5009765625, - "y": -168.17300415039062 + "x": 513.333984375, + "y": -136.05299377441406 }, { - "x": 567.39599609375, - "y": -163.00900268554688 + "x": 527.0819702148438, + "y": -133.62899780273438 }, { - "x": 582.8920288085938, - "y": -156.7480010986328 + "x": 540.6270141601562, + "y": -130.2519989013672 }, { - "x": 597.9140014648438, - "y": -149.42100524902344 + "x": 553.9039916992188, + "y": -125.93800354003906 }, { - "x": 612.3880004882812, - "y": -141.06399536132812 + "x": 566.8469848632812, + "y": -120.70899963378906 }, { - "x": 626.2440185546875, - "y": -131.71800231933594 + "x": 579.3939819335938, + "y": -114.58899688720703 }, { - "x": 639.4149780273438, - "y": -121.42900085449219 + "x": 591.4829711914062, + "y": -107.60900115966797 }, { - "x": 651.8350219726562, - "y": -110.24500274658203 + "x": 603.0570068359375, + "y": -99.8030014038086 }, { - "x": 663.4450073242188, - "y": -98.2229995727539 + "x": 614.0570068359375, + "y": -91.20800018310547 }, { - "x": 674.18798828125, - "y": -85.41899871826172 + "x": 624.4310302734375, + "y": -81.86699676513672 }, { - "x": 684.0120239257812, - "y": -71.89800262451172 + "x": 634.1279907226562, + "y": -71.82599639892578 }, { - "x": 692.8690185546875, - "y": -57.7239990234375 + "x": 643.1019897460938, + "y": -61.13199996948242 }, { - "x": 700.7150268554688, - "y": -42.96699905395508 + "x": 651.3070068359375, + "y": -49.8380012512207 }, { - "x": 707.5130004882812, - "y": -27.698999404907227 + "x": 658.7050170898438, + "y": -38 }, { - "x": 713.22998046875, - "y": -11.994000434875488 + "x": 665.2579956054688, + "y": -25.673999786376953 }, { - "x": 717.8359985351562, - "y": 4.071000099182129 + "x": 670.9359741210938, + "y": -12.920999526977539 }, { - "x": 721.3109741210938, - "y": 20.420000076293945 + "x": 675.7109985351562, + "y": 0.19599999487400055 }, { - "x": 723.6370239257812, - "y": 36.970001220703125 + "x": 679.5590209960938, + "y": 13.614999771118164 }, { - "x": 724.802978515625, - "y": 53.643001556396484 + "x": 682.4609985351562, + "y": 27.270000457763672 }, { - "x": 724.802978515625, - "y": 70.35600280761719 + "x": 684.4039916992188, + "y": 41.09400177001953 }, { - "x": 723.6370239257812, - "y": 87.02899932861328 + "x": 685.3779907226562, + "y": 55.02000045776367 }, { - "x": 721.3109741210938, - "y": 103.5790023803711 + "x": 685.3779907226562, + "y": 68.97899627685547 }, { - "x": 717.8359985351562, - "y": 119.9280014038086 + "x": 684.4039916992188, + "y": 82.90499877929688 }, { - "x": 713.22998046875, - "y": 135.99400329589844 + "x": 682.4609985351562, + "y": 96.72899627685547 }, { - "x": 707.5130004882812, - "y": 151.69900512695312 + "x": 679.5590209960938, + "y": 110.38400268554688 }, { - "x": 700.7150268554688, - "y": 166.9669952392578 + "x": 675.7109985351562, + "y": 123.8030014038086 } ], "isCurve": true, @@ -1108,120 +1060,104 @@ "link": "", "route": [ { - "x": 684.0120239257812, - "y": 195.8979949951172 + "x": 634.1279907226562, + "y": 195.8260040283203 }, { - "x": 674.18798828125, - "y": 209.41900634765625 + "x": 624.4310302734375, + "y": 205.86700439453125 }, { - "x": 663.4450073242188, - "y": 222.22300720214844 + "x": 614.0570068359375, + "y": 215.20799255371094 }, { - "x": 651.8350219726562, - "y": 234.2449951171875 + "x": 603.0570068359375, + "y": 223.80299377441406 }, { - "x": 639.4149780273438, - "y": 245.4290008544922 + "x": 591.4829711914062, + "y": 231.60899353027344 }, { - "x": 626.2440185546875, - "y": 255.71800231933594 + "x": 579.3939819335938, + "y": 238.58900451660156 }, { - "x": 612.3880004882812, - "y": 265.0639953613281 + "x": 566.8469848632812, + "y": 244.70899963378906 }, { - "x": 597.9140014648438, - "y": 273.4209899902344 + "x": 553.9039916992188, + "y": 249.93800354003906 }, { - "x": 582.8920288085938, - "y": 280.74798583984375 + "x": 540.6270141601562, + "y": 254.2519989013672 }, { - "x": 567.39599609375, - "y": 287.0090026855469 + "x": 527.0819702148438, + "y": 257.6289978027344 }, { - "x": 551.5009765625, - "y": 292.1730041503906 + "x": 513.333984375, + "y": 260.0530090332031 }, { - "x": 535.2839965820312, - "y": 296.2170104980469 - }, - { - "x": 518.823974609375, - "y": 299.1189880371094 - }, - { - "x": 502.2030029296875, - "y": 300.8659973144531 + "x": 499.45098876953125, + "y": 261.5119934082031 }, { "x": 485.5, - "y": 301.4490051269531 - }, - { - "x": 468.7959899902344, - "y": 300.8659973144531 - }, - { - "x": 452.17498779296875, - "y": 299.1189880371094 + "y": 262 }, { - "x": 435.7149963378906, - "y": 296.2170104980469 + "x": 471.5480041503906, + "y": 261.5119934082031 }, { - "x": 419.49798583984375, - "y": 292.1730041503906 + "x": 457.6650085449219, + "y": 260.0530090332031 }, { - "x": 403.6029968261719, - "y": 287.0090026855469 + "x": 443.9169921875, + "y": 257.6289978027344 }, { - "x": 388.10699462890625, - "y": 280.74798583984375 + "x": 430.37200927734375, + "y": 254.2519989013672 }, { - "x": 373.0849914550781, - "y": 273.4209899902344 + "x": 417.0950012207031, + "y": 249.93800354003906 }, { - "x": 358.6109924316406, - "y": 265.0639953613281 + "x": 404.1520080566406, + "y": 244.70899963378906 }, { - "x": 344.7550048828125, - "y": 255.71800231933594 + "x": 391.6050109863281, + "y": 238.58900451660156 }, { - "x": 331.5840148925781, - "y": 245.4290008544922 + "x": 379.5159912109375, + "y": 231.60899353027344 }, { - "x": 319.16400146484375, - "y": 234.2449951171875 + "x": 367.9419860839844, + "y": 223.80299377441406 }, { - "x": 307.5539855957031, - "y": 222.22300720214844 + "x": 356.9419860839844, + "y": 215.20799255371094 }, { - "x": 296.8110046386719, - "y": 209.41900634765625 + "x": 346.5679931640625, + "y": 205.86700439453125 }, { - "x": 286.98699951171875, - "y": 195.8979949951172 + "x": 336.8710021972656, + "y": 195.8260040283203 } ], "isCurve": true, @@ -1256,112 +1192,112 @@ "link": "", "route": [ { - "x": 953.35302734375, - "y": -215.9080047607422 + "x": 946.4920043945312, + "y": -183.62899780273438 }, { - "x": 976.9110107421875, - "y": -209.5959930419922 + "x": 966.7130126953125, + "y": -178.21099853515625 }, { - "x": 999.6790161132812, - "y": -200.8560028076172 + "x": 986.2570190429688, + "y": -170.70899963378906 }, { - "x": 1021.4099731445312, - "y": -189.7830047607422 + "x": 1004.9099731445312, + "y": -161.2050018310547 }, { - "x": 1041.864013671875, - "y": -176.5 + "x": 1022.4669799804688, + "y": -149.80299377441406 }, { - "x": 1060.8170166015625, - "y": -161.15199279785156 + "x": 1038.7359619140625, + "y": -136.6280059814453 }, { - "x": 1078.06201171875, - "y": -143.90699768066406 + "x": 1053.5389404296875, + "y": -121.82599639892578 }, { - "x": 1093.4110107421875, - "y": -124.9530029296875 + "x": 1066.7130126953125, + "y": -105.55699920654297 }, { - "x": 1106.6939697265625, - "y": -104.5 + "x": 1078.114990234375, + "y": -88 }, { - "x": 1117.7659912109375, - "y": -82.76899719238281 + "x": 1087.6190185546875, + "y": -69.34700012207031 }, { - "x": 1126.5059814453125, - "y": -60 + "x": 1095.1209716796875, + "y": -49.803001403808594 }, { - "x": 1132.8179931640625, - "y": -36.44300079345703 + "x": 1100.5389404296875, + "y": -29.582000732421875 }, { - "x": 1136.633056640625, - "y": -12.354999542236328 + "x": 1103.81396484375, + "y": -8.904999732971191 }, { - "x": 1137.9100341796875, + "x": 1104.9100341796875, "y": 12 }, { - "x": 1136.633056640625, - "y": 36.35499954223633 + "x": 1103.81396484375, + "y": 32.904998779296875 }, { - "x": 1132.8179931640625, - "y": 60.44300079345703 + "x": 1100.5389404296875, + "y": 53.582000732421875 }, { - "x": 1126.5059814453125, - "y": 84 + "x": 1095.1209716796875, + "y": 73.8030014038086 }, { - "x": 1117.7659912109375, - "y": 106.76899719238281 + "x": 1087.6190185546875, + "y": 93.34700012207031 }, { - "x": 1106.6939697265625, - "y": 128.49899291992188 + "x": 1078.114990234375, + "y": 111.9990005493164 }, { - "x": 1093.4110107421875, - "y": 148.9530029296875 + "x": 1066.7130126953125, + "y": 129.5570068359375 }, { - "x": 1078.06201171875, - "y": 167.90699768066406 + "x": 1053.5389404296875, + "y": 145.8260040283203 }, { - "x": 1060.8170166015625, - "y": 185.15199279785156 + "x": 1038.7359619140625, + "y": 160.6280059814453 }, { - "x": 1041.864013671875, - "y": 200.5 + "x": 1022.4669799804688, + "y": 173.80299377441406 }, { - "x": 1021.4099731445312, - "y": 213.7830047607422 + "x": 1004.9099731445312, + "y": 185.2050018310547 }, { - "x": 999.6790161132812, - "y": 224.8560028076172 + "x": 986.2570190429688, + "y": 194.70899963378906 }, { - "x": 976.9110107421875, - "y": 233.5959930419922 + "x": 966.7130126953125, + "y": 202.21099853515625 }, { - "x": 953.35302734375, - "y": 239.9080047607422 + "x": 946.4920043945312, + "y": 207.62899780273438 } ], "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 40824648c5..f5afaee6a7 100644 --- a/e2etests/testdata/txtar/cycle-diagram/elk/sketch.exp.svg +++ b/e2etests/testdata/txtar/cycle-diagram/elk/sketch.exp.svg @@ -1,9 +1,9 @@ -abcdabcab - + .d2-2409080064 .fill-N1{fill:#0A0F25;} + .d2-2409080064 .fill-N2{fill:#676C7E;} + .d2-2409080064 .fill-N3{fill:#9499AB;} + .d2-2409080064 .fill-N4{fill:#CFD2DD;} + .d2-2409080064 .fill-N5{fill:#DEE1EB;} + .d2-2409080064 .fill-N6{fill:#EEF1F8;} + .d2-2409080064 .fill-N7{fill:#FFFFFF;} + .d2-2409080064 .fill-B1{fill:#0D32B2;} + .d2-2409080064 .fill-B2{fill:#0D32B2;} + .d2-2409080064 .fill-B3{fill:#E3E9FD;} + .d2-2409080064 .fill-B4{fill:#E3E9FD;} + .d2-2409080064 .fill-B5{fill:#EDF0FD;} + .d2-2409080064 .fill-B6{fill:#F7F8FE;} + .d2-2409080064 .fill-AA2{fill:#4A6FF3;} + .d2-2409080064 .fill-AA4{fill:#EDF0FD;} + .d2-2409080064 .fill-AA5{fill:#F7F8FE;} + .d2-2409080064 .fill-AB4{fill:#EDF0FD;} + .d2-2409080064 .fill-AB5{fill:#F7F8FE;} + .d2-2409080064 .stroke-N1{stroke:#0A0F25;} + .d2-2409080064 .stroke-N2{stroke:#676C7E;} + .d2-2409080064 .stroke-N3{stroke:#9499AB;} + .d2-2409080064 .stroke-N4{stroke:#CFD2DD;} + .d2-2409080064 .stroke-N5{stroke:#DEE1EB;} + .d2-2409080064 .stroke-N6{stroke:#EEF1F8;} + .d2-2409080064 .stroke-N7{stroke:#FFFFFF;} + .d2-2409080064 .stroke-B1{stroke:#0D32B2;} + .d2-2409080064 .stroke-B2{stroke:#0D32B2;} + .d2-2409080064 .stroke-B3{stroke:#E3E9FD;} + .d2-2409080064 .stroke-B4{stroke:#E3E9FD;} + .d2-2409080064 .stroke-B5{stroke:#EDF0FD;} + .d2-2409080064 .stroke-B6{stroke:#F7F8FE;} + .d2-2409080064 .stroke-AA2{stroke:#4A6FF3;} + .d2-2409080064 .stroke-AA4{stroke:#EDF0FD;} + .d2-2409080064 .stroke-AA5{stroke:#F7F8FE;} + .d2-2409080064 .stroke-AB4{stroke:#EDF0FD;} + .d2-2409080064 .stroke-AB5{stroke:#F7F8FE;} + .d2-2409080064 .background-color-N1{background-color:#0A0F25;} + .d2-2409080064 .background-color-N2{background-color:#676C7E;} + .d2-2409080064 .background-color-N3{background-color:#9499AB;} + .d2-2409080064 .background-color-N4{background-color:#CFD2DD;} + .d2-2409080064 .background-color-N5{background-color:#DEE1EB;} + .d2-2409080064 .background-color-N6{background-color:#EEF1F8;} + .d2-2409080064 .background-color-N7{background-color:#FFFFFF;} + .d2-2409080064 .background-color-B1{background-color:#0D32B2;} + .d2-2409080064 .background-color-B2{background-color:#0D32B2;} + .d2-2409080064 .background-color-B3{background-color:#E3E9FD;} + .d2-2409080064 .background-color-B4{background-color:#E3E9FD;} + .d2-2409080064 .background-color-B5{background-color:#EDF0FD;} + .d2-2409080064 .background-color-B6{background-color:#F7F8FE;} + .d2-2409080064 .background-color-AA2{background-color:#4A6FF3;} + .d2-2409080064 .background-color-AA4{background-color:#EDF0FD;} + .d2-2409080064 .background-color-AA5{background-color:#F7F8FE;} + .d2-2409080064 .background-color-AB4{background-color:#EDF0FD;} + .d2-2409080064 .background-color-AB5{background-color:#F7F8FE;} + .d2-2409080064 .color-N1{color:#0A0F25;} + .d2-2409080064 .color-N2{color:#676C7E;} + .d2-2409080064 .color-N3{color:#9499AB;} + .d2-2409080064 .color-N4{color:#CFD2DD;} + .d2-2409080064 .color-N5{color:#DEE1EB;} + .d2-2409080064 .color-N6{color:#EEF1F8;} + .d2-2409080064 .color-N7{color:#FFFFFF;} + .d2-2409080064 .color-B1{color:#0D32B2;} + .d2-2409080064 .color-B2{color:#0D32B2;} + .d2-2409080064 .color-B3{color:#E3E9FD;} + .d2-2409080064 .color-B4{color:#E3E9FD;} + .d2-2409080064 .color-B5{color:#EDF0FD;} + .d2-2409080064 .color-B6{color:#F7F8FE;} + .d2-2409080064 .color-AA2{color:#4A6FF3;} + .d2-2409080064 .color-AA4{color:#EDF0FD;} + .d2-2409080064 .color-AA5{color:#F7F8FE;} + .d2-2409080064 .color-AB4{color:#EDF0FD;} + .d2-2409080064 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker-d2-2409080064);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker-d2-2409080064);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright-d2-2409080064);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright-d2-2409080064);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright-d2-2409080064);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright-d2-2409080064);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark-d2-2409080064);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright-d2-2409080064);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright-d2-2409080064);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright-d2-2409080064);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright-d2-2409080064);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker-d2-2409080064);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark-d2-2409080064);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal-d2-2409080064);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal-d2-2409080064);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright-d2-2409080064);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright-d2-2409080064);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright-d2-2409080064);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>abcdabcab + From 7bc2b2a3d8d25a68237b4146e8819cb99e33aa50 Mon Sep 17 00:00:00 2001 From: Mayank Mohapatra <125661248+Mayank77maruti@users.noreply.github.com> Date: Fri, 21 Feb 2025 19:18:03 +0000 Subject: [PATCH 13/73] test 2 --- d2layouts/d2cycle/layout.go | 36 ++++++++++++++++++++++-------------- 1 file changed, 22 insertions(+), 14 deletions(-) diff --git a/d2layouts/d2cycle/layout.go b/d2layouts/d2cycle/layout.go index 559bd0b3a4..fcf7b968bd 100644 --- a/d2layouts/d2cycle/layout.go +++ b/d2layouts/d2cycle/layout.go @@ -78,6 +78,7 @@ func createCircularArc(edge *d2graph.Edge) { dstAngle += 2 * math.Pi } + // Use the source center's distance for the arc radius. arcRadius := math.Hypot(srcCenter.X, srcCenter.Y) path := make([]*geo.Point, 0, ARC_STEPS+1) @@ -113,15 +114,11 @@ func clampPointOutsideBox(box *geo.Box, path []*geo.Point, startIdx int) (int, * if boxContains(box, path[i]) { continue } - seg := geo.NewSegment(path[i-1], path[i]) - inters := boxIntersections(box, *seg) - if len(inters) > 0 { - return i, inters[0] - } - return i, path[i] + // Refine the intersection between the last inside and the first outside point. + refined := refineIntersection(box, path[i-1], path[i]) + return i, refined } - last := len(path) - 1 - return last, path[last] + return len(path) - 1, path[len(path)-1] } func clampPointOutsideBoxReverse(box *geo.Box, path []*geo.Point, endIdx int) (int, *geo.Point) { @@ -136,16 +133,27 @@ func clampPointOutsideBoxReverse(box *geo.Box, path []*geo.Point, endIdx int) (i if boxContains(box, path[j]) { continue } - seg := geo.NewSegment(path[j], path[j+1]) - inters := boxIntersections(box, *seg) - if len(inters) > 0 { - return j, inters[0] - } - return j, path[j] + refined := refineIntersection(box, path[j], path[j+1]) + return j, refined } return 0, path[0] } +func refineIntersection(box *geo.Box, pInside, pOutside *geo.Point) *geo.Point { + const epsilon = 1e-6 + a := pInside + b := pOutside + for math.Hypot(b.X-a.X, b.Y-a.Y) > epsilon { + mid := geo.NewPoint((a.X+b.X)/2, (a.Y+b.Y)/2) + if boxContains(box, mid) { + a = mid + } else { + b = mid + } + } + return geo.NewPoint((a.X+b.X)/2, (a.Y+b.Y)/2) +} + func boxContains(b *geo.Box, p *geo.Point) bool { return p.X >= b.TopLeft.X && p.X <= b.TopLeft.X+b.Width && From f6c3bdcae62ec12d24c2344eed462831f5e6ee81 Mon Sep 17 00:00:00 2001 From: Mayank Mohapatra <125661248+Mayank77maruti@users.noreply.github.com> Date: Fri, 21 Feb 2025 19:23:46 +0000 Subject: [PATCH 14/73] test 2 --- d2layouts/d2cycle/layout.go | 292 ++++++++++++++---- .../txtar/cycle-diagram/dagre/board.exp.json | 144 +++++++++ .../txtar/cycle-diagram/dagre/sketch.exp.svg | 152 ++++----- .../txtar/cycle-diagram/elk/board.exp.json | 144 +++++++++ .../txtar/cycle-diagram/elk/sketch.exp.svg | 152 ++++----- 5 files changed, 671 insertions(+), 213 deletions(-) diff --git a/d2layouts/d2cycle/layout.go b/d2layouts/d2cycle/layout.go index fcf7b968bd..d7306ff1a4 100644 --- a/d2layouts/d2cycle/layout.go +++ b/d2layouts/d2cycle/layout.go @@ -1,3 +1,198 @@ +// package d2cycle + +// import ( +// "context" +// "math" + +// "oss.terrastruct.com/d2/d2graph" +// "oss.terrastruct.com/d2/lib/geo" +// "oss.terrastruct.com/d2/lib/label" +// "oss.terrastruct.com/util-go/go2" +// ) + +// const ( +// MIN_RADIUS = 200 +// PADDING = 20 +// MIN_SEGMENT_LEN = 10 +// ARC_STEPS = 30 +// ) + +// func Layout(ctx context.Context, g *d2graph.Graph, layout d2graph.LayoutGraph) error { +// objects := g.Root.ChildrenArray +// if len(objects) == 0 { +// return nil +// } + +// for _, obj := range g.Objects { +// positionLabelsIcons(obj) +// } + +// radius := calculateRadius(objects) +// positionObjects(objects, radius) + +// for _, edge := range g.Edges { +// createCircularArc(edge) +// } + +// return nil +// } + +// func calculateRadius(objects []*d2graph.Object) float64 { +// numObjects := float64(len(objects)) +// maxSize := 0.0 +// for _, obj := range objects { +// size := math.Max(obj.Box.Width, obj.Box.Height) +// maxSize = math.Max(maxSize, size) +// } +// minRadius := (maxSize/2.0 + PADDING) / math.Sin(math.Pi/numObjects) +// return math.Max(minRadius, MIN_RADIUS) +// } + +// func positionObjects(objects []*d2graph.Object, radius float64) { +// numObjects := float64(len(objects)) +// angleOffset := -math.Pi / 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, +// ) +// } +// } + +// func createCircularArc(edge *d2graph.Edge) { +// if edge.Src == nil || edge.Dst == nil { +// return +// } + +// srcCenter := edge.Src.Center() +// dstCenter := edge.Dst.Center() + +// srcAngle := math.Atan2(srcCenter.Y, srcCenter.X) +// dstAngle := math.Atan2(dstCenter.Y, dstCenter.X) +// if dstAngle < srcAngle { +// dstAngle += 2 * math.Pi +// } + +// arcRadius := math.Hypot(srcCenter.X, srcCenter.Y) + +// path := make([]*geo.Point, 0, ARC_STEPS+1) +// 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) +// path = append(path, geo.NewPoint(x, y)) +// } +// path[0] = srcCenter +// path[len(path)-1] = dstCenter + +// startIndex, newSrc := clampPointOutsideBox(edge.Src.Box, path, 0) +// endIndex, newDst := clampPointOutsideBoxReverse(edge.Dst.Box, path, len(path)-1) + +// path[0] = newSrc +// path[len(path)-1] = newDst + +// edge.Route = path[startIndex : endIndex+1] +// edge.IsCurve = true +// } + +// func clampPointOutsideBox(box *geo.Box, path []*geo.Point, startIdx int) (int, *geo.Point) { +// if startIdx >= len(path)-1 { +// return startIdx, path[startIdx] +// } +// if !boxContains(box, path[startIdx]) { +// return startIdx, path[startIdx] +// } + +// for i := startIdx + 1; i < len(path); i++ { +// if boxContains(box, path[i]) { +// continue +// } +// seg := geo.NewSegment(path[i-1], path[i]) +// inters := boxIntersections(box, *seg) +// if len(inters) > 0 { +// return i, inters[0] +// } +// return i, path[i] +// } +// last := len(path) - 1 +// return last, path[last] +// } + +// func clampPointOutsideBoxReverse(box *geo.Box, path []*geo.Point, endIdx int) (int, *geo.Point) { +// if endIdx <= 0 { +// return endIdx, path[endIdx] +// } +// if !boxContains(box, path[endIdx]) { +// return endIdx, path[endIdx] +// } + +// for j := endIdx - 1; j >= 0; j-- { +// if boxContains(box, path[j]) { +// continue +// } +// seg := geo.NewSegment(path[j], path[j+1]) +// inters := boxIntersections(box, *seg) +// if len(inters) > 0 { +// return j, inters[0] +// } +// return j, path[j] +// } +// return 0, path[0] +// } + +// func boxContains(b *geo.Box, p *geo.Point) bool { +// return p.X >= b.TopLeft.X && +// p.X <= b.TopLeft.X+b.Width && +// p.Y >= b.TopLeft.Y && +// p.Y <= b.TopLeft.Y+b.Height +// } + +// func boxIntersections(b *geo.Box, seg geo.Segment) []*geo.Point { +// return b.Intersections(seg) +// } + +// func positionLabelsIcons(obj *d2graph.Object) { +// if obj.Icon != nil && obj.IconPosition == nil { +// if len(obj.ChildrenArray) > 0 { +// obj.IconPosition = go2.Pointer(label.OutsideTopLeft.String()) +// if obj.LabelPosition == nil { +// obj.LabelPosition = go2.Pointer(label.OutsideTopRight.String()) +// return +// } +// } else if obj.SQLTable != nil || obj.Class != nil || obj.Language != "" { +// obj.IconPosition = go2.Pointer(label.OutsideTopLeft.String()) +// } else { +// obj.IconPosition = go2.Pointer(label.InsideMiddleCenter.String()) +// } +// } + +// if obj.HasLabel() && obj.LabelPosition == nil { +// if len(obj.ChildrenArray) > 0 { +// obj.LabelPosition = go2.Pointer(label.OutsideTopCenter.String()) +// } else if obj.HasOutsideBottomLabel() { +// obj.LabelPosition = go2.Pointer(label.OutsideBottomCenter.String()) +// } else if obj.Icon != nil { +// obj.LabelPosition = go2.Pointer(label.InsideTopCenter.String()) +// } else { +// obj.LabelPosition = go2.Pointer(label.InsideMiddleCenter.String()) +// } + +// if float64(obj.LabelDimensions.Width) > obj.Width || +// float64(obj.LabelDimensions.Height) > obj.Height { +// if len(obj.ChildrenArray) > 0 { +// obj.LabelPosition = go2.Pointer(label.OutsideTopCenter.String()) +// } else { +// obj.LabelPosition = go2.Pointer(label.OutsideBottomCenter.String()) +// } +// } +// } +// } package d2cycle import ( @@ -64,6 +259,9 @@ func positionObjects(objects []*d2graph.Object, radius float64) { } } +// createCircularArc computes an arc along a circle from the source to destination, +// then computes the exact intersection points between a ray from the object's center +// and its bounding box. This ensures that the arrow precisely touches the boundary. func createCircularArc(edge *d2graph.Edge) { if edge.Src == nil || edge.Dst == nil { return @@ -78,9 +276,10 @@ func createCircularArc(edge *d2graph.Edge) { dstAngle += 2 * math.Pi } - // Use the source center's distance for the arc radius. + // Here we use the source center's distance as the arc radius. arcRadius := math.Hypot(srcCenter.X, srcCenter.Y) + // Sample points along the circular arc. path := make([]*geo.Point, 0, ARC_STEPS+1) for i := 0; i <= ARC_STEPS; i++ { t := float64(i) / float64(ARC_STEPS) @@ -89,80 +288,51 @@ func createCircularArc(edge *d2graph.Edge) { y := arcRadius * math.Sin(angle) path = append(path, geo.NewPoint(x, y)) } - path[0] = srcCenter - path[len(path)-1] = dstCenter - - startIndex, newSrc := clampPointOutsideBox(edge.Src.Box, path, 0) - endIndex, newDst := clampPointOutsideBoxReverse(edge.Dst.Box, path, len(path)-1) + // Instead of relying on iterative clamping, we compute exact intersection points. + // For the source, the ray is from the center toward the second sample point. + newSrc := rayRectangleIntersection(srcCenter, edge.Src.Box, path[1].X-srcCenter.X, path[1].Y-srcCenter.Y) + // For the destination, the ray is from the center in the direction opposite to the second-to-last sample. + newDst := rayRectangleIntersection(dstCenter, edge.Dst.Box, dstCenter.X-path[len(path)-2].X, dstCenter.Y-path[len(path)-2].Y) path[0] = newSrc path[len(path)-1] = newDst - edge.Route = path[startIndex : endIndex+1] + edge.Route = path edge.IsCurve = true } -func clampPointOutsideBox(box *geo.Box, path []*geo.Point, startIdx int) (int, *geo.Point) { - if startIdx >= len(path)-1 { - return startIdx, path[startIdx] - } - if !boxContains(box, path[startIdx]) { - return startIdx, path[startIdx] - } - - for i := startIdx + 1; i < len(path); i++ { - if boxContains(box, path[i]) { - continue - } - // Refine the intersection between the last inside and the first outside point. - refined := refineIntersection(box, path[i-1], path[i]) - return i, refined - } - return len(path) - 1, path[len(path)-1] -} +// rayRectangleIntersection computes the exact intersection point of a ray starting at 'center' +// with direction (dx, dy) and the boundary of an axis-aligned rectangle 'box'. +// The rectangle is defined by its TopLeft corner, width, and height. +func rayRectangleIntersection(center *geo.Point, box *geo.Box, dx, dy float64) *geo.Point { + L := box.TopLeft.X + R := box.TopLeft.X + box.Width + T := box.TopLeft.Y + B := box.TopLeft.Y + box.Height -func clampPointOutsideBoxReverse(box *geo.Box, path []*geo.Point, endIdx int) (int, *geo.Point) { - if endIdx <= 0 { - return endIdx, path[endIdx] - } - if !boxContains(box, path[endIdx]) { - return endIdx, path[endIdx] + var tX, tY float64 + if dx > 0 { + tX = (R - center.X) / dx + } else if dx < 0 { + tX = (L - center.X) / dx + } else { + tX = math.Inf(1) } - for j := endIdx - 1; j >= 0; j-- { - if boxContains(box, path[j]) { - continue - } - refined := refineIntersection(box, path[j], path[j+1]) - return j, refined + if dy > 0 { + tY = (B - center.Y) / dy + } else if dy < 0 { + tY = (T - center.Y) / dy + } else { + tY = math.Inf(1) } - return 0, path[0] -} -func refineIntersection(box *geo.Box, pInside, pOutside *geo.Point) *geo.Point { - const epsilon = 1e-6 - a := pInside - b := pOutside - for math.Hypot(b.X-a.X, b.Y-a.Y) > epsilon { - mid := geo.NewPoint((a.X+b.X)/2, (a.Y+b.Y)/2) - if boxContains(box, mid) { - a = mid - } else { - b = mid - } + t := tX + if tY < t { + t = tY } - return geo.NewPoint((a.X+b.X)/2, (a.Y+b.Y)/2) -} - -func boxContains(b *geo.Box, p *geo.Point) bool { - return p.X >= b.TopLeft.X && - p.X <= b.TopLeft.X+b.Width && - p.Y >= b.TopLeft.Y && - p.Y <= b.TopLeft.Y+b.Height -} -func boxIntersections(b *geo.Box, seg geo.Segment) []*geo.Point { - return b.Intersections(seg) + return geo.NewPoint(center.X+dx*t, center.Y+dy*t) } func positionLabelsIcons(obj *d2graph.Object) { diff --git a/e2etests/testdata/txtar/cycle-diagram/dagre/board.exp.json b/e2etests/testdata/txtar/cycle-diagram/dagre/board.exp.json index 104df56cce..f2104c95c4 100644 --- a/e2etests/testdata/txtar/cycle-diagram/dagre/board.exp.json +++ b/e2etests/testdata/txtar/cycle-diagram/dagre/board.exp.json @@ -539,6 +539,18 @@ "labelPercentage": 0, "link": "", "route": [ + { + "x": 26.5, + "y": -199.30599975585938 + }, + { + "x": 10.467000007629395, + "y": -199.72500610351562 + }, + { + "x": 20.905000686645508, + "y": -198.9040069580078 + }, { "x": 31.285999298095703, "y": -197.53700256347656 @@ -634,6 +646,22 @@ { "x": 195.62899780273438, "y": -41.582000732421875 + }, + { + "x": 197.53700256347656, + "y": -31.285999298095703 + }, + { + "x": 198.9040069580078, + "y": -20.905000686645508 + }, + { + "x": 199.72500610351562, + "y": -10.467000007629395 + }, + { + "x": 200.86399841308594, + "y": 33 } ], "isCurve": true, @@ -667,6 +695,22 @@ "labelPercentage": 0, "link": "", "route": [ + { + "x": 199.13499450683594, + "y": 33 + }, + { + "x": 199.72500610351562, + "y": 10.467000007629395 + }, + { + "x": 198.9040069580078, + "y": 20.905000686645508 + }, + { + "x": 197.53700256347656, + "y": 31.285999298095703 + }, { "x": 195.62899780273438, "y": 41.582000732421875 @@ -762,6 +806,18 @@ { "x": 31.285999298095703, "y": 197.53700256347656 + }, + { + "x": 20.905000686645508, + "y": 198.9040069580078 + }, + { + "x": 10.467000007629395, + "y": 199.72500610351562 + }, + { + "x": -26.499000549316406, + "y": 200.6929931640625 } ], "isCurve": true, @@ -795,6 +851,18 @@ "labelPercentage": 0, "link": "", "route": [ + { + "x": -26.499000549316406, + "y": 199.30599975585938 + }, + { + "x": -10.467000007629395, + "y": 199.72500610351562 + }, + { + "x": -20.905000686645508, + "y": 198.9040069580078 + }, { "x": -31.285999298095703, "y": 197.53700256347656 @@ -890,6 +958,22 @@ { "x": -195.62899780273438, "y": 41.582000732421875 + }, + { + "x": -197.53700256347656, + "y": 31.285999298095703 + }, + { + "x": -198.9040069580078, + "y": 20.905000686645508 + }, + { + "x": -199.72500610351562, + "y": 10.467000007629395 + }, + { + "x": -200.86399841308594, + "y": -32.999000549316406 } ], "isCurve": true, @@ -923,6 +1007,14 @@ "labelPercentage": 0, "link": "", "route": [ + { + "x": 539.5, + "y": -149.07400512695312 + }, + { + "x": 526.9509887695312, + "y": -149.51199340820312 + }, { "x": 540.833984375, "y": -148.05299377441406 @@ -1026,6 +1118,18 @@ { "x": 703.2109985351562, "y": 111.8030014038086 + }, + { + "x": 698.4359741210938, + "y": 124.9209976196289 + }, + { + "x": 692.7579956054688, + "y": 137.6739959716797 + }, + { + "x": 668.6580200195312, + "y": 182.99899291992188 } ], "isCurve": true, @@ -1059,6 +1163,18 @@ "labelPercentage": 0, "link": "", "route": [ + { + "x": 665.583984375, + "y": 182.99899291992188 + }, + { + "x": 678.8070068359375, + "y": 161.83799743652344 + }, + { + "x": 670.6019897460938, + "y": 173.1320037841797 + }, { "x": 661.6279907226562, "y": 183.8260040283203 @@ -1158,6 +1274,18 @@ { "x": 364.3710021972656, "y": 183.8260040283203 + }, + { + "x": 355.3970031738281, + "y": 173.1320037841797 + }, + { + "x": 347.1919860839844, + "y": 161.83799743652344 + }, + { + "x": 319.17401123046875, + "y": 117 } ], "isCurve": true, @@ -1191,6 +1319,14 @@ "labelPercentage": 0, "link": "", "route": [ + { + "x": 998.5, + "y": -198.61099243164062 + }, + { + "x": 992.905029296875, + "y": -198.9040069580078 + }, { "x": 1013.5819702148438, "y": -195.62899780273438 @@ -1298,6 +1434,14 @@ { "x": 1013.5819702148438, "y": 195.62899780273438 + }, + { + "x": 992.905029296875, + "y": 198.9040069580078 + }, + { + "x": 945.5, + "y": 201.38800048828125 } ], "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 ecc9129818..9d9c1e229e 100644 --- a/e2etests/testdata/txtar/cycle-diagram/dagre/sketch.exp.svg +++ b/e2etests/testdata/txtar/cycle-diagram/dagre/sketch.exp.svg @@ -1,9 +1,9 @@ -abcdabcab + .d2-3910026144 .fill-N1{fill:#0A0F25;} + .d2-3910026144 .fill-N2{fill:#676C7E;} + .d2-3910026144 .fill-N3{fill:#9499AB;} + .d2-3910026144 .fill-N4{fill:#CFD2DD;} + .d2-3910026144 .fill-N5{fill:#DEE1EB;} + .d2-3910026144 .fill-N6{fill:#EEF1F8;} + .d2-3910026144 .fill-N7{fill:#FFFFFF;} + .d2-3910026144 .fill-B1{fill:#0D32B2;} + .d2-3910026144 .fill-B2{fill:#0D32B2;} + .d2-3910026144 .fill-B3{fill:#E3E9FD;} + .d2-3910026144 .fill-B4{fill:#E3E9FD;} + .d2-3910026144 .fill-B5{fill:#EDF0FD;} + .d2-3910026144 .fill-B6{fill:#F7F8FE;} + .d2-3910026144 .fill-AA2{fill:#4A6FF3;} + .d2-3910026144 .fill-AA4{fill:#EDF0FD;} + .d2-3910026144 .fill-AA5{fill:#F7F8FE;} + .d2-3910026144 .fill-AB4{fill:#EDF0FD;} + .d2-3910026144 .fill-AB5{fill:#F7F8FE;} + .d2-3910026144 .stroke-N1{stroke:#0A0F25;} + .d2-3910026144 .stroke-N2{stroke:#676C7E;} + .d2-3910026144 .stroke-N3{stroke:#9499AB;} + .d2-3910026144 .stroke-N4{stroke:#CFD2DD;} + .d2-3910026144 .stroke-N5{stroke:#DEE1EB;} + .d2-3910026144 .stroke-N6{stroke:#EEF1F8;} + .d2-3910026144 .stroke-N7{stroke:#FFFFFF;} + .d2-3910026144 .stroke-B1{stroke:#0D32B2;} + .d2-3910026144 .stroke-B2{stroke:#0D32B2;} + .d2-3910026144 .stroke-B3{stroke:#E3E9FD;} + .d2-3910026144 .stroke-B4{stroke:#E3E9FD;} + .d2-3910026144 .stroke-B5{stroke:#EDF0FD;} + .d2-3910026144 .stroke-B6{stroke:#F7F8FE;} + .d2-3910026144 .stroke-AA2{stroke:#4A6FF3;} + .d2-3910026144 .stroke-AA4{stroke:#EDF0FD;} + .d2-3910026144 .stroke-AA5{stroke:#F7F8FE;} + .d2-3910026144 .stroke-AB4{stroke:#EDF0FD;} + .d2-3910026144 .stroke-AB5{stroke:#F7F8FE;} + .d2-3910026144 .background-color-N1{background-color:#0A0F25;} + .d2-3910026144 .background-color-N2{background-color:#676C7E;} + .d2-3910026144 .background-color-N3{background-color:#9499AB;} + .d2-3910026144 .background-color-N4{background-color:#CFD2DD;} + .d2-3910026144 .background-color-N5{background-color:#DEE1EB;} + .d2-3910026144 .background-color-N6{background-color:#EEF1F8;} + .d2-3910026144 .background-color-N7{background-color:#FFFFFF;} + .d2-3910026144 .background-color-B1{background-color:#0D32B2;} + .d2-3910026144 .background-color-B2{background-color:#0D32B2;} + .d2-3910026144 .background-color-B3{background-color:#E3E9FD;} + .d2-3910026144 .background-color-B4{background-color:#E3E9FD;} + .d2-3910026144 .background-color-B5{background-color:#EDF0FD;} + .d2-3910026144 .background-color-B6{background-color:#F7F8FE;} + .d2-3910026144 .background-color-AA2{background-color:#4A6FF3;} + .d2-3910026144 .background-color-AA4{background-color:#EDF0FD;} + .d2-3910026144 .background-color-AA5{background-color:#F7F8FE;} + .d2-3910026144 .background-color-AB4{background-color:#EDF0FD;} + .d2-3910026144 .background-color-AB5{background-color:#F7F8FE;} + .d2-3910026144 .color-N1{color:#0A0F25;} + .d2-3910026144 .color-N2{color:#676C7E;} + .d2-3910026144 .color-N3{color:#9499AB;} + .d2-3910026144 .color-N4{color:#CFD2DD;} + .d2-3910026144 .color-N5{color:#DEE1EB;} + .d2-3910026144 .color-N6{color:#EEF1F8;} + .d2-3910026144 .color-N7{color:#FFFFFF;} + .d2-3910026144 .color-B1{color:#0D32B2;} + .d2-3910026144 .color-B2{color:#0D32B2;} + .d2-3910026144 .color-B3{color:#E3E9FD;} + .d2-3910026144 .color-B4{color:#E3E9FD;} + .d2-3910026144 .color-B5{color:#EDF0FD;} + .d2-3910026144 .color-B6{color:#F7F8FE;} + .d2-3910026144 .color-AA2{color:#4A6FF3;} + .d2-3910026144 .color-AA4{color:#EDF0FD;} + .d2-3910026144 .color-AA5{color:#F7F8FE;} + .d2-3910026144 .color-AB4{color:#EDF0FD;} + .d2-3910026144 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker-d2-3910026144);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker-d2-3910026144);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright-d2-3910026144);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright-d2-3910026144);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright-d2-3910026144);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright-d2-3910026144);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark-d2-3910026144);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright-d2-3910026144);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright-d2-3910026144);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright-d2-3910026144);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright-d2-3910026144);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker-d2-3910026144);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark-d2-3910026144);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal-d2-3910026144);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal-d2-3910026144);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright-d2-3910026144);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright-d2-3910026144);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright-d2-3910026144);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>abcdabcab diff --git a/e2etests/testdata/txtar/cycle-diagram/elk/board.exp.json b/e2etests/testdata/txtar/cycle-diagram/elk/board.exp.json index ad3f518e0c..37e4ae23c2 100644 --- a/e2etests/testdata/txtar/cycle-diagram/elk/board.exp.json +++ b/e2etests/testdata/txtar/cycle-diagram/elk/board.exp.json @@ -539,6 +539,18 @@ "labelPercentage": 0, "link": "", "route": [ + { + "x": 38.5, + "y": -187.30599975585938 + }, + { + "x": 22.466999053955078, + "y": -187.72500610351562 + }, + { + "x": 32.904998779296875, + "y": -186.9040069580078 + }, { "x": 43.2859992980957, "y": -185.53700256347656 @@ -634,6 +646,22 @@ { "x": 207.62899780273438, "y": -29.582000732421875 + }, + { + "x": 209.53700256347656, + "y": -19.285999298095703 + }, + { + "x": 210.9040069580078, + "y": -8.904999732971191 + }, + { + "x": 211.72500610351562, + "y": 1.531999945640564 + }, + { + "x": 212.86399841308594, + "y": 45 } ], "isCurve": true, @@ -667,6 +695,22 @@ "labelPercentage": 0, "link": "", "route": [ + { + "x": 211.13499450683594, + "y": 45 + }, + { + "x": 211.72500610351562, + "y": 22.466999053955078 + }, + { + "x": 210.9040069580078, + "y": 32.904998779296875 + }, + { + "x": 209.53700256347656, + "y": 43.2859992980957 + }, { "x": 207.62899780273438, "y": 53.582000732421875 @@ -762,6 +806,18 @@ { "x": 43.2859992980957, "y": 209.53700256347656 + }, + { + "x": 32.904998779296875, + "y": 210.9040069580078 + }, + { + "x": 22.466999053955078, + "y": 211.72500610351562 + }, + { + "x": -14.49899959564209, + "y": 212.6929931640625 } ], "isCurve": true, @@ -795,6 +851,18 @@ "labelPercentage": 0, "link": "", "route": [ + { + "x": -14.49899959564209, + "y": 211.30599975585938 + }, + { + "x": 1.531999945640564, + "y": 211.72500610351562 + }, + { + "x": -8.904999732971191, + "y": 210.9040069580078 + }, { "x": -19.285999298095703, "y": 209.53700256347656 @@ -890,6 +958,22 @@ { "x": -183.62899780273438, "y": 53.582000732421875 + }, + { + "x": -185.53700256347656, + "y": 43.2859992980957 + }, + { + "x": -186.9040069580078, + "y": 32.904998779296875 + }, + { + "x": -187.72500610351562, + "y": 22.466999053955078 + }, + { + "x": -188.86399841308594, + "y": -20.999000549316406 } ], "isCurve": true, @@ -923,6 +1007,14 @@ "labelPercentage": 0, "link": "", "route": [ + { + "x": 512, + "y": -137.07400512695312 + }, + { + "x": 499.45098876953125, + "y": -137.51199340820312 + }, { "x": 513.333984375, "y": -136.05299377441406 @@ -1026,6 +1118,18 @@ { "x": 675.7109985351562, "y": 123.8030014038086 + }, + { + "x": 670.9359741210938, + "y": 136.92100524902344 + }, + { + "x": 665.2579956054688, + "y": 149.6739959716797 + }, + { + "x": 641.1580200195312, + "y": 194.99899291992188 } ], "isCurve": true, @@ -1059,6 +1163,18 @@ "labelPercentage": 0, "link": "", "route": [ + { + "x": 638.083984375, + "y": 194.99899291992188 + }, + { + "x": 651.3070068359375, + "y": 173.83799743652344 + }, + { + "x": 643.1019897460938, + "y": 185.1320037841797 + }, { "x": 634.1279907226562, "y": 195.8260040283203 @@ -1158,6 +1274,18 @@ { "x": 336.8710021972656, "y": 195.8260040283203 + }, + { + "x": 327.8970031738281, + "y": 185.1320037841797 + }, + { + "x": 319.6919860839844, + "y": 173.83799743652344 + }, + { + "x": 291.67401123046875, + "y": 129 } ], "isCurve": true, @@ -1191,6 +1319,14 @@ "labelPercentage": 0, "link": "", "route": [ + { + "x": 931.4099731445312, + "y": -186.61099243164062 + }, + { + "x": 925.8150024414062, + "y": -186.9040069580078 + }, { "x": 946.4920043945312, "y": -183.62899780273438 @@ -1298,6 +1434,14 @@ { "x": 946.4920043945312, "y": 207.62899780273438 + }, + { + "x": 925.8150024414062, + "y": 210.9040069580078 + }, + { + "x": 878.4099731445312, + "y": 213.38800048828125 } ], "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 f5afaee6a7..44b8e6cf78 100644 --- a/e2etests/testdata/txtar/cycle-diagram/elk/sketch.exp.svg +++ b/e2etests/testdata/txtar/cycle-diagram/elk/sketch.exp.svg @@ -1,9 +1,9 @@ -abcdabcab + .d2-451256407 .fill-N1{fill:#0A0F25;} + .d2-451256407 .fill-N2{fill:#676C7E;} + .d2-451256407 .fill-N3{fill:#9499AB;} + .d2-451256407 .fill-N4{fill:#CFD2DD;} + .d2-451256407 .fill-N5{fill:#DEE1EB;} + .d2-451256407 .fill-N6{fill:#EEF1F8;} + .d2-451256407 .fill-N7{fill:#FFFFFF;} + .d2-451256407 .fill-B1{fill:#0D32B2;} + .d2-451256407 .fill-B2{fill:#0D32B2;} + .d2-451256407 .fill-B3{fill:#E3E9FD;} + .d2-451256407 .fill-B4{fill:#E3E9FD;} + .d2-451256407 .fill-B5{fill:#EDF0FD;} + .d2-451256407 .fill-B6{fill:#F7F8FE;} + .d2-451256407 .fill-AA2{fill:#4A6FF3;} + .d2-451256407 .fill-AA4{fill:#EDF0FD;} + .d2-451256407 .fill-AA5{fill:#F7F8FE;} + .d2-451256407 .fill-AB4{fill:#EDF0FD;} + .d2-451256407 .fill-AB5{fill:#F7F8FE;} + .d2-451256407 .stroke-N1{stroke:#0A0F25;} + .d2-451256407 .stroke-N2{stroke:#676C7E;} + .d2-451256407 .stroke-N3{stroke:#9499AB;} + .d2-451256407 .stroke-N4{stroke:#CFD2DD;} + .d2-451256407 .stroke-N5{stroke:#DEE1EB;} + .d2-451256407 .stroke-N6{stroke:#EEF1F8;} + .d2-451256407 .stroke-N7{stroke:#FFFFFF;} + .d2-451256407 .stroke-B1{stroke:#0D32B2;} + .d2-451256407 .stroke-B2{stroke:#0D32B2;} + .d2-451256407 .stroke-B3{stroke:#E3E9FD;} + .d2-451256407 .stroke-B4{stroke:#E3E9FD;} + .d2-451256407 .stroke-B5{stroke:#EDF0FD;} + .d2-451256407 .stroke-B6{stroke:#F7F8FE;} + .d2-451256407 .stroke-AA2{stroke:#4A6FF3;} + .d2-451256407 .stroke-AA4{stroke:#EDF0FD;} + .d2-451256407 .stroke-AA5{stroke:#F7F8FE;} + .d2-451256407 .stroke-AB4{stroke:#EDF0FD;} + .d2-451256407 .stroke-AB5{stroke:#F7F8FE;} + .d2-451256407 .background-color-N1{background-color:#0A0F25;} + .d2-451256407 .background-color-N2{background-color:#676C7E;} + .d2-451256407 .background-color-N3{background-color:#9499AB;} + .d2-451256407 .background-color-N4{background-color:#CFD2DD;} + .d2-451256407 .background-color-N5{background-color:#DEE1EB;} + .d2-451256407 .background-color-N6{background-color:#EEF1F8;} + .d2-451256407 .background-color-N7{background-color:#FFFFFF;} + .d2-451256407 .background-color-B1{background-color:#0D32B2;} + .d2-451256407 .background-color-B2{background-color:#0D32B2;} + .d2-451256407 .background-color-B3{background-color:#E3E9FD;} + .d2-451256407 .background-color-B4{background-color:#E3E9FD;} + .d2-451256407 .background-color-B5{background-color:#EDF0FD;} + .d2-451256407 .background-color-B6{background-color:#F7F8FE;} + .d2-451256407 .background-color-AA2{background-color:#4A6FF3;} + .d2-451256407 .background-color-AA4{background-color:#EDF0FD;} + .d2-451256407 .background-color-AA5{background-color:#F7F8FE;} + .d2-451256407 .background-color-AB4{background-color:#EDF0FD;} + .d2-451256407 .background-color-AB5{background-color:#F7F8FE;} + .d2-451256407 .color-N1{color:#0A0F25;} + .d2-451256407 .color-N2{color:#676C7E;} + .d2-451256407 .color-N3{color:#9499AB;} + .d2-451256407 .color-N4{color:#CFD2DD;} + .d2-451256407 .color-N5{color:#DEE1EB;} + .d2-451256407 .color-N6{color:#EEF1F8;} + .d2-451256407 .color-N7{color:#FFFFFF;} + .d2-451256407 .color-B1{color:#0D32B2;} + .d2-451256407 .color-B2{color:#0D32B2;} + .d2-451256407 .color-B3{color:#E3E9FD;} + .d2-451256407 .color-B4{color:#E3E9FD;} + .d2-451256407 .color-B5{color:#EDF0FD;} + .d2-451256407 .color-B6{color:#F7F8FE;} + .d2-451256407 .color-AA2{color:#4A6FF3;} + .d2-451256407 .color-AA4{color:#EDF0FD;} + .d2-451256407 .color-AA5{color:#F7F8FE;} + .d2-451256407 .color-AB4{color:#EDF0FD;} + .d2-451256407 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker-d2-451256407);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker-d2-451256407);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright-d2-451256407);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright-d2-451256407);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright-d2-451256407);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright-d2-451256407);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark-d2-451256407);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright-d2-451256407);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright-d2-451256407);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright-d2-451256407);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright-d2-451256407);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker-d2-451256407);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark-d2-451256407);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal-d2-451256407);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal-d2-451256407);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright-d2-451256407);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright-d2-451256407);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright-d2-451256407);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>abcdabcab From dd28b2cd1b9a109d17c340b27fae64b322d6a352 Mon Sep 17 00:00:00 2001 From: Mayank Mohapatra <125661248+Mayank77maruti@users.noreply.github.com> Date: Fri, 21 Feb 2025 19:24:57 +0000 Subject: [PATCH 15/73] test 2 --- d2layouts/d2cycle/layout.go | 286 ++++-------------- .../txtar/cycle-diagram/dagre/board.exp.json | 144 --------- .../txtar/cycle-diagram/dagre/sketch.exp.svg | 152 +++++----- .../txtar/cycle-diagram/elk/board.exp.json | 144 --------- .../txtar/cycle-diagram/elk/sketch.exp.svg | 152 +++++----- 5 files changed, 206 insertions(+), 672 deletions(-) diff --git a/d2layouts/d2cycle/layout.go b/d2layouts/d2cycle/layout.go index d7306ff1a4..940a2ff097 100644 --- a/d2layouts/d2cycle/layout.go +++ b/d2layouts/d2cycle/layout.go @@ -1,198 +1,3 @@ -// package d2cycle - -// import ( -// "context" -// "math" - -// "oss.terrastruct.com/d2/d2graph" -// "oss.terrastruct.com/d2/lib/geo" -// "oss.terrastruct.com/d2/lib/label" -// "oss.terrastruct.com/util-go/go2" -// ) - -// const ( -// MIN_RADIUS = 200 -// PADDING = 20 -// MIN_SEGMENT_LEN = 10 -// ARC_STEPS = 30 -// ) - -// func Layout(ctx context.Context, g *d2graph.Graph, layout d2graph.LayoutGraph) error { -// objects := g.Root.ChildrenArray -// if len(objects) == 0 { -// return nil -// } - -// for _, obj := range g.Objects { -// positionLabelsIcons(obj) -// } - -// radius := calculateRadius(objects) -// positionObjects(objects, radius) - -// for _, edge := range g.Edges { -// createCircularArc(edge) -// } - -// return nil -// } - -// func calculateRadius(objects []*d2graph.Object) float64 { -// numObjects := float64(len(objects)) -// maxSize := 0.0 -// for _, obj := range objects { -// size := math.Max(obj.Box.Width, obj.Box.Height) -// maxSize = math.Max(maxSize, size) -// } -// minRadius := (maxSize/2.0 + PADDING) / math.Sin(math.Pi/numObjects) -// return math.Max(minRadius, MIN_RADIUS) -// } - -// func positionObjects(objects []*d2graph.Object, radius float64) { -// numObjects := float64(len(objects)) -// angleOffset := -math.Pi / 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, -// ) -// } -// } - -// func createCircularArc(edge *d2graph.Edge) { -// if edge.Src == nil || edge.Dst == nil { -// return -// } - -// srcCenter := edge.Src.Center() -// dstCenter := edge.Dst.Center() - -// srcAngle := math.Atan2(srcCenter.Y, srcCenter.X) -// dstAngle := math.Atan2(dstCenter.Y, dstCenter.X) -// if dstAngle < srcAngle { -// dstAngle += 2 * math.Pi -// } - -// arcRadius := math.Hypot(srcCenter.X, srcCenter.Y) - -// path := make([]*geo.Point, 0, ARC_STEPS+1) -// 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) -// path = append(path, geo.NewPoint(x, y)) -// } -// path[0] = srcCenter -// path[len(path)-1] = dstCenter - -// startIndex, newSrc := clampPointOutsideBox(edge.Src.Box, path, 0) -// endIndex, newDst := clampPointOutsideBoxReverse(edge.Dst.Box, path, len(path)-1) - -// path[0] = newSrc -// path[len(path)-1] = newDst - -// edge.Route = path[startIndex : endIndex+1] -// edge.IsCurve = true -// } - -// func clampPointOutsideBox(box *geo.Box, path []*geo.Point, startIdx int) (int, *geo.Point) { -// if startIdx >= len(path)-1 { -// return startIdx, path[startIdx] -// } -// if !boxContains(box, path[startIdx]) { -// return startIdx, path[startIdx] -// } - -// for i := startIdx + 1; i < len(path); i++ { -// if boxContains(box, path[i]) { -// continue -// } -// seg := geo.NewSegment(path[i-1], path[i]) -// inters := boxIntersections(box, *seg) -// if len(inters) > 0 { -// return i, inters[0] -// } -// return i, path[i] -// } -// last := len(path) - 1 -// return last, path[last] -// } - -// func clampPointOutsideBoxReverse(box *geo.Box, path []*geo.Point, endIdx int) (int, *geo.Point) { -// if endIdx <= 0 { -// return endIdx, path[endIdx] -// } -// if !boxContains(box, path[endIdx]) { -// return endIdx, path[endIdx] -// } - -// for j := endIdx - 1; j >= 0; j-- { -// if boxContains(box, path[j]) { -// continue -// } -// seg := geo.NewSegment(path[j], path[j+1]) -// inters := boxIntersections(box, *seg) -// if len(inters) > 0 { -// return j, inters[0] -// } -// return j, path[j] -// } -// return 0, path[0] -// } - -// func boxContains(b *geo.Box, p *geo.Point) bool { -// return p.X >= b.TopLeft.X && -// p.X <= b.TopLeft.X+b.Width && -// p.Y >= b.TopLeft.Y && -// p.Y <= b.TopLeft.Y+b.Height -// } - -// func boxIntersections(b *geo.Box, seg geo.Segment) []*geo.Point { -// return b.Intersections(seg) -// } - -// func positionLabelsIcons(obj *d2graph.Object) { -// if obj.Icon != nil && obj.IconPosition == nil { -// if len(obj.ChildrenArray) > 0 { -// obj.IconPosition = go2.Pointer(label.OutsideTopLeft.String()) -// if obj.LabelPosition == nil { -// obj.LabelPosition = go2.Pointer(label.OutsideTopRight.String()) -// return -// } -// } else if obj.SQLTable != nil || obj.Class != nil || obj.Language != "" { -// obj.IconPosition = go2.Pointer(label.OutsideTopLeft.String()) -// } else { -// obj.IconPosition = go2.Pointer(label.InsideMiddleCenter.String()) -// } -// } - -// if obj.HasLabel() && obj.LabelPosition == nil { -// if len(obj.ChildrenArray) > 0 { -// obj.LabelPosition = go2.Pointer(label.OutsideTopCenter.String()) -// } else if obj.HasOutsideBottomLabel() { -// obj.LabelPosition = go2.Pointer(label.OutsideBottomCenter.String()) -// } else if obj.Icon != nil { -// obj.LabelPosition = go2.Pointer(label.InsideTopCenter.String()) -// } else { -// obj.LabelPosition = go2.Pointer(label.InsideMiddleCenter.String()) -// } - -// if float64(obj.LabelDimensions.Width) > obj.Width || -// float64(obj.LabelDimensions.Height) > obj.Height { -// if len(obj.ChildrenArray) > 0 { -// obj.LabelPosition = go2.Pointer(label.OutsideTopCenter.String()) -// } else { -// obj.LabelPosition = go2.Pointer(label.OutsideBottomCenter.String()) -// } -// } -// } -// } package d2cycle import ( @@ -259,9 +64,6 @@ func positionObjects(objects []*d2graph.Object, radius float64) { } } -// createCircularArc computes an arc along a circle from the source to destination, -// then computes the exact intersection points between a ray from the object's center -// and its bounding box. This ensures that the arrow precisely touches the boundary. func createCircularArc(edge *d2graph.Edge) { if edge.Src == nil || edge.Dst == nil { return @@ -276,10 +78,8 @@ func createCircularArc(edge *d2graph.Edge) { dstAngle += 2 * math.Pi } - // Here we use the source center's distance as the arc radius. arcRadius := math.Hypot(srcCenter.X, srcCenter.Y) - // Sample points along the circular arc. path := make([]*geo.Point, 0, ARC_STEPS+1) for i := 0; i <= ARC_STEPS; i++ { t := float64(i) / float64(ARC_STEPS) @@ -288,51 +88,73 @@ func createCircularArc(edge *d2graph.Edge) { y := arcRadius * math.Sin(angle) path = append(path, geo.NewPoint(x, y)) } - // Instead of relying on iterative clamping, we compute exact intersection points. - // For the source, the ray is from the center toward the second sample point. - newSrc := rayRectangleIntersection(srcCenter, edge.Src.Box, path[1].X-srcCenter.X, path[1].Y-srcCenter.Y) - // For the destination, the ray is from the center in the direction opposite to the second-to-last sample. - newDst := rayRectangleIntersection(dstCenter, edge.Dst.Box, dstCenter.X-path[len(path)-2].X, dstCenter.Y-path[len(path)-2].Y) + path[0] = srcCenter + path[len(path)-1] = dstCenter + + startIndex, newSrc := clampPointOutsideBox(edge.Src.Box, path, 0) + endIndex, newDst := clampPointOutsideBoxReverse(edge.Dst.Box, path, len(path)-1) path[0] = newSrc path[len(path)-1] = newDst - edge.Route = path + edge.Route = path[startIndex : endIndex+1] edge.IsCurve = true } -// rayRectangleIntersection computes the exact intersection point of a ray starting at 'center' -// with direction (dx, dy) and the boundary of an axis-aligned rectangle 'box'. -// The rectangle is defined by its TopLeft corner, width, and height. -func rayRectangleIntersection(center *geo.Point, box *geo.Box, dx, dy float64) *geo.Point { - L := box.TopLeft.X - R := box.TopLeft.X + box.Width - T := box.TopLeft.Y - B := box.TopLeft.Y + box.Height +func clampPointOutsideBox(box *geo.Box, path []*geo.Point, startIdx int) (int, *geo.Point) { + if startIdx >= len(path)-1 { + return startIdx, path[startIdx] + } + if !boxContains(box, path[startIdx]) { + return startIdx, path[startIdx] + } - var tX, tY float64 - if dx > 0 { - tX = (R - center.X) / dx - } else if dx < 0 { - tX = (L - center.X) / dx - } else { - tX = math.Inf(1) + for i := startIdx + 1; i < len(path); i++ { + if boxContains(box, path[i]) { + continue + } + seg := geo.NewSegment(path[i-1], path[i]) + inters := boxIntersections(box, *seg) + if len(inters) > 0 { + return i, inters[0] + } + return i, path[i] } + last := len(path) - 1 + return last, path[last] +} - if dy > 0 { - tY = (B - center.Y) / dy - } else if dy < 0 { - tY = (T - center.Y) / dy - } else { - tY = math.Inf(1) +func clampPointOutsideBoxReverse(box *geo.Box, path []*geo.Point, endIdx int) (int, *geo.Point) { + if endIdx <= 0 { + return endIdx, path[endIdx] + } + if !boxContains(box, path[endIdx]) { + return endIdx, path[endIdx] } - t := tX - if tY < t { - t = tY + for j := endIdx - 1; j >= 0; j-- { + if boxContains(box, path[j]) { + continue + } + seg := geo.NewSegment(path[j], path[j+1]) + inters := boxIntersections(box, *seg) + if len(inters) > 0 { + return j, inters[0] + } + return j, path[j] } + return 0, path[0] +} - return geo.NewPoint(center.X+dx*t, center.Y+dy*t) +func boxContains(b *geo.Box, p *geo.Point) bool { + return p.X >= b.TopLeft.X && + p.X <= b.TopLeft.X+b.Width && + p.Y >= b.TopLeft.Y && + p.Y <= b.TopLeft.Y+b.Height +} + +func boxIntersections(b *geo.Box, seg geo.Segment) []*geo.Point { + return b.Intersections(seg) } func positionLabelsIcons(obj *d2graph.Object) { @@ -370,4 +192,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 f2104c95c4..104df56cce 100644 --- a/e2etests/testdata/txtar/cycle-diagram/dagre/board.exp.json +++ b/e2etests/testdata/txtar/cycle-diagram/dagre/board.exp.json @@ -539,18 +539,6 @@ "labelPercentage": 0, "link": "", "route": [ - { - "x": 26.5, - "y": -199.30599975585938 - }, - { - "x": 10.467000007629395, - "y": -199.72500610351562 - }, - { - "x": 20.905000686645508, - "y": -198.9040069580078 - }, { "x": 31.285999298095703, "y": -197.53700256347656 @@ -646,22 +634,6 @@ { "x": 195.62899780273438, "y": -41.582000732421875 - }, - { - "x": 197.53700256347656, - "y": -31.285999298095703 - }, - { - "x": 198.9040069580078, - "y": -20.905000686645508 - }, - { - "x": 199.72500610351562, - "y": -10.467000007629395 - }, - { - "x": 200.86399841308594, - "y": 33 } ], "isCurve": true, @@ -695,22 +667,6 @@ "labelPercentage": 0, "link": "", "route": [ - { - "x": 199.13499450683594, - "y": 33 - }, - { - "x": 199.72500610351562, - "y": 10.467000007629395 - }, - { - "x": 198.9040069580078, - "y": 20.905000686645508 - }, - { - "x": 197.53700256347656, - "y": 31.285999298095703 - }, { "x": 195.62899780273438, "y": 41.582000732421875 @@ -806,18 +762,6 @@ { "x": 31.285999298095703, "y": 197.53700256347656 - }, - { - "x": 20.905000686645508, - "y": 198.9040069580078 - }, - { - "x": 10.467000007629395, - "y": 199.72500610351562 - }, - { - "x": -26.499000549316406, - "y": 200.6929931640625 } ], "isCurve": true, @@ -851,18 +795,6 @@ "labelPercentage": 0, "link": "", "route": [ - { - "x": -26.499000549316406, - "y": 199.30599975585938 - }, - { - "x": -10.467000007629395, - "y": 199.72500610351562 - }, - { - "x": -20.905000686645508, - "y": 198.9040069580078 - }, { "x": -31.285999298095703, "y": 197.53700256347656 @@ -958,22 +890,6 @@ { "x": -195.62899780273438, "y": 41.582000732421875 - }, - { - "x": -197.53700256347656, - "y": 31.285999298095703 - }, - { - "x": -198.9040069580078, - "y": 20.905000686645508 - }, - { - "x": -199.72500610351562, - "y": 10.467000007629395 - }, - { - "x": -200.86399841308594, - "y": -32.999000549316406 } ], "isCurve": true, @@ -1007,14 +923,6 @@ "labelPercentage": 0, "link": "", "route": [ - { - "x": 539.5, - "y": -149.07400512695312 - }, - { - "x": 526.9509887695312, - "y": -149.51199340820312 - }, { "x": 540.833984375, "y": -148.05299377441406 @@ -1118,18 +1026,6 @@ { "x": 703.2109985351562, "y": 111.8030014038086 - }, - { - "x": 698.4359741210938, - "y": 124.9209976196289 - }, - { - "x": 692.7579956054688, - "y": 137.6739959716797 - }, - { - "x": 668.6580200195312, - "y": 182.99899291992188 } ], "isCurve": true, @@ -1163,18 +1059,6 @@ "labelPercentage": 0, "link": "", "route": [ - { - "x": 665.583984375, - "y": 182.99899291992188 - }, - { - "x": 678.8070068359375, - "y": 161.83799743652344 - }, - { - "x": 670.6019897460938, - "y": 173.1320037841797 - }, { "x": 661.6279907226562, "y": 183.8260040283203 @@ -1274,18 +1158,6 @@ { "x": 364.3710021972656, "y": 183.8260040283203 - }, - { - "x": 355.3970031738281, - "y": 173.1320037841797 - }, - { - "x": 347.1919860839844, - "y": 161.83799743652344 - }, - { - "x": 319.17401123046875, - "y": 117 } ], "isCurve": true, @@ -1319,14 +1191,6 @@ "labelPercentage": 0, "link": "", "route": [ - { - "x": 998.5, - "y": -198.61099243164062 - }, - { - "x": 992.905029296875, - "y": -198.9040069580078 - }, { "x": 1013.5819702148438, "y": -195.62899780273438 @@ -1434,14 +1298,6 @@ { "x": 1013.5819702148438, "y": 195.62899780273438 - }, - { - "x": 992.905029296875, - "y": 198.9040069580078 - }, - { - "x": 945.5, - "y": 201.38800048828125 } ], "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 9d9c1e229e..ecc9129818 100644 --- a/e2etests/testdata/txtar/cycle-diagram/dagre/sketch.exp.svg +++ b/e2etests/testdata/txtar/cycle-diagram/dagre/sketch.exp.svg @@ -1,9 +1,9 @@ -abcdabcab + .d2-3480499724 .fill-N1{fill:#0A0F25;} + .d2-3480499724 .fill-N2{fill:#676C7E;} + .d2-3480499724 .fill-N3{fill:#9499AB;} + .d2-3480499724 .fill-N4{fill:#CFD2DD;} + .d2-3480499724 .fill-N5{fill:#DEE1EB;} + .d2-3480499724 .fill-N6{fill:#EEF1F8;} + .d2-3480499724 .fill-N7{fill:#FFFFFF;} + .d2-3480499724 .fill-B1{fill:#0D32B2;} + .d2-3480499724 .fill-B2{fill:#0D32B2;} + .d2-3480499724 .fill-B3{fill:#E3E9FD;} + .d2-3480499724 .fill-B4{fill:#E3E9FD;} + .d2-3480499724 .fill-B5{fill:#EDF0FD;} + .d2-3480499724 .fill-B6{fill:#F7F8FE;} + .d2-3480499724 .fill-AA2{fill:#4A6FF3;} + .d2-3480499724 .fill-AA4{fill:#EDF0FD;} + .d2-3480499724 .fill-AA5{fill:#F7F8FE;} + .d2-3480499724 .fill-AB4{fill:#EDF0FD;} + .d2-3480499724 .fill-AB5{fill:#F7F8FE;} + .d2-3480499724 .stroke-N1{stroke:#0A0F25;} + .d2-3480499724 .stroke-N2{stroke:#676C7E;} + .d2-3480499724 .stroke-N3{stroke:#9499AB;} + .d2-3480499724 .stroke-N4{stroke:#CFD2DD;} + .d2-3480499724 .stroke-N5{stroke:#DEE1EB;} + .d2-3480499724 .stroke-N6{stroke:#EEF1F8;} + .d2-3480499724 .stroke-N7{stroke:#FFFFFF;} + .d2-3480499724 .stroke-B1{stroke:#0D32B2;} + .d2-3480499724 .stroke-B2{stroke:#0D32B2;} + .d2-3480499724 .stroke-B3{stroke:#E3E9FD;} + .d2-3480499724 .stroke-B4{stroke:#E3E9FD;} + .d2-3480499724 .stroke-B5{stroke:#EDF0FD;} + .d2-3480499724 .stroke-B6{stroke:#F7F8FE;} + .d2-3480499724 .stroke-AA2{stroke:#4A6FF3;} + .d2-3480499724 .stroke-AA4{stroke:#EDF0FD;} + .d2-3480499724 .stroke-AA5{stroke:#F7F8FE;} + .d2-3480499724 .stroke-AB4{stroke:#EDF0FD;} + .d2-3480499724 .stroke-AB5{stroke:#F7F8FE;} + .d2-3480499724 .background-color-N1{background-color:#0A0F25;} + .d2-3480499724 .background-color-N2{background-color:#676C7E;} + .d2-3480499724 .background-color-N3{background-color:#9499AB;} + .d2-3480499724 .background-color-N4{background-color:#CFD2DD;} + .d2-3480499724 .background-color-N5{background-color:#DEE1EB;} + .d2-3480499724 .background-color-N6{background-color:#EEF1F8;} + .d2-3480499724 .background-color-N7{background-color:#FFFFFF;} + .d2-3480499724 .background-color-B1{background-color:#0D32B2;} + .d2-3480499724 .background-color-B2{background-color:#0D32B2;} + .d2-3480499724 .background-color-B3{background-color:#E3E9FD;} + .d2-3480499724 .background-color-B4{background-color:#E3E9FD;} + .d2-3480499724 .background-color-B5{background-color:#EDF0FD;} + .d2-3480499724 .background-color-B6{background-color:#F7F8FE;} + .d2-3480499724 .background-color-AA2{background-color:#4A6FF3;} + .d2-3480499724 .background-color-AA4{background-color:#EDF0FD;} + .d2-3480499724 .background-color-AA5{background-color:#F7F8FE;} + .d2-3480499724 .background-color-AB4{background-color:#EDF0FD;} + .d2-3480499724 .background-color-AB5{background-color:#F7F8FE;} + .d2-3480499724 .color-N1{color:#0A0F25;} + .d2-3480499724 .color-N2{color:#676C7E;} + .d2-3480499724 .color-N3{color:#9499AB;} + .d2-3480499724 .color-N4{color:#CFD2DD;} + .d2-3480499724 .color-N5{color:#DEE1EB;} + .d2-3480499724 .color-N6{color:#EEF1F8;} + .d2-3480499724 .color-N7{color:#FFFFFF;} + .d2-3480499724 .color-B1{color:#0D32B2;} + .d2-3480499724 .color-B2{color:#0D32B2;} + .d2-3480499724 .color-B3{color:#E3E9FD;} + .d2-3480499724 .color-B4{color:#E3E9FD;} + .d2-3480499724 .color-B5{color:#EDF0FD;} + .d2-3480499724 .color-B6{color:#F7F8FE;} + .d2-3480499724 .color-AA2{color:#4A6FF3;} + .d2-3480499724 .color-AA4{color:#EDF0FD;} + .d2-3480499724 .color-AA5{color:#F7F8FE;} + .d2-3480499724 .color-AB4{color:#EDF0FD;} + .d2-3480499724 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker-d2-3480499724);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker-d2-3480499724);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright-d2-3480499724);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright-d2-3480499724);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright-d2-3480499724);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright-d2-3480499724);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark-d2-3480499724);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright-d2-3480499724);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright-d2-3480499724);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright-d2-3480499724);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright-d2-3480499724);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker-d2-3480499724);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark-d2-3480499724);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal-d2-3480499724);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal-d2-3480499724);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright-d2-3480499724);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright-d2-3480499724);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright-d2-3480499724);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>abcdabcab diff --git a/e2etests/testdata/txtar/cycle-diagram/elk/board.exp.json b/e2etests/testdata/txtar/cycle-diagram/elk/board.exp.json index 37e4ae23c2..ad3f518e0c 100644 --- a/e2etests/testdata/txtar/cycle-diagram/elk/board.exp.json +++ b/e2etests/testdata/txtar/cycle-diagram/elk/board.exp.json @@ -539,18 +539,6 @@ "labelPercentage": 0, "link": "", "route": [ - { - "x": 38.5, - "y": -187.30599975585938 - }, - { - "x": 22.466999053955078, - "y": -187.72500610351562 - }, - { - "x": 32.904998779296875, - "y": -186.9040069580078 - }, { "x": 43.2859992980957, "y": -185.53700256347656 @@ -646,22 +634,6 @@ { "x": 207.62899780273438, "y": -29.582000732421875 - }, - { - "x": 209.53700256347656, - "y": -19.285999298095703 - }, - { - "x": 210.9040069580078, - "y": -8.904999732971191 - }, - { - "x": 211.72500610351562, - "y": 1.531999945640564 - }, - { - "x": 212.86399841308594, - "y": 45 } ], "isCurve": true, @@ -695,22 +667,6 @@ "labelPercentage": 0, "link": "", "route": [ - { - "x": 211.13499450683594, - "y": 45 - }, - { - "x": 211.72500610351562, - "y": 22.466999053955078 - }, - { - "x": 210.9040069580078, - "y": 32.904998779296875 - }, - { - "x": 209.53700256347656, - "y": 43.2859992980957 - }, { "x": 207.62899780273438, "y": 53.582000732421875 @@ -806,18 +762,6 @@ { "x": 43.2859992980957, "y": 209.53700256347656 - }, - { - "x": 32.904998779296875, - "y": 210.9040069580078 - }, - { - "x": 22.466999053955078, - "y": 211.72500610351562 - }, - { - "x": -14.49899959564209, - "y": 212.6929931640625 } ], "isCurve": true, @@ -851,18 +795,6 @@ "labelPercentage": 0, "link": "", "route": [ - { - "x": -14.49899959564209, - "y": 211.30599975585938 - }, - { - "x": 1.531999945640564, - "y": 211.72500610351562 - }, - { - "x": -8.904999732971191, - "y": 210.9040069580078 - }, { "x": -19.285999298095703, "y": 209.53700256347656 @@ -958,22 +890,6 @@ { "x": -183.62899780273438, "y": 53.582000732421875 - }, - { - "x": -185.53700256347656, - "y": 43.2859992980957 - }, - { - "x": -186.9040069580078, - "y": 32.904998779296875 - }, - { - "x": -187.72500610351562, - "y": 22.466999053955078 - }, - { - "x": -188.86399841308594, - "y": -20.999000549316406 } ], "isCurve": true, @@ -1007,14 +923,6 @@ "labelPercentage": 0, "link": "", "route": [ - { - "x": 512, - "y": -137.07400512695312 - }, - { - "x": 499.45098876953125, - "y": -137.51199340820312 - }, { "x": 513.333984375, "y": -136.05299377441406 @@ -1118,18 +1026,6 @@ { "x": 675.7109985351562, "y": 123.8030014038086 - }, - { - "x": 670.9359741210938, - "y": 136.92100524902344 - }, - { - "x": 665.2579956054688, - "y": 149.6739959716797 - }, - { - "x": 641.1580200195312, - "y": 194.99899291992188 } ], "isCurve": true, @@ -1163,18 +1059,6 @@ "labelPercentage": 0, "link": "", "route": [ - { - "x": 638.083984375, - "y": 194.99899291992188 - }, - { - "x": 651.3070068359375, - "y": 173.83799743652344 - }, - { - "x": 643.1019897460938, - "y": 185.1320037841797 - }, { "x": 634.1279907226562, "y": 195.8260040283203 @@ -1274,18 +1158,6 @@ { "x": 336.8710021972656, "y": 195.8260040283203 - }, - { - "x": 327.8970031738281, - "y": 185.1320037841797 - }, - { - "x": 319.6919860839844, - "y": 173.83799743652344 - }, - { - "x": 291.67401123046875, - "y": 129 } ], "isCurve": true, @@ -1319,14 +1191,6 @@ "labelPercentage": 0, "link": "", "route": [ - { - "x": 931.4099731445312, - "y": -186.61099243164062 - }, - { - "x": 925.8150024414062, - "y": -186.9040069580078 - }, { "x": 946.4920043945312, "y": -183.62899780273438 @@ -1434,14 +1298,6 @@ { "x": 946.4920043945312, "y": 207.62899780273438 - }, - { - "x": 925.8150024414062, - "y": 210.9040069580078 - }, - { - "x": 878.4099731445312, - "y": 213.38800048828125 } ], "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 44b8e6cf78..f5afaee6a7 100644 --- a/e2etests/testdata/txtar/cycle-diagram/elk/sketch.exp.svg +++ b/e2etests/testdata/txtar/cycle-diagram/elk/sketch.exp.svg @@ -1,9 +1,9 @@ -abcdabcab + .d2-2409080064 .fill-N1{fill:#0A0F25;} + .d2-2409080064 .fill-N2{fill:#676C7E;} + .d2-2409080064 .fill-N3{fill:#9499AB;} + .d2-2409080064 .fill-N4{fill:#CFD2DD;} + .d2-2409080064 .fill-N5{fill:#DEE1EB;} + .d2-2409080064 .fill-N6{fill:#EEF1F8;} + .d2-2409080064 .fill-N7{fill:#FFFFFF;} + .d2-2409080064 .fill-B1{fill:#0D32B2;} + .d2-2409080064 .fill-B2{fill:#0D32B2;} + .d2-2409080064 .fill-B3{fill:#E3E9FD;} + .d2-2409080064 .fill-B4{fill:#E3E9FD;} + .d2-2409080064 .fill-B5{fill:#EDF0FD;} + .d2-2409080064 .fill-B6{fill:#F7F8FE;} + .d2-2409080064 .fill-AA2{fill:#4A6FF3;} + .d2-2409080064 .fill-AA4{fill:#EDF0FD;} + .d2-2409080064 .fill-AA5{fill:#F7F8FE;} + .d2-2409080064 .fill-AB4{fill:#EDF0FD;} + .d2-2409080064 .fill-AB5{fill:#F7F8FE;} + .d2-2409080064 .stroke-N1{stroke:#0A0F25;} + .d2-2409080064 .stroke-N2{stroke:#676C7E;} + .d2-2409080064 .stroke-N3{stroke:#9499AB;} + .d2-2409080064 .stroke-N4{stroke:#CFD2DD;} + .d2-2409080064 .stroke-N5{stroke:#DEE1EB;} + .d2-2409080064 .stroke-N6{stroke:#EEF1F8;} + .d2-2409080064 .stroke-N7{stroke:#FFFFFF;} + .d2-2409080064 .stroke-B1{stroke:#0D32B2;} + .d2-2409080064 .stroke-B2{stroke:#0D32B2;} + .d2-2409080064 .stroke-B3{stroke:#E3E9FD;} + .d2-2409080064 .stroke-B4{stroke:#E3E9FD;} + .d2-2409080064 .stroke-B5{stroke:#EDF0FD;} + .d2-2409080064 .stroke-B6{stroke:#F7F8FE;} + .d2-2409080064 .stroke-AA2{stroke:#4A6FF3;} + .d2-2409080064 .stroke-AA4{stroke:#EDF0FD;} + .d2-2409080064 .stroke-AA5{stroke:#F7F8FE;} + .d2-2409080064 .stroke-AB4{stroke:#EDF0FD;} + .d2-2409080064 .stroke-AB5{stroke:#F7F8FE;} + .d2-2409080064 .background-color-N1{background-color:#0A0F25;} + .d2-2409080064 .background-color-N2{background-color:#676C7E;} + .d2-2409080064 .background-color-N3{background-color:#9499AB;} + .d2-2409080064 .background-color-N4{background-color:#CFD2DD;} + .d2-2409080064 .background-color-N5{background-color:#DEE1EB;} + .d2-2409080064 .background-color-N6{background-color:#EEF1F8;} + .d2-2409080064 .background-color-N7{background-color:#FFFFFF;} + .d2-2409080064 .background-color-B1{background-color:#0D32B2;} + .d2-2409080064 .background-color-B2{background-color:#0D32B2;} + .d2-2409080064 .background-color-B3{background-color:#E3E9FD;} + .d2-2409080064 .background-color-B4{background-color:#E3E9FD;} + .d2-2409080064 .background-color-B5{background-color:#EDF0FD;} + .d2-2409080064 .background-color-B6{background-color:#F7F8FE;} + .d2-2409080064 .background-color-AA2{background-color:#4A6FF3;} + .d2-2409080064 .background-color-AA4{background-color:#EDF0FD;} + .d2-2409080064 .background-color-AA5{background-color:#F7F8FE;} + .d2-2409080064 .background-color-AB4{background-color:#EDF0FD;} + .d2-2409080064 .background-color-AB5{background-color:#F7F8FE;} + .d2-2409080064 .color-N1{color:#0A0F25;} + .d2-2409080064 .color-N2{color:#676C7E;} + .d2-2409080064 .color-N3{color:#9499AB;} + .d2-2409080064 .color-N4{color:#CFD2DD;} + .d2-2409080064 .color-N5{color:#DEE1EB;} + .d2-2409080064 .color-N6{color:#EEF1F8;} + .d2-2409080064 .color-N7{color:#FFFFFF;} + .d2-2409080064 .color-B1{color:#0D32B2;} + .d2-2409080064 .color-B2{color:#0D32B2;} + .d2-2409080064 .color-B3{color:#E3E9FD;} + .d2-2409080064 .color-B4{color:#E3E9FD;} + .d2-2409080064 .color-B5{color:#EDF0FD;} + .d2-2409080064 .color-B6{color:#F7F8FE;} + .d2-2409080064 .color-AA2{color:#4A6FF3;} + .d2-2409080064 .color-AA4{color:#EDF0FD;} + .d2-2409080064 .color-AA5{color:#F7F8FE;} + .d2-2409080064 .color-AB4{color:#EDF0FD;} + .d2-2409080064 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker-d2-2409080064);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker-d2-2409080064);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright-d2-2409080064);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright-d2-2409080064);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright-d2-2409080064);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright-d2-2409080064);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark-d2-2409080064);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright-d2-2409080064);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright-d2-2409080064);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright-d2-2409080064);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright-d2-2409080064);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker-d2-2409080064);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark-d2-2409080064);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal-d2-2409080064);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal-d2-2409080064);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright-d2-2409080064);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright-d2-2409080064);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright-d2-2409080064);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>abcdabcab From b2a639540126d5083c90bddee83128c88863adae Mon Sep 17 00:00:00 2001 From: Mayank Mohapatra <125661248+Mayank77maruti@users.noreply.github.com> Date: Sat, 22 Feb 2025 09:54:19 +0000 Subject: [PATCH 16/73] try --- d2layouts/d2cycle/layout.go | 39 +++++++++++++++++++++++++++++++++---- 1 file changed, 35 insertions(+), 4 deletions(-) diff --git a/d2layouts/d2cycle/layout.go b/d2layouts/d2cycle/layout.go index 940a2ff097..3a661b1a80 100644 --- a/d2layouts/d2cycle/layout.go +++ b/d2layouts/d2cycle/layout.go @@ -101,6 +101,29 @@ func createCircularArc(edge *d2graph.Edge) { edge.IsCurve = true } +// func clampPointOutsideBox(box *geo.Box, path []*geo.Point, startIdx int) (int, *geo.Point) { +// if startIdx >= len(path)-1 { +// return startIdx, path[startIdx] +// } +// if !boxContains(box, path[startIdx]) { +// return startIdx, path[startIdx] +// } + +// for i := startIdx + 1; i < len(path); i++ { +// if boxContains(box, path[i]) { +// continue +// } +// seg := geo.NewSegment(path[i-1], path[i]) +// inters := boxIntersections(box, *seg) +// if len(inters) > 0 { +// return i, inters[0] +// } +// return i, path[i] +// } +// last := len(path) - 1 +// return last, path[last] +// } + func clampPointOutsideBox(box *geo.Box, path []*geo.Point, startIdx int) (int, *geo.Point) { if startIdx >= len(path)-1 { return startIdx, path[startIdx] @@ -116,6 +139,7 @@ func clampPointOutsideBox(box *geo.Box, path []*geo.Point, startIdx int) (int, * seg := geo.NewSegment(path[i-1], path[i]) inters := boxIntersections(box, *seg) if len(inters) > 0 { + // Optionally, if multiple intersections are returned, choose the one nearest to path[i-1] return i, inters[0] } return i, path[i] @@ -146,13 +170,20 @@ func clampPointOutsideBoxReverse(box *geo.Box, path []*geo.Point, endIdx int) (i return 0, path[0] } +// func boxContains(b *geo.Box, p *geo.Point) bool { +// return p.X >= b.TopLeft.X && +// p.X <= b.TopLeft.X+b.Width && +// p.Y >= b.TopLeft.Y && +// p.Y <= b.TopLeft.Y+b.Height +// } func boxContains(b *geo.Box, p *geo.Point) bool { - return p.X >= b.TopLeft.X && - p.X <= b.TopLeft.X+b.Width && - p.Y >= b.TopLeft.Y && - p.Y <= b.TopLeft.Y+b.Height + return p.X > b.TopLeft.X && + p.X < b.TopLeft.X+b.Width && + p.Y > b.TopLeft.Y && + p.Y < b.TopLeft.Y+b.Height } + func boxIntersections(b *geo.Box, seg geo.Segment) []*geo.Point { return b.Intersections(seg) } From 39d2022956f3ae240cddb3c27c6aff7979079491 Mon Sep 17 00:00:00 2001 From: Mayank Mohapatra <125661248+Mayank77maruti@users.noreply.github.com> Date: Sat, 22 Feb 2025 10:09:19 +0000 Subject: [PATCH 17/73] try --- d2layouts/d2cycle/layout.go | 39 ++++--------------------------------- 1 file changed, 4 insertions(+), 35 deletions(-) diff --git a/d2layouts/d2cycle/layout.go b/d2layouts/d2cycle/layout.go index 3a661b1a80..940a2ff097 100644 --- a/d2layouts/d2cycle/layout.go +++ b/d2layouts/d2cycle/layout.go @@ -101,29 +101,6 @@ func createCircularArc(edge *d2graph.Edge) { edge.IsCurve = true } -// func clampPointOutsideBox(box *geo.Box, path []*geo.Point, startIdx int) (int, *geo.Point) { -// if startIdx >= len(path)-1 { -// return startIdx, path[startIdx] -// } -// if !boxContains(box, path[startIdx]) { -// return startIdx, path[startIdx] -// } - -// for i := startIdx + 1; i < len(path); i++ { -// if boxContains(box, path[i]) { -// continue -// } -// seg := geo.NewSegment(path[i-1], path[i]) -// inters := boxIntersections(box, *seg) -// if len(inters) > 0 { -// return i, inters[0] -// } -// return i, path[i] -// } -// last := len(path) - 1 -// return last, path[last] -// } - func clampPointOutsideBox(box *geo.Box, path []*geo.Point, startIdx int) (int, *geo.Point) { if startIdx >= len(path)-1 { return startIdx, path[startIdx] @@ -139,7 +116,6 @@ func clampPointOutsideBox(box *geo.Box, path []*geo.Point, startIdx int) (int, * seg := geo.NewSegment(path[i-1], path[i]) inters := boxIntersections(box, *seg) if len(inters) > 0 { - // Optionally, if multiple intersections are returned, choose the one nearest to path[i-1] return i, inters[0] } return i, path[i] @@ -170,20 +146,13 @@ func clampPointOutsideBoxReverse(box *geo.Box, path []*geo.Point, endIdx int) (i return 0, path[0] } -// func boxContains(b *geo.Box, p *geo.Point) bool { -// return p.X >= b.TopLeft.X && -// p.X <= b.TopLeft.X+b.Width && -// p.Y >= b.TopLeft.Y && -// p.Y <= b.TopLeft.Y+b.Height -// } func boxContains(b *geo.Box, p *geo.Point) bool { - return p.X > b.TopLeft.X && - p.X < b.TopLeft.X+b.Width && - p.Y > b.TopLeft.Y && - p.Y < b.TopLeft.Y+b.Height + return p.X >= b.TopLeft.X && + p.X <= b.TopLeft.X+b.Width && + p.Y >= b.TopLeft.Y && + p.Y <= b.TopLeft.Y+b.Height } - func boxIntersections(b *geo.Box, seg geo.Segment) []*geo.Point { return b.Intersections(seg) } From 3c1be1ee2ad8198d4c1db19db4fb82f335280aee Mon Sep 17 00:00:00 2001 From: Mayank Mohapatra <125661248+Mayank77maruti@users.noreply.github.com> Date: Sat, 22 Feb 2025 10:32:46 +0000 Subject: [PATCH 18/73] try --- d2layouts/d2cycle/layout.go | 367 ++++++++++-------- .../txtar/cycle-diagram/dagre/board.exp.json | 48 +++ .../txtar/cycle-diagram/dagre/sketch.exp.svg | 152 ++++---- .../txtar/cycle-diagram/elk/board.exp.json | 48 +++ .../txtar/cycle-diagram/elk/sketch.exp.svg | 152 ++++---- 5 files changed, 453 insertions(+), 314 deletions(-) diff --git a/d2layouts/d2cycle/layout.go b/d2layouts/d2cycle/layout.go index 940a2ff097..e8eeeba117 100644 --- a/d2layouts/d2cycle/layout.go +++ b/d2layouts/d2cycle/layout.go @@ -1,195 +1,238 @@ package d2cycle import ( - "context" - "math" + "context" + "math" - "oss.terrastruct.com/d2/d2graph" - "oss.terrastruct.com/d2/lib/geo" - "oss.terrastruct.com/d2/lib/label" - "oss.terrastruct.com/util-go/go2" + "oss.terrastruct.com/d2/d2graph" + "oss.terrastruct.com/d2/lib/geo" + "oss.terrastruct.com/d2/lib/label" + "oss.terrastruct.com/util-go/go2" ) const ( - MIN_RADIUS = 200 - PADDING = 20 - MIN_SEGMENT_LEN = 10 - ARC_STEPS = 30 + MIN_RADIUS = 200 + PADDING = 20 + MIN_SEGMENT_LEN = 10 + ARC_STEPS = 30 + EPSILON = 1e-10 // Small value for floating point comparisons ) func Layout(ctx context.Context, g *d2graph.Graph, layout d2graph.LayoutGraph) error { - objects := g.Root.ChildrenArray - if len(objects) == 0 { - return nil - } + objects := g.Root.ChildrenArray + if len(objects) == 0 { + return nil + } - for _, obj := range g.Objects { - positionLabelsIcons(obj) - } + for _, obj := range g.Objects { + positionLabelsIcons(obj) + } - radius := calculateRadius(objects) - positionObjects(objects, radius) + radius := calculateRadius(objects) + positionObjects(objects, radius) - for _, edge := range g.Edges { - createCircularArc(edge) - } + for _, edge := range g.Edges { + createPreciseCircularArc(edge) + } - return nil + return nil } func calculateRadius(objects []*d2graph.Object) float64 { - numObjects := float64(len(objects)) - maxSize := 0.0 - for _, obj := range objects { - size := math.Max(obj.Box.Width, obj.Box.Height) - maxSize = math.Max(maxSize, size) - } - minRadius := (maxSize/2.0 + PADDING) / math.Sin(math.Pi/numObjects) - return math.Max(minRadius, MIN_RADIUS) + numObjects := float64(len(objects)) + maxSize := 0.0 + for _, obj := range objects { + size := math.Max(obj.Box.Width, obj.Box.Height) + maxSize = math.Max(maxSize, size) + } + minRadius := (maxSize/2.0 + PADDING) / math.Sin(math.Pi/numObjects) + return math.Max(minRadius, MIN_RADIUS) } func positionObjects(objects []*d2graph.Object, radius float64) { - numObjects := float64(len(objects)) - angleOffset := -math.Pi / 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, - ) - } + numObjects := float64(len(objects)) + angleOffset := -math.Pi / 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, + ) + } } -func createCircularArc(edge *d2graph.Edge) { - if edge.Src == nil || edge.Dst == nil { - return - } - - srcCenter := edge.Src.Center() - dstCenter := edge.Dst.Center() - - srcAngle := math.Atan2(srcCenter.Y, srcCenter.X) - dstAngle := math.Atan2(dstCenter.Y, dstCenter.X) - if dstAngle < srcAngle { - dstAngle += 2 * math.Pi - } - - arcRadius := math.Hypot(srcCenter.X, srcCenter.Y) - - path := make([]*geo.Point, 0, ARC_STEPS+1) - 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) - path = append(path, geo.NewPoint(x, y)) - } - path[0] = srcCenter - path[len(path)-1] = dstCenter - - startIndex, newSrc := clampPointOutsideBox(edge.Src.Box, path, 0) - endIndex, newDst := clampPointOutsideBoxReverse(edge.Dst.Box, path, len(path)-1) - - path[0] = newSrc - path[len(path)-1] = newDst - - edge.Route = path[startIndex : endIndex+1] - edge.IsCurve = true +func createPreciseCircularArc(edge *d2graph.Edge) { + if edge.Src == nil || edge.Dst == nil { + return + } + + srcCenter := edge.Src.Center() + dstCenter := edge.Dst.Center() + + // Calculate angles in the circular layout + srcAngle := math.Atan2(srcCenter.Y, srcCenter.X) + dstAngle := math.Atan2(dstCenter.Y, dstCenter.X) + if dstAngle < srcAngle { + dstAngle += 2 * math.Pi + } + + arcRadius := math.Hypot(srcCenter.X, srcCenter.Y) + + // Generate initial path points + path := make([]*geo.Point, 0, ARC_STEPS+1) + 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) + path = append(path, geo.NewPoint(x, y)) + } + + // Find precise intersection points + srcIntersection := findPreciseBoxIntersection(edge.Src.Box, path[0], path[1]) + dstIntersection := findPreciseBoxIntersection(edge.Dst.Box, path[len(path)-1], path[len(path)-2]) + + // Update path endpoints with precise intersections + path[0] = srcIntersection + path[len(path)-1] = dstIntersection + + // Remove any points that might be inside the boxes + startIdx := 0 + endIdx := len(path) - 1 + + for i := 1; i < len(path)-1; i++ { + if boxContains(edge.Src.Box, path[i]) { + startIdx = i + } + if boxContains(edge.Dst.Box, path[i]) { + endIdx = i + break + } + } + + edge.Route = path[startIdx:endIdx+1] + edge.IsCurve = true } -func clampPointOutsideBox(box *geo.Box, path []*geo.Point, startIdx int) (int, *geo.Point) { - if startIdx >= len(path)-1 { - return startIdx, path[startIdx] - } - if !boxContains(box, path[startIdx]) { - return startIdx, path[startIdx] - } - - for i := startIdx + 1; i < len(path); i++ { - if boxContains(box, path[i]) { - continue - } - seg := geo.NewSegment(path[i-1], path[i]) - inters := boxIntersections(box, *seg) - if len(inters) > 0 { - return i, inters[0] - } - return i, path[i] - } - last := len(path) - 1 - return last, path[last] +func findPreciseBoxIntersection(box *geo.Box, p1, p2 *geo.Point) *geo.Point { + // Define box edges as line segments + edges := []geo.Segment{ + // Top edge + *geo.NewSegment( + geo.NewPoint(box.TopLeft.X, box.TopLeft.Y), + geo.NewPoint(box.TopLeft.X+box.Width, box.TopLeft.Y), + ), + // Right edge + *geo.NewSegment( + geo.NewPoint(box.TopLeft.X+box.Width, box.TopLeft.Y), + geo.NewPoint(box.TopLeft.X+box.Width, box.TopLeft.Y+box.Height), + ), + // Bottom edge + *geo.NewSegment( + geo.NewPoint(box.TopLeft.X, box.TopLeft.Y+box.Height), + geo.NewPoint(box.TopLeft.X+box.Width, box.TopLeft.Y+box.Height), + ), + // Left edge + *geo.NewSegment( + geo.NewPoint(box.TopLeft.X, box.TopLeft.Y), + geo.NewPoint(box.TopLeft.X, box.TopLeft.Y+box.Height), + ), + } + + // Line segment from p1 to p2 + line := *geo.NewSegment(p1, p2) + + // Find the intersection point closest to p1 + var closestIntersection *geo.Point + minDist := math.MaxFloat64 + + for _, edge := range edges { + if intersection := findSegmentIntersection(line, edge); intersection != nil { + dist := math.Hypot( + intersection.X-p1.X, + intersection.Y-p1.Y, + ) + if dist < minDist { + minDist = dist + closestIntersection = intersection + } + } + } + + if closestIntersection != nil { + return closestIntersection + } + return p1 } -func clampPointOutsideBoxReverse(box *geo.Box, path []*geo.Point, endIdx int) (int, *geo.Point) { - if endIdx <= 0 { - return endIdx, path[endIdx] - } - if !boxContains(box, path[endIdx]) { - return endIdx, path[endIdx] - } - - for j := endIdx - 1; j >= 0; j-- { - if boxContains(box, path[j]) { - continue - } - seg := geo.NewSegment(path[j], path[j+1]) - inters := boxIntersections(box, *seg) - if len(inters) > 0 { - return j, inters[0] - } - return j, path[j] - } - return 0, path[0] -} +func findSegmentIntersection(s1, s2 geo.Segment) *geo.Point { + // Calculate the intersection of two line segments using parametric equations + x1, y1 := s1.Start.X, s1.Start.Y + x2, y2 := s1.End.X, s1.End.Y + x3, y3 := s2.Start.X, s2.Start.Y + x4, y4 := s2.End.X, s2.End.Y -func boxContains(b *geo.Box, p *geo.Point) bool { - return p.X >= b.TopLeft.X && - p.X <= b.TopLeft.X+b.Width && - p.Y >= b.TopLeft.Y && - p.Y <= b.TopLeft.Y+b.Height + denominator := (x1-x2)*(y3-y4) - (y1-y2)*(x3-x4) + if math.Abs(denominator) < EPSILON { + return nil + } + + t := ((x1-x3)*(y3-y4) - (y1-y3)*(x3-x4)) / denominator + u := -((x1-x2)*(y1-y3) - (y1-y2)*(x1-x3)) / denominator + + if t >= 0 && t <= 1 && u >= 0 && u <= 1 { + x := x1 + t*(x2-x1) + y := y1 + t*(y2-y1) + return geo.NewPoint(x, y) + } + + return nil } -func boxIntersections(b *geo.Box, seg geo.Segment) []*geo.Point { - return b.Intersections(seg) +func boxContains(b *geo.Box, p *geo.Point) bool { + return p.X >= b.TopLeft.X-EPSILON && + p.X <= b.TopLeft.X+b.Width+EPSILON && + p.Y >= b.TopLeft.Y-EPSILON && + p.Y <= b.TopLeft.Y+b.Height+EPSILON } func positionLabelsIcons(obj *d2graph.Object) { - if obj.Icon != nil && obj.IconPosition == nil { - if len(obj.ChildrenArray) > 0 { - obj.IconPosition = go2.Pointer(label.OutsideTopLeft.String()) - if obj.LabelPosition == nil { - obj.LabelPosition = go2.Pointer(label.OutsideTopRight.String()) - return - } - } else if obj.SQLTable != nil || obj.Class != nil || obj.Language != "" { - obj.IconPosition = go2.Pointer(label.OutsideTopLeft.String()) - } else { - obj.IconPosition = go2.Pointer(label.InsideMiddleCenter.String()) - } - } - - if obj.HasLabel() && obj.LabelPosition == nil { - if len(obj.ChildrenArray) > 0 { - obj.LabelPosition = go2.Pointer(label.OutsideTopCenter.String()) - } else if obj.HasOutsideBottomLabel() { - obj.LabelPosition = go2.Pointer(label.OutsideBottomCenter.String()) - } else if obj.Icon != nil { - obj.LabelPosition = go2.Pointer(label.InsideTopCenter.String()) - } else { - obj.LabelPosition = go2.Pointer(label.InsideMiddleCenter.String()) - } - - if float64(obj.LabelDimensions.Width) > obj.Width || - float64(obj.LabelDimensions.Height) > obj.Height { - if len(obj.ChildrenArray) > 0 { - obj.LabelPosition = go2.Pointer(label.OutsideTopCenter.String()) - } else { - obj.LabelPosition = go2.Pointer(label.OutsideBottomCenter.String()) - } - } - } + if obj.Icon != nil && obj.IconPosition == nil { + if len(obj.ChildrenArray) > 0 { + obj.IconPosition = go2.Pointer(label.OutsideTopLeft.String()) + if obj.LabelPosition == nil { + obj.LabelPosition = go2.Pointer(label.OutsideTopRight.String()) + return + } + } else if obj.SQLTable != nil || obj.Class != nil || obj.Language != "" { + obj.IconPosition = go2.Pointer(label.OutsideTopLeft.String()) + } else { + obj.IconPosition = go2.Pointer(label.InsideMiddleCenter.String()) + } + } + + if obj.HasLabel() && obj.LabelPosition == nil { + if len(obj.ChildrenArray) > 0 { + obj.LabelPosition = go2.Pointer(label.OutsideTopCenter.String()) + } else if obj.HasOutsideBottomLabel() { + obj.LabelPosition = go2.Pointer(label.OutsideBottomCenter.String()) + } else if obj.Icon != nil { + obj.LabelPosition = go2.Pointer(label.InsideTopCenter.String()) + } else { + obj.LabelPosition = go2.Pointer(label.InsideMiddleCenter.String()) + } + + if float64(obj.LabelDimensions.Width) > obj.Width || + float64(obj.LabelDimensions.Height) > obj.Height { + if len(obj.ChildrenArray) > 0 { + obj.LabelPosition = go2.Pointer(label.OutsideTopCenter.String()) + } else { + obj.LabelPosition = go2.Pointer(label.OutsideBottomCenter.String()) + } + } + } } \ 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 104df56cce..1a8d4250a9 100644 --- a/e2etests/testdata/txtar/cycle-diagram/dagre/board.exp.json +++ b/e2etests/testdata/txtar/cycle-diagram/dagre/board.exp.json @@ -539,6 +539,10 @@ "labelPercentage": 0, "link": "", "route": [ + { + "x": 20.905000686645508, + "y": -198.9040069580078 + }, { "x": 31.285999298095703, "y": -197.53700256347656 @@ -634,6 +638,10 @@ { "x": 195.62899780273438, "y": -41.582000732421875 + }, + { + "x": 197.53700256347656, + "y": -31.285999298095703 } ], "isCurve": true, @@ -667,6 +675,10 @@ "labelPercentage": 0, "link": "", "route": [ + { + "x": 197.53700256347656, + "y": 31.285999298095703 + }, { "x": 195.62899780273438, "y": 41.582000732421875 @@ -762,6 +774,10 @@ { "x": 31.285999298095703, "y": 197.53700256347656 + }, + { + "x": 20.905000686645508, + "y": 198.9040069580078 } ], "isCurve": true, @@ -795,6 +811,10 @@ "labelPercentage": 0, "link": "", "route": [ + { + "x": -20.905000686645508, + "y": 198.9040069580078 + }, { "x": -31.285999298095703, "y": 197.53700256347656 @@ -890,6 +910,10 @@ { "x": -195.62899780273438, "y": 41.582000732421875 + }, + { + "x": -197.53700256347656, + "y": 31.285999298095703 } ], "isCurve": true, @@ -923,6 +947,10 @@ "labelPercentage": 0, "link": "", "route": [ + { + "x": 526.9509887695312, + "y": -149.51199340820312 + }, { "x": 540.833984375, "y": -148.05299377441406 @@ -1026,6 +1054,10 @@ { "x": 703.2109985351562, "y": 111.8030014038086 + }, + { + "x": 698.4359741210938, + "y": 124.9209976196289 } ], "isCurve": true, @@ -1059,6 +1091,10 @@ "labelPercentage": 0, "link": "", "route": [ + { + "x": 670.6019897460938, + "y": 173.1320037841797 + }, { "x": 661.6279907226562, "y": 183.8260040283203 @@ -1158,6 +1194,10 @@ { "x": 364.3710021972656, "y": 183.8260040283203 + }, + { + "x": 355.3970031738281, + "y": 173.1320037841797 } ], "isCurve": true, @@ -1191,6 +1231,10 @@ "labelPercentage": 0, "link": "", "route": [ + { + "x": 992.905029296875, + "y": -198.9040069580078 + }, { "x": 1013.5819702148438, "y": -195.62899780273438 @@ -1298,6 +1342,10 @@ { "x": 1013.5819702148438, "y": 195.62899780273438 + }, + { + "x": 992.905029296875, + "y": 198.9040069580078 } ], "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 ecc9129818..18ebdee8aa 100644 --- a/e2etests/testdata/txtar/cycle-diagram/dagre/sketch.exp.svg +++ b/e2etests/testdata/txtar/cycle-diagram/dagre/sketch.exp.svg @@ -1,9 +1,9 @@ -abcdabcab + .d2-363313595 .fill-N1{fill:#0A0F25;} + .d2-363313595 .fill-N2{fill:#676C7E;} + .d2-363313595 .fill-N3{fill:#9499AB;} + .d2-363313595 .fill-N4{fill:#CFD2DD;} + .d2-363313595 .fill-N5{fill:#DEE1EB;} + .d2-363313595 .fill-N6{fill:#EEF1F8;} + .d2-363313595 .fill-N7{fill:#FFFFFF;} + .d2-363313595 .fill-B1{fill:#0D32B2;} + .d2-363313595 .fill-B2{fill:#0D32B2;} + .d2-363313595 .fill-B3{fill:#E3E9FD;} + .d2-363313595 .fill-B4{fill:#E3E9FD;} + .d2-363313595 .fill-B5{fill:#EDF0FD;} + .d2-363313595 .fill-B6{fill:#F7F8FE;} + .d2-363313595 .fill-AA2{fill:#4A6FF3;} + .d2-363313595 .fill-AA4{fill:#EDF0FD;} + .d2-363313595 .fill-AA5{fill:#F7F8FE;} + .d2-363313595 .fill-AB4{fill:#EDF0FD;} + .d2-363313595 .fill-AB5{fill:#F7F8FE;} + .d2-363313595 .stroke-N1{stroke:#0A0F25;} + .d2-363313595 .stroke-N2{stroke:#676C7E;} + .d2-363313595 .stroke-N3{stroke:#9499AB;} + .d2-363313595 .stroke-N4{stroke:#CFD2DD;} + .d2-363313595 .stroke-N5{stroke:#DEE1EB;} + .d2-363313595 .stroke-N6{stroke:#EEF1F8;} + .d2-363313595 .stroke-N7{stroke:#FFFFFF;} + .d2-363313595 .stroke-B1{stroke:#0D32B2;} + .d2-363313595 .stroke-B2{stroke:#0D32B2;} + .d2-363313595 .stroke-B3{stroke:#E3E9FD;} + .d2-363313595 .stroke-B4{stroke:#E3E9FD;} + .d2-363313595 .stroke-B5{stroke:#EDF0FD;} + .d2-363313595 .stroke-B6{stroke:#F7F8FE;} + .d2-363313595 .stroke-AA2{stroke:#4A6FF3;} + .d2-363313595 .stroke-AA4{stroke:#EDF0FD;} + .d2-363313595 .stroke-AA5{stroke:#F7F8FE;} + .d2-363313595 .stroke-AB4{stroke:#EDF0FD;} + .d2-363313595 .stroke-AB5{stroke:#F7F8FE;} + .d2-363313595 .background-color-N1{background-color:#0A0F25;} + .d2-363313595 .background-color-N2{background-color:#676C7E;} + .d2-363313595 .background-color-N3{background-color:#9499AB;} + .d2-363313595 .background-color-N4{background-color:#CFD2DD;} + .d2-363313595 .background-color-N5{background-color:#DEE1EB;} + .d2-363313595 .background-color-N6{background-color:#EEF1F8;} + .d2-363313595 .background-color-N7{background-color:#FFFFFF;} + .d2-363313595 .background-color-B1{background-color:#0D32B2;} + .d2-363313595 .background-color-B2{background-color:#0D32B2;} + .d2-363313595 .background-color-B3{background-color:#E3E9FD;} + .d2-363313595 .background-color-B4{background-color:#E3E9FD;} + .d2-363313595 .background-color-B5{background-color:#EDF0FD;} + .d2-363313595 .background-color-B6{background-color:#F7F8FE;} + .d2-363313595 .background-color-AA2{background-color:#4A6FF3;} + .d2-363313595 .background-color-AA4{background-color:#EDF0FD;} + .d2-363313595 .background-color-AA5{background-color:#F7F8FE;} + .d2-363313595 .background-color-AB4{background-color:#EDF0FD;} + .d2-363313595 .background-color-AB5{background-color:#F7F8FE;} + .d2-363313595 .color-N1{color:#0A0F25;} + .d2-363313595 .color-N2{color:#676C7E;} + .d2-363313595 .color-N3{color:#9499AB;} + .d2-363313595 .color-N4{color:#CFD2DD;} + .d2-363313595 .color-N5{color:#DEE1EB;} + .d2-363313595 .color-N6{color:#EEF1F8;} + .d2-363313595 .color-N7{color:#FFFFFF;} + .d2-363313595 .color-B1{color:#0D32B2;} + .d2-363313595 .color-B2{color:#0D32B2;} + .d2-363313595 .color-B3{color:#E3E9FD;} + .d2-363313595 .color-B4{color:#E3E9FD;} + .d2-363313595 .color-B5{color:#EDF0FD;} + .d2-363313595 .color-B6{color:#F7F8FE;} + .d2-363313595 .color-AA2{color:#4A6FF3;} + .d2-363313595 .color-AA4{color:#EDF0FD;} + .d2-363313595 .color-AA5{color:#F7F8FE;} + .d2-363313595 .color-AB4{color:#EDF0FD;} + .d2-363313595 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker-d2-363313595);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker-d2-363313595);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright-d2-363313595);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright-d2-363313595);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright-d2-363313595);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright-d2-363313595);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark-d2-363313595);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright-d2-363313595);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright-d2-363313595);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright-d2-363313595);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright-d2-363313595);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker-d2-363313595);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark-d2-363313595);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal-d2-363313595);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal-d2-363313595);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright-d2-363313595);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright-d2-363313595);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright-d2-363313595);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>abcdabcab diff --git a/e2etests/testdata/txtar/cycle-diagram/elk/board.exp.json b/e2etests/testdata/txtar/cycle-diagram/elk/board.exp.json index ad3f518e0c..ad4e2a99c0 100644 --- a/e2etests/testdata/txtar/cycle-diagram/elk/board.exp.json +++ b/e2etests/testdata/txtar/cycle-diagram/elk/board.exp.json @@ -539,6 +539,10 @@ "labelPercentage": 0, "link": "", "route": [ + { + "x": 32.904998779296875, + "y": -186.9040069580078 + }, { "x": 43.2859992980957, "y": -185.53700256347656 @@ -634,6 +638,10 @@ { "x": 207.62899780273438, "y": -29.582000732421875 + }, + { + "x": 209.53700256347656, + "y": -19.285999298095703 } ], "isCurve": true, @@ -667,6 +675,10 @@ "labelPercentage": 0, "link": "", "route": [ + { + "x": 209.53700256347656, + "y": 43.2859992980957 + }, { "x": 207.62899780273438, "y": 53.582000732421875 @@ -762,6 +774,10 @@ { "x": 43.2859992980957, "y": 209.53700256347656 + }, + { + "x": 32.904998779296875, + "y": 210.9040069580078 } ], "isCurve": true, @@ -795,6 +811,10 @@ "labelPercentage": 0, "link": "", "route": [ + { + "x": -8.904999732971191, + "y": 210.9040069580078 + }, { "x": -19.285999298095703, "y": 209.53700256347656 @@ -890,6 +910,10 @@ { "x": -183.62899780273438, "y": 53.582000732421875 + }, + { + "x": -185.53700256347656, + "y": 43.2859992980957 } ], "isCurve": true, @@ -923,6 +947,10 @@ "labelPercentage": 0, "link": "", "route": [ + { + "x": 499.45098876953125, + "y": -137.51199340820312 + }, { "x": 513.333984375, "y": -136.05299377441406 @@ -1026,6 +1054,10 @@ { "x": 675.7109985351562, "y": 123.8030014038086 + }, + { + "x": 670.9359741210938, + "y": 136.92100524902344 } ], "isCurve": true, @@ -1059,6 +1091,10 @@ "labelPercentage": 0, "link": "", "route": [ + { + "x": 643.1019897460938, + "y": 185.1320037841797 + }, { "x": 634.1279907226562, "y": 195.8260040283203 @@ -1158,6 +1194,10 @@ { "x": 336.8710021972656, "y": 195.8260040283203 + }, + { + "x": 327.8970031738281, + "y": 185.1320037841797 } ], "isCurve": true, @@ -1191,6 +1231,10 @@ "labelPercentage": 0, "link": "", "route": [ + { + "x": 925.8150024414062, + "y": -186.9040069580078 + }, { "x": 946.4920043945312, "y": -183.62899780273438 @@ -1298,6 +1342,10 @@ { "x": 946.4920043945312, "y": 207.62899780273438 + }, + { + "x": 925.8150024414062, + "y": 210.9040069580078 } ], "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 f5afaee6a7..bcdbbd69f0 100644 --- a/e2etests/testdata/txtar/cycle-diagram/elk/sketch.exp.svg +++ b/e2etests/testdata/txtar/cycle-diagram/elk/sketch.exp.svg @@ -1,9 +1,9 @@ -abcdabcab + .d2-170048528 .fill-N1{fill:#0A0F25;} + .d2-170048528 .fill-N2{fill:#676C7E;} + .d2-170048528 .fill-N3{fill:#9499AB;} + .d2-170048528 .fill-N4{fill:#CFD2DD;} + .d2-170048528 .fill-N5{fill:#DEE1EB;} + .d2-170048528 .fill-N6{fill:#EEF1F8;} + .d2-170048528 .fill-N7{fill:#FFFFFF;} + .d2-170048528 .fill-B1{fill:#0D32B2;} + .d2-170048528 .fill-B2{fill:#0D32B2;} + .d2-170048528 .fill-B3{fill:#E3E9FD;} + .d2-170048528 .fill-B4{fill:#E3E9FD;} + .d2-170048528 .fill-B5{fill:#EDF0FD;} + .d2-170048528 .fill-B6{fill:#F7F8FE;} + .d2-170048528 .fill-AA2{fill:#4A6FF3;} + .d2-170048528 .fill-AA4{fill:#EDF0FD;} + .d2-170048528 .fill-AA5{fill:#F7F8FE;} + .d2-170048528 .fill-AB4{fill:#EDF0FD;} + .d2-170048528 .fill-AB5{fill:#F7F8FE;} + .d2-170048528 .stroke-N1{stroke:#0A0F25;} + .d2-170048528 .stroke-N2{stroke:#676C7E;} + .d2-170048528 .stroke-N3{stroke:#9499AB;} + .d2-170048528 .stroke-N4{stroke:#CFD2DD;} + .d2-170048528 .stroke-N5{stroke:#DEE1EB;} + .d2-170048528 .stroke-N6{stroke:#EEF1F8;} + .d2-170048528 .stroke-N7{stroke:#FFFFFF;} + .d2-170048528 .stroke-B1{stroke:#0D32B2;} + .d2-170048528 .stroke-B2{stroke:#0D32B2;} + .d2-170048528 .stroke-B3{stroke:#E3E9FD;} + .d2-170048528 .stroke-B4{stroke:#E3E9FD;} + .d2-170048528 .stroke-B5{stroke:#EDF0FD;} + .d2-170048528 .stroke-B6{stroke:#F7F8FE;} + .d2-170048528 .stroke-AA2{stroke:#4A6FF3;} + .d2-170048528 .stroke-AA4{stroke:#EDF0FD;} + .d2-170048528 .stroke-AA5{stroke:#F7F8FE;} + .d2-170048528 .stroke-AB4{stroke:#EDF0FD;} + .d2-170048528 .stroke-AB5{stroke:#F7F8FE;} + .d2-170048528 .background-color-N1{background-color:#0A0F25;} + .d2-170048528 .background-color-N2{background-color:#676C7E;} + .d2-170048528 .background-color-N3{background-color:#9499AB;} + .d2-170048528 .background-color-N4{background-color:#CFD2DD;} + .d2-170048528 .background-color-N5{background-color:#DEE1EB;} + .d2-170048528 .background-color-N6{background-color:#EEF1F8;} + .d2-170048528 .background-color-N7{background-color:#FFFFFF;} + .d2-170048528 .background-color-B1{background-color:#0D32B2;} + .d2-170048528 .background-color-B2{background-color:#0D32B2;} + .d2-170048528 .background-color-B3{background-color:#E3E9FD;} + .d2-170048528 .background-color-B4{background-color:#E3E9FD;} + .d2-170048528 .background-color-B5{background-color:#EDF0FD;} + .d2-170048528 .background-color-B6{background-color:#F7F8FE;} + .d2-170048528 .background-color-AA2{background-color:#4A6FF3;} + .d2-170048528 .background-color-AA4{background-color:#EDF0FD;} + .d2-170048528 .background-color-AA5{background-color:#F7F8FE;} + .d2-170048528 .background-color-AB4{background-color:#EDF0FD;} + .d2-170048528 .background-color-AB5{background-color:#F7F8FE;} + .d2-170048528 .color-N1{color:#0A0F25;} + .d2-170048528 .color-N2{color:#676C7E;} + .d2-170048528 .color-N3{color:#9499AB;} + .d2-170048528 .color-N4{color:#CFD2DD;} + .d2-170048528 .color-N5{color:#DEE1EB;} + .d2-170048528 .color-N6{color:#EEF1F8;} + .d2-170048528 .color-N7{color:#FFFFFF;} + .d2-170048528 .color-B1{color:#0D32B2;} + .d2-170048528 .color-B2{color:#0D32B2;} + .d2-170048528 .color-B3{color:#E3E9FD;} + .d2-170048528 .color-B4{color:#E3E9FD;} + .d2-170048528 .color-B5{color:#EDF0FD;} + .d2-170048528 .color-B6{color:#F7F8FE;} + .d2-170048528 .color-AA2{color:#4A6FF3;} + .d2-170048528 .color-AA4{color:#EDF0FD;} + .d2-170048528 .color-AA5{color:#F7F8FE;} + .d2-170048528 .color-AB4{color:#EDF0FD;} + .d2-170048528 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker-d2-170048528);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker-d2-170048528);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright-d2-170048528);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright-d2-170048528);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright-d2-170048528);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright-d2-170048528);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark-d2-170048528);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright-d2-170048528);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright-d2-170048528);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright-d2-170048528);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright-d2-170048528);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker-d2-170048528);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark-d2-170048528);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal-d2-170048528);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal-d2-170048528);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright-d2-170048528);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright-d2-170048528);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright-d2-170048528);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>abcdabcab From d00529c6f0bbd3973e2bb80a547248f9ef1186b2 Mon Sep 17 00:00:00 2001 From: Mayank Mohapatra <125661248+Mayank77maruti@users.noreply.github.com> Date: Sat, 22 Feb 2025 10:36:51 +0000 Subject: [PATCH 19/73] try --- d2layouts/d2cycle/layout.go | 429 +++++++++++++++++++----------------- 1 file changed, 226 insertions(+), 203 deletions(-) diff --git a/d2layouts/d2cycle/layout.go b/d2layouts/d2cycle/layout.go index e8eeeba117..a2999b1d46 100644 --- a/d2layouts/d2cycle/layout.go +++ b/d2layouts/d2cycle/layout.go @@ -1,238 +1,261 @@ package d2cycle import ( - "context" - "math" + "context" + "math" - "oss.terrastruct.com/d2/d2graph" - "oss.terrastruct.com/d2/lib/geo" - "oss.terrastruct.com/d2/lib/label" - "oss.terrastruct.com/util-go/go2" + "oss.terrastruct.com/d2/d2graph" + "oss.terrastruct.com/d2/lib/geo" + "oss.terrastruct.com/d2/lib/label" + "oss.terrastruct.com/util-go/go2" ) const ( - MIN_RADIUS = 200 - PADDING = 20 - MIN_SEGMENT_LEN = 10 - ARC_STEPS = 30 - EPSILON = 1e-10 // Small value for floating point comparisons + MIN_RADIUS = 200 + PADDING = 20 + MIN_SEGMENT_LEN = 10 + ARC_STEPS = 30 + EPSILON = 1e-10 // Small value for floating point comparisons ) +// Layout computes node positions and generates curved edge routes. func Layout(ctx context.Context, g *d2graph.Graph, layout d2graph.LayoutGraph) error { - objects := g.Root.ChildrenArray - if len(objects) == 0 { - return nil - } + objects := g.Root.ChildrenArray + if len(objects) == 0 { + return nil + } - for _, obj := range g.Objects { - positionLabelsIcons(obj) - } + for _, obj := range g.Objects { + positionLabelsIcons(obj) + } - radius := calculateRadius(objects) - positionObjects(objects, radius) + radius := calculateRadius(objects) + positionObjects(objects, radius) - for _, edge := range g.Edges { - createPreciseCircularArc(edge) - } + for _, edge := range g.Edges { + createPreciseCircularArc(edge) + } - return nil + return nil } func calculateRadius(objects []*d2graph.Object) float64 { - numObjects := float64(len(objects)) - maxSize := 0.0 - for _, obj := range objects { - size := math.Max(obj.Box.Width, obj.Box.Height) - maxSize = math.Max(maxSize, size) - } - minRadius := (maxSize/2.0 + PADDING) / math.Sin(math.Pi/numObjects) - return math.Max(minRadius, MIN_RADIUS) + numObjects := float64(len(objects)) + maxSize := 0.0 + for _, obj := range objects { + size := math.Max(obj.Box.Width, obj.Box.Height) + maxSize = math.Max(maxSize, size) + } + minRadius := (maxSize/2.0 + PADDING) / math.Sin(math.Pi/numObjects) + return math.Max(minRadius, MIN_RADIUS) } func positionObjects(objects []*d2graph.Object, radius float64) { - numObjects := float64(len(objects)) - angleOffset := -math.Pi / 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, - ) - } + numObjects := float64(len(objects)) + angleOffset := -math.Pi / 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, + ) + } } +// createPreciseCircularArc computes a curved edge path that touches the node boundaries exactly. func createPreciseCircularArc(edge *d2graph.Edge) { - if edge.Src == nil || edge.Dst == nil { - return - } - - srcCenter := edge.Src.Center() - dstCenter := edge.Dst.Center() - - // Calculate angles in the circular layout - srcAngle := math.Atan2(srcCenter.Y, srcCenter.X) - dstAngle := math.Atan2(dstCenter.Y, dstCenter.X) - if dstAngle < srcAngle { - dstAngle += 2 * math.Pi - } - - arcRadius := math.Hypot(srcCenter.X, srcCenter.Y) - - // Generate initial path points - path := make([]*geo.Point, 0, ARC_STEPS+1) - 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) - path = append(path, geo.NewPoint(x, y)) - } - - // Find precise intersection points - srcIntersection := findPreciseBoxIntersection(edge.Src.Box, path[0], path[1]) - dstIntersection := findPreciseBoxIntersection(edge.Dst.Box, path[len(path)-1], path[len(path)-2]) - - // Update path endpoints with precise intersections - path[0] = srcIntersection - path[len(path)-1] = dstIntersection - - // Remove any points that might be inside the boxes - startIdx := 0 - endIdx := len(path) - 1 - - for i := 1; i < len(path)-1; i++ { - if boxContains(edge.Src.Box, path[i]) { - startIdx = i - } - if boxContains(edge.Dst.Box, path[i]) { - endIdx = i - break - } - } - - edge.Route = path[startIdx:endIdx+1] - edge.IsCurve = true + if edge.Src == nil || edge.Dst == nil { + return + } + + srcCenter := edge.Src.Center() + dstCenter := edge.Dst.Center() + + // Compute angles for the circular arc. + srcAngle := math.Atan2(srcCenter.Y, srcCenter.X) + dstAngle := math.Atan2(dstCenter.Y, dstCenter.X) + if dstAngle < srcAngle { + dstAngle += 2 * math.Pi + } + + arcRadius := math.Hypot(srcCenter.X, srcCenter.Y) + + // Generate the initial arc path. + path := make([]*geo.Point, 0, ARC_STEPS+1) + 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) + path = append(path, geo.NewPoint(x, y)) + } + + // Compute precise intersection points so the arrow touches the node boundaries. + // For the source, the segment goes from the center (inside) to the next point (outside). + srcIntersection := findPreciseBoxIntersection(edge.Src.Box, path[0], path[1]) + // For the destination, the segment goes from the center to the previous point (outside). + dstIntersection := findPreciseBoxIntersection(edge.Dst.Box, path[len(path)-1], path[len(path)-2]) + + // Update the endpoints with the snapped intersection points. + path[0] = srcIntersection + path[len(path)-1] = dstIntersection + + // Trim intermediate points that still fall inside the boxes. + startIdx := 0 + endIdx := len(path) - 1 + for i := 1; i < len(path); i++ { + if !boxContains(edge.Src.Box, path[i]) { + startIdx = i - 1 + break + } + } + for i := len(path) - 2; i >= 0; i-- { + if !boxContains(edge.Dst.Box, path[i]) { + endIdx = i + 1 + break + } + } + + edge.Route = path[startIdx : endIdx+1] + edge.IsCurve = true } +// findPreciseBoxIntersection returns the intersection point of the line (from p1 to p2) with the box boundary, +// snapped exactly to the nearest edge. func findPreciseBoxIntersection(box *geo.Box, p1, p2 *geo.Point) *geo.Point { - // Define box edges as line segments - edges := []geo.Segment{ - // Top edge - *geo.NewSegment( - geo.NewPoint(box.TopLeft.X, box.TopLeft.Y), - geo.NewPoint(box.TopLeft.X+box.Width, box.TopLeft.Y), - ), - // Right edge - *geo.NewSegment( - geo.NewPoint(box.TopLeft.X+box.Width, box.TopLeft.Y), - geo.NewPoint(box.TopLeft.X+box.Width, box.TopLeft.Y+box.Height), - ), - // Bottom edge - *geo.NewSegment( - geo.NewPoint(box.TopLeft.X, box.TopLeft.Y+box.Height), - geo.NewPoint(box.TopLeft.X+box.Width, box.TopLeft.Y+box.Height), - ), - // Left edge - *geo.NewSegment( - geo.NewPoint(box.TopLeft.X, box.TopLeft.Y), - geo.NewPoint(box.TopLeft.X, box.TopLeft.Y+box.Height), - ), - } - - // Line segment from p1 to p2 - line := *geo.NewSegment(p1, p2) - - // Find the intersection point closest to p1 - var closestIntersection *geo.Point - minDist := math.MaxFloat64 - - for _, edge := range edges { - if intersection := findSegmentIntersection(line, edge); intersection != nil { - dist := math.Hypot( - intersection.X-p1.X, - intersection.Y-p1.Y, - ) - if dist < minDist { - minDist = dist - closestIntersection = intersection - } - } - } - - if closestIntersection != nil { - return closestIntersection - } - return p1 + // Define the four box edges. + edges := []geo.Segment{ + *geo.NewSegment( + geo.NewPoint(box.TopLeft.X, box.TopLeft.Y), + geo.NewPoint(box.TopLeft.X+box.Width, box.TopLeft.Y), + ), // Top + *geo.NewSegment( + geo.NewPoint(box.TopLeft.X+box.Width, box.TopLeft.Y), + geo.NewPoint(box.TopLeft.X+box.Width, box.TopLeft.Y+box.Height), + ), // Right + *geo.NewSegment( + geo.NewPoint(box.TopLeft.X, box.TopLeft.Y+box.Height), + geo.NewPoint(box.TopLeft.X+box.Width, box.TopLeft.Y+box.Height), + ), // Bottom + *geo.NewSegment( + geo.NewPoint(box.TopLeft.X, box.TopLeft.Y), + geo.NewPoint(box.TopLeft.X, box.TopLeft.Y+box.Height), + ), // Left + } + + // Construct the line from p1 (inside) to p2 (outside). + line := *geo.NewSegment(p1, p2) + var closestIntersection *geo.Point + minDist := math.MaxFloat64 + + // Find the intersection among the four edges that is closest to p1. + for _, seg := range edges { + if intersection := findSegmentIntersection(line, seg); intersection != nil { + dist := math.Hypot(intersection.X-p1.X, intersection.Y-p1.Y) + if dist < minDist { + minDist = dist + closestIntersection = intersection + } + } + } + + if closestIntersection != nil { + return snapToBoundary(box, closestIntersection) + } + return p1 } +// findSegmentIntersection computes the intersection between two line segments s1 and s2 using their parametric form. func findSegmentIntersection(s1, s2 geo.Segment) *geo.Point { - // Calculate the intersection of two line segments using parametric equations - x1, y1 := s1.Start.X, s1.Start.Y - x2, y2 := s1.End.X, s1.End.Y - x3, y3 := s2.Start.X, s2.Start.Y - x4, y4 := s2.End.X, s2.End.Y - - denominator := (x1-x2)*(y3-y4) - (y1-y2)*(x3-x4) - if math.Abs(denominator) < EPSILON { - return nil - } - - t := ((x1-x3)*(y3-y4) - (y1-y3)*(x3-x4)) / denominator - u := -((x1-x2)*(y1-y3) - (y1-y2)*(x1-x3)) / denominator - - if t >= 0 && t <= 1 && u >= 0 && u <= 1 { - x := x1 + t*(x2-x1) - y := y1 + t*(y2-y1) - return geo.NewPoint(x, y) - } - - return nil + x1, y1 := s1.Start.X, s1.Start.Y + x2, y2 := s1.End.X, s1.End.Y + x3, y3 := s2.Start.X, s2.Start.Y + x4, y4 := s2.End.X, s2.End.Y + + denom := (x1-x2)*(y3-y4) - (y1-y2)*(x3-x4) + if math.Abs(denom) < EPSILON { + return nil + } + + t := ((x1-x3)*(y3-y4) - (y1-y3)*(x3-x4)) / denom + u := -((x1-x2)*(y1-y3) - (y1-y2)*(x1-x3)) / denom + + if t >= 0 && t <= 1 && u >= 0 && u <= 1 { + x := x1 + t*(x2-x1) + y := y1 + t*(y2-y1) + return geo.NewPoint(x, y) + } + return nil } +// snapToBoundary adjusts point p so that it lies exactly on the nearest boundary of box. +func snapToBoundary(box *geo.Box, p *geo.Point) *geo.Point { + left := box.TopLeft.X + right := box.TopLeft.X + box.Width + top := box.TopLeft.Y + bottom := box.TopLeft.Y + box.Height + + dLeft := math.Abs(p.X - left) + dRight := math.Abs(p.X - right) + dTop := math.Abs(p.Y - top) + dBottom := math.Abs(p.Y - bottom) + + if dLeft < dRight && dLeft < dTop && dLeft < dBottom { + return geo.NewPoint(left, p.Y) + } else if dRight < dLeft && dRight < dTop && dRight < dBottom { + return geo.NewPoint(right, p.Y) + } else if dTop < dBottom { + return geo.NewPoint(p.X, top) + } else { + return geo.NewPoint(p.X, bottom) + } +} + +// boxContains returns true if point p is inside the box (using EPSILON for floating point tolerance). func boxContains(b *geo.Box, p *geo.Point) bool { - return p.X >= b.TopLeft.X-EPSILON && - p.X <= b.TopLeft.X+b.Width+EPSILON && - p.Y >= b.TopLeft.Y-EPSILON && - p.Y <= b.TopLeft.Y+b.Height+EPSILON + return p.X >= b.TopLeft.X-EPSILON && + p.X <= b.TopLeft.X+b.Width+EPSILON && + p.Y >= b.TopLeft.Y-EPSILON && + p.Y <= b.TopLeft.Y+b.Height+EPSILON } func positionLabelsIcons(obj *d2graph.Object) { - if obj.Icon != nil && obj.IconPosition == nil { - if len(obj.ChildrenArray) > 0 { - obj.IconPosition = go2.Pointer(label.OutsideTopLeft.String()) - if obj.LabelPosition == nil { - obj.LabelPosition = go2.Pointer(label.OutsideTopRight.String()) - return - } - } else if obj.SQLTable != nil || obj.Class != nil || obj.Language != "" { - obj.IconPosition = go2.Pointer(label.OutsideTopLeft.String()) - } else { - obj.IconPosition = go2.Pointer(label.InsideMiddleCenter.String()) - } - } - - if obj.HasLabel() && obj.LabelPosition == nil { - if len(obj.ChildrenArray) > 0 { - obj.LabelPosition = go2.Pointer(label.OutsideTopCenter.String()) - } else if obj.HasOutsideBottomLabel() { - obj.LabelPosition = go2.Pointer(label.OutsideBottomCenter.String()) - } else if obj.Icon != nil { - obj.LabelPosition = go2.Pointer(label.InsideTopCenter.String()) - } else { - obj.LabelPosition = go2.Pointer(label.InsideMiddleCenter.String()) - } - - if float64(obj.LabelDimensions.Width) > obj.Width || - float64(obj.LabelDimensions.Height) > obj.Height { - if len(obj.ChildrenArray) > 0 { - obj.LabelPosition = go2.Pointer(label.OutsideTopCenter.String()) - } else { - obj.LabelPosition = go2.Pointer(label.OutsideBottomCenter.String()) - } - } - } -} \ No newline at end of file + if obj.Icon != nil && obj.IconPosition == nil { + if len(obj.ChildrenArray) > 0 { + obj.IconPosition = go2.Pointer(label.OutsideTopLeft.String()) + if obj.LabelPosition == nil { + obj.LabelPosition = go2.Pointer(label.OutsideTopRight.String()) + return + } + } else if obj.SQLTable != nil || obj.Class != nil || obj.Language != "" { + obj.IconPosition = go2.Pointer(label.OutsideTopLeft.String()) + } else { + obj.IconPosition = go2.Pointer(label.InsideMiddleCenter.String()) + } + } + + if obj.HasLabel() && obj.LabelPosition == nil { + if len(obj.ChildrenArray) > 0 { + obj.LabelPosition = go2.Pointer(label.OutsideTopCenter.String()) + } else if obj.HasOutsideBottomLabel() { + obj.LabelPosition = go2.Pointer(label.OutsideBottomCenter.String()) + } else if obj.Icon != nil { + obj.LabelPosition = go2.Pointer(label.InsideTopCenter.String()) + } else { + obj.LabelPosition = go2.Pointer(label.InsideMiddleCenter.String()) + } + + if float64(obj.LabelDimensions.Width) > obj.Width || + float64(obj.LabelDimensions.Height) > obj.Height { + if len(obj.ChildrenArray) > 0 { + obj.LabelPosition = go2.Pointer(label.OutsideTopCenter.String()) + } else { + obj.LabelPosition = go2.Pointer(label.OutsideBottomCenter.String()) + } + } + } +} From bef6b8b86685e2a3bf489941ab9d47810d2be36d Mon Sep 17 00:00:00 2001 From: Mayank Mohapatra <125661248+Mayank77maruti@users.noreply.github.com> Date: Sat, 22 Feb 2025 10:37:44 +0000 Subject: [PATCH 20/73] try --- d2layouts/d2cycle/layout.go | 258 +- .../txtar/cycle-diagram/dagre/board.exp.json | 2214 ++++++++++++++--- .../txtar/cycle-diagram/dagre/sketch.exp.svg | 152 +- .../txtar/cycle-diagram/elk/board.exp.json | 2214 ++++++++++++++--- .../txtar/cycle-diagram/elk/sketch.exp.svg | 152 +- 5 files changed, 3911 insertions(+), 1079 deletions(-) diff --git a/d2layouts/d2cycle/layout.go b/d2layouts/d2cycle/layout.go index a2999b1d46..0e9036f748 100644 --- a/d2layouts/d2cycle/layout.go +++ b/d2layouts/d2cycle/layout.go @@ -3,6 +3,7 @@ package d2cycle import ( "context" "math" + "sort" "oss.terrastruct.com/d2/d2graph" "oss.terrastruct.com/d2/lib/geo" @@ -14,11 +15,10 @@ const ( MIN_RADIUS = 200 PADDING = 20 MIN_SEGMENT_LEN = 10 - ARC_STEPS = 30 - EPSILON = 1e-10 // Small value for floating point comparisons + ARC_STEPS = 100 ) -// Layout computes node positions and generates curved edge routes. +// Layout lays out the graph and computes curved edge routes. func Layout(ctx context.Context, g *d2graph.Graph, layout d2graph.LayoutGraph) error { objects := g.Root.ChildrenArray if len(objects) == 0 { @@ -33,7 +33,7 @@ func Layout(ctx context.Context, g *d2graph.Graph, layout d2graph.LayoutGraph) e positionObjects(objects, radius) for _, edge := range g.Edges { - createPreciseCircularArc(edge) + createCircularArc(edge) } return nil @@ -58,7 +58,6 @@ func positionObjects(objects []*d2graph.Object, radius float64) { 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, @@ -66,8 +65,7 @@ func positionObjects(objects []*d2graph.Object, radius float64) { } } -// createPreciseCircularArc computes a curved edge path that touches the node boundaries exactly. -func createPreciseCircularArc(edge *d2graph.Edge) { +func createCircularArc(edge *d2graph.Edge) { if edge.Src == nil || edge.Dst == nil { return } @@ -75,7 +73,6 @@ func createPreciseCircularArc(edge *d2graph.Edge) { srcCenter := edge.Src.Center() dstCenter := edge.Dst.Center() - // Compute angles for the circular arc. srcAngle := math.Atan2(srcCenter.Y, srcCenter.X) dstAngle := math.Atan2(dstCenter.Y, dstCenter.X) if dstAngle < srcAngle { @@ -84,7 +81,6 @@ func createPreciseCircularArc(edge *d2graph.Edge) { arcRadius := math.Hypot(srcCenter.X, srcCenter.Y) - // Generate the initial arc path. path := make([]*geo.Point, 0, ARC_STEPS+1) for i := 0; i <= ARC_STEPS; i++ { t := float64(i) / float64(ARC_STEPS) @@ -93,134 +89,170 @@ func createPreciseCircularArc(edge *d2graph.Edge) { y := arcRadius * math.Sin(angle) path = append(path, geo.NewPoint(x, y)) } + path[0] = srcCenter + path[len(path)-1] = dstCenter - // Compute precise intersection points so the arrow touches the node boundaries. - // For the source, the segment goes from the center (inside) to the next point (outside). - srcIntersection := findPreciseBoxIntersection(edge.Src.Box, path[0], path[1]) - // For the destination, the segment goes from the center to the previous point (outside). - dstIntersection := findPreciseBoxIntersection(edge.Dst.Box, path[len(path)-1], path[len(path)-2]) - - // Update the endpoints with the snapped intersection points. - path[0] = srcIntersection - path[len(path)-1] = dstIntersection - - // Trim intermediate points that still fall inside the boxes. - startIdx := 0 - endIdx := len(path) - 1 - for i := 1; i < len(path); i++ { - if !boxContains(edge.Src.Box, path[i]) { - startIdx = i - 1 - break - } - } - for i := len(path) - 2; i >= 0; i-- { - if !boxContains(edge.Dst.Box, path[i]) { - endIdx = i + 1 - break - } - } + // Clamp endpoints to the boundaries of the source and destination 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 - edge.Route = path[startIdx : endIdx+1] + // Trim redundant path points that fall inside node boundaries. + path = trimPathPoints(path, edge.Src.Box) + path = trimPathPoints(path, edge.Dst.Box) + + edge.Route = path edge.IsCurve = true } -// findPreciseBoxIntersection returns the intersection point of the line (from p1 to p2) with the box boundary, -// snapped exactly to the nearest edge. -func findPreciseBoxIntersection(box *geo.Box, p1, p2 *geo.Point) *geo.Point { - // Define the four box edges. - edges := []geo.Segment{ - *geo.NewSegment( - geo.NewPoint(box.TopLeft.X, box.TopLeft.Y), - geo.NewPoint(box.TopLeft.X+box.Width, box.TopLeft.Y), - ), // Top - *geo.NewSegment( - geo.NewPoint(box.TopLeft.X+box.Width, box.TopLeft.Y), - geo.NewPoint(box.TopLeft.X+box.Width, box.TopLeft.Y+box.Height), - ), // Right - *geo.NewSegment( - geo.NewPoint(box.TopLeft.X, box.TopLeft.Y+box.Height), - geo.NewPoint(box.TopLeft.X+box.Width, box.TopLeft.Y+box.Height), - ), // Bottom - *geo.NewSegment( - geo.NewPoint(box.TopLeft.X, box.TopLeft.Y), - geo.NewPoint(box.TopLeft.X, box.TopLeft.Y+box.Height), - ), // Left +// clampPointOutsideBox walks forward along the path until it finds a point outside the box, +// then replaces the point with a precise intersection. +func clampPointOutsideBox(box *geo.Box, path []*geo.Point, startIdx int) (int, *geo.Point) { + if startIdx >= len(path)-1 { + return startIdx, path[startIdx] } - - // Construct the line from p1 (inside) to p2 (outside). - line := *geo.NewSegment(p1, p2) - var closestIntersection *geo.Point - minDist := math.MaxFloat64 - - // Find the intersection among the four edges that is closest to p1. - for _, seg := range edges { - if intersection := findSegmentIntersection(line, seg); intersection != nil { - dist := math.Hypot(intersection.X-p1.X, intersection.Y-p1.Y) - if dist < minDist { - minDist = dist - closestIntersection = intersection - } - } + if !boxContains(box, path[startIdx]) { + return startIdx, path[startIdx] } - if closestIntersection != nil { - return snapToBoundary(box, closestIntersection) + for i := startIdx + 1; i < len(path); i++ { + if boxContains(box, path[i]) { + continue + } + seg := geo.NewSegment(path[i-1], path[i]) + inter := findPreciseIntersection(box, *seg) + if inter != nil { + return i, inter + } + return i, path[i] } - return p1 + return len(path)-1, path[len(path)-1] } -// findSegmentIntersection computes the intersection between two line segments s1 and s2 using their parametric form. -func findSegmentIntersection(s1, s2 geo.Segment) *geo.Point { - x1, y1 := s1.Start.X, s1.Start.Y - x2, y2 := s1.End.X, s1.End.Y - x3, y3 := s2.Start.X, s2.Start.Y - x4, y4 := s2.End.X, s2.End.Y - - denom := (x1-x2)*(y3-y4) - (y1-y2)*(x3-x4) - if math.Abs(denom) < EPSILON { - return nil +// clampPointOutsideBoxReverse works similarly but in reverse order. +func clampPointOutsideBoxReverse(box *geo.Box, path []*geo.Point, endIdx int) (int, *geo.Point) { + if endIdx <= 0 { + return endIdx, path[endIdx] + } + if !boxContains(box, path[endIdx]) { + return endIdx, path[endIdx] } - t := ((x1-x3)*(y3-y4) - (y1-y3)*(x3-x4)) / denom - u := -((x1-x2)*(y1-y3) - (y1-y2)*(x1-x3)) / denom - - if t >= 0 && t <= 1 && u >= 0 && u <= 1 { - x := x1 + t*(x2-x1) - y := y1 + t*(y2-y1) - return geo.NewPoint(x, y) + for j := endIdx - 1; j >= 0; j-- { + if boxContains(box, path[j]) { + continue + } + seg := geo.NewSegment(path[j], path[j+1]) + inter := findPreciseIntersection(box, *seg) + if inter != nil { + return j, inter + } + return j, path[j] } - return nil + return 0, path[0] } -// snapToBoundary adjusts point p so that it lies exactly on the nearest boundary of box. -func snapToBoundary(box *geo.Box, p *geo.Point) *geo.Point { +// findPreciseIntersection calculates intersection points between seg and all four sides of the box, +// then returns the intersection closest to seg.Start. +func findPreciseIntersection(box *geo.Box, seg geo.Segment) *geo.Point { + intersections := []struct { + point *geo.Point + t float64 + }{} + left := box.TopLeft.X right := box.TopLeft.X + box.Width top := box.TopLeft.Y bottom := box.TopLeft.Y + box.Height - dLeft := math.Abs(p.X - left) - dRight := math.Abs(p.X - right) - dTop := math.Abs(p.Y - top) - dBottom := math.Abs(p.Y - bottom) - - if dLeft < dRight && dLeft < dTop && dLeft < dBottom { - return geo.NewPoint(left, p.Y) - } else if dRight < dLeft && dRight < dTop && dRight < dBottom { - return geo.NewPoint(right, p.Y) - } else if dTop < dBottom { - return geo.NewPoint(p.X, top) - } else { - return geo.NewPoint(p.X, bottom) + dx := seg.End.X - seg.Start.X + dy := seg.End.Y - seg.Start.Y + + // Check vertical boundaries. + if dx != 0 { + // Left boundary. + t := (left - seg.Start.X) / dx + if t >= 0 && t <= 1 { + y := seg.Start.Y + t*dy + if y >= top && y <= bottom { + intersections = append(intersections, struct { + point *geo.Point + t float64 + }{geo.NewPoint(left, y), t}) + } + } + // Right boundary. + t = (right - seg.Start.X) / dx + if t >= 0 && t <= 1 { + y := seg.Start.Y + t*dy + if y >= top && y <= bottom { + intersections = append(intersections, struct { + point *geo.Point + t float64 + }{geo.NewPoint(right, y), t}) + } + } + } + + // Check horizontal boundaries. + if dy != 0 { + // Top boundary. + t := (top - seg.Start.Y) / dy + if t >= 0 && t <= 1 { + x := seg.Start.X + t*dx + if x >= left && x <= right { + intersections = append(intersections, struct { + point *geo.Point + t float64 + }{geo.NewPoint(x, top), t}) + } + } + // Bottom boundary. + t = (bottom - seg.Start.Y) / dy + if t >= 0 && t <= 1 { + x := seg.Start.X + t*dx + if x >= left && x <= right { + intersections = append(intersections, struct { + point *geo.Point + t float64 + }{geo.NewPoint(x, bottom), t}) + } + } } + + if len(intersections) == 0 { + return nil + } + + // Sort intersections by t (distance from seg.Start) and return the closest. + sort.Slice(intersections, func(i, j int) bool { + return intersections[i].t < intersections[j].t + }) + return intersections[0].point } -// boxContains returns true if point p is inside the box (using EPSILON for floating point tolerance). +// trimPathPoints removes intermediate points that fall inside the given box while preserving endpoints. +func trimPathPoints(path []*geo.Point, box *geo.Box) []*geo.Point { + if len(path) <= 2 { + return path + } + trimmed := []*geo.Point{path[0]} + for i := 1; i < len(path)-1; i++ { + if !boxContains(box, path[i]) { + trimmed = append(trimmed, path[i]) + } + } + trimmed = append(trimmed, path[len(path)-1]) + return trimmed +} + +// boxContains uses strict inequalities so that points exactly on the boundary are considered outside. func boxContains(b *geo.Box, p *geo.Point) bool { - return p.X >= b.TopLeft.X-EPSILON && - p.X <= b.TopLeft.X+b.Width+EPSILON && - p.Y >= b.TopLeft.Y-EPSILON && - p.Y <= b.TopLeft.Y+b.Height+EPSILON + return p.X > b.TopLeft.X && + p.X < b.TopLeft.X+b.Width && + p.Y > b.TopLeft.Y && + p.Y < b.TopLeft.Y+b.Height } func positionLabelsIcons(obj *d2graph.Object) { @@ -258,4 +290,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 1a8d4250a9..78ed2dffeb 100644 --- a/e2etests/testdata/txtar/cycle-diagram/dagre/board.exp.json +++ b/e2etests/testdata/txtar/cycle-diagram/dagre/board.exp.json @@ -540,108 +540,336 @@ "link": "", "route": [ { - "x": 20.905000686645508, - "y": -198.9040069580078 + "x": 26.5, + "y": -198.22999572753906 + }, + { + "x": 28.18000030517578, + "y": -198.00399780273438 }, { "x": 31.285999298095703, "y": -197.53700256347656 }, { - "x": 41.582000732421875, - "y": -195.62899780273438 + "x": 34.3849983215332, + "y": -197.02099609375 + }, + { + "x": 37.47600173950195, + "y": -196.45700073242188 + }, + { + "x": 40.55699920654297, + "y": -195.843994140625 + }, + { + "x": 43.62799835205078, + "y": -195.18299865722656 + }, + { + "x": 46.68899917602539, + "y": -194.47300720214844 + }, + { + "x": 49.73699951171875, + "y": -193.71600341796875 + }, + { + "x": 52.77399826049805, + "y": -192.91099548339844 + }, + { + "x": 55.79800033569336, + "y": -192.05799865722656 }, { - "x": 51.76300048828125, - "y": -193.18499755859375 + "x": 58.80799865722656, + "y": -191.1580047607422 }, { "x": 61.803001403808594, "y": -190.21099853515625 }, { - "x": 71.6729965209961, - "y": -186.71600341796875 + "x": 64.78299713134766, + "y": -189.2169952392578 }, { - "x": 81.34700012207031, - "y": -182.70899963378906 + "x": 67.74700164794922, + "y": -188.17599487304688 + }, + { + "x": 70.69400024414062, + "y": -187.08799743652344 + }, + { + "x": 73.6240005493164, + "y": -185.9550018310547 + }, + { + "x": 76.53600311279297, + "y": -184.77499389648438 + }, + { + "x": 79.42900085449219, + "y": -183.5500030517578 + }, + { + "x": 82.302001953125, + "y": -182.27999877929688 + }, + { + "x": 85.15499877929688, + "y": -180.96499633789062 + }, + { + "x": 87.98699951171875, + "y": -179.60499572753906 }, { "x": 90.7979965209961, "y": -178.2010040283203 }, { - "x": 99.9990005493164, - "y": -173.2050018310547 + "x": 93.58499908447266, + "y": -176.7530059814453 + }, + { + "x": 96.3499984741211, + "y": -175.26100158691406 }, { - "x": 108.927001953125, - "y": -167.73399353027344 + "x": 99.09100341796875, + "y": -173.7259979248047 + }, + { + "x": 101.80799865722656, + "y": -172.1479949951172 + }, + { + "x": 104.4990005493164, + "y": -170.5279998779297 + }, + { + "x": 107.16500091552734, + "y": -168.86500549316406 + }, + { + "x": 109.80400085449219, + "y": -167.16099548339844 + }, + { + "x": 112.41600036621094, + "y": -165.41600036621094 + }, + { + "x": 115.0009994506836, + "y": -163.62899780273438 }, { "x": 117.55699920654297, "y": -161.80299377441406 }, { - "x": 125.86399841308594, - "y": -155.4290008544922 + "x": 120.08399963378906, + "y": -159.93600463867188 + }, + { + "x": 122.58100128173828, + "y": -158.031005859375 + }, + { + "x": 125.0479965209961, + "y": -156.08599853515625 }, { - "x": 133.8260040283203, - "y": -148.6280059814453 + "x": 127.48400115966797, + "y": -154.1020050048828 + }, + { + "x": 129.88900756835938, + "y": -152.08099365234375 + }, + { + "x": 132.26199340820312, + "y": -150.02200317382812 + }, + { + "x": 134.6020050048828, + "y": -147.92599487304688 + }, + { + "x": 136.90899658203125, + "y": -145.79299926757812 + }, + { + "x": 139.1820068359375, + "y": -143.625 }, { "x": 141.42100524902344, "y": -141.42100524902344 }, { - "x": 148.6280059814453, - "y": -133.8260040283203 + "x": 143.625, + "y": -139.1820068359375 + }, + { + "x": 145.79299926757812, + "y": -136.90899658203125 + }, + { + "x": 147.92599487304688, + "y": -134.6020050048828 + }, + { + "x": 150.02200317382812, + "y": -132.26199340820312 }, { - "x": 155.4290008544922, - "y": -125.86399841308594 + "x": 152.08099365234375, + "y": -129.88900756835938 + }, + { + "x": 154.1020050048828, + "y": -127.48400115966797 + }, + { + "x": 156.08599853515625, + "y": -125.0479965209961 + }, + { + "x": 158.031005859375, + "y": -122.58100128173828 + }, + { + "x": 159.93600463867188, + "y": -120.08399963378906 }, { "x": 161.80299377441406, "y": -117.55699920654297 }, { - "x": 167.73399353027344, - "y": -108.927001953125 + "x": 163.62899780273438, + "y": -115.0009994506836 + }, + { + "x": 165.41600036621094, + "y": -112.41600036621094 + }, + { + "x": 167.16099548339844, + "y": -109.80400085449219 + }, + { + "x": 168.86500549316406, + "y": -107.16500091552734 + }, + { + "x": 170.5279998779297, + "y": -104.4990005493164 }, { - "x": 173.2050018310547, - "y": -100 + "x": 172.1479949951172, + "y": -101.80799865722656 + }, + { + "x": 173.7259979248047, + "y": -99.09100341796875 + }, + { + "x": 175.26100158691406, + "y": -96.3499984741211 + }, + { + "x": 176.7530059814453, + "y": -93.58499908447266 }, { "x": 178.2010040283203, "y": -90.7979965209961 }, { - "x": 182.70899963378906, - "y": -81.34700012207031 + "x": 179.60499572753906, + "y": -87.98699951171875 + }, + { + "x": 180.96499633789062, + "y": -85.15499877929688 + }, + { + "x": 182.27999877929688, + "y": -82.302001953125 + }, + { + "x": 183.5500030517578, + "y": -79.42900085449219 + }, + { + "x": 184.77499389648438, + "y": -76.53600311279297 + }, + { + "x": 185.9550018310547, + "y": -73.6240005493164 }, { - "x": 186.71600341796875, - "y": -71.6729965209961 + "x": 187.08799743652344, + "y": -70.69400024414062 + }, + { + "x": 188.17599487304688, + "y": -67.74700164794922 + }, + { + "x": 189.2169952392578, + "y": -64.78299713134766 }, { "x": 190.21099853515625, "y": -61.803001403808594 }, { - "x": 193.18499755859375, - "y": -51.76300048828125 + "x": 191.1580047607422, + "y": -58.80799865722656 }, { - "x": 195.62899780273438, - "y": -41.582000732421875 + "x": 192.05799865722656, + "y": -55.79800033569336 }, { - "x": 197.53700256347656, - "y": -31.285999298095703 + "x": 192.91099548339844, + "y": -52.77399826049805 + }, + { + "x": 193.71600341796875, + "y": -49.73699951171875 + }, + { + "x": 194.47300720214844, + "y": -46.68899917602539 + }, + { + "x": 195.18299865722656, + "y": -43.62799835205078 + }, + { + "x": 195.843994140625, + "y": -40.55699920654297 + }, + { + "x": 196.45700073242188, + "y": -37.47600173950195 + }, + { + "x": 197.02099609375, + "y": -34.3849983215332 + }, + { + "x": 197.2519989013672, + "y": -33 } ], "isCurve": true, @@ -676,244 +904,1444 @@ "link": "", "route": [ { - "x": 197.53700256347656, - "y": 31.285999298095703 + "x": 197.2519989013672, + "y": 33 + }, + { + "x": 197.02099609375, + "y": 34.3849983215332 + }, + { + "x": 196.45700073242188, + "y": 37.47600173950195 + }, + { + "x": 195.843994140625, + "y": 40.55699920654297 + }, + { + "x": 195.18299865722656, + "y": 43.62799835205078 + }, + { + "x": 194.47300720214844, + "y": 46.68899917602539 + }, + { + "x": 193.71600341796875, + "y": 49.73699951171875 + }, + { + "x": 192.91099548339844, + "y": 52.77399826049805 + }, + { + "x": 192.05799865722656, + "y": 55.79800033569336 + }, + { + "x": 191.1580047607422, + "y": 58.80799865722656 + }, + { + "x": 190.21099853515625, + "y": 61.803001403808594 + }, + { + "x": 189.2169952392578, + "y": 64.78299713134766 + }, + { + "x": 188.17599487304688, + "y": 67.74700164794922 + }, + { + "x": 187.08799743652344, + "y": 70.69400024414062 + }, + { + "x": 185.9550018310547, + "y": 73.6240005493164 + }, + { + "x": 184.77499389648438, + "y": 76.53600311279297 + }, + { + "x": 183.5500030517578, + "y": 79.42900085449219 + }, + { + "x": 182.27999877929688, + "y": 82.302001953125 + }, + { + "x": 180.96499633789062, + "y": 85.15499877929688 + }, + { + "x": 179.60499572753906, + "y": 87.98699951171875 + }, + { + "x": 178.2010040283203, + "y": 90.7979965209961 + }, + { + "x": 176.7530059814453, + "y": 93.58499908447266 + }, + { + "x": 175.26100158691406, + "y": 96.3499984741211 + }, + { + "x": 173.7259979248047, + "y": 99.09100341796875 + }, + { + "x": 172.1479949951172, + "y": 101.80799865722656 + }, + { + "x": 170.5279998779297, + "y": 104.4990005493164 + }, + { + "x": 168.86500549316406, + "y": 107.16500091552734 + }, + { + "x": 167.16099548339844, + "y": 109.80400085449219 + }, + { + "x": 165.41600036621094, + "y": 112.41600036621094 + }, + { + "x": 163.62899780273438, + "y": 115.0009994506836 + }, + { + "x": 161.80299377441406, + "y": 117.55699920654297 + }, + { + "x": 159.93600463867188, + "y": 120.08399963378906 + }, + { + "x": 158.031005859375, + "y": 122.58100128173828 + }, + { + "x": 156.08599853515625, + "y": 125.0479965209961 + }, + { + "x": 154.1020050048828, + "y": 127.48400115966797 + }, + { + "x": 152.08099365234375, + "y": 129.88900756835938 + }, + { + "x": 150.02200317382812, + "y": 132.26199340820312 + }, + { + "x": 147.92599487304688, + "y": 134.6020050048828 + }, + { + "x": 145.79299926757812, + "y": 136.90899658203125 + }, + { + "x": 143.625, + "y": 139.1820068359375 + }, + { + "x": 141.42100524902344, + "y": 141.42100524902344 + }, + { + "x": 139.1820068359375, + "y": 143.625 + }, + { + "x": 136.90899658203125, + "y": 145.79299926757812 + }, + { + "x": 134.6020050048828, + "y": 147.92599487304688 + }, + { + "x": 132.26199340820312, + "y": 150.02200317382812 + }, + { + "x": 129.88900756835938, + "y": 152.08099365234375 + }, + { + "x": 127.48400115966797, + "y": 154.1020050048828 + }, + { + "x": 125.0479965209961, + "y": 156.08599853515625 + }, + { + "x": 122.58100128173828, + "y": 158.031005859375 + }, + { + "x": 120.08399963378906, + "y": 159.93600463867188 + }, + { + "x": 117.55699920654297, + "y": 161.80299377441406 + }, + { + "x": 115.0009994506836, + "y": 163.62899780273438 + }, + { + "x": 112.41600036621094, + "y": 165.41600036621094 + }, + { + "x": 109.80400085449219, + "y": 167.16099548339844 + }, + { + "x": 107.16500091552734, + "y": 168.86500549316406 + }, + { + "x": 104.4990005493164, + "y": 170.5279998779297 + }, + { + "x": 101.80799865722656, + "y": 172.1479949951172 + }, + { + "x": 99.09100341796875, + "y": 173.7259979248047 + }, + { + "x": 96.3499984741211, + "y": 175.26100158691406 + }, + { + "x": 93.58499908447266, + "y": 176.7530059814453 + }, + { + "x": 90.7979965209961, + "y": 178.2010040283203 + }, + { + "x": 87.98699951171875, + "y": 179.60499572753906 + }, + { + "x": 85.15499877929688, + "y": 180.96499633789062 + }, + { + "x": 82.302001953125, + "y": 182.27999877929688 + }, + { + "x": 79.42900085449219, + "y": 183.5500030517578 + }, + { + "x": 76.53600311279297, + "y": 184.77499389648438 + }, + { + "x": 73.6240005493164, + "y": 185.9550018310547 + }, + { + "x": 70.69400024414062, + "y": 187.08799743652344 + }, + { + "x": 67.74700164794922, + "y": 188.17599487304688 + }, + { + "x": 64.78299713134766, + "y": 189.2169952392578 + }, + { + "x": 61.803001403808594, + "y": 190.21099853515625 + }, + { + "x": 58.80799865722656, + "y": 191.1580047607422 + }, + { + "x": 55.79800033569336, + "y": 192.05799865722656 + }, + { + "x": 52.77399826049805, + "y": 192.91099548339844 + }, + { + "x": 49.73699951171875, + "y": 193.71600341796875 + }, + { + "x": 46.68899917602539, + "y": 194.47300720214844 + }, + { + "x": 43.62799835205078, + "y": 195.18299865722656 + }, + { + "x": 40.55699920654297, + "y": 195.843994140625 + }, + { + "x": 37.47600173950195, + "y": 196.45700073242188 + }, + { + "x": 34.3849983215332, + "y": 197.02099609375 + }, + { + "x": 31.285999298095703, + "y": 197.53700256347656 + }, + { + "x": 28.18000030517578, + "y": 198.00399780273438 + }, + { + "x": 26.5, + "y": 198.22999572753906 + } + ], + "isCurve": true, + "animated": false, + "tooltip": "", + "icon": null, + "zIndex": 0 + }, + { + "id": "1.(c -> d)[0]", + "src": "1.c", + "srcArrow": "none", + "dst": "1.d", + "dstArrow": "triangle", + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "stroke": "B1", + "borderRadius": 10, + "label": "", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N2", + "italic": true, + "bold": false, + "underline": false, + "labelWidth": 0, + "labelHeight": 0, + "labelPosition": "", + "labelPercentage": 0, + "link": "", + "route": [ + { + "x": -26.499000549316406, + "y": 198.22999572753906 + }, + { + "x": -28.18000030517578, + "y": 198.00399780273438 + }, + { + "x": -31.285999298095703, + "y": 197.53700256347656 + }, + { + "x": -34.3849983215332, + "y": 197.02099609375 + }, + { + "x": -37.47600173950195, + "y": 196.45700073242188 + }, + { + "x": -40.55699920654297, + "y": 195.843994140625 + }, + { + "x": -43.62799835205078, + "y": 195.18299865722656 + }, + { + "x": -46.68899917602539, + "y": 194.47300720214844 + }, + { + "x": -49.73699951171875, + "y": 193.71600341796875 + }, + { + "x": -52.77399826049805, + "y": 192.91099548339844 + }, + { + "x": -55.79800033569336, + "y": 192.05799865722656 + }, + { + "x": -58.80799865722656, + "y": 191.1580047607422 + }, + { + "x": -61.803001403808594, + "y": 190.21099853515625 + }, + { + "x": -64.78299713134766, + "y": 189.2169952392578 + }, + { + "x": -67.74700164794922, + "y": 188.17599487304688 + }, + { + "x": -70.69400024414062, + "y": 187.08799743652344 + }, + { + "x": -73.6240005493164, + "y": 185.9550018310547 + }, + { + "x": -76.53600311279297, + "y": 184.77499389648438 + }, + { + "x": -79.42900085449219, + "y": 183.5500030517578 + }, + { + "x": -82.302001953125, + "y": 182.27999877929688 + }, + { + "x": -85.15499877929688, + "y": 180.96499633789062 + }, + { + "x": -87.98699951171875, + "y": 179.60499572753906 + }, + { + "x": -90.7979965209961, + "y": 178.2010040283203 + }, + { + "x": -93.58499908447266, + "y": 176.7530059814453 + }, + { + "x": -96.3499984741211, + "y": 175.26100158691406 + }, + { + "x": -99.09100341796875, + "y": 173.7259979248047 + }, + { + "x": -101.80799865722656, + "y": 172.1479949951172 + }, + { + "x": -104.4990005493164, + "y": 170.5279998779297 + }, + { + "x": -107.16500091552734, + "y": 168.86500549316406 + }, + { + "x": -109.80400085449219, + "y": 167.16099548339844 + }, + { + "x": -112.41600036621094, + "y": 165.41600036621094 + }, + { + "x": -115.0009994506836, + "y": 163.62899780273438 + }, + { + "x": -117.55699920654297, + "y": 161.80299377441406 + }, + { + "x": -120.08399963378906, + "y": 159.93600463867188 + }, + { + "x": -122.58100128173828, + "y": 158.031005859375 + }, + { + "x": -125.0479965209961, + "y": 156.08599853515625 + }, + { + "x": -127.48400115966797, + "y": 154.1020050048828 + }, + { + "x": -129.88900756835938, + "y": 152.08099365234375 + }, + { + "x": -132.26199340820312, + "y": 150.02200317382812 + }, + { + "x": -134.6020050048828, + "y": 147.92599487304688 + }, + { + "x": -136.90899658203125, + "y": 145.79299926757812 + }, + { + "x": -139.1820068359375, + "y": 143.625 + }, + { + "x": -141.42100524902344, + "y": 141.42100524902344 + }, + { + "x": -143.625, + "y": 139.1820068359375 + }, + { + "x": -145.79299926757812, + "y": 136.90899658203125 + }, + { + "x": -147.92599487304688, + "y": 134.6020050048828 + }, + { + "x": -150.02200317382812, + "y": 132.26199340820312 + }, + { + "x": -152.08099365234375, + "y": 129.88900756835938 + }, + { + "x": -154.1020050048828, + "y": 127.48400115966797 + }, + { + "x": -156.08599853515625, + "y": 125.0479965209961 + }, + { + "x": -158.031005859375, + "y": 122.58100128173828 + }, + { + "x": -159.93600463867188, + "y": 120.08399963378906 + }, + { + "x": -161.80299377441406, + "y": 117.55699920654297 + }, + { + "x": -163.62899780273438, + "y": 115.0009994506836 + }, + { + "x": -165.41600036621094, + "y": 112.41600036621094 + }, + { + "x": -167.16099548339844, + "y": 109.80400085449219 + }, + { + "x": -168.86500549316406, + "y": 107.16500091552734 + }, + { + "x": -170.5279998779297, + "y": 104.4990005493164 + }, + { + "x": -172.1479949951172, + "y": 101.80799865722656 + }, + { + "x": -173.7259979248047, + "y": 99.09100341796875 + }, + { + "x": -175.26100158691406, + "y": 96.3499984741211 + }, + { + "x": -176.7530059814453, + "y": 93.58499908447266 + }, + { + "x": -178.2010040283203, + "y": 90.7979965209961 + }, + { + "x": -179.60499572753906, + "y": 87.98699951171875 + }, + { + "x": -180.96499633789062, + "y": 85.15499877929688 + }, + { + "x": -182.27999877929688, + "y": 82.302001953125 + }, + { + "x": -183.5500030517578, + "y": 79.42900085449219 + }, + { + "x": -184.77499389648438, + "y": 76.53600311279297 + }, + { + "x": -185.9550018310547, + "y": 73.6240005493164 + }, + { + "x": -187.08799743652344, + "y": 70.69400024414062 + }, + { + "x": -188.17599487304688, + "y": 67.74700164794922 + }, + { + "x": -189.2169952392578, + "y": 64.78299713134766 + }, + { + "x": -190.21099853515625, + "y": 61.803001403808594 + }, + { + "x": -191.1580047607422, + "y": 58.80799865722656 + }, + { + "x": -192.05799865722656, + "y": 55.79800033569336 + }, + { + "x": -192.91099548339844, + "y": 52.77399826049805 + }, + { + "x": -193.71600341796875, + "y": 49.73699951171875 + }, + { + "x": -194.47300720214844, + "y": 46.68899917602539 + }, + { + "x": -195.18299865722656, + "y": 43.62799835205078 + }, + { + "x": -195.843994140625, + "y": 40.55699920654297 + }, + { + "x": -196.45700073242188, + "y": 37.47600173950195 + }, + { + "x": -197.02099609375, + "y": 34.3849983215332 + }, + { + "x": -197.2519989013672, + "y": 33 + } + ], + "isCurve": true, + "animated": false, + "tooltip": "", + "icon": null, + "zIndex": 0 + }, + { + "id": "2.(a -> b)[0]", + "src": "2.a", + "srcArrow": "none", + "dst": "2.b", + "dstArrow": "triangle", + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "stroke": "B1", + "borderRadius": 10, + "label": "", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N2", + "italic": true, + "bold": false, + "underline": false, + "labelWidth": 0, + "labelHeight": 0, + "labelPosition": "", + "labelPercentage": 0, + "link": "", + "route": [ + { + "x": 539.5, + "y": -148.2259979248047 + }, + { + "x": 542.2160034179688, + "y": -147.85400390625 + }, + { + "x": 546.35302734375, + "y": -147.19900512695312 + }, + { + "x": 550.4760131835938, + "y": -146.45700073242188 + }, + { + "x": 554.5819702148438, + "y": -145.62899780273438 + }, + { + "x": 558.6699829101562, + "y": -144.71499633789062 + }, + { + "x": 562.7369995117188, + "y": -143.71600341796875 + }, + { + "x": 566.7830200195312, + "y": -142.6320037841797 + }, + { + "x": 570.8060302734375, + "y": -141.46299743652344 + }, + { + "x": 574.802978515625, + "y": -140.21099853515625 + }, + { + "x": 578.7730102539062, + "y": -138.875 + }, + { + "x": 582.7139892578125, + "y": -137.45599365234375 + }, + { + "x": 586.6240234375, + "y": -135.9550018310547 + }, + { + "x": 590.5029907226562, + "y": -134.3719940185547 + }, + { + "x": 594.3469848632812, + "y": -132.70899963378906 + }, + { + "x": 598.155029296875, + "y": -130.96499633789062 + }, + { + "x": 601.927001953125, + "y": -129.14199829101562 + }, + { + "x": 605.6589965820312, + "y": -127.23999786376953 + }, + { + "x": 609.3499755859375, + "y": -125.26100158691406 + }, + { + "x": 613, + "y": -123.20500183105469 + }, + { + "x": 616.60498046875, + "y": -121.0719985961914 + }, + { + "x": 620.1649780273438, + "y": -118.86499786376953 + }, + { + "x": 623.677978515625, + "y": -116.58399963378906 + }, + { + "x": 627.1420288085938, + "y": -114.22899627685547 + }, + { + "x": 630.5570068359375, + "y": -111.8030014038086 + }, + { + "x": 633.9190063476562, + "y": -109.30500030517578 + }, + { + "x": 637.22900390625, + "y": -106.73799896240234 + }, + { + "x": 640.4840087890625, + "y": -104.10199737548828 + }, + { + "x": 643.6840209960938, + "y": -101.39900207519531 + }, + { + "x": 646.8259887695312, + "y": -98.62799835205078 + }, + { + "x": 649.9089965820312, + "y": -95.79299926757812 + }, + { + "x": 652.9320068359375, + "y": -92.89399719238281 + }, + { + "x": 655.8939819335938, + "y": -89.93199920654297 + }, + { + "x": 658.7930297851562, + "y": -86.90899658203125 + }, + { + "x": 661.6279907226562, + "y": -83.82599639892578 + }, + { + "x": 664.3989868164062, + "y": -80.68399810791016 + }, + { + "x": 667.1019897460938, + "y": -77.48400115966797 + }, + { + "x": 669.7379760742188, + "y": -74.22899627685547 + }, + { + "x": 672.3049926757812, + "y": -70.91899871826172 + }, + { + "x": 674.802978515625, + "y": -67.55699920654297 + }, + { + "x": 677.22900390625, + "y": -64.14199829101562 + }, + { + "x": 679.583984375, + "y": -60.678001403808594 + }, + { + "x": 681.864990234375, + "y": -57.165000915527344 + }, + { + "x": 684.072021484375, + "y": -53.60499954223633 + }, + { + "x": 686.2050170898438, + "y": -50 + }, + { + "x": 688.260986328125, + "y": -46.349998474121094 + }, + { + "x": 690.239990234375, + "y": -42.659000396728516 + }, + { + "x": 692.1420288085938, + "y": -38.926998138427734 + }, + { + "x": 693.9650268554688, + "y": -35.154998779296875 + }, + { + "x": 695.708984375, + "y": -31.347000122070312 + }, + { + "x": 697.3720092773438, + "y": -27.503000259399414 + }, + { + "x": 698.9550170898438, + "y": -23.624000549316406 + }, + { + "x": 700.4559936523438, + "y": -19.714000701904297 + }, + { + "x": 701.875, + "y": -15.77299976348877 + }, + { + "x": 703.2109985351562, + "y": -11.803000450134277 + }, + { + "x": 704.4630126953125, + "y": -7.806000232696533 + }, + { + "x": 705.6320190429688, + "y": -3.7829999923706055 + }, + { + "x": 706.7160034179688, + "y": 0.2619999945163727 + }, + { + "x": 707.7150268554688, + "y": 4.328999996185303 + }, + { + "x": 708.6290283203125, + "y": 8.416999816894531 + }, + { + "x": 709.4569702148438, + "y": 12.52299976348877 + }, + { + "x": 710.198974609375, + "y": 16.645999908447266 + }, + { + "x": 710.85400390625, + "y": 20.783000946044922 + }, + { + "x": 711.4219970703125, + "y": 24.933000564575195 + }, + { + "x": 711.9039916992188, + "y": 29.0939998626709 + }, + { + "x": 712.2979736328125, + "y": 33.263999938964844 + }, + { + "x": 712.60498046875, + "y": 37.441001892089844 + }, + { + "x": 712.823974609375, + "y": 41.624000549316406 + }, + { + "x": 712.9559936523438, + "y": 45.81100082397461 + }, + { + "x": 713, + "y": 50 + }, + { + "x": 712.9559936523438, + "y": 54.1879997253418 + }, + { + "x": 712.823974609375, + "y": 58.375 + }, + { + "x": 712.60498046875, + "y": 62.55799865722656 + }, + { + "x": 712.2979736328125, + "y": 66.73500061035156 + }, + { + "x": 711.9039916992188, + "y": 70.90499877929688 + }, + { + "x": 711.4219970703125, + "y": 75.06600189208984 + }, + { + "x": 710.85400390625, + "y": 79.21600341796875 + }, + { + "x": 710.198974609375, + "y": 83.35299682617188 + }, + { + "x": 709.4569702148438, + "y": 87.47599792480469 + }, + { + "x": 708.6290283203125, + "y": 91.58200073242188 + }, + { + "x": 707.7150268554688, + "y": 95.66999816894531 + }, + { + "x": 706.7160034179688, + "y": 99.73699951171875 + }, + { + "x": 705.6320190429688, + "y": 103.78299713134766 + }, + { + "x": 704.4630126953125, + "y": 107.80599975585938 + }, + { + "x": 703.2109985351562, + "y": 111.8030014038086 + }, + { + "x": 701.875, + "y": 115.77300262451172 + }, + { + "x": 701.4329833984375, + "y": 116.9990005493164 + } + ], + "isCurve": true, + "animated": false, + "tooltip": "", + "icon": null, + "zIndex": 0 + }, + { + "id": "2.(b -> c)[0]", + "src": "2.b", + "srcArrow": "none", + "dst": "2.c", + "dstArrow": "triangle", + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "stroke": "B1", + "borderRadius": 10, + "label": "", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N2", + "italic": true, + "bold": false, + "underline": false, + "labelWidth": 0, + "labelHeight": 0, + "labelPosition": "", + "labelPercentage": 0, + "link": "", + "route": [ + { + "x": 662.3569946289062, + "y": 182.99899291992188 + }, + { + "x": 661.6279907226562, + "y": 183.8260040283203 + }, + { + "x": 658.7930297851562, + "y": 186.90899658203125 + }, + { + "x": 655.8939819335938, + "y": 189.9320068359375 + }, + { + "x": 652.9320068359375, + "y": 192.8939971923828 + }, + { + "x": 649.9089965820312, + "y": 195.79299926757812 + }, + { + "x": 646.8259887695312, + "y": 198.6280059814453 + }, + { + "x": 643.6840209960938, + "y": 201.3990020751953 + }, + { + "x": 640.4840087890625, + "y": 204.1020050048828 + }, + { + "x": 637.22900390625, + "y": 206.73800659179688 + }, + { + "x": 633.9190063476562, + "y": 209.30499267578125 + }, + { + "x": 630.5570068359375, + "y": 211.80299377441406 + }, + { + "x": 627.1420288085938, + "y": 214.22900390625 + }, + { + "x": 623.677978515625, + "y": 216.58399963378906 + }, + { + "x": 620.1649780273438, + "y": 218.86500549316406 + }, + { + "x": 616.60498046875, + "y": 221.07200622558594 + }, + { + "x": 613, + "y": 223.2050018310547 + }, + { + "x": 609.3499755859375, + "y": 225.26100158691406 + }, + { + "x": 605.6589965820312, + "y": 227.24000549316406 + }, + { + "x": 601.927001953125, + "y": 229.14199829101562 + }, + { + "x": 598.155029296875, + "y": 230.96499633789062 + }, + { + "x": 594.3469848632812, + "y": 232.70899963378906 + }, + { + "x": 590.5029907226562, + "y": 234.3719940185547 + }, + { + "x": 586.6240234375, + "y": 235.9550018310547 + }, + { + "x": 582.7139892578125, + "y": 237.45599365234375 + }, + { + "x": 578.7730102539062, + "y": 238.875 + }, + { + "x": 574.802978515625, + "y": 240.21099853515625 + }, + { + "x": 570.8060302734375, + "y": 241.46299743652344 }, { - "x": 195.62899780273438, - "y": 41.582000732421875 + "x": 566.7830200195312, + "y": 242.6320037841797 }, { - "x": 193.18499755859375, - "y": 51.76300048828125 + "x": 562.7369995117188, + "y": 243.71600341796875 }, { - "x": 190.21099853515625, - "y": 61.803001403808594 + "x": 558.6699829101562, + "y": 244.71499633789062 }, { - "x": 186.71600341796875, - "y": 71.6729965209961 + "x": 554.5819702148438, + "y": 245.62899780273438 }, { - "x": 182.70899963378906, - "y": 81.34700012207031 + "x": 550.4760131835938, + "y": 246.45700073242188 }, { - "x": 178.2010040283203, - "y": 90.7979965209961 + "x": 546.35302734375, + "y": 247.19900512695312 }, { - "x": 173.2050018310547, - "y": 99.9990005493164 + "x": 542.2160034179688, + "y": 247.85400390625 }, { - "x": 167.73399353027344, - "y": 108.927001953125 + "x": 538.0659790039062, + "y": 248.4219970703125 }, { - "x": 161.80299377441406, - "y": 117.55699920654297 + "x": 533.905029296875, + "y": 248.9040069580078 }, { - "x": 155.4290008544922, - "y": 125.86399841308594 + "x": 529.7349853515625, + "y": 249.29800415039062 }, { - "x": 148.6280059814453, - "y": 133.8260040283203 + "x": 525.5579833984375, + "y": 249.60499572753906 }, { - "x": 141.42100524902344, - "y": 141.42100524902344 + "x": 521.375, + "y": 249.82400512695312 }, { - "x": 133.8260040283203, - "y": 148.6280059814453 + "x": 517.18798828125, + "y": 249.95599365234375 }, { - "x": 125.86399841308594, - "y": 155.4290008544922 + "x": 513, + "y": 250 }, { - "x": 117.55699920654297, - "y": 161.80299377441406 + "x": 508.8110046386719, + "y": 249.95599365234375 }, { - "x": 108.927001953125, - "y": 167.73399353027344 + "x": 504.6239929199219, + "y": 249.82400512695312 }, { - "x": 100, - "y": 173.2050018310547 + "x": 500.4410095214844, + "y": 249.60499572753906 }, { - "x": 90.7979965209961, - "y": 178.2010040283203 + "x": 496.2640075683594, + "y": 249.29800415039062 }, { - "x": 81.34700012207031, - "y": 182.70899963378906 + "x": 492.093994140625, + "y": 248.9040069580078 }, { - "x": 71.6729965209961, - "y": 186.71600341796875 + "x": 487.9330139160156, + "y": 248.4219970703125 }, { - "x": 61.803001403808594, - "y": 190.21099853515625 + "x": 483.7829895019531, + "y": 247.85400390625 }, { - "x": 51.76300048828125, - "y": 193.18499755859375 + "x": 479.64599609375, + "y": 247.19900512695312 }, { - "x": 41.582000732421875, - "y": 195.62899780273438 + "x": 475.52301025390625, + "y": 246.45700073242188 }, { - "x": 31.285999298095703, - "y": 197.53700256347656 + "x": 471.4169921875, + "y": 245.62899780273438 }, { - "x": 20.905000686645508, - "y": 198.9040069580078 - } - ], - "isCurve": true, - "animated": false, - "tooltip": "", - "icon": null, - "zIndex": 0 - }, - { - "id": "1.(c -> d)[0]", - "src": "1.c", - "srcArrow": "none", - "dst": "1.d", - "dstArrow": "triangle", - "opacity": 1, - "strokeDash": 0, - "strokeWidth": 2, - "stroke": "B1", - "borderRadius": 10, - "label": "", - "fontSize": 16, - "fontFamily": "DEFAULT", - "language": "", - "color": "N2", - "italic": true, - "bold": false, - "underline": false, - "labelWidth": 0, - "labelHeight": 0, - "labelPosition": "", - "labelPercentage": 0, - "link": "", - "route": [ + "x": 467.3290100097656, + "y": 244.71499633789062 + }, { - "x": -20.905000686645508, - "y": 198.9040069580078 + "x": 463.2619934082031, + "y": 243.71600341796875 }, { - "x": -31.285999298095703, - "y": 197.53700256347656 + "x": 459.21600341796875, + "y": 242.6320037841797 }, { - "x": -41.582000732421875, - "y": 195.62899780273438 + "x": 455.1929931640625, + "y": 241.46299743652344 }, { - "x": -51.76300048828125, - "y": 193.18499755859375 + "x": 451.1960144042969, + "y": 240.21099853515625 }, { - "x": -61.803001403808594, - "y": 190.21099853515625 + "x": 447.22601318359375, + "y": 238.875 }, { - "x": -71.6729965209961, - "y": 186.71600341796875 + "x": 443.2850036621094, + "y": 237.45599365234375 }, { - "x": -81.34700012207031, - "y": 182.70899963378906 + "x": 439.375, + "y": 235.9550018310547 }, { - "x": -90.7979965209961, - "y": 178.2010040283203 + "x": 435.4960021972656, + "y": 234.3719940185547 + }, + { + "x": 431.6520080566406, + "y": 232.70899963378906 }, { - "x": -99.9990005493164, - "y": 173.2050018310547 + "x": 427.843994140625, + "y": 230.96499633789062 }, { - "x": -108.927001953125, - "y": 167.73399353027344 + "x": 424.0719909667969, + "y": 229.14199829101562 }, { - "x": -117.55699920654297, - "y": 161.80299377441406 + "x": 420.3399963378906, + "y": 227.24000549316406 }, { - "x": -125.86399841308594, - "y": 155.4290008544922 + "x": 416.64898681640625, + "y": 225.26100158691406 }, { - "x": -133.8260040283203, - "y": 148.6280059814453 + "x": 413, + "y": 223.2050018310547 }, { - "x": -141.42100524902344, - "y": 141.42100524902344 + "x": 409.3940124511719, + "y": 221.07200622558594 }, { - "x": -148.6280059814453, - "y": 133.8260040283203 + "x": 405.8340148925781, + "y": 218.86500549316406 }, { - "x": -155.4290008544922, - "y": 125.86399841308594 + "x": 402.3210144042969, + "y": 216.58399963378906 }, { - "x": -161.80299377441406, - "y": 117.55699920654297 + "x": 398.85699462890625, + "y": 214.22900390625 }, { - "x": -167.73399353027344, - "y": 108.927001953125 + "x": 395.4419860839844, + "y": 211.80299377441406 }, { - "x": -173.2050018310547, - "y": 100 + "x": 392.0799865722656, + "y": 209.30499267578125 }, { - "x": -178.2010040283203, - "y": 90.7979965209961 + "x": 388.7699890136719, + "y": 206.73800659179688 }, { - "x": -182.70899963378906, - "y": 81.34700012207031 + "x": 385.5150146484375, + "y": 204.1020050048828 }, { - "x": -186.71600341796875, - "y": 71.6729965209961 + "x": 382.31500244140625, + "y": 201.3990020751953 }, { - "x": -190.21099853515625, - "y": 61.803001403808594 + "x": 379.1730041503906, + "y": 198.6280059814453 }, { - "x": -193.18499755859375, - "y": 51.76300048828125 + "x": 376.0899963378906, + "y": 195.79299926757812 }, { - "x": -195.62899780273438, - "y": 41.582000732421875 + "x": 373.0669860839844, + "y": 192.8939971923828 }, { - "x": -197.53700256347656, - "y": 31.285999298095703 + "x": 370.1050109863281, + "y": 189.9320068359375 + }, + { + "x": 367.20599365234375, + "y": 186.90899658203125 + }, + { + "x": 364.3710021972656, + "y": 183.8260040283203 + }, + { + "x": 363.6419982910156, + "y": 183 } ], "isCurve": true, @@ -923,10 +2351,10 @@ "zIndex": 0 }, { - "id": "2.(a -> b)[0]", - "src": "2.a", + "id": "3.(a -> b)[0]", + "src": "3.a", "srcArrow": "none", - "dst": "2.b", + "dst": "3.b", "dstArrow": "triangle", "opacity": 1, "strokeDash": 0, @@ -948,404 +2376,376 @@ "link": "", "route": [ { - "x": 526.9509887695312, - "y": -149.51199340820312 + "x": 998.5, + "y": -198.21800231933594 }, { - "x": 540.833984375, - "y": -148.05299377441406 + "x": 1003.2860107421875, + "y": -197.53700256347656 }, { - "x": 554.5819702148438, - "y": -145.62899780273438 + "x": 1009.4760131835938, + "y": -196.45700073242188 }, { - "x": 568.1270141601562, - "y": -142.2519989013672 + "x": 1015.6279907226562, + "y": -195.18299865722656 }, { - "x": 581.4039916992188, - "y": -137.93800354003906 + "x": 1021.7369995117188, + "y": -193.71600341796875 }, { - "x": 594.3469848632812, - "y": -132.70899963378906 + "x": 1027.7979736328125, + "y": -192.05799865722656 }, { - "x": 606.8939819335938, - "y": -126.58899688720703 + "x": 1033.802978515625, + "y": -190.21099853515625 }, { - "x": 618.9829711914062, - "y": -119.60900115966797 + "x": 1039.7469482421875, + "y": -188.17599487304688 }, { - "x": 630.5570068359375, - "y": -111.8030014038086 + "x": 1045.6240234375, + "y": -185.9550018310547 }, { - "x": 641.5570068359375, - "y": -103.20800018310547 + "x": 1051.428955078125, + "y": -183.5500030517578 }, { - "x": 651.9310302734375, - "y": -93.86699676513672 + "x": 1057.155029296875, + "y": -180.96499633789062 }, { - "x": 661.6279907226562, - "y": -83.82599639892578 + "x": 1062.7979736328125, + "y": -178.2010040283203 }, { - "x": 670.6019897460938, - "y": -73.13200378417969 + "x": 1068.3499755859375, + "y": -175.26100158691406 }, { - "x": 678.8070068359375, - "y": -61.8380012512207 + "x": 1073.8079833984375, + "y": -172.1479949951172 }, { - "x": 686.2050170898438, - "y": -50 + "x": 1079.1650390625, + "y": -168.86500549316406 }, { - "x": 692.7579956054688, - "y": -37.67399978637695 + "x": 1084.416015625, + "y": -165.41600036621094 }, { - "x": 698.4359741210938, - "y": -24.92099952697754 + "x": 1089.5570068359375, + "y": -161.80299377441406 }, { - "x": 703.2109985351562, - "y": -11.803000450134277 + "x": 1094.5810546875, + "y": -158.031005859375 }, { - "x": 707.0590209960938, - "y": 1.6150000095367432 + "x": 1099.4840087890625, + "y": -154.1020050048828 }, { - "x": 709.9609985351562, - "y": 15.270000457763672 + "x": 1104.261962890625, + "y": -150.02200317382812 }, { - "x": 711.9039916992188, - "y": 29.0939998626709 + "x": 1108.9090576171875, + "y": -145.79299926757812 }, { - "x": 712.8779907226562, - "y": 43.02000045776367 + "x": 1113.4210205078125, + "y": -141.42100524902344 }, { - "x": 712.8779907226562, - "y": 56.979000091552734 + "x": 1117.79296875, + "y": -136.90899658203125 }, { - "x": 711.9039916992188, - "y": 70.90499877929688 + "x": 1122.02197265625, + "y": -132.26199340820312 }, { - "x": 709.9609985351562, - "y": 84.72899627685547 + "x": 1126.10205078125, + "y": -127.48400115966797 }, { - "x": 707.0590209960938, - "y": 98.38400268554688 + "x": 1130.031005859375, + "y": -122.58100128173828 }, { - "x": 703.2109985351562, - "y": 111.8030014038086 + "x": 1133.802978515625, + "y": -117.55699920654297 }, { - "x": 698.4359741210938, - "y": 124.9209976196289 - } - ], - "isCurve": true, - "animated": false, - "tooltip": "", - "icon": null, - "zIndex": 0 - }, - { - "id": "2.(b -> c)[0]", - "src": "2.b", - "srcArrow": "none", - "dst": "2.c", - "dstArrow": "triangle", - "opacity": 1, - "strokeDash": 0, - "strokeWidth": 2, - "stroke": "B1", - "borderRadius": 10, - "label": "", - "fontSize": 16, - "fontFamily": "DEFAULT", - "language": "", - "color": "N2", - "italic": true, - "bold": false, - "underline": false, - "labelWidth": 0, - "labelHeight": 0, - "labelPosition": "", - "labelPercentage": 0, - "link": "", - "route": [ + "x": 1137.416015625, + "y": -112.41600036621094 + }, { - "x": 670.6019897460938, - "y": 173.1320037841797 + "x": 1140.864990234375, + "y": -107.16500091552734 }, { - "x": 661.6279907226562, - "y": 183.8260040283203 + "x": 1144.14794921875, + "y": -101.80799865722656 }, { - "x": 651.9310302734375, - "y": 193.86700439453125 + "x": 1147.260986328125, + "y": -96.3499984741211 }, { - "x": 641.5570068359375, - "y": 203.20799255371094 + "x": 1150.2010498046875, + "y": -90.7979965209961 }, { - "x": 630.5570068359375, - "y": 211.80299377441406 + "x": 1152.9649658203125, + "y": -85.15499877929688 }, { - "x": 618.9829711914062, - "y": 219.60899353027344 + "x": 1155.550048828125, + "y": -79.42900085449219 }, { - "x": 606.8939819335938, - "y": 226.58900451660156 + "x": 1157.9549560546875, + "y": -73.6240005493164 }, { - "x": 594.3469848632812, - "y": 232.70899963378906 + "x": 1160.176025390625, + "y": -67.74700164794922 }, { - "x": 581.4039916992188, - "y": 237.93800354003906 + "x": 1162.2110595703125, + "y": -61.803001403808594 }, { - "x": 568.1270141601562, - "y": 242.2519989013672 + "x": 1164.0579833984375, + "y": -55.79800033569336 }, { - "x": 554.5819702148438, - "y": 245.62899780273438 + "x": 1165.7159423828125, + "y": -49.73699951171875 }, { - "x": 540.833984375, - "y": 248.05299377441406 + "x": 1167.1829833984375, + "y": -43.62799835205078 }, { - "x": 526.9509887695312, - "y": 249.51199340820312 + "x": 1168.45703125, + "y": -37.47600173950195 }, { - "x": 513, - "y": 250 + "x": 1169.5369873046875, + "y": -31.285999298095703 }, { - "x": 499.0480041503906, - "y": 249.51199340820312 + "x": 1170.4219970703125, + "y": -25.06599998474121 }, { - "x": 485.1650085449219, - "y": 248.05299377441406 + "x": 1171.112060546875, + "y": -18.820999145507812 }, { - "x": 471.4169921875, - "y": 245.62899780273438 + "x": 1171.60498046875, + "y": -12.557999610900879 }, { - "x": 457.87200927734375, - "y": 242.2519989013672 + "x": 1171.9010009765625, + "y": -6.2820000648498535 }, { - "x": 444.5950012207031, - "y": 237.93800354003906 + "x": 1172, + "y": 0 }, { - "x": 431.6520080566406, - "y": 232.70899963378906 + "x": 1171.9010009765625, + "y": 6.2820000648498535 }, { - "x": 419.1050109863281, - "y": 226.58900451660156 + "x": 1171.60498046875, + "y": 12.557999610900879 }, { - "x": 407.0159912109375, - "y": 219.60899353027344 + "x": 1171.112060546875, + "y": 18.820999145507812 }, { - "x": 395.4419860839844, - "y": 211.80299377441406 + "x": 1170.4219970703125, + "y": 25.06599998474121 }, { - "x": 384.4419860839844, - "y": 203.20799255371094 + "x": 1169.5369873046875, + "y": 31.285999298095703 }, { - "x": 374.0679931640625, - "y": 193.86700439453125 + "x": 1168.45703125, + "y": 37.47600173950195 }, { - "x": 364.3710021972656, - "y": 183.8260040283203 + "x": 1167.1829833984375, + "y": 43.62799835205078 }, { - "x": 355.3970031738281, - "y": 173.1320037841797 - } - ], - "isCurve": true, - "animated": false, - "tooltip": "", - "icon": null, - "zIndex": 0 - }, - { - "id": "3.(a -> b)[0]", - "src": "3.a", - "srcArrow": "none", - "dst": "3.b", - "dstArrow": "triangle", - "opacity": 1, - "strokeDash": 0, - "strokeWidth": 2, - "stroke": "B1", - "borderRadius": 10, - "label": "", - "fontSize": 16, - "fontFamily": "DEFAULT", - "language": "", - "color": "N2", - "italic": true, - "bold": false, - "underline": false, - "labelWidth": 0, - "labelHeight": 0, - "labelPosition": "", - "labelPercentage": 0, - "link": "", - "route": [ + "x": 1165.7159423828125, + "y": 49.73699951171875 + }, + { + "x": 1164.0579833984375, + "y": 55.79800033569336 + }, { - "x": 992.905029296875, - "y": -198.9040069580078 + "x": 1162.2110595703125, + "y": 61.803001403808594 }, { - "x": 1013.5819702148438, - "y": -195.62899780273438 + "x": 1160.176025390625, + "y": 67.74700164794922 }, { - "x": 1033.802978515625, - "y": -190.21099853515625 + "x": 1157.9549560546875, + "y": 73.6240005493164 }, { - "x": 1053.3470458984375, - "y": -182.70899963378906 + "x": 1155.550048828125, + "y": 79.42900085449219 }, { - "x": 1072, - "y": -173.2050018310547 + "x": 1152.9649658203125, + "y": 85.15499877929688 }, { - "x": 1089.5570068359375, - "y": -161.80299377441406 + "x": 1150.2010498046875, + "y": 90.7979965209961 + }, + { + "x": 1147.260986328125, + "y": 96.3499984741211 + }, + { + "x": 1144.14794921875, + "y": 101.80799865722656 }, { - "x": 1105.8260498046875, - "y": -148.6280059814453 + "x": 1140.864990234375, + "y": 107.16500091552734 }, { - "x": 1120.6280517578125, - "y": -133.8260040283203 + "x": 1137.416015625, + "y": 112.41600036621094 }, { "x": 1133.802978515625, - "y": -117.55699920654297 + "y": 117.55699920654297 }, { - "x": 1145.2049560546875, - "y": -100 + "x": 1130.031005859375, + "y": 122.58100128173828 }, { - "x": 1154.708984375, - "y": -81.34700012207031 + "x": 1126.10205078125, + "y": 127.48400115966797 }, { - "x": 1162.2110595703125, - "y": -61.803001403808594 + "x": 1122.02197265625, + "y": 132.26199340820312 }, { - "x": 1167.6290283203125, - "y": -41.582000732421875 + "x": 1117.79296875, + "y": 136.90899658203125 }, { - "x": 1170.904052734375, - "y": -20.905000686645508 + "x": 1113.4210205078125, + "y": 141.42100524902344 }, { - "x": 1172, - "y": 0 + "x": 1108.9090576171875, + "y": 145.79299926757812 }, { - "x": 1170.904052734375, - "y": 20.905000686645508 + "x": 1104.261962890625, + "y": 150.02200317382812 }, { - "x": 1167.6290283203125, - "y": 41.582000732421875 + "x": 1099.4840087890625, + "y": 154.1020050048828 }, { - "x": 1162.2110595703125, - "y": 61.803001403808594 + "x": 1094.5810546875, + "y": 158.031005859375 }, { - "x": 1154.708984375, - "y": 81.34700012207031 + "x": 1089.5570068359375, + "y": 161.80299377441406 }, { - "x": 1145.2049560546875, - "y": 99.9990005493164 + "x": 1084.416015625, + "y": 165.41600036621094 }, { - "x": 1133.802978515625, - "y": 117.55699920654297 + "x": 1079.1650390625, + "y": 168.86500549316406 }, { - "x": 1120.6280517578125, - "y": 133.8260040283203 + "x": 1073.8079833984375, + "y": 172.1479949951172 }, { - "x": 1105.8260498046875, - "y": 148.6280059814453 + "x": 1068.3499755859375, + "y": 175.26100158691406 }, { - "x": 1089.5570068359375, - "y": 161.80299377441406 + "x": 1062.7979736328125, + "y": 178.2010040283203 + }, + { + "x": 1057.155029296875, + "y": 180.96499633789062 + }, + { + "x": 1051.428955078125, + "y": 183.5500030517578 }, { - "x": 1072, - "y": 173.2050018310547 + "x": 1045.6240234375, + "y": 185.9550018310547 }, { - "x": 1053.3470458984375, - "y": 182.70899963378906 + "x": 1039.7469482421875, + "y": 188.17599487304688 }, { "x": 1033.802978515625, "y": 190.21099853515625 }, { - "x": 1013.5819702148438, - "y": 195.62899780273438 + "x": 1027.7979736328125, + "y": 192.05799865722656 + }, + { + "x": 1021.7369995117188, + "y": 193.71600341796875 + }, + { + "x": 1015.6279907226562, + "y": 195.18299865722656 + }, + { + "x": 1009.4760131835938, + "y": 196.45700073242188 + }, + { + "x": 1003.2860107421875, + "y": 197.53700256347656 }, { - "x": 992.905029296875, - "y": 198.9040069580078 + "x": 998.5, + "y": 198.21800231933594 } ], "isCurve": true, diff --git a/e2etests/testdata/txtar/cycle-diagram/dagre/sketch.exp.svg b/e2etests/testdata/txtar/cycle-diagram/dagre/sketch.exp.svg index 18ebdee8aa..015478d741 100644 --- a/e2etests/testdata/txtar/cycle-diagram/dagre/sketch.exp.svg +++ b/e2etests/testdata/txtar/cycle-diagram/dagre/sketch.exp.svg @@ -1,9 +1,9 @@ -abcdabcab + .d2-153681122 .fill-N1{fill:#0A0F25;} + .d2-153681122 .fill-N2{fill:#676C7E;} + .d2-153681122 .fill-N3{fill:#9499AB;} + .d2-153681122 .fill-N4{fill:#CFD2DD;} + .d2-153681122 .fill-N5{fill:#DEE1EB;} + .d2-153681122 .fill-N6{fill:#EEF1F8;} + .d2-153681122 .fill-N7{fill:#FFFFFF;} + .d2-153681122 .fill-B1{fill:#0D32B2;} + .d2-153681122 .fill-B2{fill:#0D32B2;} + .d2-153681122 .fill-B3{fill:#E3E9FD;} + .d2-153681122 .fill-B4{fill:#E3E9FD;} + .d2-153681122 .fill-B5{fill:#EDF0FD;} + .d2-153681122 .fill-B6{fill:#F7F8FE;} + .d2-153681122 .fill-AA2{fill:#4A6FF3;} + .d2-153681122 .fill-AA4{fill:#EDF0FD;} + .d2-153681122 .fill-AA5{fill:#F7F8FE;} + .d2-153681122 .fill-AB4{fill:#EDF0FD;} + .d2-153681122 .fill-AB5{fill:#F7F8FE;} + .d2-153681122 .stroke-N1{stroke:#0A0F25;} + .d2-153681122 .stroke-N2{stroke:#676C7E;} + .d2-153681122 .stroke-N3{stroke:#9499AB;} + .d2-153681122 .stroke-N4{stroke:#CFD2DD;} + .d2-153681122 .stroke-N5{stroke:#DEE1EB;} + .d2-153681122 .stroke-N6{stroke:#EEF1F8;} + .d2-153681122 .stroke-N7{stroke:#FFFFFF;} + .d2-153681122 .stroke-B1{stroke:#0D32B2;} + .d2-153681122 .stroke-B2{stroke:#0D32B2;} + .d2-153681122 .stroke-B3{stroke:#E3E9FD;} + .d2-153681122 .stroke-B4{stroke:#E3E9FD;} + .d2-153681122 .stroke-B5{stroke:#EDF0FD;} + .d2-153681122 .stroke-B6{stroke:#F7F8FE;} + .d2-153681122 .stroke-AA2{stroke:#4A6FF3;} + .d2-153681122 .stroke-AA4{stroke:#EDF0FD;} + .d2-153681122 .stroke-AA5{stroke:#F7F8FE;} + .d2-153681122 .stroke-AB4{stroke:#EDF0FD;} + .d2-153681122 .stroke-AB5{stroke:#F7F8FE;} + .d2-153681122 .background-color-N1{background-color:#0A0F25;} + .d2-153681122 .background-color-N2{background-color:#676C7E;} + .d2-153681122 .background-color-N3{background-color:#9499AB;} + .d2-153681122 .background-color-N4{background-color:#CFD2DD;} + .d2-153681122 .background-color-N5{background-color:#DEE1EB;} + .d2-153681122 .background-color-N6{background-color:#EEF1F8;} + .d2-153681122 .background-color-N7{background-color:#FFFFFF;} + .d2-153681122 .background-color-B1{background-color:#0D32B2;} + .d2-153681122 .background-color-B2{background-color:#0D32B2;} + .d2-153681122 .background-color-B3{background-color:#E3E9FD;} + .d2-153681122 .background-color-B4{background-color:#E3E9FD;} + .d2-153681122 .background-color-B5{background-color:#EDF0FD;} + .d2-153681122 .background-color-B6{background-color:#F7F8FE;} + .d2-153681122 .background-color-AA2{background-color:#4A6FF3;} + .d2-153681122 .background-color-AA4{background-color:#EDF0FD;} + .d2-153681122 .background-color-AA5{background-color:#F7F8FE;} + .d2-153681122 .background-color-AB4{background-color:#EDF0FD;} + .d2-153681122 .background-color-AB5{background-color:#F7F8FE;} + .d2-153681122 .color-N1{color:#0A0F25;} + .d2-153681122 .color-N2{color:#676C7E;} + .d2-153681122 .color-N3{color:#9499AB;} + .d2-153681122 .color-N4{color:#CFD2DD;} + .d2-153681122 .color-N5{color:#DEE1EB;} + .d2-153681122 .color-N6{color:#EEF1F8;} + .d2-153681122 .color-N7{color:#FFFFFF;} + .d2-153681122 .color-B1{color:#0D32B2;} + .d2-153681122 .color-B2{color:#0D32B2;} + .d2-153681122 .color-B3{color:#E3E9FD;} + .d2-153681122 .color-B4{color:#E3E9FD;} + .d2-153681122 .color-B5{color:#EDF0FD;} + .d2-153681122 .color-B6{color:#F7F8FE;} + .d2-153681122 .color-AA2{color:#4A6FF3;} + .d2-153681122 .color-AA4{color:#EDF0FD;} + .d2-153681122 .color-AA5{color:#F7F8FE;} + .d2-153681122 .color-AB4{color:#EDF0FD;} + .d2-153681122 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker-d2-153681122);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker-d2-153681122);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright-d2-153681122);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright-d2-153681122);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright-d2-153681122);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright-d2-153681122);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark-d2-153681122);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright-d2-153681122);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright-d2-153681122);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright-d2-153681122);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright-d2-153681122);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker-d2-153681122);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark-d2-153681122);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal-d2-153681122);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal-d2-153681122);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright-d2-153681122);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright-d2-153681122);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright-d2-153681122);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>abcdabcab diff --git a/e2etests/testdata/txtar/cycle-diagram/elk/board.exp.json b/e2etests/testdata/txtar/cycle-diagram/elk/board.exp.json index ad4e2a99c0..6eb058a841 100644 --- a/e2etests/testdata/txtar/cycle-diagram/elk/board.exp.json +++ b/e2etests/testdata/txtar/cycle-diagram/elk/board.exp.json @@ -540,108 +540,336 @@ "link": "", "route": [ { - "x": 32.904998779296875, - "y": -186.9040069580078 + "x": 38.5, + "y": -186.22999572753906 + }, + { + "x": 40.18000030517578, + "y": -186.00399780273438 }, { "x": 43.2859992980957, "y": -185.53700256347656 }, { - "x": 53.582000732421875, - "y": -183.62899780273438 + "x": 46.3849983215332, + "y": -185.02099609375 + }, + { + "x": 49.47600173950195, + "y": -184.45700073242188 + }, + { + "x": 52.55699920654297, + "y": -183.843994140625 + }, + { + "x": 55.62799835205078, + "y": -183.18299865722656 + }, + { + "x": 58.68899917602539, + "y": -182.47300720214844 + }, + { + "x": 61.73699951171875, + "y": -181.71600341796875 + }, + { + "x": 64.77400207519531, + "y": -180.91099548339844 + }, + { + "x": 67.7979965209961, + "y": -180.05799865722656 }, { - "x": 63.76300048828125, - "y": -181.18499755859375 + "x": 70.80799865722656, + "y": -179.1580047607422 }, { "x": 73.8030014038086, "y": -178.21099853515625 }, { - "x": 83.6729965209961, - "y": -174.71600341796875 + "x": 76.78299713134766, + "y": -177.2169952392578 }, { - "x": 93.34700012207031, - "y": -170.70899963378906 + "x": 79.74700164794922, + "y": -176.17599487304688 + }, + { + "x": 82.69400024414062, + "y": -175.08799743652344 + }, + { + "x": 85.6240005493164, + "y": -173.9550018310547 + }, + { + "x": 88.53600311279297, + "y": -172.77499389648438 + }, + { + "x": 91.42900085449219, + "y": -171.5500030517578 + }, + { + "x": 94.302001953125, + "y": -170.27999877929688 + }, + { + "x": 97.15499877929688, + "y": -168.96499633789062 + }, + { + "x": 99.98699951171875, + "y": -167.60499572753906 }, { "x": 102.7979965209961, "y": -166.2010040283203 }, { - "x": 111.9990005493164, - "y": -161.2050018310547 + "x": 105.58499908447266, + "y": -164.7530059814453 + }, + { + "x": 108.3499984741211, + "y": -163.26100158691406 }, { - "x": 120.927001953125, - "y": -155.73399353027344 + "x": 111.09100341796875, + "y": -161.7259979248047 + }, + { + "x": 113.80799865722656, + "y": -160.1479949951172 + }, + { + "x": 116.4990005493164, + "y": -158.5279998779297 + }, + { + "x": 119.16500091552734, + "y": -156.86500549316406 + }, + { + "x": 121.80400085449219, + "y": -155.16099548339844 + }, + { + "x": 124.41600036621094, + "y": -153.41600036621094 + }, + { + "x": 127.0009994506836, + "y": -151.62899780273438 }, { "x": 129.5570068359375, "y": -149.80299377441406 }, { - "x": 137.86399841308594, - "y": -143.4290008544922 + "x": 132.08399963378906, + "y": -147.93600463867188 + }, + { + "x": 134.58099365234375, + "y": -146.031005859375 + }, + { + "x": 137.04800415039062, + "y": -144.08599853515625 }, { - "x": 145.8260040283203, - "y": -136.6280059814453 + "x": 139.48399353027344, + "y": -142.1020050048828 + }, + { + "x": 141.88900756835938, + "y": -140.08099365234375 + }, + { + "x": 144.26199340820312, + "y": -138.02200317382812 + }, + { + "x": 146.6020050048828, + "y": -135.92599487304688 + }, + { + "x": 148.90899658203125, + "y": -133.79299926757812 + }, + { + "x": 151.1820068359375, + "y": -131.625 }, { "x": 153.42100524902344, "y": -129.42100524902344 }, { - "x": 160.6280059814453, - "y": -121.82599639892578 + "x": 155.625, + "y": -127.18199920654297 + }, + { + "x": 157.79299926757812, + "y": -124.90899658203125 + }, + { + "x": 159.92599487304688, + "y": -122.60199737548828 + }, + { + "x": 162.02200317382812, + "y": -120.26200103759766 }, { - "x": 167.4290008544922, - "y": -113.86399841308594 + "x": 164.08099365234375, + "y": -117.88899993896484 + }, + { + "x": 166.1020050048828, + "y": -115.48400115966797 + }, + { + "x": 168.08599853515625, + "y": -113.0479965209961 + }, + { + "x": 170.031005859375, + "y": -110.58100128173828 + }, + { + "x": 171.93600463867188, + "y": -108.08399963378906 }, { "x": 173.80299377441406, "y": -105.55699920654297 }, { - "x": 179.73399353027344, - "y": -96.927001953125 + "x": 175.62899780273438, + "y": -103.0009994506836 + }, + { + "x": 177.41600036621094, + "y": -100.41600036621094 + }, + { + "x": 179.16099548339844, + "y": -97.80400085449219 + }, + { + "x": 180.86500549316406, + "y": -95.16500091552734 + }, + { + "x": 182.5279998779297, + "y": -92.4990005493164 }, { - "x": 185.2050018310547, - "y": -88 + "x": 184.1479949951172, + "y": -89.80799865722656 + }, + { + "x": 185.7259979248047, + "y": -87.09100341796875 + }, + { + "x": 187.26100158691406, + "y": -84.3499984741211 + }, + { + "x": 188.7530059814453, + "y": -81.58499908447266 }, { "x": 190.2010040283203, "y": -78.7979965209961 }, { - "x": 194.70899963378906, - "y": -69.34700012207031 + "x": 191.60499572753906, + "y": -75.98699951171875 + }, + { + "x": 192.96499633789062, + "y": -73.15499877929688 + }, + { + "x": 194.27999877929688, + "y": -70.302001953125 + }, + { + "x": 195.5500030517578, + "y": -67.42900085449219 + }, + { + "x": 196.77499389648438, + "y": -64.53600311279297 + }, + { + "x": 197.9550018310547, + "y": -61.624000549316406 }, { - "x": 198.71600341796875, - "y": -59.67300033569336 + "x": 199.08799743652344, + "y": -58.694000244140625 + }, + { + "x": 200.17599487304688, + "y": -55.74700164794922 + }, + { + "x": 201.2169952392578, + "y": -52.78300094604492 }, { "x": 202.21099853515625, "y": -49.803001403808594 }, { - "x": 205.18499755859375, - "y": -39.76300048828125 + "x": 203.1580047607422, + "y": -46.80799865722656 }, { - "x": 207.62899780273438, - "y": -29.582000732421875 + "x": 204.05799865722656, + "y": -43.79800033569336 }, { - "x": 209.53700256347656, - "y": -19.285999298095703 + "x": 204.91099548339844, + "y": -40.77399826049805 + }, + { + "x": 205.71600341796875, + "y": -37.73699951171875 + }, + { + "x": 206.47300720214844, + "y": -34.68899917602539 + }, + { + "x": 207.18299865722656, + "y": -31.628000259399414 + }, + { + "x": 207.843994140625, + "y": -28.55699920654297 + }, + { + "x": 208.45700073242188, + "y": -25.47599983215332 + }, + { + "x": 209.02099609375, + "y": -22.385000228881836 + }, + { + "x": 209.2519989013672, + "y": -21 } ], "isCurve": true, @@ -676,244 +904,1444 @@ "link": "", "route": [ { - "x": 209.53700256347656, - "y": 43.2859992980957 + "x": 209.2519989013672, + "y": 45 + }, + { + "x": 209.02099609375, + "y": 46.3849983215332 + }, + { + "x": 208.45700073242188, + "y": 49.47600173950195 + }, + { + "x": 207.843994140625, + "y": 52.55699920654297 + }, + { + "x": 207.18299865722656, + "y": 55.62799835205078 + }, + { + "x": 206.47300720214844, + "y": 58.68899917602539 + }, + { + "x": 205.71600341796875, + "y": 61.73699951171875 + }, + { + "x": 204.91099548339844, + "y": 64.77400207519531 + }, + { + "x": 204.05799865722656, + "y": 67.7979965209961 + }, + { + "x": 203.1580047607422, + "y": 70.80799865722656 + }, + { + "x": 202.21099853515625, + "y": 73.8030014038086 + }, + { + "x": 201.2169952392578, + "y": 76.78299713134766 + }, + { + "x": 200.17599487304688, + "y": 79.74700164794922 + }, + { + "x": 199.08799743652344, + "y": 82.69400024414062 + }, + { + "x": 197.9550018310547, + "y": 85.6240005493164 + }, + { + "x": 196.77499389648438, + "y": 88.53600311279297 + }, + { + "x": 195.5500030517578, + "y": 91.42900085449219 + }, + { + "x": 194.27999877929688, + "y": 94.302001953125 + }, + { + "x": 192.96499633789062, + "y": 97.15499877929688 + }, + { + "x": 191.60499572753906, + "y": 99.98699951171875 + }, + { + "x": 190.2010040283203, + "y": 102.7979965209961 + }, + { + "x": 188.7530059814453, + "y": 105.58499908447266 + }, + { + "x": 187.26100158691406, + "y": 108.3499984741211 + }, + { + "x": 185.7259979248047, + "y": 111.09100341796875 + }, + { + "x": 184.1479949951172, + "y": 113.80799865722656 + }, + { + "x": 182.5279998779297, + "y": 116.4990005493164 + }, + { + "x": 180.86500549316406, + "y": 119.16500091552734 + }, + { + "x": 179.16099548339844, + "y": 121.80400085449219 + }, + { + "x": 177.41600036621094, + "y": 124.41600036621094 + }, + { + "x": 175.62899780273438, + "y": 127.0009994506836 + }, + { + "x": 173.80299377441406, + "y": 129.5570068359375 + }, + { + "x": 171.93600463867188, + "y": 132.08399963378906 + }, + { + "x": 170.031005859375, + "y": 134.58099365234375 + }, + { + "x": 168.08599853515625, + "y": 137.04800415039062 + }, + { + "x": 166.1020050048828, + "y": 139.48399353027344 + }, + { + "x": 164.08099365234375, + "y": 141.88900756835938 + }, + { + "x": 162.02200317382812, + "y": 144.26199340820312 + }, + { + "x": 159.92599487304688, + "y": 146.6020050048828 + }, + { + "x": 157.79299926757812, + "y": 148.90899658203125 + }, + { + "x": 155.625, + "y": 151.1820068359375 + }, + { + "x": 153.42100524902344, + "y": 153.42100524902344 + }, + { + "x": 151.1820068359375, + "y": 155.625 + }, + { + "x": 148.90899658203125, + "y": 157.79299926757812 + }, + { + "x": 146.6020050048828, + "y": 159.92599487304688 + }, + { + "x": 144.26199340820312, + "y": 162.02200317382812 + }, + { + "x": 141.88900756835938, + "y": 164.08099365234375 + }, + { + "x": 139.48399353027344, + "y": 166.1020050048828 + }, + { + "x": 137.04800415039062, + "y": 168.08599853515625 + }, + { + "x": 134.58099365234375, + "y": 170.031005859375 + }, + { + "x": 132.08399963378906, + "y": 171.93600463867188 + }, + { + "x": 129.5570068359375, + "y": 173.80299377441406 + }, + { + "x": 127.0009994506836, + "y": 175.62899780273438 + }, + { + "x": 124.41600036621094, + "y": 177.41600036621094 + }, + { + "x": 121.80400085449219, + "y": 179.16099548339844 + }, + { + "x": 119.16500091552734, + "y": 180.86500549316406 + }, + { + "x": 116.4990005493164, + "y": 182.5279998779297 + }, + { + "x": 113.80799865722656, + "y": 184.1479949951172 + }, + { + "x": 111.09100341796875, + "y": 185.7259979248047 + }, + { + "x": 108.3499984741211, + "y": 187.26100158691406 + }, + { + "x": 105.58499908447266, + "y": 188.7530059814453 + }, + { + "x": 102.7979965209961, + "y": 190.2010040283203 + }, + { + "x": 99.98699951171875, + "y": 191.60499572753906 + }, + { + "x": 97.15499877929688, + "y": 192.96499633789062 + }, + { + "x": 94.302001953125, + "y": 194.27999877929688 + }, + { + "x": 91.42900085449219, + "y": 195.5500030517578 + }, + { + "x": 88.53600311279297, + "y": 196.77499389648438 + }, + { + "x": 85.6240005493164, + "y": 197.9550018310547 + }, + { + "x": 82.69400024414062, + "y": 199.08799743652344 + }, + { + "x": 79.74700164794922, + "y": 200.17599487304688 + }, + { + "x": 76.78299713134766, + "y": 201.2169952392578 + }, + { + "x": 73.8030014038086, + "y": 202.21099853515625 + }, + { + "x": 70.80799865722656, + "y": 203.1580047607422 + }, + { + "x": 67.7979965209961, + "y": 204.05799865722656 + }, + { + "x": 64.77400207519531, + "y": 204.91099548339844 + }, + { + "x": 61.73699951171875, + "y": 205.71600341796875 + }, + { + "x": 58.68899917602539, + "y": 206.47300720214844 + }, + { + "x": 55.62799835205078, + "y": 207.18299865722656 + }, + { + "x": 52.55699920654297, + "y": 207.843994140625 + }, + { + "x": 49.47600173950195, + "y": 208.45700073242188 + }, + { + "x": 46.3849983215332, + "y": 209.02099609375 + }, + { + "x": 43.2859992980957, + "y": 209.53700256347656 + }, + { + "x": 40.18000030517578, + "y": 210.00399780273438 + }, + { + "x": 38.5, + "y": 210.22999572753906 + } + ], + "isCurve": true, + "animated": false, + "tooltip": "", + "icon": null, + "zIndex": 0 + }, + { + "id": "1.(c -> d)[0]", + "src": "1.c", + "srcArrow": "none", + "dst": "1.d", + "dstArrow": "triangle", + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "stroke": "B1", + "borderRadius": 10, + "label": "", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N2", + "italic": true, + "bold": false, + "underline": false, + "labelWidth": 0, + "labelHeight": 0, + "labelPosition": "", + "labelPercentage": 0, + "link": "", + "route": [ + { + "x": -14.49899959564209, + "y": 210.22999572753906 + }, + { + "x": -16.18000030517578, + "y": 210.00399780273438 + }, + { + "x": -19.285999298095703, + "y": 209.53700256347656 + }, + { + "x": -22.385000228881836, + "y": 209.02099609375 + }, + { + "x": -25.47599983215332, + "y": 208.45700073242188 + }, + { + "x": -28.55699920654297, + "y": 207.843994140625 + }, + { + "x": -31.628000259399414, + "y": 207.18299865722656 + }, + { + "x": -34.68899917602539, + "y": 206.47300720214844 + }, + { + "x": -37.73699951171875, + "y": 205.71600341796875 + }, + { + "x": -40.77399826049805, + "y": 204.91099548339844 + }, + { + "x": -43.79800033569336, + "y": 204.05799865722656 + }, + { + "x": -46.80799865722656, + "y": 203.1580047607422 + }, + { + "x": -49.803001403808594, + "y": 202.21099853515625 + }, + { + "x": -52.78300094604492, + "y": 201.2169952392578 + }, + { + "x": -55.74700164794922, + "y": 200.17599487304688 + }, + { + "x": -58.694000244140625, + "y": 199.08799743652344 + }, + { + "x": -61.624000549316406, + "y": 197.9550018310547 + }, + { + "x": -64.53600311279297, + "y": 196.77499389648438 + }, + { + "x": -67.42900085449219, + "y": 195.5500030517578 + }, + { + "x": -70.302001953125, + "y": 194.27999877929688 + }, + { + "x": -73.15499877929688, + "y": 192.96499633789062 + }, + { + "x": -75.98699951171875, + "y": 191.60499572753906 + }, + { + "x": -78.7979965209961, + "y": 190.2010040283203 + }, + { + "x": -81.58499908447266, + "y": 188.7530059814453 + }, + { + "x": -84.3499984741211, + "y": 187.26100158691406 + }, + { + "x": -87.09100341796875, + "y": 185.7259979248047 + }, + { + "x": -89.80799865722656, + "y": 184.1479949951172 + }, + { + "x": -92.4990005493164, + "y": 182.5279998779297 + }, + { + "x": -95.16500091552734, + "y": 180.86500549316406 + }, + { + "x": -97.80400085449219, + "y": 179.16099548339844 + }, + { + "x": -100.41600036621094, + "y": 177.41600036621094 + }, + { + "x": -103.0009994506836, + "y": 175.62899780273438 + }, + { + "x": -105.55699920654297, + "y": 173.80299377441406 + }, + { + "x": -108.08399963378906, + "y": 171.93600463867188 + }, + { + "x": -110.58100128173828, + "y": 170.031005859375 + }, + { + "x": -113.0479965209961, + "y": 168.08599853515625 + }, + { + "x": -115.48400115966797, + "y": 166.1020050048828 + }, + { + "x": -117.88899993896484, + "y": 164.08099365234375 + }, + { + "x": -120.26200103759766, + "y": 162.02200317382812 + }, + { + "x": -122.60199737548828, + "y": 159.92599487304688 + }, + { + "x": -124.90899658203125, + "y": 157.79299926757812 + }, + { + "x": -127.18199920654297, + "y": 155.625 + }, + { + "x": -129.42100524902344, + "y": 153.42100524902344 + }, + { + "x": -131.625, + "y": 151.1820068359375 + }, + { + "x": -133.79299926757812, + "y": 148.90899658203125 + }, + { + "x": -135.92599487304688, + "y": 146.6020050048828 + }, + { + "x": -138.02200317382812, + "y": 144.26199340820312 + }, + { + "x": -140.08099365234375, + "y": 141.88900756835938 + }, + { + "x": -142.1020050048828, + "y": 139.48399353027344 + }, + { + "x": -144.08599853515625, + "y": 137.04800415039062 + }, + { + "x": -146.031005859375, + "y": 134.58099365234375 + }, + { + "x": -147.93600463867188, + "y": 132.08399963378906 + }, + { + "x": -149.80299377441406, + "y": 129.5570068359375 + }, + { + "x": -151.62899780273438, + "y": 127.0009994506836 + }, + { + "x": -153.41600036621094, + "y": 124.41600036621094 + }, + { + "x": -155.16099548339844, + "y": 121.80400085449219 + }, + { + "x": -156.86500549316406, + "y": 119.16500091552734 + }, + { + "x": -158.5279998779297, + "y": 116.4990005493164 + }, + { + "x": -160.1479949951172, + "y": 113.80799865722656 + }, + { + "x": -161.7259979248047, + "y": 111.09100341796875 + }, + { + "x": -163.26100158691406, + "y": 108.3499984741211 + }, + { + "x": -164.7530059814453, + "y": 105.58499908447266 + }, + { + "x": -166.2010040283203, + "y": 102.7979965209961 + }, + { + "x": -167.60499572753906, + "y": 99.98699951171875 + }, + { + "x": -168.96499633789062, + "y": 97.15499877929688 + }, + { + "x": -170.27999877929688, + "y": 94.302001953125 + }, + { + "x": -171.5500030517578, + "y": 91.42900085449219 + }, + { + "x": -172.77499389648438, + "y": 88.53600311279297 + }, + { + "x": -173.9550018310547, + "y": 85.6240005493164 + }, + { + "x": -175.08799743652344, + "y": 82.69400024414062 + }, + { + "x": -176.17599487304688, + "y": 79.74700164794922 + }, + { + "x": -177.2169952392578, + "y": 76.78299713134766 + }, + { + "x": -178.21099853515625, + "y": 73.8030014038086 + }, + { + "x": -179.1580047607422, + "y": 70.80799865722656 + }, + { + "x": -180.05799865722656, + "y": 67.7979965209961 + }, + { + "x": -180.91099548339844, + "y": 64.77400207519531 + }, + { + "x": -181.71600341796875, + "y": 61.73699951171875 + }, + { + "x": -182.47300720214844, + "y": 58.68899917602539 + }, + { + "x": -183.18299865722656, + "y": 55.62799835205078 + }, + { + "x": -183.843994140625, + "y": 52.55699920654297 + }, + { + "x": -184.45700073242188, + "y": 49.47600173950195 + }, + { + "x": -185.02099609375, + "y": 46.3849983215332 + }, + { + "x": -185.2519989013672, + "y": 45 + } + ], + "isCurve": true, + "animated": false, + "tooltip": "", + "icon": null, + "zIndex": 0 + }, + { + "id": "2.(a -> b)[0]", + "src": "2.a", + "srcArrow": "none", + "dst": "2.b", + "dstArrow": "triangle", + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "stroke": "B1", + "borderRadius": 10, + "label": "", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N2", + "italic": true, + "bold": false, + "underline": false, + "labelWidth": 0, + "labelHeight": 0, + "labelPosition": "", + "labelPercentage": 0, + "link": "", + "route": [ + { + "x": 512, + "y": -136.2259979248047 + }, + { + "x": 514.7160034179688, + "y": -135.85400390625 + }, + { + "x": 518.85302734375, + "y": -135.19900512695312 + }, + { + "x": 522.9760131835938, + "y": -134.45700073242188 + }, + { + "x": 527.0819702148438, + "y": -133.62899780273438 + }, + { + "x": 531.1699829101562, + "y": -132.71499633789062 + }, + { + "x": 535.2369995117188, + "y": -131.71600341796875 + }, + { + "x": 539.2830200195312, + "y": -130.6320037841797 + }, + { + "x": 543.3060302734375, + "y": -129.46299743652344 + }, + { + "x": 547.302978515625, + "y": -128.21099853515625 + }, + { + "x": 551.2730102539062, + "y": -126.875 + }, + { + "x": 555.2139892578125, + "y": -125.45600128173828 + }, + { + "x": 559.1240234375, + "y": -123.95500183105469 + }, + { + "x": 563.0029907226562, + "y": -122.37200164794922 + }, + { + "x": 566.8469848632812, + "y": -120.70899963378906 + }, + { + "x": 570.655029296875, + "y": -118.96499633789062 + }, + { + "x": 574.427001953125, + "y": -117.14199829101562 + }, + { + "x": 578.1589965820312, + "y": -115.23999786376953 + }, + { + "x": 581.8499755859375, + "y": -113.26100158691406 + }, + { + "x": 585.5, + "y": -111.20500183105469 + }, + { + "x": 589.10498046875, + "y": -109.0719985961914 + }, + { + "x": 592.6649780273438, + "y": -106.86499786376953 + }, + { + "x": 596.177978515625, + "y": -104.58399963378906 + }, + { + "x": 599.6420288085938, + "y": -102.22899627685547 + }, + { + "x": 603.0570068359375, + "y": -99.8030014038086 + }, + { + "x": 606.4190063476562, + "y": -97.30500030517578 + }, + { + "x": 609.72900390625, + "y": -94.73799896240234 + }, + { + "x": 612.9840087890625, + "y": -92.10199737548828 + }, + { + "x": 616.1840209960938, + "y": -89.39900207519531 + }, + { + "x": 619.3259887695312, + "y": -86.62799835205078 + }, + { + "x": 622.4089965820312, + "y": -83.79299926757812 + }, + { + "x": 625.4320068359375, + "y": -80.89399719238281 + }, + { + "x": 628.3939819335938, + "y": -77.93199920654297 + }, + { + "x": 631.2930297851562, + "y": -74.90899658203125 + }, + { + "x": 634.1279907226562, + "y": -71.82599639892578 + }, + { + "x": 636.8989868164062, + "y": -68.68399810791016 + }, + { + "x": 639.6019897460938, + "y": -65.48400115966797 + }, + { + "x": 642.2379760742188, + "y": -62.229000091552734 + }, + { + "x": 644.8049926757812, + "y": -58.91899871826172 + }, + { + "x": 647.302978515625, + "y": -55.55699920654297 + }, + { + "x": 649.72900390625, + "y": -52.141998291015625 + }, + { + "x": 652.083984375, + "y": -48.678001403808594 + }, + { + "x": 654.364990234375, + "y": -45.165000915527344 + }, + { + "x": 656.572021484375, + "y": -41.60499954223633 + }, + { + "x": 658.7050170898438, + "y": -38 + }, + { + "x": 660.760986328125, + "y": -34.349998474121094 + }, + { + "x": 662.739990234375, + "y": -30.659000396728516 + }, + { + "x": 664.6420288085938, + "y": -26.927000045776367 + }, + { + "x": 666.4650268554688, + "y": -23.155000686645508 + }, + { + "x": 668.208984375, + "y": -19.347000122070312 + }, + { + "x": 669.8720092773438, + "y": -15.503000259399414 + }, + { + "x": 671.4550170898438, + "y": -11.62399959564209 + }, + { + "x": 672.9559936523438, + "y": -7.714000225067139 + }, + { + "x": 674.375, + "y": -3.7730000019073486 + }, + { + "x": 675.7109985351562, + "y": 0.19599999487400055 + }, + { + "x": 676.9630126953125, + "y": 4.192999839782715 + }, + { + "x": 678.1320190429688, + "y": 8.215999603271484 + }, + { + "x": 679.2160034179688, + "y": 12.26200008392334 + }, + { + "x": 680.2150268554688, + "y": 16.32900047302246 + }, + { + "x": 681.1290283203125, + "y": 20.41699981689453 + }, + { + "x": 681.9569702148438, + "y": 24.523000717163086 + }, + { + "x": 682.698974609375, + "y": 28.645999908447266 + }, + { + "x": 683.35400390625, + "y": 32.78300094604492 + }, + { + "x": 683.9219970703125, + "y": 36.93299865722656 + }, + { + "x": 684.4039916992188, + "y": 41.09400177001953 + }, + { + "x": 684.7979736328125, + "y": 45.263999938964844 + }, + { + "x": 685.10498046875, + "y": 49.441001892089844 + }, + { + "x": 685.323974609375, + "y": 53.624000549316406 + }, + { + "x": 685.4559936523438, + "y": 57.81100082397461 + }, + { + "x": 685.5, + "y": 61.999000549316406 + }, + { + "x": 685.4559936523438, + "y": 66.18800354003906 + }, + { + "x": 685.323974609375, + "y": 70.375 + }, + { + "x": 685.10498046875, + "y": 74.55799865722656 + }, + { + "x": 684.7979736328125, + "y": 78.73500061035156 + }, + { + "x": 684.4039916992188, + "y": 82.90499877929688 + }, + { + "x": 683.9219970703125, + "y": 87.06600189208984 + }, + { + "x": 683.35400390625, + "y": 91.21600341796875 + }, + { + "x": 682.698974609375, + "y": 95.35299682617188 + }, + { + "x": 681.9569702148438, + "y": 99.47599792480469 + }, + { + "x": 681.1290283203125, + "y": 103.58200073242188 + }, + { + "x": 680.2150268554688, + "y": 107.66999816894531 + }, + { + "x": 679.2160034179688, + "y": 111.73699951171875 + }, + { + "x": 678.1320190429688, + "y": 115.78299713134766 + }, + { + "x": 676.9630126953125, + "y": 119.80599975585938 + }, + { + "x": 675.7109985351562, + "y": 123.8030014038086 + }, + { + "x": 674.375, + "y": 127.77300262451172 + }, + { + "x": 673.9329833984375, + "y": 128.99899291992188 + } + ], + "isCurve": true, + "animated": false, + "tooltip": "", + "icon": null, + "zIndex": 0 + }, + { + "id": "2.(b -> c)[0]", + "src": "2.b", + "srcArrow": "none", + "dst": "2.c", + "dstArrow": "triangle", + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "stroke": "B1", + "borderRadius": 10, + "label": "", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N2", + "italic": true, + "bold": false, + "underline": false, + "labelWidth": 0, + "labelHeight": 0, + "labelPosition": "", + "labelPercentage": 0, + "link": "", + "route": [ + { + "x": 634.8569946289062, + "y": 194.99899291992188 + }, + { + "x": 634.1279907226562, + "y": 195.8260040283203 + }, + { + "x": 631.2930297851562, + "y": 198.90899658203125 + }, + { + "x": 628.3939819335938, + "y": 201.9320068359375 + }, + { + "x": 625.4320068359375, + "y": 204.8939971923828 + }, + { + "x": 622.4089965820312, + "y": 207.79299926757812 + }, + { + "x": 619.3259887695312, + "y": 210.6280059814453 + }, + { + "x": 616.1840209960938, + "y": 213.3990020751953 + }, + { + "x": 612.9840087890625, + "y": 216.1020050048828 + }, + { + "x": 609.72900390625, + "y": 218.73800659179688 + }, + { + "x": 606.4190063476562, + "y": 221.30499267578125 + }, + { + "x": 603.0570068359375, + "y": 223.80299377441406 + }, + { + "x": 599.6420288085938, + "y": 226.22900390625 + }, + { + "x": 596.177978515625, + "y": 228.58399963378906 + }, + { + "x": 592.6649780273438, + "y": 230.86500549316406 + }, + { + "x": 589.10498046875, + "y": 233.07200622558594 + }, + { + "x": 585.5, + "y": 235.2050018310547 + }, + { + "x": 581.8499755859375, + "y": 237.26100158691406 + }, + { + "x": 578.1589965820312, + "y": 239.24000549316406 + }, + { + "x": 574.427001953125, + "y": 241.14199829101562 + }, + { + "x": 570.655029296875, + "y": 242.96499633789062 + }, + { + "x": 566.8469848632812, + "y": 244.70899963378906 + }, + { + "x": 563.0029907226562, + "y": 246.3719940185547 + }, + { + "x": 559.1240234375, + "y": 247.9550018310547 + }, + { + "x": 555.2139892578125, + "y": 249.45599365234375 + }, + { + "x": 551.2730102539062, + "y": 250.875 + }, + { + "x": 547.302978515625, + "y": 252.21099853515625 + }, + { + "x": 543.3060302734375, + "y": 253.46299743652344 }, { - "x": 207.62899780273438, - "y": 53.582000732421875 + "x": 539.2830200195312, + "y": 254.6320037841797 }, { - "x": 205.18499755859375, - "y": 63.76300048828125 + "x": 535.2369995117188, + "y": 255.71600341796875 }, { - "x": 202.21099853515625, - "y": 73.8030014038086 + "x": 531.1699829101562, + "y": 256.7149963378906 }, { - "x": 198.71600341796875, - "y": 83.6729965209961 + "x": 527.0819702148438, + "y": 257.6289978027344 }, { - "x": 194.70899963378906, - "y": 93.34700012207031 + "x": 522.9760131835938, + "y": 258.4570007324219 }, { - "x": 190.2010040283203, - "y": 102.7979965209961 + "x": 518.85302734375, + "y": 259.1990051269531 }, { - "x": 185.2050018310547, - "y": 111.9990005493164 + "x": 514.7160034179688, + "y": 259.85400390625 }, { - "x": 179.73399353027344, - "y": 120.927001953125 + "x": 510.5660095214844, + "y": 260.4219970703125 }, { - "x": 173.80299377441406, - "y": 129.5570068359375 + "x": 506.4049987792969, + "y": 260.90399169921875 }, { - "x": 167.4290008544922, - "y": 137.86399841308594 + "x": 502.2349853515625, + "y": 261.2980041503906 }, { - "x": 160.6280059814453, - "y": 145.8260040283203 + "x": 498.0580139160156, + "y": 261.6050109863281 }, { - "x": 153.42100524902344, - "y": 153.42100524902344 + "x": 493.875, + "y": 261.8240051269531 }, { - "x": 145.8260040283203, - "y": 160.6280059814453 + "x": 489.68798828125, + "y": 261.95599365234375 }, { - "x": 137.86399841308594, - "y": 167.4290008544922 + "x": 485.5, + "y": 262 }, { - "x": 129.5570068359375, - "y": 173.80299377441406 + "x": 481.3110046386719, + "y": 261.95599365234375 }, { - "x": 120.927001953125, - "y": 179.73399353027344 + "x": 477.1239929199219, + "y": 261.8240051269531 }, { - "x": 112, - "y": 185.2050018310547 + "x": 472.9410095214844, + "y": 261.6050109863281 }, { - "x": 102.7979965209961, - "y": 190.2010040283203 + "x": 468.7640075683594, + "y": 261.2980041503906 }, { - "x": 93.34700012207031, - "y": 194.70899963378906 + "x": 464.593994140625, + "y": 260.90399169921875 }, { - "x": 83.6729965209961, - "y": 198.71600341796875 + "x": 460.4330139160156, + "y": 260.4219970703125 }, { - "x": 73.8030014038086, - "y": 202.21099853515625 + "x": 456.2829895019531, + "y": 259.85400390625 }, { - "x": 63.76300048828125, - "y": 205.18499755859375 + "x": 452.14599609375, + "y": 259.1990051269531 }, { - "x": 53.582000732421875, - "y": 207.62899780273438 + "x": 448.02301025390625, + "y": 258.4570007324219 }, { - "x": 43.2859992980957, - "y": 209.53700256347656 + "x": 443.9169921875, + "y": 257.6289978027344 }, { - "x": 32.904998779296875, - "y": 210.9040069580078 - } - ], - "isCurve": true, - "animated": false, - "tooltip": "", - "icon": null, - "zIndex": 0 - }, - { - "id": "1.(c -> d)[0]", - "src": "1.c", - "srcArrow": "none", - "dst": "1.d", - "dstArrow": "triangle", - "opacity": 1, - "strokeDash": 0, - "strokeWidth": 2, - "stroke": "B1", - "borderRadius": 10, - "label": "", - "fontSize": 16, - "fontFamily": "DEFAULT", - "language": "", - "color": "N2", - "italic": true, - "bold": false, - "underline": false, - "labelWidth": 0, - "labelHeight": 0, - "labelPosition": "", - "labelPercentage": 0, - "link": "", - "route": [ + "x": 439.8290100097656, + "y": 256.7149963378906 + }, { - "x": -8.904999732971191, - "y": 210.9040069580078 + "x": 435.7619934082031, + "y": 255.71600341796875 }, { - "x": -19.285999298095703, - "y": 209.53700256347656 + "x": 431.71600341796875, + "y": 254.6320037841797 }, { - "x": -29.582000732421875, - "y": 207.62899780273438 + "x": 427.6929931640625, + "y": 253.46299743652344 }, { - "x": -39.76300048828125, - "y": 205.18499755859375 + "x": 423.6960144042969, + "y": 252.21099853515625 }, { - "x": -49.803001403808594, - "y": 202.21099853515625 + "x": 419.72601318359375, + "y": 250.875 }, { - "x": -59.67300033569336, - "y": 198.71600341796875 + "x": 415.7850036621094, + "y": 249.45599365234375 }, { - "x": -69.34700012207031, - "y": 194.70899963378906 + "x": 411.875, + "y": 247.9550018310547 }, { - "x": -78.7979965209961, - "y": 190.2010040283203 + "x": 407.9960021972656, + "y": 246.3719940185547 + }, + { + "x": 404.1520080566406, + "y": 244.70899963378906 }, { - "x": -87.9990005493164, - "y": 185.2050018310547 + "x": 400.343994140625, + "y": 242.96499633789062 }, { - "x": -96.927001953125, - "y": 179.73399353027344 + "x": 396.5719909667969, + "y": 241.14199829101562 }, { - "x": -105.55699920654297, - "y": 173.80299377441406 + "x": 392.8399963378906, + "y": 239.24000549316406 }, { - "x": -113.86399841308594, - "y": 167.4290008544922 + "x": 389.14898681640625, + "y": 237.26100158691406 }, { - "x": -121.82599639892578, - "y": 160.6280059814453 + "x": 385.5, + "y": 235.2050018310547 }, { - "x": -129.42100524902344, - "y": 153.42100524902344 + "x": 381.8940124511719, + "y": 233.07200622558594 }, { - "x": -136.6280059814453, - "y": 145.8260040283203 + "x": 378.3340148925781, + "y": 230.86500549316406 }, { - "x": -143.4290008544922, - "y": 137.86399841308594 + "x": 374.8210144042969, + "y": 228.58399963378906 }, { - "x": -149.80299377441406, - "y": 129.5570068359375 + "x": 371.35699462890625, + "y": 226.22900390625 }, { - "x": -155.73399353027344, - "y": 120.927001953125 + "x": 367.9419860839844, + "y": 223.80299377441406 }, { - "x": -161.2050018310547, - "y": 112 + "x": 364.5799865722656, + "y": 221.30499267578125 }, { - "x": -166.2010040283203, - "y": 102.7979965209961 + "x": 361.2699890136719, + "y": 218.73800659179688 }, { - "x": -170.70899963378906, - "y": 93.34700012207031 + "x": 358.0150146484375, + "y": 216.1020050048828 }, { - "x": -174.71600341796875, - "y": 83.6729965209961 + "x": 354.81500244140625, + "y": 213.3990020751953 }, { - "x": -178.21099853515625, - "y": 73.8030014038086 + "x": 351.6730041503906, + "y": 210.6280059814453 }, { - "x": -181.18499755859375, - "y": 63.76300048828125 + "x": 348.5899963378906, + "y": 207.79299926757812 }, { - "x": -183.62899780273438, - "y": 53.582000732421875 + "x": 345.5669860839844, + "y": 204.8939971923828 }, { - "x": -185.53700256347656, - "y": 43.2859992980957 + "x": 342.6050109863281, + "y": 201.9320068359375 + }, + { + "x": 339.70599365234375, + "y": 198.90899658203125 + }, + { + "x": 336.8710021972656, + "y": 195.8260040283203 + }, + { + "x": 336.1419982910156, + "y": 195 } ], "isCurve": true, @@ -923,10 +2351,10 @@ "zIndex": 0 }, { - "id": "2.(a -> b)[0]", - "src": "2.a", + "id": "3.(a -> b)[0]", + "src": "3.a", "srcArrow": "none", - "dst": "2.b", + "dst": "3.b", "dstArrow": "triangle", "opacity": 1, "strokeDash": 0, @@ -948,404 +2376,376 @@ "link": "", "route": [ { - "x": 499.45098876953125, - "y": -137.51199340820312 + "x": 931.4099731445312, + "y": -186.21800231933594 }, { - "x": 513.333984375, - "y": -136.05299377441406 + "x": 936.197021484375, + "y": -185.53700256347656 }, { - "x": 527.0819702148438, - "y": -133.62899780273438 + "x": 942.385986328125, + "y": -184.45700073242188 }, { - "x": 540.6270141601562, - "y": -130.2519989013672 + "x": 948.5380249023438, + "y": -183.18299865722656 }, { - "x": 553.9039916992188, - "y": -125.93800354003906 + "x": 954.6480102539062, + "y": -181.71600341796875 }, { - "x": 566.8469848632812, - "y": -120.70899963378906 + "x": 960.7080078125, + "y": -180.05799865722656 }, { - "x": 579.3939819335938, - "y": -114.58899688720703 + "x": 966.7130126953125, + "y": -178.21099853515625 }, { - "x": 591.4829711914062, - "y": -107.60900115966797 + "x": 972.656982421875, + "y": -176.17599487304688 }, { - "x": 603.0570068359375, - "y": -99.8030014038086 + "x": 978.5349731445312, + "y": -173.9550018310547 }, { - "x": 614.0570068359375, - "y": -91.20800018310547 + "x": 984.3389892578125, + "y": -171.5500030517578 }, { - "x": 624.4310302734375, - "y": -81.86699676513672 + "x": 990.0659790039062, + "y": -168.96499633789062 }, { - "x": 634.1279907226562, - "y": -71.82599639892578 + "x": 995.7080078125, + "y": -166.2010040283203 }, { - "x": 643.1019897460938, - "y": -61.13199996948242 + "x": 1001.260009765625, + "y": -163.26100158691406 }, { - "x": 651.3070068359375, - "y": -49.8380012512207 + "x": 1006.718017578125, + "y": -160.1479949951172 }, { - "x": 658.7050170898438, - "y": -38 + "x": 1012.0750122070312, + "y": -156.86500549316406 }, { - "x": 665.2579956054688, - "y": -25.673999786376953 + "x": 1017.3259887695312, + "y": -153.41600036621094 }, { - "x": 670.9359741210938, - "y": -12.920999526977539 + "x": 1022.4669799804688, + "y": -149.80299377441406 }, { - "x": 675.7109985351562, - "y": 0.19599999487400055 + "x": 1027.490966796875, + "y": -146.031005859375 }, { - "x": 679.5590209960938, - "y": 13.614999771118164 + "x": 1032.39404296875, + "y": -142.1020050048828 }, { - "x": 682.4609985351562, - "y": 27.270000457763672 + "x": 1037.1719970703125, + "y": -138.02200317382812 }, { - "x": 684.4039916992188, - "y": 41.09400177001953 + "x": 1041.8189697265625, + "y": -133.79299926757812 }, { - "x": 685.3779907226562, - "y": 55.02000045776367 + "x": 1046.3310546875, + "y": -129.42100524902344 }, { - "x": 685.3779907226562, - "y": 68.97899627685547 + "x": 1050.7030029296875, + "y": -124.90899658203125 }, { - "x": 684.4039916992188, - "y": 82.90499877929688 + "x": 1054.9320068359375, + "y": -120.26200103759766 }, { - "x": 682.4609985351562, - "y": 96.72899627685547 + "x": 1059.011962890625, + "y": -115.48400115966797 }, { - "x": 679.5590209960938, - "y": 110.38400268554688 + "x": 1062.9410400390625, + "y": -110.58100128173828 }, { - "x": 675.7109985351562, - "y": 123.8030014038086 + "x": 1066.7130126953125, + "y": -105.55699920654297 }, { - "x": 670.9359741210938, - "y": 136.92100524902344 - } - ], - "isCurve": true, - "animated": false, - "tooltip": "", - "icon": null, - "zIndex": 0 - }, - { - "id": "2.(b -> c)[0]", - "src": "2.b", - "srcArrow": "none", - "dst": "2.c", - "dstArrow": "triangle", - "opacity": 1, - "strokeDash": 0, - "strokeWidth": 2, - "stroke": "B1", - "borderRadius": 10, - "label": "", - "fontSize": 16, - "fontFamily": "DEFAULT", - "language": "", - "color": "N2", - "italic": true, - "bold": false, - "underline": false, - "labelWidth": 0, - "labelHeight": 0, - "labelPosition": "", - "labelPercentage": 0, - "link": "", - "route": [ + "x": 1070.3260498046875, + "y": -100.41600036621094 + }, { - "x": 643.1019897460938, - "y": 185.1320037841797 + "x": 1073.7750244140625, + "y": -95.16500091552734 }, { - "x": 634.1279907226562, - "y": 195.8260040283203 + "x": 1077.0579833984375, + "y": -89.80799865722656 }, { - "x": 624.4310302734375, - "y": 205.86700439453125 + "x": 1080.1710205078125, + "y": -84.3499984741211 }, { - "x": 614.0570068359375, - "y": 215.20799255371094 + "x": 1083.1109619140625, + "y": -78.7979965209961 }, { - "x": 603.0570068359375, - "y": 223.80299377441406 + "x": 1085.875, + "y": -73.15499877929688 }, { - "x": 591.4829711914062, - "y": 231.60899353027344 + "x": 1088.4610595703125, + "y": -67.42900085449219 }, { - "x": 579.3939819335938, - "y": 238.58900451660156 + "x": 1090.864990234375, + "y": -61.624000549316406 }, { - "x": 566.8469848632812, - "y": 244.70899963378906 + "x": 1093.0860595703125, + "y": -55.74700164794922 }, { - "x": 553.9039916992188, - "y": 249.93800354003906 + "x": 1095.1209716796875, + "y": -49.803001403808594 }, { - "x": 540.6270141601562, - "y": 254.2519989013672 + "x": 1096.968017578125, + "y": -43.79800033569336 }, { - "x": 527.0819702148438, - "y": 257.6289978027344 + "x": 1098.6259765625, + "y": -37.73699951171875 }, { - "x": 513.333984375, - "y": 260.0530090332031 + "x": 1100.093017578125, + "y": -31.628000259399414 }, { - "x": 499.45098876953125, - "y": 261.5119934082031 + "x": 1101.366943359375, + "y": -25.47599983215332 }, { - "x": 485.5, - "y": 262 + "x": 1102.447021484375, + "y": -19.285999298095703 }, { - "x": 471.5480041503906, - "y": 261.5119934082031 + "x": 1103.3330078125, + "y": -13.065999984741211 }, { - "x": 457.6650085449219, - "y": 260.0530090332031 + "x": 1104.02197265625, + "y": -6.821000099182129 }, { - "x": 443.9169921875, - "y": 257.6289978027344 + "x": 1104.5150146484375, + "y": -0.5580000281333923 }, { - "x": 430.37200927734375, - "y": 254.2519989013672 + "x": 1104.81103515625, + "y": 5.7170000076293945 }, { - "x": 417.0950012207031, - "y": 249.93800354003906 + "x": 1104.9100341796875, + "y": 12 }, { - "x": 404.1520080566406, - "y": 244.70899963378906 + "x": 1104.81103515625, + "y": 18.281999588012695 }, { - "x": 391.6050109863281, - "y": 238.58900451660156 + "x": 1104.5150146484375, + "y": 24.558000564575195 }, { - "x": 379.5159912109375, - "y": 231.60899353027344 + "x": 1104.02197265625, + "y": 30.820999145507812 }, { - "x": 367.9419860839844, - "y": 223.80299377441406 + "x": 1103.3330078125, + "y": 37.066001892089844 }, { - "x": 356.9419860839844, - "y": 215.20799255371094 + "x": 1102.447021484375, + "y": 43.2859992980957 }, { - "x": 346.5679931640625, - "y": 205.86700439453125 + "x": 1101.366943359375, + "y": 49.47600173950195 }, { - "x": 336.8710021972656, - "y": 195.8260040283203 + "x": 1100.093017578125, + "y": 55.62799835205078 }, { - "x": 327.8970031738281, - "y": 185.1320037841797 - } - ], - "isCurve": true, - "animated": false, - "tooltip": "", - "icon": null, - "zIndex": 0 - }, - { - "id": "3.(a -> b)[0]", - "src": "3.a", - "srcArrow": "none", - "dst": "3.b", - "dstArrow": "triangle", - "opacity": 1, - "strokeDash": 0, - "strokeWidth": 2, - "stroke": "B1", - "borderRadius": 10, - "label": "", - "fontSize": 16, - "fontFamily": "DEFAULT", - "language": "", - "color": "N2", - "italic": true, - "bold": false, - "underline": false, - "labelWidth": 0, - "labelHeight": 0, - "labelPosition": "", - "labelPercentage": 0, - "link": "", - "route": [ + "x": 1098.6259765625, + "y": 61.73699951171875 + }, + { + "x": 1096.968017578125, + "y": 67.7979965209961 + }, { - "x": 925.8150024414062, - "y": -186.9040069580078 + "x": 1095.1209716796875, + "y": 73.8030014038086 }, { - "x": 946.4920043945312, - "y": -183.62899780273438 + "x": 1093.0860595703125, + "y": 79.74700164794922 }, { - "x": 966.7130126953125, - "y": -178.21099853515625 + "x": 1090.864990234375, + "y": 85.6240005493164 }, { - "x": 986.2570190429688, - "y": -170.70899963378906 + "x": 1088.4610595703125, + "y": 91.42900085449219 }, { - "x": 1004.9099731445312, - "y": -161.2050018310547 + "x": 1085.875, + "y": 97.15499877929688 }, { - "x": 1022.4669799804688, - "y": -149.80299377441406 + "x": 1083.1109619140625, + "y": 102.7979965209961 + }, + { + "x": 1080.1710205078125, + "y": 108.3499984741211 + }, + { + "x": 1077.0579833984375, + "y": 113.80799865722656 }, { - "x": 1038.7359619140625, - "y": -136.6280059814453 + "x": 1073.7750244140625, + "y": 119.16500091552734 }, { - "x": 1053.5389404296875, - "y": -121.82599639892578 + "x": 1070.3260498046875, + "y": 124.41600036621094 }, { "x": 1066.7130126953125, - "y": -105.55699920654297 + "y": 129.5570068359375 }, { - "x": 1078.114990234375, - "y": -88 + "x": 1062.9410400390625, + "y": 134.58099365234375 }, { - "x": 1087.6190185546875, - "y": -69.34700012207031 + "x": 1059.011962890625, + "y": 139.48399353027344 }, { - "x": 1095.1209716796875, - "y": -49.803001403808594 + "x": 1054.9320068359375, + "y": 144.26199340820312 }, { - "x": 1100.5389404296875, - "y": -29.582000732421875 + "x": 1050.7030029296875, + "y": 148.90899658203125 }, { - "x": 1103.81396484375, - "y": -8.904999732971191 + "x": 1046.3310546875, + "y": 153.42100524902344 }, { - "x": 1104.9100341796875, - "y": 12 + "x": 1041.8189697265625, + "y": 157.79299926757812 }, { - "x": 1103.81396484375, - "y": 32.904998779296875 + "x": 1037.1719970703125, + "y": 162.02200317382812 }, { - "x": 1100.5389404296875, - "y": 53.582000732421875 + "x": 1032.39404296875, + "y": 166.1020050048828 }, { - "x": 1095.1209716796875, - "y": 73.8030014038086 + "x": 1027.490966796875, + "y": 170.031005859375 }, { - "x": 1087.6190185546875, - "y": 93.34700012207031 + "x": 1022.4669799804688, + "y": 173.80299377441406 }, { - "x": 1078.114990234375, - "y": 111.9990005493164 + "x": 1017.3259887695312, + "y": 177.41600036621094 }, { - "x": 1066.7130126953125, - "y": 129.5570068359375 + "x": 1012.0750122070312, + "y": 180.86500549316406 }, { - "x": 1053.5389404296875, - "y": 145.8260040283203 + "x": 1006.718017578125, + "y": 184.1479949951172 }, { - "x": 1038.7359619140625, - "y": 160.6280059814453 + "x": 1001.260009765625, + "y": 187.26100158691406 }, { - "x": 1022.4669799804688, - "y": 173.80299377441406 + "x": 995.7080078125, + "y": 190.2010040283203 + }, + { + "x": 990.0659790039062, + "y": 192.96499633789062 + }, + { + "x": 984.3389892578125, + "y": 195.5500030517578 }, { - "x": 1004.9099731445312, - "y": 185.2050018310547 + "x": 978.5349731445312, + "y": 197.9550018310547 }, { - "x": 986.2570190429688, - "y": 194.70899963378906 + "x": 972.656982421875, + "y": 200.17599487304688 }, { "x": 966.7130126953125, "y": 202.21099853515625 }, { - "x": 946.4920043945312, - "y": 207.62899780273438 + "x": 960.7080078125, + "y": 204.05799865722656 + }, + { + "x": 954.6480102539062, + "y": 205.71600341796875 + }, + { + "x": 948.5380249023438, + "y": 207.18299865722656 + }, + { + "x": 942.385986328125, + "y": 208.45700073242188 + }, + { + "x": 936.197021484375, + "y": 209.53700256347656 }, { - "x": 925.8150024414062, - "y": 210.9040069580078 + "x": 931.4099731445312, + "y": 210.21800231933594 } ], "isCurve": true, diff --git a/e2etests/testdata/txtar/cycle-diagram/elk/sketch.exp.svg b/e2etests/testdata/txtar/cycle-diagram/elk/sketch.exp.svg index bcdbbd69f0..21e65f752a 100644 --- a/e2etests/testdata/txtar/cycle-diagram/elk/sketch.exp.svg +++ b/e2etests/testdata/txtar/cycle-diagram/elk/sketch.exp.svg @@ -1,9 +1,9 @@ -abcdabcab + .d2-2891159010 .fill-N1{fill:#0A0F25;} + .d2-2891159010 .fill-N2{fill:#676C7E;} + .d2-2891159010 .fill-N3{fill:#9499AB;} + .d2-2891159010 .fill-N4{fill:#CFD2DD;} + .d2-2891159010 .fill-N5{fill:#DEE1EB;} + .d2-2891159010 .fill-N6{fill:#EEF1F8;} + .d2-2891159010 .fill-N7{fill:#FFFFFF;} + .d2-2891159010 .fill-B1{fill:#0D32B2;} + .d2-2891159010 .fill-B2{fill:#0D32B2;} + .d2-2891159010 .fill-B3{fill:#E3E9FD;} + .d2-2891159010 .fill-B4{fill:#E3E9FD;} + .d2-2891159010 .fill-B5{fill:#EDF0FD;} + .d2-2891159010 .fill-B6{fill:#F7F8FE;} + .d2-2891159010 .fill-AA2{fill:#4A6FF3;} + .d2-2891159010 .fill-AA4{fill:#EDF0FD;} + .d2-2891159010 .fill-AA5{fill:#F7F8FE;} + .d2-2891159010 .fill-AB4{fill:#EDF0FD;} + .d2-2891159010 .fill-AB5{fill:#F7F8FE;} + .d2-2891159010 .stroke-N1{stroke:#0A0F25;} + .d2-2891159010 .stroke-N2{stroke:#676C7E;} + .d2-2891159010 .stroke-N3{stroke:#9499AB;} + .d2-2891159010 .stroke-N4{stroke:#CFD2DD;} + .d2-2891159010 .stroke-N5{stroke:#DEE1EB;} + .d2-2891159010 .stroke-N6{stroke:#EEF1F8;} + .d2-2891159010 .stroke-N7{stroke:#FFFFFF;} + .d2-2891159010 .stroke-B1{stroke:#0D32B2;} + .d2-2891159010 .stroke-B2{stroke:#0D32B2;} + .d2-2891159010 .stroke-B3{stroke:#E3E9FD;} + .d2-2891159010 .stroke-B4{stroke:#E3E9FD;} + .d2-2891159010 .stroke-B5{stroke:#EDF0FD;} + .d2-2891159010 .stroke-B6{stroke:#F7F8FE;} + .d2-2891159010 .stroke-AA2{stroke:#4A6FF3;} + .d2-2891159010 .stroke-AA4{stroke:#EDF0FD;} + .d2-2891159010 .stroke-AA5{stroke:#F7F8FE;} + .d2-2891159010 .stroke-AB4{stroke:#EDF0FD;} + .d2-2891159010 .stroke-AB5{stroke:#F7F8FE;} + .d2-2891159010 .background-color-N1{background-color:#0A0F25;} + .d2-2891159010 .background-color-N2{background-color:#676C7E;} + .d2-2891159010 .background-color-N3{background-color:#9499AB;} + .d2-2891159010 .background-color-N4{background-color:#CFD2DD;} + .d2-2891159010 .background-color-N5{background-color:#DEE1EB;} + .d2-2891159010 .background-color-N6{background-color:#EEF1F8;} + .d2-2891159010 .background-color-N7{background-color:#FFFFFF;} + .d2-2891159010 .background-color-B1{background-color:#0D32B2;} + .d2-2891159010 .background-color-B2{background-color:#0D32B2;} + .d2-2891159010 .background-color-B3{background-color:#E3E9FD;} + .d2-2891159010 .background-color-B4{background-color:#E3E9FD;} + .d2-2891159010 .background-color-B5{background-color:#EDF0FD;} + .d2-2891159010 .background-color-B6{background-color:#F7F8FE;} + .d2-2891159010 .background-color-AA2{background-color:#4A6FF3;} + .d2-2891159010 .background-color-AA4{background-color:#EDF0FD;} + .d2-2891159010 .background-color-AA5{background-color:#F7F8FE;} + .d2-2891159010 .background-color-AB4{background-color:#EDF0FD;} + .d2-2891159010 .background-color-AB5{background-color:#F7F8FE;} + .d2-2891159010 .color-N1{color:#0A0F25;} + .d2-2891159010 .color-N2{color:#676C7E;} + .d2-2891159010 .color-N3{color:#9499AB;} + .d2-2891159010 .color-N4{color:#CFD2DD;} + .d2-2891159010 .color-N5{color:#DEE1EB;} + .d2-2891159010 .color-N6{color:#EEF1F8;} + .d2-2891159010 .color-N7{color:#FFFFFF;} + .d2-2891159010 .color-B1{color:#0D32B2;} + .d2-2891159010 .color-B2{color:#0D32B2;} + .d2-2891159010 .color-B3{color:#E3E9FD;} + .d2-2891159010 .color-B4{color:#E3E9FD;} + .d2-2891159010 .color-B5{color:#EDF0FD;} + .d2-2891159010 .color-B6{color:#F7F8FE;} + .d2-2891159010 .color-AA2{color:#4A6FF3;} + .d2-2891159010 .color-AA4{color:#EDF0FD;} + .d2-2891159010 .color-AA5{color:#F7F8FE;} + .d2-2891159010 .color-AB4{color:#EDF0FD;} + .d2-2891159010 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker-d2-2891159010);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker-d2-2891159010);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright-d2-2891159010);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright-d2-2891159010);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright-d2-2891159010);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright-d2-2891159010);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark-d2-2891159010);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright-d2-2891159010);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright-d2-2891159010);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright-d2-2891159010);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright-d2-2891159010);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker-d2-2891159010);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark-d2-2891159010);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal-d2-2891159010);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal-d2-2891159010);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright-d2-2891159010);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright-d2-2891159010);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright-d2-2891159010);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>abcdabcab From 65d558e0fb83e78affb5ccadfc3ece36857acc06 Mon Sep 17 00:00:00 2001 From: Mayank Mohapatra <125661248+Mayank77maruti@users.noreply.github.com> Date: Sat, 22 Feb 2025 10:41:21 +0000 Subject: [PATCH 21/73] try --- d2layouts/d2cycle/layout.go | 45 ++- .../txtar/cycle-diagram/dagre/board.exp.json | 376 ++++++++++++++++++ .../txtar/cycle-diagram/dagre/sketch.exp.svg | 152 +++---- .../txtar/cycle-diagram/elk/board.exp.json | 376 ++++++++++++++++++ .../txtar/cycle-diagram/elk/sketch.exp.svg | 152 +++---- 5 files changed, 934 insertions(+), 167 deletions(-) diff --git a/d2layouts/d2cycle/layout.go b/d2layouts/d2cycle/layout.go index 0e9036f748..53d62b45c8 100644 --- a/d2layouts/d2cycle/layout.go +++ b/d2layouts/d2cycle/layout.go @@ -89,6 +89,7 @@ func createCircularArc(edge *d2graph.Edge) { y := arcRadius * math.Sin(angle) path = append(path, geo.NewPoint(x, y)) } + // Ensure endpoints are the node centers path[0] = srcCenter path[len(path)-1] = dstCenter @@ -98,9 +99,10 @@ func createCircularArc(edge *d2graph.Edge) { path[0] = newSrc path[len(path)-1] = newDst - // Trim redundant path points that fall inside node boundaries. - path = trimPathPoints(path, edge.Src.Box) - path = trimPathPoints(path, edge.Dst.Box) + // Instead of trimming all intermediate points that fall inside a node, + // only trim contiguous points from the start and end. + path = trimStartPoints(path, edge.Src.Box) + path = trimEndPoints(path, edge.Dst.Box) edge.Route = path edge.IsCurve = true @@ -232,19 +234,32 @@ func findPreciseIntersection(box *geo.Box, seg geo.Segment) *geo.Point { return intersections[0].point } -// trimPathPoints removes intermediate points that fall inside the given box while preserving endpoints. -func trimPathPoints(path []*geo.Point, box *geo.Box) []*geo.Point { - if len(path) <= 2 { - return path +// trimStartPoints removes contiguous starting points that fall inside the box, +// but preserves one point before the first point outside to maintain smoothness. +func trimStartPoints(path []*geo.Point, box *geo.Box) []*geo.Point { + i := 0 + for i < len(path) && boxContains(box, path[i]) { + i++ } - trimmed := []*geo.Point{path[0]} - for i := 1; i < len(path)-1; i++ { - if !boxContains(box, path[i]) { - trimmed = append(trimmed, path[i]) - } + // If we've trimmed some points and there's at least one point before, + // include the last inside point to keep the curve smooth. + if i > 0 && i < len(path) { + return path[i-1:] + } + return path +} + +// trimEndPoints removes contiguous ending points that fall inside the box, +// but preserves one point after the last point outside to maintain smoothness. +func trimEndPoints(path []*geo.Point, box *geo.Box) []*geo.Point { + i := len(path) - 1 + for i >= 0 && boxContains(box, path[i]) { + i-- + } + if i < len(path)-1 && i >= 0 { + return path[:i+2] } - trimmed = append(trimmed, path[len(path)-1]) - return trimmed + return path } // boxContains uses strict inequalities so that points exactly on the boundary are considered outside. @@ -290,4 +305,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 78ed2dffeb..3f9a491438 100644 --- a/e2etests/testdata/txtar/cycle-diagram/dagre/board.exp.json +++ b/e2etests/testdata/txtar/cycle-diagram/dagre/board.exp.json @@ -543,6 +543,38 @@ "x": 26.5, "y": -198.22999572753906 }, + { + "x": 3.1410000324249268, + "y": -199.97500610351562 + }, + { + "x": 6.2820000648498535, + "y": -199.9010009765625 + }, + { + "x": 9.420999526977539, + "y": -199.77699279785156 + }, + { + "x": 12.557999610900879, + "y": -199.60499572753906 + }, + { + "x": 15.690999984741211, + "y": -199.38299560546875 + }, + { + "x": 18.820999145507812, + "y": -199.11199951171875 + }, + { + "x": 21.945999145507812, + "y": -198.79200744628906 + }, + { + "x": 25.06599998474121, + "y": -198.4219970703125 + }, { "x": 28.18000030517578, "y": -198.00399780273438 @@ -867,6 +899,46 @@ "x": 197.02099609375, "y": -34.3849983215332 }, + { + "x": 197.53700256347656, + "y": -31.285999298095703 + }, + { + "x": 198.00399780273438, + "y": -28.18000030517578 + }, + { + "x": 198.4219970703125, + "y": -25.06599998474121 + }, + { + "x": 198.79200744628906, + "y": -21.945999145507812 + }, + { + "x": 199.11199951171875, + "y": -18.820999145507812 + }, + { + "x": 199.38299560546875, + "y": -15.690999984741211 + }, + { + "x": 199.60499572753906, + "y": -12.557999610900879 + }, + { + "x": 199.77699279785156, + "y": -9.420999526977539 + }, + { + "x": 199.9010009765625, + "y": -6.2820000648498535 + }, + { + "x": 199.97500610351562, + "y": -3.1410000324249268 + }, { "x": 197.2519989013672, "y": -33 @@ -907,6 +979,46 @@ "x": 197.2519989013672, "y": 33 }, + { + "x": 199.97500610351562, + "y": 3.1410000324249268 + }, + { + "x": 199.9010009765625, + "y": 6.2820000648498535 + }, + { + "x": 199.77699279785156, + "y": 9.420999526977539 + }, + { + "x": 199.60499572753906, + "y": 12.557999610900879 + }, + { + "x": 199.38299560546875, + "y": 15.690999984741211 + }, + { + "x": 199.11199951171875, + "y": 18.820999145507812 + }, + { + "x": 198.79200744628906, + "y": 21.945999145507812 + }, + { + "x": 198.4219970703125, + "y": 25.06599998474121 + }, + { + "x": 198.00399780273438, + "y": 28.18000030517578 + }, + { + "x": 197.53700256347656, + "y": 31.285999298095703 + }, { "x": 197.02099609375, "y": 34.3849983215332 @@ -1231,6 +1343,38 @@ "x": 28.18000030517578, "y": 198.00399780273438 }, + { + "x": 25.06599998474121, + "y": 198.4219970703125 + }, + { + "x": 21.945999145507812, + "y": 198.79200744628906 + }, + { + "x": 18.820999145507812, + "y": 199.11199951171875 + }, + { + "x": 15.690999984741211, + "y": 199.38299560546875 + }, + { + "x": 12.557999610900879, + "y": 199.60499572753906 + }, + { + "x": 9.420999526977539, + "y": 199.77699279785156 + }, + { + "x": 6.2820000648498535, + "y": 199.9010009765625 + }, + { + "x": 3.1410000324249268, + "y": 199.97500610351562 + }, { "x": 26.5, "y": 198.22999572753906 @@ -1271,6 +1415,38 @@ "x": -26.499000549316406, "y": 198.22999572753906 }, + { + "x": -3.1410000324249268, + "y": 199.97500610351562 + }, + { + "x": -6.2820000648498535, + "y": 199.9010009765625 + }, + { + "x": -9.420999526977539, + "y": 199.77699279785156 + }, + { + "x": -12.557999610900879, + "y": 199.60499572753906 + }, + { + "x": -15.690999984741211, + "y": 199.38299560546875 + }, + { + "x": -18.820999145507812, + "y": 199.11199951171875 + }, + { + "x": -21.945999145507812, + "y": 198.79200744628906 + }, + { + "x": -25.06599998474121, + "y": 198.4219970703125 + }, { "x": -28.18000030517578, "y": 198.00399780273438 @@ -1595,6 +1771,46 @@ "x": -197.02099609375, "y": 34.3849983215332 }, + { + "x": -197.53700256347656, + "y": 31.285999298095703 + }, + { + "x": -198.00399780273438, + "y": 28.18000030517578 + }, + { + "x": -198.4219970703125, + "y": 25.06599998474121 + }, + { + "x": -198.79200744628906, + "y": 21.945999145507812 + }, + { + "x": -199.11199951171875, + "y": 18.820999145507812 + }, + { + "x": -199.38299560546875, + "y": 15.690999984741211 + }, + { + "x": -199.60499572753906, + "y": 12.557999610900879 + }, + { + "x": -199.77699279785156, + "y": 9.420999526977539 + }, + { + "x": -199.9010009765625, + "y": 6.2820000648498535 + }, + { + "x": -199.97500610351562, + "y": 3.1410000324249268 + }, { "x": -197.2519989013672, "y": 33 @@ -1635,6 +1851,30 @@ "x": 539.5, "y": -148.2259979248047 }, + { + "x": 517.18798828125, + "y": -149.95599365234375 + }, + { + "x": 521.375, + "y": -149.82400512695312 + }, + { + "x": 525.5579833984375, + "y": -149.60499572753906 + }, + { + "x": 529.7349853515625, + "y": -149.29800415039062 + }, + { + "x": 533.905029296875, + "y": -148.9040069580078 + }, + { + "x": 538.0659790039062, + "y": -148.4219970703125 + }, { "x": 542.2160034179688, "y": -147.85400390625 @@ -1975,6 +2215,38 @@ "x": 701.875, "y": 115.77300262451172 }, + { + "x": 700.4559936523438, + "y": 119.71399688720703 + }, + { + "x": 698.9550170898438, + "y": 123.6240005493164 + }, + { + "x": 697.3720092773438, + "y": 127.50299835205078 + }, + { + "x": 695.708984375, + "y": 131.3470001220703 + }, + { + "x": 693.9650268554688, + "y": 135.15499877929688 + }, + { + "x": 692.1420288085938, + "y": 138.927001953125 + }, + { + "x": 690.239990234375, + "y": 142.65899658203125 + }, + { + "x": 688.260986328125, + "y": 146.35000610351562 + }, { "x": 701.4329833984375, "y": 116.9990005493164 @@ -2015,6 +2287,42 @@ "x": 662.3569946289062, "y": 182.99899291992188 }, + { + "x": 684.072021484375, + "y": 153.60499572753906 + }, + { + "x": 681.864990234375, + "y": 157.1649932861328 + }, + { + "x": 679.583984375, + "y": 160.67799377441406 + }, + { + "x": 677.22900390625, + "y": 164.14199829101562 + }, + { + "x": 674.802978515625, + "y": 167.5570068359375 + }, + { + "x": 672.3049926757812, + "y": 170.91900634765625 + }, + { + "x": 669.7379760742188, + "y": 174.22900390625 + }, + { + "x": 667.1019897460938, + "y": 177.48399353027344 + }, + { + "x": 664.3989868164062, + "y": 180.6840057373047 + }, { "x": 661.6279907226562, "y": 183.8260040283203 @@ -2339,6 +2647,42 @@ "x": 364.3710021972656, "y": 183.8260040283203 }, + { + "x": 361.6000061035156, + "y": 180.6840057373047 + }, + { + "x": 358.8970031738281, + "y": 177.48399353027344 + }, + { + "x": 356.260986328125, + "y": 174.22900390625 + }, + { + "x": 353.6940002441406, + "y": 170.91900634765625 + }, + { + "x": 351.1960144042969, + "y": 167.5570068359375 + }, + { + "x": 348.7699890136719, + "y": 164.14199829101562 + }, + { + "x": 346.4150085449219, + "y": 160.67799377441406 + }, + { + "x": 344.1340026855469, + "y": 157.1649932861328 + }, + { + "x": 341.927001953125, + "y": 153.60499572753906 + }, { "x": 363.6419982910156, "y": 183 @@ -2379,6 +2723,22 @@ "x": 998.5, "y": -198.21800231933594 }, + { + "x": 978.281982421875, + "y": -199.9010009765625 + }, + { + "x": 984.5579833984375, + "y": -199.60499572753906 + }, + { + "x": 990.8209838867188, + "y": -199.11199951171875 + }, + { + "x": 997.0659790039062, + "y": -198.4219970703125 + }, { "x": 1003.2860107421875, "y": -197.53700256347656 @@ -2743,6 +3103,22 @@ "x": 1003.2860107421875, "y": 197.53700256347656 }, + { + "x": 997.0659790039062, + "y": 198.4219970703125 + }, + { + "x": 990.8209838867188, + "y": 199.11199951171875 + }, + { + "x": 984.5579833984375, + "y": 199.60499572753906 + }, + { + "x": 978.281982421875, + "y": 199.9010009765625 + }, { "x": 998.5, "y": 198.21800231933594 diff --git a/e2etests/testdata/txtar/cycle-diagram/dagre/sketch.exp.svg b/e2etests/testdata/txtar/cycle-diagram/dagre/sketch.exp.svg index 015478d741..56a9cf1f37 100644 --- a/e2etests/testdata/txtar/cycle-diagram/dagre/sketch.exp.svg +++ b/e2etests/testdata/txtar/cycle-diagram/dagre/sketch.exp.svg @@ -1,9 +1,9 @@ -abcdabcab + .d2-671326991 .fill-N1{fill:#0A0F25;} + .d2-671326991 .fill-N2{fill:#676C7E;} + .d2-671326991 .fill-N3{fill:#9499AB;} + .d2-671326991 .fill-N4{fill:#CFD2DD;} + .d2-671326991 .fill-N5{fill:#DEE1EB;} + .d2-671326991 .fill-N6{fill:#EEF1F8;} + .d2-671326991 .fill-N7{fill:#FFFFFF;} + .d2-671326991 .fill-B1{fill:#0D32B2;} + .d2-671326991 .fill-B2{fill:#0D32B2;} + .d2-671326991 .fill-B3{fill:#E3E9FD;} + .d2-671326991 .fill-B4{fill:#E3E9FD;} + .d2-671326991 .fill-B5{fill:#EDF0FD;} + .d2-671326991 .fill-B6{fill:#F7F8FE;} + .d2-671326991 .fill-AA2{fill:#4A6FF3;} + .d2-671326991 .fill-AA4{fill:#EDF0FD;} + .d2-671326991 .fill-AA5{fill:#F7F8FE;} + .d2-671326991 .fill-AB4{fill:#EDF0FD;} + .d2-671326991 .fill-AB5{fill:#F7F8FE;} + .d2-671326991 .stroke-N1{stroke:#0A0F25;} + .d2-671326991 .stroke-N2{stroke:#676C7E;} + .d2-671326991 .stroke-N3{stroke:#9499AB;} + .d2-671326991 .stroke-N4{stroke:#CFD2DD;} + .d2-671326991 .stroke-N5{stroke:#DEE1EB;} + .d2-671326991 .stroke-N6{stroke:#EEF1F8;} + .d2-671326991 .stroke-N7{stroke:#FFFFFF;} + .d2-671326991 .stroke-B1{stroke:#0D32B2;} + .d2-671326991 .stroke-B2{stroke:#0D32B2;} + .d2-671326991 .stroke-B3{stroke:#E3E9FD;} + .d2-671326991 .stroke-B4{stroke:#E3E9FD;} + .d2-671326991 .stroke-B5{stroke:#EDF0FD;} + .d2-671326991 .stroke-B6{stroke:#F7F8FE;} + .d2-671326991 .stroke-AA2{stroke:#4A6FF3;} + .d2-671326991 .stroke-AA4{stroke:#EDF0FD;} + .d2-671326991 .stroke-AA5{stroke:#F7F8FE;} + .d2-671326991 .stroke-AB4{stroke:#EDF0FD;} + .d2-671326991 .stroke-AB5{stroke:#F7F8FE;} + .d2-671326991 .background-color-N1{background-color:#0A0F25;} + .d2-671326991 .background-color-N2{background-color:#676C7E;} + .d2-671326991 .background-color-N3{background-color:#9499AB;} + .d2-671326991 .background-color-N4{background-color:#CFD2DD;} + .d2-671326991 .background-color-N5{background-color:#DEE1EB;} + .d2-671326991 .background-color-N6{background-color:#EEF1F8;} + .d2-671326991 .background-color-N7{background-color:#FFFFFF;} + .d2-671326991 .background-color-B1{background-color:#0D32B2;} + .d2-671326991 .background-color-B2{background-color:#0D32B2;} + .d2-671326991 .background-color-B3{background-color:#E3E9FD;} + .d2-671326991 .background-color-B4{background-color:#E3E9FD;} + .d2-671326991 .background-color-B5{background-color:#EDF0FD;} + .d2-671326991 .background-color-B6{background-color:#F7F8FE;} + .d2-671326991 .background-color-AA2{background-color:#4A6FF3;} + .d2-671326991 .background-color-AA4{background-color:#EDF0FD;} + .d2-671326991 .background-color-AA5{background-color:#F7F8FE;} + .d2-671326991 .background-color-AB4{background-color:#EDF0FD;} + .d2-671326991 .background-color-AB5{background-color:#F7F8FE;} + .d2-671326991 .color-N1{color:#0A0F25;} + .d2-671326991 .color-N2{color:#676C7E;} + .d2-671326991 .color-N3{color:#9499AB;} + .d2-671326991 .color-N4{color:#CFD2DD;} + .d2-671326991 .color-N5{color:#DEE1EB;} + .d2-671326991 .color-N6{color:#EEF1F8;} + .d2-671326991 .color-N7{color:#FFFFFF;} + .d2-671326991 .color-B1{color:#0D32B2;} + .d2-671326991 .color-B2{color:#0D32B2;} + .d2-671326991 .color-B3{color:#E3E9FD;} + .d2-671326991 .color-B4{color:#E3E9FD;} + .d2-671326991 .color-B5{color:#EDF0FD;} + .d2-671326991 .color-B6{color:#F7F8FE;} + .d2-671326991 .color-AA2{color:#4A6FF3;} + .d2-671326991 .color-AA4{color:#EDF0FD;} + .d2-671326991 .color-AA5{color:#F7F8FE;} + .d2-671326991 .color-AB4{color:#EDF0FD;} + .d2-671326991 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker-d2-671326991);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker-d2-671326991);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright-d2-671326991);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright-d2-671326991);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright-d2-671326991);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright-d2-671326991);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark-d2-671326991);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright-d2-671326991);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright-d2-671326991);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright-d2-671326991);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright-d2-671326991);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker-d2-671326991);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark-d2-671326991);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal-d2-671326991);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal-d2-671326991);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright-d2-671326991);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright-d2-671326991);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright-d2-671326991);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>abcdabcab diff --git a/e2etests/testdata/txtar/cycle-diagram/elk/board.exp.json b/e2etests/testdata/txtar/cycle-diagram/elk/board.exp.json index 6eb058a841..7f5a0553f8 100644 --- a/e2etests/testdata/txtar/cycle-diagram/elk/board.exp.json +++ b/e2etests/testdata/txtar/cycle-diagram/elk/board.exp.json @@ -543,6 +543,38 @@ "x": 38.5, "y": -186.22999572753906 }, + { + "x": 15.140999794006348, + "y": -187.97500610351562 + }, + { + "x": 18.281999588012695, + "y": -187.9010009765625 + }, + { + "x": 21.42099952697754, + "y": -187.77699279785156 + }, + { + "x": 24.558000564575195, + "y": -187.60499572753906 + }, + { + "x": 27.69099998474121, + "y": -187.38299560546875 + }, + { + "x": 30.820999145507812, + "y": -187.11199951171875 + }, + { + "x": 33.94599914550781, + "y": -186.79200744628906 + }, + { + "x": 37.066001892089844, + "y": -186.4219970703125 + }, { "x": 40.18000030517578, "y": -186.00399780273438 @@ -867,6 +899,46 @@ "x": 209.02099609375, "y": -22.385000228881836 }, + { + "x": 209.53700256347656, + "y": -19.285999298095703 + }, + { + "x": 210.00399780273438, + "y": -16.18000030517578 + }, + { + "x": 210.4219970703125, + "y": -13.065999984741211 + }, + { + "x": 210.79200744628906, + "y": -9.946000099182129 + }, + { + "x": 211.11199951171875, + "y": -6.821000099182129 + }, + { + "x": 211.38299560546875, + "y": -3.690999984741211 + }, + { + "x": 211.60499572753906, + "y": -0.5580000281333923 + }, + { + "x": 211.77699279785156, + "y": 2.578000068664551 + }, + { + "x": 211.9010009765625, + "y": 5.7170000076293945 + }, + { + "x": 211.97500610351562, + "y": 8.857999801635742 + }, { "x": 209.2519989013672, "y": -21 @@ -907,6 +979,46 @@ "x": 209.2519989013672, "y": 45 }, + { + "x": 211.97500610351562, + "y": 15.140999794006348 + }, + { + "x": 211.9010009765625, + "y": 18.281999588012695 + }, + { + "x": 211.77699279785156, + "y": 21.42099952697754 + }, + { + "x": 211.60499572753906, + "y": 24.558000564575195 + }, + { + "x": 211.38299560546875, + "y": 27.69099998474121 + }, + { + "x": 211.11199951171875, + "y": 30.820999145507812 + }, + { + "x": 210.79200744628906, + "y": 33.94599914550781 + }, + { + "x": 210.4219970703125, + "y": 37.066001892089844 + }, + { + "x": 210.00399780273438, + "y": 40.18000030517578 + }, + { + "x": 209.53700256347656, + "y": 43.2859992980957 + }, { "x": 209.02099609375, "y": 46.3849983215332 @@ -1231,6 +1343,38 @@ "x": 40.18000030517578, "y": 210.00399780273438 }, + { + "x": 37.066001892089844, + "y": 210.4219970703125 + }, + { + "x": 33.94599914550781, + "y": 210.79200744628906 + }, + { + "x": 30.820999145507812, + "y": 211.11199951171875 + }, + { + "x": 27.69099998474121, + "y": 211.38299560546875 + }, + { + "x": 24.558000564575195, + "y": 211.60499572753906 + }, + { + "x": 21.42099952697754, + "y": 211.77699279785156 + }, + { + "x": 18.281999588012695, + "y": 211.9010009765625 + }, + { + "x": 15.140999794006348, + "y": 211.97500610351562 + }, { "x": 38.5, "y": 210.22999572753906 @@ -1271,6 +1415,38 @@ "x": -14.49899959564209, "y": 210.22999572753906 }, + { + "x": 8.857999801635742, + "y": 211.97500610351562 + }, + { + "x": 5.7170000076293945, + "y": 211.9010009765625 + }, + { + "x": 2.578000068664551, + "y": 211.77699279785156 + }, + { + "x": -0.5580000281333923, + "y": 211.60499572753906 + }, + { + "x": -3.690999984741211, + "y": 211.38299560546875 + }, + { + "x": -6.821000099182129, + "y": 211.11199951171875 + }, + { + "x": -9.946000099182129, + "y": 210.79200744628906 + }, + { + "x": -13.065999984741211, + "y": 210.4219970703125 + }, { "x": -16.18000030517578, "y": 210.00399780273438 @@ -1595,6 +1771,46 @@ "x": -185.02099609375, "y": 46.3849983215332 }, + { + "x": -185.53700256347656, + "y": 43.2859992980957 + }, + { + "x": -186.00399780273438, + "y": 40.18000030517578 + }, + { + "x": -186.4219970703125, + "y": 37.066001892089844 + }, + { + "x": -186.79200744628906, + "y": 33.94599914550781 + }, + { + "x": -187.11199951171875, + "y": 30.820999145507812 + }, + { + "x": -187.38299560546875, + "y": 27.69099998474121 + }, + { + "x": -187.60499572753906, + "y": 24.558000564575195 + }, + { + "x": -187.77699279785156, + "y": 21.42099952697754 + }, + { + "x": -187.9010009765625, + "y": 18.281999588012695 + }, + { + "x": -187.97500610351562, + "y": 15.140999794006348 + }, { "x": -185.2519989013672, "y": 45 @@ -1635,6 +1851,30 @@ "x": 512, "y": -136.2259979248047 }, + { + "x": 489.68798828125, + "y": -137.95599365234375 + }, + { + "x": 493.875, + "y": -137.82400512695312 + }, + { + "x": 498.0580139160156, + "y": -137.60499572753906 + }, + { + "x": 502.2349853515625, + "y": -137.29800415039062 + }, + { + "x": 506.4049987792969, + "y": -136.9040069580078 + }, + { + "x": 510.5660095214844, + "y": -136.4219970703125 + }, { "x": 514.7160034179688, "y": -135.85400390625 @@ -1975,6 +2215,38 @@ "x": 674.375, "y": 127.77300262451172 }, + { + "x": 672.9559936523438, + "y": 131.71400451660156 + }, + { + "x": 671.4550170898438, + "y": 135.62399291992188 + }, + { + "x": 669.8720092773438, + "y": 139.5030059814453 + }, + { + "x": 668.208984375, + "y": 143.3470001220703 + }, + { + "x": 666.4650268554688, + "y": 147.15499877929688 + }, + { + "x": 664.6420288085938, + "y": 150.927001953125 + }, + { + "x": 662.739990234375, + "y": 154.65899658203125 + }, + { + "x": 660.760986328125, + "y": 158.35000610351562 + }, { "x": 673.9329833984375, "y": 128.99899291992188 @@ -2015,6 +2287,42 @@ "x": 634.8569946289062, "y": 194.99899291992188 }, + { + "x": 656.572021484375, + "y": 165.60499572753906 + }, + { + "x": 654.364990234375, + "y": 169.1649932861328 + }, + { + "x": 652.083984375, + "y": 172.67799377441406 + }, + { + "x": 649.72900390625, + "y": 176.14199829101562 + }, + { + "x": 647.302978515625, + "y": 179.5570068359375 + }, + { + "x": 644.8049926757812, + "y": 182.91900634765625 + }, + { + "x": 642.2379760742188, + "y": 186.22900390625 + }, + { + "x": 639.6019897460938, + "y": 189.48399353027344 + }, + { + "x": 636.8989868164062, + "y": 192.6840057373047 + }, { "x": 634.1279907226562, "y": 195.8260040283203 @@ -2339,6 +2647,42 @@ "x": 336.8710021972656, "y": 195.8260040283203 }, + { + "x": 334.1000061035156, + "y": 192.6840057373047 + }, + { + "x": 331.3970031738281, + "y": 189.48399353027344 + }, + { + "x": 328.760986328125, + "y": 186.22900390625 + }, + { + "x": 326.1940002441406, + "y": 182.91900634765625 + }, + { + "x": 323.6960144042969, + "y": 179.5570068359375 + }, + { + "x": 321.2699890136719, + "y": 176.14199829101562 + }, + { + "x": 318.9150085449219, + "y": 172.67799377441406 + }, + { + "x": 316.6340026855469, + "y": 169.1649932861328 + }, + { + "x": 314.427001953125, + "y": 165.60499572753906 + }, { "x": 336.1419982910156, "y": 195 @@ -2379,6 +2723,22 @@ "x": 931.4099731445312, "y": -186.21800231933594 }, + { + "x": 911.1920166015625, + "y": -187.9010009765625 + }, + { + "x": 917.468017578125, + "y": -187.60499572753906 + }, + { + "x": 923.7310180664062, + "y": -187.11199951171875 + }, + { + "x": 929.9760131835938, + "y": -186.4219970703125 + }, { "x": 936.197021484375, "y": -185.53700256347656 @@ -2743,6 +3103,22 @@ "x": 936.197021484375, "y": 209.53700256347656 }, + { + "x": 929.9760131835938, + "y": 210.4219970703125 + }, + { + "x": 923.7310180664062, + "y": 211.11199951171875 + }, + { + "x": 917.468017578125, + "y": 211.60499572753906 + }, + { + "x": 911.1920166015625, + "y": 211.9010009765625 + }, { "x": 931.4099731445312, "y": 210.21800231933594 diff --git a/e2etests/testdata/txtar/cycle-diagram/elk/sketch.exp.svg b/e2etests/testdata/txtar/cycle-diagram/elk/sketch.exp.svg index 21e65f752a..1a53f8d0cc 100644 --- a/e2etests/testdata/txtar/cycle-diagram/elk/sketch.exp.svg +++ b/e2etests/testdata/txtar/cycle-diagram/elk/sketch.exp.svg @@ -1,9 +1,9 @@ -abcdabcab + .d2-364931106 .fill-N1{fill:#0A0F25;} + .d2-364931106 .fill-N2{fill:#676C7E;} + .d2-364931106 .fill-N3{fill:#9499AB;} + .d2-364931106 .fill-N4{fill:#CFD2DD;} + .d2-364931106 .fill-N5{fill:#DEE1EB;} + .d2-364931106 .fill-N6{fill:#EEF1F8;} + .d2-364931106 .fill-N7{fill:#FFFFFF;} + .d2-364931106 .fill-B1{fill:#0D32B2;} + .d2-364931106 .fill-B2{fill:#0D32B2;} + .d2-364931106 .fill-B3{fill:#E3E9FD;} + .d2-364931106 .fill-B4{fill:#E3E9FD;} + .d2-364931106 .fill-B5{fill:#EDF0FD;} + .d2-364931106 .fill-B6{fill:#F7F8FE;} + .d2-364931106 .fill-AA2{fill:#4A6FF3;} + .d2-364931106 .fill-AA4{fill:#EDF0FD;} + .d2-364931106 .fill-AA5{fill:#F7F8FE;} + .d2-364931106 .fill-AB4{fill:#EDF0FD;} + .d2-364931106 .fill-AB5{fill:#F7F8FE;} + .d2-364931106 .stroke-N1{stroke:#0A0F25;} + .d2-364931106 .stroke-N2{stroke:#676C7E;} + .d2-364931106 .stroke-N3{stroke:#9499AB;} + .d2-364931106 .stroke-N4{stroke:#CFD2DD;} + .d2-364931106 .stroke-N5{stroke:#DEE1EB;} + .d2-364931106 .stroke-N6{stroke:#EEF1F8;} + .d2-364931106 .stroke-N7{stroke:#FFFFFF;} + .d2-364931106 .stroke-B1{stroke:#0D32B2;} + .d2-364931106 .stroke-B2{stroke:#0D32B2;} + .d2-364931106 .stroke-B3{stroke:#E3E9FD;} + .d2-364931106 .stroke-B4{stroke:#E3E9FD;} + .d2-364931106 .stroke-B5{stroke:#EDF0FD;} + .d2-364931106 .stroke-B6{stroke:#F7F8FE;} + .d2-364931106 .stroke-AA2{stroke:#4A6FF3;} + .d2-364931106 .stroke-AA4{stroke:#EDF0FD;} + .d2-364931106 .stroke-AA5{stroke:#F7F8FE;} + .d2-364931106 .stroke-AB4{stroke:#EDF0FD;} + .d2-364931106 .stroke-AB5{stroke:#F7F8FE;} + .d2-364931106 .background-color-N1{background-color:#0A0F25;} + .d2-364931106 .background-color-N2{background-color:#676C7E;} + .d2-364931106 .background-color-N3{background-color:#9499AB;} + .d2-364931106 .background-color-N4{background-color:#CFD2DD;} + .d2-364931106 .background-color-N5{background-color:#DEE1EB;} + .d2-364931106 .background-color-N6{background-color:#EEF1F8;} + .d2-364931106 .background-color-N7{background-color:#FFFFFF;} + .d2-364931106 .background-color-B1{background-color:#0D32B2;} + .d2-364931106 .background-color-B2{background-color:#0D32B2;} + .d2-364931106 .background-color-B3{background-color:#E3E9FD;} + .d2-364931106 .background-color-B4{background-color:#E3E9FD;} + .d2-364931106 .background-color-B5{background-color:#EDF0FD;} + .d2-364931106 .background-color-B6{background-color:#F7F8FE;} + .d2-364931106 .background-color-AA2{background-color:#4A6FF3;} + .d2-364931106 .background-color-AA4{background-color:#EDF0FD;} + .d2-364931106 .background-color-AA5{background-color:#F7F8FE;} + .d2-364931106 .background-color-AB4{background-color:#EDF0FD;} + .d2-364931106 .background-color-AB5{background-color:#F7F8FE;} + .d2-364931106 .color-N1{color:#0A0F25;} + .d2-364931106 .color-N2{color:#676C7E;} + .d2-364931106 .color-N3{color:#9499AB;} + .d2-364931106 .color-N4{color:#CFD2DD;} + .d2-364931106 .color-N5{color:#DEE1EB;} + .d2-364931106 .color-N6{color:#EEF1F8;} + .d2-364931106 .color-N7{color:#FFFFFF;} + .d2-364931106 .color-B1{color:#0D32B2;} + .d2-364931106 .color-B2{color:#0D32B2;} + .d2-364931106 .color-B3{color:#E3E9FD;} + .d2-364931106 .color-B4{color:#E3E9FD;} + .d2-364931106 .color-B5{color:#EDF0FD;} + .d2-364931106 .color-B6{color:#F7F8FE;} + .d2-364931106 .color-AA2{color:#4A6FF3;} + .d2-364931106 .color-AA4{color:#EDF0FD;} + .d2-364931106 .color-AA5{color:#F7F8FE;} + .d2-364931106 .color-AB4{color:#EDF0FD;} + .d2-364931106 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker-d2-364931106);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker-d2-364931106);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright-d2-364931106);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright-d2-364931106);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright-d2-364931106);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright-d2-364931106);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark-d2-364931106);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright-d2-364931106);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright-d2-364931106);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright-d2-364931106);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright-d2-364931106);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker-d2-364931106);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark-d2-364931106);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal-d2-364931106);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal-d2-364931106);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright-d2-364931106);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright-d2-364931106);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright-d2-364931106);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>abcdabcab From b568305b000e7ab1791cafae058e2a83410bff26 Mon Sep 17 00:00:00 2001 From: Mayank Mohapatra <125661248+Mayank77maruti@users.noreply.github.com> Date: Sat, 22 Feb 2025 10:42:02 +0000 Subject: [PATCH 22/73] try --- d2layouts/d2cycle/layout.go | 45 +-- .../txtar/cycle-diagram/dagre/board.exp.json | 376 ------------------ .../txtar/cycle-diagram/dagre/sketch.exp.svg | 152 +++---- .../txtar/cycle-diagram/elk/board.exp.json | 376 ------------------ .../txtar/cycle-diagram/elk/sketch.exp.svg | 152 +++---- 5 files changed, 167 insertions(+), 934 deletions(-) diff --git a/d2layouts/d2cycle/layout.go b/d2layouts/d2cycle/layout.go index 53d62b45c8..0e9036f748 100644 --- a/d2layouts/d2cycle/layout.go +++ b/d2layouts/d2cycle/layout.go @@ -89,7 +89,6 @@ func createCircularArc(edge *d2graph.Edge) { y := arcRadius * math.Sin(angle) path = append(path, geo.NewPoint(x, y)) } - // Ensure endpoints are the node centers path[0] = srcCenter path[len(path)-1] = dstCenter @@ -99,10 +98,9 @@ func createCircularArc(edge *d2graph.Edge) { path[0] = newSrc path[len(path)-1] = newDst - // Instead of trimming all intermediate points that fall inside a node, - // only trim contiguous points from the start and end. - path = trimStartPoints(path, edge.Src.Box) - path = trimEndPoints(path, edge.Dst.Box) + // Trim redundant path points that fall inside node boundaries. + path = trimPathPoints(path, edge.Src.Box) + path = trimPathPoints(path, edge.Dst.Box) edge.Route = path edge.IsCurve = true @@ -234,32 +232,19 @@ func findPreciseIntersection(box *geo.Box, seg geo.Segment) *geo.Point { return intersections[0].point } -// trimStartPoints removes contiguous starting points that fall inside the box, -// but preserves one point before the first point outside to maintain smoothness. -func trimStartPoints(path []*geo.Point, box *geo.Box) []*geo.Point { - i := 0 - for i < len(path) && boxContains(box, path[i]) { - i++ +// trimPathPoints removes intermediate points that fall inside the given box while preserving endpoints. +func trimPathPoints(path []*geo.Point, box *geo.Box) []*geo.Point { + if len(path) <= 2 { + return path } - // If we've trimmed some points and there's at least one point before, - // include the last inside point to keep the curve smooth. - if i > 0 && i < len(path) { - return path[i-1:] - } - return path -} - -// trimEndPoints removes contiguous ending points that fall inside the box, -// but preserves one point after the last point outside to maintain smoothness. -func trimEndPoints(path []*geo.Point, box *geo.Box) []*geo.Point { - i := len(path) - 1 - for i >= 0 && boxContains(box, path[i]) { - i-- - } - if i < len(path)-1 && i >= 0 { - return path[:i+2] + trimmed := []*geo.Point{path[0]} + for i := 1; i < len(path)-1; i++ { + if !boxContains(box, path[i]) { + trimmed = append(trimmed, path[i]) + } } - return path + trimmed = append(trimmed, path[len(path)-1]) + return trimmed } // boxContains uses strict inequalities so that points exactly on the boundary are considered outside. @@ -305,4 +290,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 3f9a491438..78ed2dffeb 100644 --- a/e2etests/testdata/txtar/cycle-diagram/dagre/board.exp.json +++ b/e2etests/testdata/txtar/cycle-diagram/dagre/board.exp.json @@ -543,38 +543,6 @@ "x": 26.5, "y": -198.22999572753906 }, - { - "x": 3.1410000324249268, - "y": -199.97500610351562 - }, - { - "x": 6.2820000648498535, - "y": -199.9010009765625 - }, - { - "x": 9.420999526977539, - "y": -199.77699279785156 - }, - { - "x": 12.557999610900879, - "y": -199.60499572753906 - }, - { - "x": 15.690999984741211, - "y": -199.38299560546875 - }, - { - "x": 18.820999145507812, - "y": -199.11199951171875 - }, - { - "x": 21.945999145507812, - "y": -198.79200744628906 - }, - { - "x": 25.06599998474121, - "y": -198.4219970703125 - }, { "x": 28.18000030517578, "y": -198.00399780273438 @@ -899,46 +867,6 @@ "x": 197.02099609375, "y": -34.3849983215332 }, - { - "x": 197.53700256347656, - "y": -31.285999298095703 - }, - { - "x": 198.00399780273438, - "y": -28.18000030517578 - }, - { - "x": 198.4219970703125, - "y": -25.06599998474121 - }, - { - "x": 198.79200744628906, - "y": -21.945999145507812 - }, - { - "x": 199.11199951171875, - "y": -18.820999145507812 - }, - { - "x": 199.38299560546875, - "y": -15.690999984741211 - }, - { - "x": 199.60499572753906, - "y": -12.557999610900879 - }, - { - "x": 199.77699279785156, - "y": -9.420999526977539 - }, - { - "x": 199.9010009765625, - "y": -6.2820000648498535 - }, - { - "x": 199.97500610351562, - "y": -3.1410000324249268 - }, { "x": 197.2519989013672, "y": -33 @@ -979,46 +907,6 @@ "x": 197.2519989013672, "y": 33 }, - { - "x": 199.97500610351562, - "y": 3.1410000324249268 - }, - { - "x": 199.9010009765625, - "y": 6.2820000648498535 - }, - { - "x": 199.77699279785156, - "y": 9.420999526977539 - }, - { - "x": 199.60499572753906, - "y": 12.557999610900879 - }, - { - "x": 199.38299560546875, - "y": 15.690999984741211 - }, - { - "x": 199.11199951171875, - "y": 18.820999145507812 - }, - { - "x": 198.79200744628906, - "y": 21.945999145507812 - }, - { - "x": 198.4219970703125, - "y": 25.06599998474121 - }, - { - "x": 198.00399780273438, - "y": 28.18000030517578 - }, - { - "x": 197.53700256347656, - "y": 31.285999298095703 - }, { "x": 197.02099609375, "y": 34.3849983215332 @@ -1343,38 +1231,6 @@ "x": 28.18000030517578, "y": 198.00399780273438 }, - { - "x": 25.06599998474121, - "y": 198.4219970703125 - }, - { - "x": 21.945999145507812, - "y": 198.79200744628906 - }, - { - "x": 18.820999145507812, - "y": 199.11199951171875 - }, - { - "x": 15.690999984741211, - "y": 199.38299560546875 - }, - { - "x": 12.557999610900879, - "y": 199.60499572753906 - }, - { - "x": 9.420999526977539, - "y": 199.77699279785156 - }, - { - "x": 6.2820000648498535, - "y": 199.9010009765625 - }, - { - "x": 3.1410000324249268, - "y": 199.97500610351562 - }, { "x": 26.5, "y": 198.22999572753906 @@ -1415,38 +1271,6 @@ "x": -26.499000549316406, "y": 198.22999572753906 }, - { - "x": -3.1410000324249268, - "y": 199.97500610351562 - }, - { - "x": -6.2820000648498535, - "y": 199.9010009765625 - }, - { - "x": -9.420999526977539, - "y": 199.77699279785156 - }, - { - "x": -12.557999610900879, - "y": 199.60499572753906 - }, - { - "x": -15.690999984741211, - "y": 199.38299560546875 - }, - { - "x": -18.820999145507812, - "y": 199.11199951171875 - }, - { - "x": -21.945999145507812, - "y": 198.79200744628906 - }, - { - "x": -25.06599998474121, - "y": 198.4219970703125 - }, { "x": -28.18000030517578, "y": 198.00399780273438 @@ -1771,46 +1595,6 @@ "x": -197.02099609375, "y": 34.3849983215332 }, - { - "x": -197.53700256347656, - "y": 31.285999298095703 - }, - { - "x": -198.00399780273438, - "y": 28.18000030517578 - }, - { - "x": -198.4219970703125, - "y": 25.06599998474121 - }, - { - "x": -198.79200744628906, - "y": 21.945999145507812 - }, - { - "x": -199.11199951171875, - "y": 18.820999145507812 - }, - { - "x": -199.38299560546875, - "y": 15.690999984741211 - }, - { - "x": -199.60499572753906, - "y": 12.557999610900879 - }, - { - "x": -199.77699279785156, - "y": 9.420999526977539 - }, - { - "x": -199.9010009765625, - "y": 6.2820000648498535 - }, - { - "x": -199.97500610351562, - "y": 3.1410000324249268 - }, { "x": -197.2519989013672, "y": 33 @@ -1851,30 +1635,6 @@ "x": 539.5, "y": -148.2259979248047 }, - { - "x": 517.18798828125, - "y": -149.95599365234375 - }, - { - "x": 521.375, - "y": -149.82400512695312 - }, - { - "x": 525.5579833984375, - "y": -149.60499572753906 - }, - { - "x": 529.7349853515625, - "y": -149.29800415039062 - }, - { - "x": 533.905029296875, - "y": -148.9040069580078 - }, - { - "x": 538.0659790039062, - "y": -148.4219970703125 - }, { "x": 542.2160034179688, "y": -147.85400390625 @@ -2215,38 +1975,6 @@ "x": 701.875, "y": 115.77300262451172 }, - { - "x": 700.4559936523438, - "y": 119.71399688720703 - }, - { - "x": 698.9550170898438, - "y": 123.6240005493164 - }, - { - "x": 697.3720092773438, - "y": 127.50299835205078 - }, - { - "x": 695.708984375, - "y": 131.3470001220703 - }, - { - "x": 693.9650268554688, - "y": 135.15499877929688 - }, - { - "x": 692.1420288085938, - "y": 138.927001953125 - }, - { - "x": 690.239990234375, - "y": 142.65899658203125 - }, - { - "x": 688.260986328125, - "y": 146.35000610351562 - }, { "x": 701.4329833984375, "y": 116.9990005493164 @@ -2287,42 +2015,6 @@ "x": 662.3569946289062, "y": 182.99899291992188 }, - { - "x": 684.072021484375, - "y": 153.60499572753906 - }, - { - "x": 681.864990234375, - "y": 157.1649932861328 - }, - { - "x": 679.583984375, - "y": 160.67799377441406 - }, - { - "x": 677.22900390625, - "y": 164.14199829101562 - }, - { - "x": 674.802978515625, - "y": 167.5570068359375 - }, - { - "x": 672.3049926757812, - "y": 170.91900634765625 - }, - { - "x": 669.7379760742188, - "y": 174.22900390625 - }, - { - "x": 667.1019897460938, - "y": 177.48399353027344 - }, - { - "x": 664.3989868164062, - "y": 180.6840057373047 - }, { "x": 661.6279907226562, "y": 183.8260040283203 @@ -2647,42 +2339,6 @@ "x": 364.3710021972656, "y": 183.8260040283203 }, - { - "x": 361.6000061035156, - "y": 180.6840057373047 - }, - { - "x": 358.8970031738281, - "y": 177.48399353027344 - }, - { - "x": 356.260986328125, - "y": 174.22900390625 - }, - { - "x": 353.6940002441406, - "y": 170.91900634765625 - }, - { - "x": 351.1960144042969, - "y": 167.5570068359375 - }, - { - "x": 348.7699890136719, - "y": 164.14199829101562 - }, - { - "x": 346.4150085449219, - "y": 160.67799377441406 - }, - { - "x": 344.1340026855469, - "y": 157.1649932861328 - }, - { - "x": 341.927001953125, - "y": 153.60499572753906 - }, { "x": 363.6419982910156, "y": 183 @@ -2723,22 +2379,6 @@ "x": 998.5, "y": -198.21800231933594 }, - { - "x": 978.281982421875, - "y": -199.9010009765625 - }, - { - "x": 984.5579833984375, - "y": -199.60499572753906 - }, - { - "x": 990.8209838867188, - "y": -199.11199951171875 - }, - { - "x": 997.0659790039062, - "y": -198.4219970703125 - }, { "x": 1003.2860107421875, "y": -197.53700256347656 @@ -3103,22 +2743,6 @@ "x": 1003.2860107421875, "y": 197.53700256347656 }, - { - "x": 997.0659790039062, - "y": 198.4219970703125 - }, - { - "x": 990.8209838867188, - "y": 199.11199951171875 - }, - { - "x": 984.5579833984375, - "y": 199.60499572753906 - }, - { - "x": 978.281982421875, - "y": 199.9010009765625 - }, { "x": 998.5, "y": 198.21800231933594 diff --git a/e2etests/testdata/txtar/cycle-diagram/dagre/sketch.exp.svg b/e2etests/testdata/txtar/cycle-diagram/dagre/sketch.exp.svg index 56a9cf1f37..015478d741 100644 --- a/e2etests/testdata/txtar/cycle-diagram/dagre/sketch.exp.svg +++ b/e2etests/testdata/txtar/cycle-diagram/dagre/sketch.exp.svg @@ -1,9 +1,9 @@ -abcdabcab + .d2-153681122 .fill-N1{fill:#0A0F25;} + .d2-153681122 .fill-N2{fill:#676C7E;} + .d2-153681122 .fill-N3{fill:#9499AB;} + .d2-153681122 .fill-N4{fill:#CFD2DD;} + .d2-153681122 .fill-N5{fill:#DEE1EB;} + .d2-153681122 .fill-N6{fill:#EEF1F8;} + .d2-153681122 .fill-N7{fill:#FFFFFF;} + .d2-153681122 .fill-B1{fill:#0D32B2;} + .d2-153681122 .fill-B2{fill:#0D32B2;} + .d2-153681122 .fill-B3{fill:#E3E9FD;} + .d2-153681122 .fill-B4{fill:#E3E9FD;} + .d2-153681122 .fill-B5{fill:#EDF0FD;} + .d2-153681122 .fill-B6{fill:#F7F8FE;} + .d2-153681122 .fill-AA2{fill:#4A6FF3;} + .d2-153681122 .fill-AA4{fill:#EDF0FD;} + .d2-153681122 .fill-AA5{fill:#F7F8FE;} + .d2-153681122 .fill-AB4{fill:#EDF0FD;} + .d2-153681122 .fill-AB5{fill:#F7F8FE;} + .d2-153681122 .stroke-N1{stroke:#0A0F25;} + .d2-153681122 .stroke-N2{stroke:#676C7E;} + .d2-153681122 .stroke-N3{stroke:#9499AB;} + .d2-153681122 .stroke-N4{stroke:#CFD2DD;} + .d2-153681122 .stroke-N5{stroke:#DEE1EB;} + .d2-153681122 .stroke-N6{stroke:#EEF1F8;} + .d2-153681122 .stroke-N7{stroke:#FFFFFF;} + .d2-153681122 .stroke-B1{stroke:#0D32B2;} + .d2-153681122 .stroke-B2{stroke:#0D32B2;} + .d2-153681122 .stroke-B3{stroke:#E3E9FD;} + .d2-153681122 .stroke-B4{stroke:#E3E9FD;} + .d2-153681122 .stroke-B5{stroke:#EDF0FD;} + .d2-153681122 .stroke-B6{stroke:#F7F8FE;} + .d2-153681122 .stroke-AA2{stroke:#4A6FF3;} + .d2-153681122 .stroke-AA4{stroke:#EDF0FD;} + .d2-153681122 .stroke-AA5{stroke:#F7F8FE;} + .d2-153681122 .stroke-AB4{stroke:#EDF0FD;} + .d2-153681122 .stroke-AB5{stroke:#F7F8FE;} + .d2-153681122 .background-color-N1{background-color:#0A0F25;} + .d2-153681122 .background-color-N2{background-color:#676C7E;} + .d2-153681122 .background-color-N3{background-color:#9499AB;} + .d2-153681122 .background-color-N4{background-color:#CFD2DD;} + .d2-153681122 .background-color-N5{background-color:#DEE1EB;} + .d2-153681122 .background-color-N6{background-color:#EEF1F8;} + .d2-153681122 .background-color-N7{background-color:#FFFFFF;} + .d2-153681122 .background-color-B1{background-color:#0D32B2;} + .d2-153681122 .background-color-B2{background-color:#0D32B2;} + .d2-153681122 .background-color-B3{background-color:#E3E9FD;} + .d2-153681122 .background-color-B4{background-color:#E3E9FD;} + .d2-153681122 .background-color-B5{background-color:#EDF0FD;} + .d2-153681122 .background-color-B6{background-color:#F7F8FE;} + .d2-153681122 .background-color-AA2{background-color:#4A6FF3;} + .d2-153681122 .background-color-AA4{background-color:#EDF0FD;} + .d2-153681122 .background-color-AA5{background-color:#F7F8FE;} + .d2-153681122 .background-color-AB4{background-color:#EDF0FD;} + .d2-153681122 .background-color-AB5{background-color:#F7F8FE;} + .d2-153681122 .color-N1{color:#0A0F25;} + .d2-153681122 .color-N2{color:#676C7E;} + .d2-153681122 .color-N3{color:#9499AB;} + .d2-153681122 .color-N4{color:#CFD2DD;} + .d2-153681122 .color-N5{color:#DEE1EB;} + .d2-153681122 .color-N6{color:#EEF1F8;} + .d2-153681122 .color-N7{color:#FFFFFF;} + .d2-153681122 .color-B1{color:#0D32B2;} + .d2-153681122 .color-B2{color:#0D32B2;} + .d2-153681122 .color-B3{color:#E3E9FD;} + .d2-153681122 .color-B4{color:#E3E9FD;} + .d2-153681122 .color-B5{color:#EDF0FD;} + .d2-153681122 .color-B6{color:#F7F8FE;} + .d2-153681122 .color-AA2{color:#4A6FF3;} + .d2-153681122 .color-AA4{color:#EDF0FD;} + .d2-153681122 .color-AA5{color:#F7F8FE;} + .d2-153681122 .color-AB4{color:#EDF0FD;} + .d2-153681122 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker-d2-153681122);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker-d2-153681122);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright-d2-153681122);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright-d2-153681122);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright-d2-153681122);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright-d2-153681122);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark-d2-153681122);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright-d2-153681122);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright-d2-153681122);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright-d2-153681122);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright-d2-153681122);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker-d2-153681122);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark-d2-153681122);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal-d2-153681122);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal-d2-153681122);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright-d2-153681122);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright-d2-153681122);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright-d2-153681122);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>abcdabcab diff --git a/e2etests/testdata/txtar/cycle-diagram/elk/board.exp.json b/e2etests/testdata/txtar/cycle-diagram/elk/board.exp.json index 7f5a0553f8..6eb058a841 100644 --- a/e2etests/testdata/txtar/cycle-diagram/elk/board.exp.json +++ b/e2etests/testdata/txtar/cycle-diagram/elk/board.exp.json @@ -543,38 +543,6 @@ "x": 38.5, "y": -186.22999572753906 }, - { - "x": 15.140999794006348, - "y": -187.97500610351562 - }, - { - "x": 18.281999588012695, - "y": -187.9010009765625 - }, - { - "x": 21.42099952697754, - "y": -187.77699279785156 - }, - { - "x": 24.558000564575195, - "y": -187.60499572753906 - }, - { - "x": 27.69099998474121, - "y": -187.38299560546875 - }, - { - "x": 30.820999145507812, - "y": -187.11199951171875 - }, - { - "x": 33.94599914550781, - "y": -186.79200744628906 - }, - { - "x": 37.066001892089844, - "y": -186.4219970703125 - }, { "x": 40.18000030517578, "y": -186.00399780273438 @@ -899,46 +867,6 @@ "x": 209.02099609375, "y": -22.385000228881836 }, - { - "x": 209.53700256347656, - "y": -19.285999298095703 - }, - { - "x": 210.00399780273438, - "y": -16.18000030517578 - }, - { - "x": 210.4219970703125, - "y": -13.065999984741211 - }, - { - "x": 210.79200744628906, - "y": -9.946000099182129 - }, - { - "x": 211.11199951171875, - "y": -6.821000099182129 - }, - { - "x": 211.38299560546875, - "y": -3.690999984741211 - }, - { - "x": 211.60499572753906, - "y": -0.5580000281333923 - }, - { - "x": 211.77699279785156, - "y": 2.578000068664551 - }, - { - "x": 211.9010009765625, - "y": 5.7170000076293945 - }, - { - "x": 211.97500610351562, - "y": 8.857999801635742 - }, { "x": 209.2519989013672, "y": -21 @@ -979,46 +907,6 @@ "x": 209.2519989013672, "y": 45 }, - { - "x": 211.97500610351562, - "y": 15.140999794006348 - }, - { - "x": 211.9010009765625, - "y": 18.281999588012695 - }, - { - "x": 211.77699279785156, - "y": 21.42099952697754 - }, - { - "x": 211.60499572753906, - "y": 24.558000564575195 - }, - { - "x": 211.38299560546875, - "y": 27.69099998474121 - }, - { - "x": 211.11199951171875, - "y": 30.820999145507812 - }, - { - "x": 210.79200744628906, - "y": 33.94599914550781 - }, - { - "x": 210.4219970703125, - "y": 37.066001892089844 - }, - { - "x": 210.00399780273438, - "y": 40.18000030517578 - }, - { - "x": 209.53700256347656, - "y": 43.2859992980957 - }, { "x": 209.02099609375, "y": 46.3849983215332 @@ -1343,38 +1231,6 @@ "x": 40.18000030517578, "y": 210.00399780273438 }, - { - "x": 37.066001892089844, - "y": 210.4219970703125 - }, - { - "x": 33.94599914550781, - "y": 210.79200744628906 - }, - { - "x": 30.820999145507812, - "y": 211.11199951171875 - }, - { - "x": 27.69099998474121, - "y": 211.38299560546875 - }, - { - "x": 24.558000564575195, - "y": 211.60499572753906 - }, - { - "x": 21.42099952697754, - "y": 211.77699279785156 - }, - { - "x": 18.281999588012695, - "y": 211.9010009765625 - }, - { - "x": 15.140999794006348, - "y": 211.97500610351562 - }, { "x": 38.5, "y": 210.22999572753906 @@ -1415,38 +1271,6 @@ "x": -14.49899959564209, "y": 210.22999572753906 }, - { - "x": 8.857999801635742, - "y": 211.97500610351562 - }, - { - "x": 5.7170000076293945, - "y": 211.9010009765625 - }, - { - "x": 2.578000068664551, - "y": 211.77699279785156 - }, - { - "x": -0.5580000281333923, - "y": 211.60499572753906 - }, - { - "x": -3.690999984741211, - "y": 211.38299560546875 - }, - { - "x": -6.821000099182129, - "y": 211.11199951171875 - }, - { - "x": -9.946000099182129, - "y": 210.79200744628906 - }, - { - "x": -13.065999984741211, - "y": 210.4219970703125 - }, { "x": -16.18000030517578, "y": 210.00399780273438 @@ -1771,46 +1595,6 @@ "x": -185.02099609375, "y": 46.3849983215332 }, - { - "x": -185.53700256347656, - "y": 43.2859992980957 - }, - { - "x": -186.00399780273438, - "y": 40.18000030517578 - }, - { - "x": -186.4219970703125, - "y": 37.066001892089844 - }, - { - "x": -186.79200744628906, - "y": 33.94599914550781 - }, - { - "x": -187.11199951171875, - "y": 30.820999145507812 - }, - { - "x": -187.38299560546875, - "y": 27.69099998474121 - }, - { - "x": -187.60499572753906, - "y": 24.558000564575195 - }, - { - "x": -187.77699279785156, - "y": 21.42099952697754 - }, - { - "x": -187.9010009765625, - "y": 18.281999588012695 - }, - { - "x": -187.97500610351562, - "y": 15.140999794006348 - }, { "x": -185.2519989013672, "y": 45 @@ -1851,30 +1635,6 @@ "x": 512, "y": -136.2259979248047 }, - { - "x": 489.68798828125, - "y": -137.95599365234375 - }, - { - "x": 493.875, - "y": -137.82400512695312 - }, - { - "x": 498.0580139160156, - "y": -137.60499572753906 - }, - { - "x": 502.2349853515625, - "y": -137.29800415039062 - }, - { - "x": 506.4049987792969, - "y": -136.9040069580078 - }, - { - "x": 510.5660095214844, - "y": -136.4219970703125 - }, { "x": 514.7160034179688, "y": -135.85400390625 @@ -2215,38 +1975,6 @@ "x": 674.375, "y": 127.77300262451172 }, - { - "x": 672.9559936523438, - "y": 131.71400451660156 - }, - { - "x": 671.4550170898438, - "y": 135.62399291992188 - }, - { - "x": 669.8720092773438, - "y": 139.5030059814453 - }, - { - "x": 668.208984375, - "y": 143.3470001220703 - }, - { - "x": 666.4650268554688, - "y": 147.15499877929688 - }, - { - "x": 664.6420288085938, - "y": 150.927001953125 - }, - { - "x": 662.739990234375, - "y": 154.65899658203125 - }, - { - "x": 660.760986328125, - "y": 158.35000610351562 - }, { "x": 673.9329833984375, "y": 128.99899291992188 @@ -2287,42 +2015,6 @@ "x": 634.8569946289062, "y": 194.99899291992188 }, - { - "x": 656.572021484375, - "y": 165.60499572753906 - }, - { - "x": 654.364990234375, - "y": 169.1649932861328 - }, - { - "x": 652.083984375, - "y": 172.67799377441406 - }, - { - "x": 649.72900390625, - "y": 176.14199829101562 - }, - { - "x": 647.302978515625, - "y": 179.5570068359375 - }, - { - "x": 644.8049926757812, - "y": 182.91900634765625 - }, - { - "x": 642.2379760742188, - "y": 186.22900390625 - }, - { - "x": 639.6019897460938, - "y": 189.48399353027344 - }, - { - "x": 636.8989868164062, - "y": 192.6840057373047 - }, { "x": 634.1279907226562, "y": 195.8260040283203 @@ -2647,42 +2339,6 @@ "x": 336.8710021972656, "y": 195.8260040283203 }, - { - "x": 334.1000061035156, - "y": 192.6840057373047 - }, - { - "x": 331.3970031738281, - "y": 189.48399353027344 - }, - { - "x": 328.760986328125, - "y": 186.22900390625 - }, - { - "x": 326.1940002441406, - "y": 182.91900634765625 - }, - { - "x": 323.6960144042969, - "y": 179.5570068359375 - }, - { - "x": 321.2699890136719, - "y": 176.14199829101562 - }, - { - "x": 318.9150085449219, - "y": 172.67799377441406 - }, - { - "x": 316.6340026855469, - "y": 169.1649932861328 - }, - { - "x": 314.427001953125, - "y": 165.60499572753906 - }, { "x": 336.1419982910156, "y": 195 @@ -2723,22 +2379,6 @@ "x": 931.4099731445312, "y": -186.21800231933594 }, - { - "x": 911.1920166015625, - "y": -187.9010009765625 - }, - { - "x": 917.468017578125, - "y": -187.60499572753906 - }, - { - "x": 923.7310180664062, - "y": -187.11199951171875 - }, - { - "x": 929.9760131835938, - "y": -186.4219970703125 - }, { "x": 936.197021484375, "y": -185.53700256347656 @@ -3103,22 +2743,6 @@ "x": 936.197021484375, "y": 209.53700256347656 }, - { - "x": 929.9760131835938, - "y": 210.4219970703125 - }, - { - "x": 923.7310180664062, - "y": 211.11199951171875 - }, - { - "x": 917.468017578125, - "y": 211.60499572753906 - }, - { - "x": 911.1920166015625, - "y": 211.9010009765625 - }, { "x": 931.4099731445312, "y": 210.21800231933594 diff --git a/e2etests/testdata/txtar/cycle-diagram/elk/sketch.exp.svg b/e2etests/testdata/txtar/cycle-diagram/elk/sketch.exp.svg index 1a53f8d0cc..21e65f752a 100644 --- a/e2etests/testdata/txtar/cycle-diagram/elk/sketch.exp.svg +++ b/e2etests/testdata/txtar/cycle-diagram/elk/sketch.exp.svg @@ -1,9 +1,9 @@ -abcdabcab + .d2-2891159010 .fill-N1{fill:#0A0F25;} + .d2-2891159010 .fill-N2{fill:#676C7E;} + .d2-2891159010 .fill-N3{fill:#9499AB;} + .d2-2891159010 .fill-N4{fill:#CFD2DD;} + .d2-2891159010 .fill-N5{fill:#DEE1EB;} + .d2-2891159010 .fill-N6{fill:#EEF1F8;} + .d2-2891159010 .fill-N7{fill:#FFFFFF;} + .d2-2891159010 .fill-B1{fill:#0D32B2;} + .d2-2891159010 .fill-B2{fill:#0D32B2;} + .d2-2891159010 .fill-B3{fill:#E3E9FD;} + .d2-2891159010 .fill-B4{fill:#E3E9FD;} + .d2-2891159010 .fill-B5{fill:#EDF0FD;} + .d2-2891159010 .fill-B6{fill:#F7F8FE;} + .d2-2891159010 .fill-AA2{fill:#4A6FF3;} + .d2-2891159010 .fill-AA4{fill:#EDF0FD;} + .d2-2891159010 .fill-AA5{fill:#F7F8FE;} + .d2-2891159010 .fill-AB4{fill:#EDF0FD;} + .d2-2891159010 .fill-AB5{fill:#F7F8FE;} + .d2-2891159010 .stroke-N1{stroke:#0A0F25;} + .d2-2891159010 .stroke-N2{stroke:#676C7E;} + .d2-2891159010 .stroke-N3{stroke:#9499AB;} + .d2-2891159010 .stroke-N4{stroke:#CFD2DD;} + .d2-2891159010 .stroke-N5{stroke:#DEE1EB;} + .d2-2891159010 .stroke-N6{stroke:#EEF1F8;} + .d2-2891159010 .stroke-N7{stroke:#FFFFFF;} + .d2-2891159010 .stroke-B1{stroke:#0D32B2;} + .d2-2891159010 .stroke-B2{stroke:#0D32B2;} + .d2-2891159010 .stroke-B3{stroke:#E3E9FD;} + .d2-2891159010 .stroke-B4{stroke:#E3E9FD;} + .d2-2891159010 .stroke-B5{stroke:#EDF0FD;} + .d2-2891159010 .stroke-B6{stroke:#F7F8FE;} + .d2-2891159010 .stroke-AA2{stroke:#4A6FF3;} + .d2-2891159010 .stroke-AA4{stroke:#EDF0FD;} + .d2-2891159010 .stroke-AA5{stroke:#F7F8FE;} + .d2-2891159010 .stroke-AB4{stroke:#EDF0FD;} + .d2-2891159010 .stroke-AB5{stroke:#F7F8FE;} + .d2-2891159010 .background-color-N1{background-color:#0A0F25;} + .d2-2891159010 .background-color-N2{background-color:#676C7E;} + .d2-2891159010 .background-color-N3{background-color:#9499AB;} + .d2-2891159010 .background-color-N4{background-color:#CFD2DD;} + .d2-2891159010 .background-color-N5{background-color:#DEE1EB;} + .d2-2891159010 .background-color-N6{background-color:#EEF1F8;} + .d2-2891159010 .background-color-N7{background-color:#FFFFFF;} + .d2-2891159010 .background-color-B1{background-color:#0D32B2;} + .d2-2891159010 .background-color-B2{background-color:#0D32B2;} + .d2-2891159010 .background-color-B3{background-color:#E3E9FD;} + .d2-2891159010 .background-color-B4{background-color:#E3E9FD;} + .d2-2891159010 .background-color-B5{background-color:#EDF0FD;} + .d2-2891159010 .background-color-B6{background-color:#F7F8FE;} + .d2-2891159010 .background-color-AA2{background-color:#4A6FF3;} + .d2-2891159010 .background-color-AA4{background-color:#EDF0FD;} + .d2-2891159010 .background-color-AA5{background-color:#F7F8FE;} + .d2-2891159010 .background-color-AB4{background-color:#EDF0FD;} + .d2-2891159010 .background-color-AB5{background-color:#F7F8FE;} + .d2-2891159010 .color-N1{color:#0A0F25;} + .d2-2891159010 .color-N2{color:#676C7E;} + .d2-2891159010 .color-N3{color:#9499AB;} + .d2-2891159010 .color-N4{color:#CFD2DD;} + .d2-2891159010 .color-N5{color:#DEE1EB;} + .d2-2891159010 .color-N6{color:#EEF1F8;} + .d2-2891159010 .color-N7{color:#FFFFFF;} + .d2-2891159010 .color-B1{color:#0D32B2;} + .d2-2891159010 .color-B2{color:#0D32B2;} + .d2-2891159010 .color-B3{color:#E3E9FD;} + .d2-2891159010 .color-B4{color:#E3E9FD;} + .d2-2891159010 .color-B5{color:#EDF0FD;} + .d2-2891159010 .color-B6{color:#F7F8FE;} + .d2-2891159010 .color-AA2{color:#4A6FF3;} + .d2-2891159010 .color-AA4{color:#EDF0FD;} + .d2-2891159010 .color-AA5{color:#F7F8FE;} + .d2-2891159010 .color-AB4{color:#EDF0FD;} + .d2-2891159010 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker-d2-2891159010);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker-d2-2891159010);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright-d2-2891159010);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright-d2-2891159010);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright-d2-2891159010);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright-d2-2891159010);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark-d2-2891159010);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright-d2-2891159010);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright-d2-2891159010);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright-d2-2891159010);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright-d2-2891159010);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker-d2-2891159010);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark-d2-2891159010);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal-d2-2891159010);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal-d2-2891159010);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright-d2-2891159010);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright-d2-2891159010);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright-d2-2891159010);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>abcdabcab From be5ba61297e7065005a81b321e1cc8fe7c63f088 Mon Sep 17 00:00:00 2001 From: Mayank Mohapatra <125661248+Mayank77maruti@users.noreply.github.com> Date: Sat, 22 Feb 2025 10:49:36 +0000 Subject: [PATCH 23/73] try --- d2layouts/d2cycle/layout.go | 96 ++++++++++++++++++++++--------------- 1 file changed, 58 insertions(+), 38 deletions(-) diff --git a/d2layouts/d2cycle/layout.go b/d2layouts/d2cycle/layout.go index 0e9036f748..af13cc00ee 100644 --- a/d2layouts/d2cycle/layout.go +++ b/d2layouts/d2cycle/layout.go @@ -66,44 +66,64 @@ func positionObjects(objects []*d2graph.Object, radius float64) { } func createCircularArc(edge *d2graph.Edge) { - if edge.Src == nil || edge.Dst == nil { - return - } - - srcCenter := edge.Src.Center() - dstCenter := edge.Dst.Center() - - srcAngle := math.Atan2(srcCenter.Y, srcCenter.X) - dstAngle := math.Atan2(dstCenter.Y, dstCenter.X) - if dstAngle < srcAngle { - dstAngle += 2 * math.Pi - } - - arcRadius := math.Hypot(srcCenter.X, srcCenter.Y) - - path := make([]*geo.Point, 0, ARC_STEPS+1) - 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) - path = append(path, geo.NewPoint(x, y)) - } - path[0] = srcCenter - path[len(path)-1] = dstCenter - - // Clamp endpoints to the boundaries of the source and destination 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. - path = trimPathPoints(path, edge.Src.Box) - path = trimPathPoints(path, edge.Dst.Box) - - edge.Route = path - edge.IsCurve = true + if edge.Src == nil || edge.Dst == nil { + return + } + + srcCenter := edge.Src.Center() + dstCenter := edge.Dst.Center() + + // Calculate the radius based on the distance from origin to the centers + srcRadius := math.Hypot(srcCenter.X, srcCenter.Y) + dstRadius := math.Hypot(dstCenter.X, dstCenter.Y) + + // Use average radius for more consistent arcs + + + // Calculate angles but preserve relative positioning + srcAngle := math.Atan2(srcCenter.Y, srcCenter.X) + dstAngle := math.Atan2(dstCenter.Y, dstCenter.X) + + // Ensure we take the shorter path around the circle + if dstAngle < srcAngle { + if srcAngle - dstAngle > math.Pi { + dstAngle += 2 * math.Pi + } + } else { + if dstAngle - srcAngle > math.Pi { + srcAngle += 2 * math.Pi + } + } + + path := make([]*geo.Point, 0, ARC_STEPS+1) + for i := 0; i <= ARC_STEPS; i++ { + t := float64(i) / float64(ARC_STEPS) + angle := srcAngle + t*(dstAngle-srcAngle) + + // Use interpolated radius for smoother transition + radius := srcRadius + t*(dstRadius-srcRadius) + + x := radius * math.Cos(angle) + y := radius * math.Sin(angle) + path = append(path, geo.NewPoint(x, y)) + } + + // Ensure exact endpoints + path[0] = srcCenter + path[len(path)-1] = dstCenter + + // Clamp endpoints to the boundaries of the source and destination 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 + path = trimPathPoints(path, edge.Src.Box) + path = trimPathPoints(path, edge.Dst.Box) + + edge.Route = path + edge.IsCurve = true } // clampPointOutsideBox walks forward along the path until it finds a point outside the box, From 85c1ea10f40d956c7db9aa6d0d681ef9ce97f308 Mon Sep 17 00:00:00 2001 From: Mayank Mohapatra <125661248+Mayank77maruti@users.noreply.github.com> Date: Sat, 22 Feb 2025 10:50:31 +0000 Subject: [PATCH 24/73] try --- d2layouts/d2cycle/layout.go | 96 +++++++++++++++---------------------- 1 file changed, 38 insertions(+), 58 deletions(-) diff --git a/d2layouts/d2cycle/layout.go b/d2layouts/d2cycle/layout.go index af13cc00ee..0e9036f748 100644 --- a/d2layouts/d2cycle/layout.go +++ b/d2layouts/d2cycle/layout.go @@ -66,64 +66,44 @@ func positionObjects(objects []*d2graph.Object, radius float64) { } func createCircularArc(edge *d2graph.Edge) { - if edge.Src == nil || edge.Dst == nil { - return - } - - srcCenter := edge.Src.Center() - dstCenter := edge.Dst.Center() - - // Calculate the radius based on the distance from origin to the centers - srcRadius := math.Hypot(srcCenter.X, srcCenter.Y) - dstRadius := math.Hypot(dstCenter.X, dstCenter.Y) - - // Use average radius for more consistent arcs - - - // Calculate angles but preserve relative positioning - srcAngle := math.Atan2(srcCenter.Y, srcCenter.X) - dstAngle := math.Atan2(dstCenter.Y, dstCenter.X) - - // Ensure we take the shorter path around the circle - if dstAngle < srcAngle { - if srcAngle - dstAngle > math.Pi { - dstAngle += 2 * math.Pi - } - } else { - if dstAngle - srcAngle > math.Pi { - srcAngle += 2 * math.Pi - } - } - - path := make([]*geo.Point, 0, ARC_STEPS+1) - for i := 0; i <= ARC_STEPS; i++ { - t := float64(i) / float64(ARC_STEPS) - angle := srcAngle + t*(dstAngle-srcAngle) - - // Use interpolated radius for smoother transition - radius := srcRadius + t*(dstRadius-srcRadius) - - x := radius * math.Cos(angle) - y := radius * math.Sin(angle) - path = append(path, geo.NewPoint(x, y)) - } - - // Ensure exact endpoints - path[0] = srcCenter - path[len(path)-1] = dstCenter - - // Clamp endpoints to the boundaries of the source and destination 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 - path = trimPathPoints(path, edge.Src.Box) - path = trimPathPoints(path, edge.Dst.Box) - - edge.Route = path - edge.IsCurve = true + if edge.Src == nil || edge.Dst == nil { + return + } + + srcCenter := edge.Src.Center() + dstCenter := edge.Dst.Center() + + srcAngle := math.Atan2(srcCenter.Y, srcCenter.X) + dstAngle := math.Atan2(dstCenter.Y, dstCenter.X) + if dstAngle < srcAngle { + dstAngle += 2 * math.Pi + } + + arcRadius := math.Hypot(srcCenter.X, srcCenter.Y) + + path := make([]*geo.Point, 0, ARC_STEPS+1) + 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) + path = append(path, geo.NewPoint(x, y)) + } + path[0] = srcCenter + path[len(path)-1] = dstCenter + + // Clamp endpoints to the boundaries of the source and destination 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. + path = trimPathPoints(path, edge.Src.Box) + path = trimPathPoints(path, edge.Dst.Box) + + edge.Route = path + edge.IsCurve = true } // clampPointOutsideBox walks forward along the path until it finds a point outside the box, From 6736a70389506a98b08423606cddcd9c3bec4820 Mon Sep 17 00:00:00 2001 From: Mayank Mohapatra <125661248+Mayank77maruti@users.noreply.github.com> Date: Sat, 22 Feb 2025 11:00:58 +0000 Subject: [PATCH 25/73] try --- d2layouts/d2cycle/layout.go | 61 +++++++ .../txtar/cycle-diagram/dagre/board.exp.json | 24 +-- .../txtar/cycle-diagram/dagre/sketch.exp.svg | 152 +++++++++--------- .../txtar/cycle-diagram/elk/board.exp.json | 24 +-- .../txtar/cycle-diagram/elk/sketch.exp.svg | 152 +++++++++--------- 5 files changed, 237 insertions(+), 176 deletions(-) diff --git a/d2layouts/d2cycle/layout.go b/d2layouts/d2cycle/layout.go index 0e9036f748..f0786f4009 100644 --- a/d2layouts/d2cycle/layout.go +++ b/d2layouts/d2cycle/layout.go @@ -65,6 +65,47 @@ func positionObjects(objects []*d2graph.Object, radius float64) { } } +// func createCircularArc(edge *d2graph.Edge) { +// if edge.Src == nil || edge.Dst == nil { +// return +// } + +// srcCenter := edge.Src.Center() +// dstCenter := edge.Dst.Center() + +// srcAngle := math.Atan2(srcCenter.Y, srcCenter.X) +// dstAngle := math.Atan2(dstCenter.Y, dstCenter.X) +// if dstAngle < srcAngle { +// dstAngle += 2 * math.Pi +// } + +// arcRadius := math.Hypot(srcCenter.X, srcCenter.Y) + +// path := make([]*geo.Point, 0, ARC_STEPS+1) +// 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) +// path = append(path, geo.NewPoint(x, y)) +// } +// path[0] = srcCenter +// path[len(path)-1] = dstCenter + +// // Clamp endpoints to the boundaries of the source and destination 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. +// path = trimPathPoints(path, edge.Src.Box) +// path = trimPathPoints(path, edge.Dst.Box) + +// edge.Route = path +// edge.IsCurve = true +// } +// createCircularArc creates a circular arc path for the edge and adjusts the last segment to align with the tangent direction. func createCircularArc(edge *d2graph.Edge) { if edge.Src == nil || edge.Dst == nil { return @@ -102,6 +143,26 @@ func createCircularArc(edge *d2graph.Edge) { path = trimPathPoints(path, edge.Src.Box) path = trimPathPoints(path, edge.Dst.Box) + // Adjust the last segment to align with the tangent direction at the destination + if len(path) >= 2 { + last := path[len(path)-1] + // Calculate tangent direction (perpendicular to radius vector) + tangentX := -last.Y + tangentY := last.X + tangentLength := math.Hypot(tangentX, tangentY) + if tangentLength > 0 { + // Normalize tangent direction + tangentDir := geo.NewPoint(tangentX/tangentLength, tangentY/tangentLength) + // Move second-to-last point along the tangent direction + delta := 10.0 + newSecondLast := geo.NewPoint( + last.X-delta*tangentDir.X, + last.Y-delta*tangentDir.Y, + ) + path[len(path)-2] = newSecondLast + } + } + edge.Route = path edge.IsCurve = true } diff --git a/e2etests/testdata/txtar/cycle-diagram/dagre/board.exp.json b/e2etests/testdata/txtar/cycle-diagram/dagre/board.exp.json index 78ed2dffeb..f260b08863 100644 --- a/e2etests/testdata/txtar/cycle-diagram/dagre/board.exp.json +++ b/e2etests/testdata/txtar/cycle-diagram/dagre/board.exp.json @@ -864,8 +864,8 @@ "y": -37.47600173950195 }, { - "x": 197.02099609375, - "y": -34.3849983215332 + "x": 195.6020050048828, + "y": -42.86199951171875 }, { "x": 197.2519989013672, @@ -1228,8 +1228,8 @@ "y": 197.53700256347656 }, { - "x": 28.18000030517578, - "y": 198.00399780273438 + "x": 36.4109992980957, + "y": 196.90499877929688 }, { "x": 26.5, @@ -1592,8 +1592,8 @@ "y": 37.47600173950195 }, { - "x": -197.02099609375, - "y": 34.3849983215332 + "x": -195.6020050048828, + "y": 42.86199951171875 }, { "x": -197.2519989013672, @@ -1972,8 +1972,8 @@ "y": 111.8030014038086 }, { - "x": 701.875, - "y": 115.77300262451172 + "x": 704.7830200195312, + "y": 107.5770034790039 }, { "x": 701.4329833984375, @@ -2336,8 +2336,8 @@ "y": 186.90899658203125 }, { - "x": 364.3710021972656, - "y": 183.8260040283203 + "x": 370.2919921875, + "y": 190.46800231933594 }, { "x": 363.6419982910156, @@ -2740,8 +2740,8 @@ "y": 196.45700073242188 }, { - "x": 1003.2860107421875, - "y": 197.53700256347656 + "x": 1008.4110107421875, + "y": 196.89300537109375 }, { "x": 998.5, diff --git a/e2etests/testdata/txtar/cycle-diagram/dagre/sketch.exp.svg b/e2etests/testdata/txtar/cycle-diagram/dagre/sketch.exp.svg index 015478d741..037adcdace 100644 --- a/e2etests/testdata/txtar/cycle-diagram/dagre/sketch.exp.svg +++ b/e2etests/testdata/txtar/cycle-diagram/dagre/sketch.exp.svg @@ -1,9 +1,9 @@ -abcdabcab + .d2-2450559997 .fill-N1{fill:#0A0F25;} + .d2-2450559997 .fill-N2{fill:#676C7E;} + .d2-2450559997 .fill-N3{fill:#9499AB;} + .d2-2450559997 .fill-N4{fill:#CFD2DD;} + .d2-2450559997 .fill-N5{fill:#DEE1EB;} + .d2-2450559997 .fill-N6{fill:#EEF1F8;} + .d2-2450559997 .fill-N7{fill:#FFFFFF;} + .d2-2450559997 .fill-B1{fill:#0D32B2;} + .d2-2450559997 .fill-B2{fill:#0D32B2;} + .d2-2450559997 .fill-B3{fill:#E3E9FD;} + .d2-2450559997 .fill-B4{fill:#E3E9FD;} + .d2-2450559997 .fill-B5{fill:#EDF0FD;} + .d2-2450559997 .fill-B6{fill:#F7F8FE;} + .d2-2450559997 .fill-AA2{fill:#4A6FF3;} + .d2-2450559997 .fill-AA4{fill:#EDF0FD;} + .d2-2450559997 .fill-AA5{fill:#F7F8FE;} + .d2-2450559997 .fill-AB4{fill:#EDF0FD;} + .d2-2450559997 .fill-AB5{fill:#F7F8FE;} + .d2-2450559997 .stroke-N1{stroke:#0A0F25;} + .d2-2450559997 .stroke-N2{stroke:#676C7E;} + .d2-2450559997 .stroke-N3{stroke:#9499AB;} + .d2-2450559997 .stroke-N4{stroke:#CFD2DD;} + .d2-2450559997 .stroke-N5{stroke:#DEE1EB;} + .d2-2450559997 .stroke-N6{stroke:#EEF1F8;} + .d2-2450559997 .stroke-N7{stroke:#FFFFFF;} + .d2-2450559997 .stroke-B1{stroke:#0D32B2;} + .d2-2450559997 .stroke-B2{stroke:#0D32B2;} + .d2-2450559997 .stroke-B3{stroke:#E3E9FD;} + .d2-2450559997 .stroke-B4{stroke:#E3E9FD;} + .d2-2450559997 .stroke-B5{stroke:#EDF0FD;} + .d2-2450559997 .stroke-B6{stroke:#F7F8FE;} + .d2-2450559997 .stroke-AA2{stroke:#4A6FF3;} + .d2-2450559997 .stroke-AA4{stroke:#EDF0FD;} + .d2-2450559997 .stroke-AA5{stroke:#F7F8FE;} + .d2-2450559997 .stroke-AB4{stroke:#EDF0FD;} + .d2-2450559997 .stroke-AB5{stroke:#F7F8FE;} + .d2-2450559997 .background-color-N1{background-color:#0A0F25;} + .d2-2450559997 .background-color-N2{background-color:#676C7E;} + .d2-2450559997 .background-color-N3{background-color:#9499AB;} + .d2-2450559997 .background-color-N4{background-color:#CFD2DD;} + .d2-2450559997 .background-color-N5{background-color:#DEE1EB;} + .d2-2450559997 .background-color-N6{background-color:#EEF1F8;} + .d2-2450559997 .background-color-N7{background-color:#FFFFFF;} + .d2-2450559997 .background-color-B1{background-color:#0D32B2;} + .d2-2450559997 .background-color-B2{background-color:#0D32B2;} + .d2-2450559997 .background-color-B3{background-color:#E3E9FD;} + .d2-2450559997 .background-color-B4{background-color:#E3E9FD;} + .d2-2450559997 .background-color-B5{background-color:#EDF0FD;} + .d2-2450559997 .background-color-B6{background-color:#F7F8FE;} + .d2-2450559997 .background-color-AA2{background-color:#4A6FF3;} + .d2-2450559997 .background-color-AA4{background-color:#EDF0FD;} + .d2-2450559997 .background-color-AA5{background-color:#F7F8FE;} + .d2-2450559997 .background-color-AB4{background-color:#EDF0FD;} + .d2-2450559997 .background-color-AB5{background-color:#F7F8FE;} + .d2-2450559997 .color-N1{color:#0A0F25;} + .d2-2450559997 .color-N2{color:#676C7E;} + .d2-2450559997 .color-N3{color:#9499AB;} + .d2-2450559997 .color-N4{color:#CFD2DD;} + .d2-2450559997 .color-N5{color:#DEE1EB;} + .d2-2450559997 .color-N6{color:#EEF1F8;} + .d2-2450559997 .color-N7{color:#FFFFFF;} + .d2-2450559997 .color-B1{color:#0D32B2;} + .d2-2450559997 .color-B2{color:#0D32B2;} + .d2-2450559997 .color-B3{color:#E3E9FD;} + .d2-2450559997 .color-B4{color:#E3E9FD;} + .d2-2450559997 .color-B5{color:#EDF0FD;} + .d2-2450559997 .color-B6{color:#F7F8FE;} + .d2-2450559997 .color-AA2{color:#4A6FF3;} + .d2-2450559997 .color-AA4{color:#EDF0FD;} + .d2-2450559997 .color-AA5{color:#F7F8FE;} + .d2-2450559997 .color-AB4{color:#EDF0FD;} + .d2-2450559997 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker-d2-2450559997);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker-d2-2450559997);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright-d2-2450559997);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright-d2-2450559997);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright-d2-2450559997);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright-d2-2450559997);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark-d2-2450559997);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright-d2-2450559997);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright-d2-2450559997);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright-d2-2450559997);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright-d2-2450559997);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker-d2-2450559997);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark-d2-2450559997);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal-d2-2450559997);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal-d2-2450559997);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright-d2-2450559997);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright-d2-2450559997);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright-d2-2450559997);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>abcdabcab diff --git a/e2etests/testdata/txtar/cycle-diagram/elk/board.exp.json b/e2etests/testdata/txtar/cycle-diagram/elk/board.exp.json index 6eb058a841..94712ff99d 100644 --- a/e2etests/testdata/txtar/cycle-diagram/elk/board.exp.json +++ b/e2etests/testdata/txtar/cycle-diagram/elk/board.exp.json @@ -864,8 +864,8 @@ "y": -25.47599983215332 }, { - "x": 209.02099609375, - "y": -22.385000228881836 + "x": 207.6020050048828, + "y": -30.86199951171875 }, { "x": 209.2519989013672, @@ -1228,8 +1228,8 @@ "y": 209.53700256347656 }, { - "x": 40.18000030517578, - "y": 210.00399780273438 + "x": 48.4109992980957, + "y": 208.90499877929688 }, { "x": 38.5, @@ -1592,8 +1592,8 @@ "y": 49.47600173950195 }, { - "x": -185.02099609375, - "y": 46.3849983215332 + "x": -183.6020050048828, + "y": 54.86199951171875 }, { "x": -185.2519989013672, @@ -1972,8 +1972,8 @@ "y": 123.8030014038086 }, { - "x": 674.375, - "y": 127.77300262451172 + "x": 677.2830200195312, + "y": 119.5770034790039 }, { "x": 673.9329833984375, @@ -2336,8 +2336,8 @@ "y": 198.90899658203125 }, { - "x": 336.8710021972656, - "y": 195.8260040283203 + "x": 342.7919921875, + "y": 202.46800231933594 }, { "x": 336.1419982910156, @@ -2740,8 +2740,8 @@ "y": 208.45700073242188 }, { - "x": 936.197021484375, - "y": 209.53700256347656 + "x": 941.3209838867188, + "y": 208.89300537109375 }, { "x": 931.4099731445312, diff --git a/e2etests/testdata/txtar/cycle-diagram/elk/sketch.exp.svg b/e2etests/testdata/txtar/cycle-diagram/elk/sketch.exp.svg index 21e65f752a..c894e3d67f 100644 --- a/e2etests/testdata/txtar/cycle-diagram/elk/sketch.exp.svg +++ b/e2etests/testdata/txtar/cycle-diagram/elk/sketch.exp.svg @@ -1,9 +1,9 @@ -abcdabcab + .d2-3675916959 .fill-N1{fill:#0A0F25;} + .d2-3675916959 .fill-N2{fill:#676C7E;} + .d2-3675916959 .fill-N3{fill:#9499AB;} + .d2-3675916959 .fill-N4{fill:#CFD2DD;} + .d2-3675916959 .fill-N5{fill:#DEE1EB;} + .d2-3675916959 .fill-N6{fill:#EEF1F8;} + .d2-3675916959 .fill-N7{fill:#FFFFFF;} + .d2-3675916959 .fill-B1{fill:#0D32B2;} + .d2-3675916959 .fill-B2{fill:#0D32B2;} + .d2-3675916959 .fill-B3{fill:#E3E9FD;} + .d2-3675916959 .fill-B4{fill:#E3E9FD;} + .d2-3675916959 .fill-B5{fill:#EDF0FD;} + .d2-3675916959 .fill-B6{fill:#F7F8FE;} + .d2-3675916959 .fill-AA2{fill:#4A6FF3;} + .d2-3675916959 .fill-AA4{fill:#EDF0FD;} + .d2-3675916959 .fill-AA5{fill:#F7F8FE;} + .d2-3675916959 .fill-AB4{fill:#EDF0FD;} + .d2-3675916959 .fill-AB5{fill:#F7F8FE;} + .d2-3675916959 .stroke-N1{stroke:#0A0F25;} + .d2-3675916959 .stroke-N2{stroke:#676C7E;} + .d2-3675916959 .stroke-N3{stroke:#9499AB;} + .d2-3675916959 .stroke-N4{stroke:#CFD2DD;} + .d2-3675916959 .stroke-N5{stroke:#DEE1EB;} + .d2-3675916959 .stroke-N6{stroke:#EEF1F8;} + .d2-3675916959 .stroke-N7{stroke:#FFFFFF;} + .d2-3675916959 .stroke-B1{stroke:#0D32B2;} + .d2-3675916959 .stroke-B2{stroke:#0D32B2;} + .d2-3675916959 .stroke-B3{stroke:#E3E9FD;} + .d2-3675916959 .stroke-B4{stroke:#E3E9FD;} + .d2-3675916959 .stroke-B5{stroke:#EDF0FD;} + .d2-3675916959 .stroke-B6{stroke:#F7F8FE;} + .d2-3675916959 .stroke-AA2{stroke:#4A6FF3;} + .d2-3675916959 .stroke-AA4{stroke:#EDF0FD;} + .d2-3675916959 .stroke-AA5{stroke:#F7F8FE;} + .d2-3675916959 .stroke-AB4{stroke:#EDF0FD;} + .d2-3675916959 .stroke-AB5{stroke:#F7F8FE;} + .d2-3675916959 .background-color-N1{background-color:#0A0F25;} + .d2-3675916959 .background-color-N2{background-color:#676C7E;} + .d2-3675916959 .background-color-N3{background-color:#9499AB;} + .d2-3675916959 .background-color-N4{background-color:#CFD2DD;} + .d2-3675916959 .background-color-N5{background-color:#DEE1EB;} + .d2-3675916959 .background-color-N6{background-color:#EEF1F8;} + .d2-3675916959 .background-color-N7{background-color:#FFFFFF;} + .d2-3675916959 .background-color-B1{background-color:#0D32B2;} + .d2-3675916959 .background-color-B2{background-color:#0D32B2;} + .d2-3675916959 .background-color-B3{background-color:#E3E9FD;} + .d2-3675916959 .background-color-B4{background-color:#E3E9FD;} + .d2-3675916959 .background-color-B5{background-color:#EDF0FD;} + .d2-3675916959 .background-color-B6{background-color:#F7F8FE;} + .d2-3675916959 .background-color-AA2{background-color:#4A6FF3;} + .d2-3675916959 .background-color-AA4{background-color:#EDF0FD;} + .d2-3675916959 .background-color-AA5{background-color:#F7F8FE;} + .d2-3675916959 .background-color-AB4{background-color:#EDF0FD;} + .d2-3675916959 .background-color-AB5{background-color:#F7F8FE;} + .d2-3675916959 .color-N1{color:#0A0F25;} + .d2-3675916959 .color-N2{color:#676C7E;} + .d2-3675916959 .color-N3{color:#9499AB;} + .d2-3675916959 .color-N4{color:#CFD2DD;} + .d2-3675916959 .color-N5{color:#DEE1EB;} + .d2-3675916959 .color-N6{color:#EEF1F8;} + .d2-3675916959 .color-N7{color:#FFFFFF;} + .d2-3675916959 .color-B1{color:#0D32B2;} + .d2-3675916959 .color-B2{color:#0D32B2;} + .d2-3675916959 .color-B3{color:#E3E9FD;} + .d2-3675916959 .color-B4{color:#E3E9FD;} + .d2-3675916959 .color-B5{color:#EDF0FD;} + .d2-3675916959 .color-B6{color:#F7F8FE;} + .d2-3675916959 .color-AA2{color:#4A6FF3;} + .d2-3675916959 .color-AA4{color:#EDF0FD;} + .d2-3675916959 .color-AA5{color:#F7F8FE;} + .d2-3675916959 .color-AB4{color:#EDF0FD;} + .d2-3675916959 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker-d2-3675916959);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker-d2-3675916959);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright-d2-3675916959);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright-d2-3675916959);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright-d2-3675916959);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright-d2-3675916959);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark-d2-3675916959);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright-d2-3675916959);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright-d2-3675916959);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright-d2-3675916959);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright-d2-3675916959);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker-d2-3675916959);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark-d2-3675916959);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal-d2-3675916959);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal-d2-3675916959);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright-d2-3675916959);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright-d2-3675916959);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright-d2-3675916959);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>abcdabcab From b99d79cd97e80995f75d5cbc957c2a41a95b3112 Mon Sep 17 00:00:00 2001 From: Mayank Mohapatra <125661248+Mayank77maruti@users.noreply.github.com> Date: Sat, 22 Feb 2025 11:04:03 +0000 Subject: [PATCH 26/73] try --- d2layouts/d2cycle/layout.go | 61 ------- .../txtar/cycle-diagram/dagre/board.exp.json | 24 +-- .../txtar/cycle-diagram/dagre/sketch.exp.svg | 152 +++++++++--------- .../txtar/cycle-diagram/elk/board.exp.json | 24 +-- .../txtar/cycle-diagram/elk/sketch.exp.svg | 152 +++++++++--------- 5 files changed, 176 insertions(+), 237 deletions(-) diff --git a/d2layouts/d2cycle/layout.go b/d2layouts/d2cycle/layout.go index f0786f4009..0e9036f748 100644 --- a/d2layouts/d2cycle/layout.go +++ b/d2layouts/d2cycle/layout.go @@ -65,47 +65,6 @@ func positionObjects(objects []*d2graph.Object, radius float64) { } } -// func createCircularArc(edge *d2graph.Edge) { -// if edge.Src == nil || edge.Dst == nil { -// return -// } - -// srcCenter := edge.Src.Center() -// dstCenter := edge.Dst.Center() - -// srcAngle := math.Atan2(srcCenter.Y, srcCenter.X) -// dstAngle := math.Atan2(dstCenter.Y, dstCenter.X) -// if dstAngle < srcAngle { -// dstAngle += 2 * math.Pi -// } - -// arcRadius := math.Hypot(srcCenter.X, srcCenter.Y) - -// path := make([]*geo.Point, 0, ARC_STEPS+1) -// 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) -// path = append(path, geo.NewPoint(x, y)) -// } -// path[0] = srcCenter -// path[len(path)-1] = dstCenter - -// // Clamp endpoints to the boundaries of the source and destination 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. -// path = trimPathPoints(path, edge.Src.Box) -// path = trimPathPoints(path, edge.Dst.Box) - -// edge.Route = path -// edge.IsCurve = true -// } -// createCircularArc creates a circular arc path for the edge and adjusts the last segment to align with the tangent direction. func createCircularArc(edge *d2graph.Edge) { if edge.Src == nil || edge.Dst == nil { return @@ -143,26 +102,6 @@ func createCircularArc(edge *d2graph.Edge) { path = trimPathPoints(path, edge.Src.Box) path = trimPathPoints(path, edge.Dst.Box) - // Adjust the last segment to align with the tangent direction at the destination - if len(path) >= 2 { - last := path[len(path)-1] - // Calculate tangent direction (perpendicular to radius vector) - tangentX := -last.Y - tangentY := last.X - tangentLength := math.Hypot(tangentX, tangentY) - if tangentLength > 0 { - // Normalize tangent direction - tangentDir := geo.NewPoint(tangentX/tangentLength, tangentY/tangentLength) - // Move second-to-last point along the tangent direction - delta := 10.0 - newSecondLast := geo.NewPoint( - last.X-delta*tangentDir.X, - last.Y-delta*tangentDir.Y, - ) - path[len(path)-2] = newSecondLast - } - } - edge.Route = path edge.IsCurve = true } diff --git a/e2etests/testdata/txtar/cycle-diagram/dagre/board.exp.json b/e2etests/testdata/txtar/cycle-diagram/dagre/board.exp.json index f260b08863..78ed2dffeb 100644 --- a/e2etests/testdata/txtar/cycle-diagram/dagre/board.exp.json +++ b/e2etests/testdata/txtar/cycle-diagram/dagre/board.exp.json @@ -864,8 +864,8 @@ "y": -37.47600173950195 }, { - "x": 195.6020050048828, - "y": -42.86199951171875 + "x": 197.02099609375, + "y": -34.3849983215332 }, { "x": 197.2519989013672, @@ -1228,8 +1228,8 @@ "y": 197.53700256347656 }, { - "x": 36.4109992980957, - "y": 196.90499877929688 + "x": 28.18000030517578, + "y": 198.00399780273438 }, { "x": 26.5, @@ -1592,8 +1592,8 @@ "y": 37.47600173950195 }, { - "x": -195.6020050048828, - "y": 42.86199951171875 + "x": -197.02099609375, + "y": 34.3849983215332 }, { "x": -197.2519989013672, @@ -1972,8 +1972,8 @@ "y": 111.8030014038086 }, { - "x": 704.7830200195312, - "y": 107.5770034790039 + "x": 701.875, + "y": 115.77300262451172 }, { "x": 701.4329833984375, @@ -2336,8 +2336,8 @@ "y": 186.90899658203125 }, { - "x": 370.2919921875, - "y": 190.46800231933594 + "x": 364.3710021972656, + "y": 183.8260040283203 }, { "x": 363.6419982910156, @@ -2740,8 +2740,8 @@ "y": 196.45700073242188 }, { - "x": 1008.4110107421875, - "y": 196.89300537109375 + "x": 1003.2860107421875, + "y": 197.53700256347656 }, { "x": 998.5, diff --git a/e2etests/testdata/txtar/cycle-diagram/dagre/sketch.exp.svg b/e2etests/testdata/txtar/cycle-diagram/dagre/sketch.exp.svg index 037adcdace..015478d741 100644 --- a/e2etests/testdata/txtar/cycle-diagram/dagre/sketch.exp.svg +++ b/e2etests/testdata/txtar/cycle-diagram/dagre/sketch.exp.svg @@ -1,9 +1,9 @@ -abcdabcab + .d2-153681122 .fill-N1{fill:#0A0F25;} + .d2-153681122 .fill-N2{fill:#676C7E;} + .d2-153681122 .fill-N3{fill:#9499AB;} + .d2-153681122 .fill-N4{fill:#CFD2DD;} + .d2-153681122 .fill-N5{fill:#DEE1EB;} + .d2-153681122 .fill-N6{fill:#EEF1F8;} + .d2-153681122 .fill-N7{fill:#FFFFFF;} + .d2-153681122 .fill-B1{fill:#0D32B2;} + .d2-153681122 .fill-B2{fill:#0D32B2;} + .d2-153681122 .fill-B3{fill:#E3E9FD;} + .d2-153681122 .fill-B4{fill:#E3E9FD;} + .d2-153681122 .fill-B5{fill:#EDF0FD;} + .d2-153681122 .fill-B6{fill:#F7F8FE;} + .d2-153681122 .fill-AA2{fill:#4A6FF3;} + .d2-153681122 .fill-AA4{fill:#EDF0FD;} + .d2-153681122 .fill-AA5{fill:#F7F8FE;} + .d2-153681122 .fill-AB4{fill:#EDF0FD;} + .d2-153681122 .fill-AB5{fill:#F7F8FE;} + .d2-153681122 .stroke-N1{stroke:#0A0F25;} + .d2-153681122 .stroke-N2{stroke:#676C7E;} + .d2-153681122 .stroke-N3{stroke:#9499AB;} + .d2-153681122 .stroke-N4{stroke:#CFD2DD;} + .d2-153681122 .stroke-N5{stroke:#DEE1EB;} + .d2-153681122 .stroke-N6{stroke:#EEF1F8;} + .d2-153681122 .stroke-N7{stroke:#FFFFFF;} + .d2-153681122 .stroke-B1{stroke:#0D32B2;} + .d2-153681122 .stroke-B2{stroke:#0D32B2;} + .d2-153681122 .stroke-B3{stroke:#E3E9FD;} + .d2-153681122 .stroke-B4{stroke:#E3E9FD;} + .d2-153681122 .stroke-B5{stroke:#EDF0FD;} + .d2-153681122 .stroke-B6{stroke:#F7F8FE;} + .d2-153681122 .stroke-AA2{stroke:#4A6FF3;} + .d2-153681122 .stroke-AA4{stroke:#EDF0FD;} + .d2-153681122 .stroke-AA5{stroke:#F7F8FE;} + .d2-153681122 .stroke-AB4{stroke:#EDF0FD;} + .d2-153681122 .stroke-AB5{stroke:#F7F8FE;} + .d2-153681122 .background-color-N1{background-color:#0A0F25;} + .d2-153681122 .background-color-N2{background-color:#676C7E;} + .d2-153681122 .background-color-N3{background-color:#9499AB;} + .d2-153681122 .background-color-N4{background-color:#CFD2DD;} + .d2-153681122 .background-color-N5{background-color:#DEE1EB;} + .d2-153681122 .background-color-N6{background-color:#EEF1F8;} + .d2-153681122 .background-color-N7{background-color:#FFFFFF;} + .d2-153681122 .background-color-B1{background-color:#0D32B2;} + .d2-153681122 .background-color-B2{background-color:#0D32B2;} + .d2-153681122 .background-color-B3{background-color:#E3E9FD;} + .d2-153681122 .background-color-B4{background-color:#E3E9FD;} + .d2-153681122 .background-color-B5{background-color:#EDF0FD;} + .d2-153681122 .background-color-B6{background-color:#F7F8FE;} + .d2-153681122 .background-color-AA2{background-color:#4A6FF3;} + .d2-153681122 .background-color-AA4{background-color:#EDF0FD;} + .d2-153681122 .background-color-AA5{background-color:#F7F8FE;} + .d2-153681122 .background-color-AB4{background-color:#EDF0FD;} + .d2-153681122 .background-color-AB5{background-color:#F7F8FE;} + .d2-153681122 .color-N1{color:#0A0F25;} + .d2-153681122 .color-N2{color:#676C7E;} + .d2-153681122 .color-N3{color:#9499AB;} + .d2-153681122 .color-N4{color:#CFD2DD;} + .d2-153681122 .color-N5{color:#DEE1EB;} + .d2-153681122 .color-N6{color:#EEF1F8;} + .d2-153681122 .color-N7{color:#FFFFFF;} + .d2-153681122 .color-B1{color:#0D32B2;} + .d2-153681122 .color-B2{color:#0D32B2;} + .d2-153681122 .color-B3{color:#E3E9FD;} + .d2-153681122 .color-B4{color:#E3E9FD;} + .d2-153681122 .color-B5{color:#EDF0FD;} + .d2-153681122 .color-B6{color:#F7F8FE;} + .d2-153681122 .color-AA2{color:#4A6FF3;} + .d2-153681122 .color-AA4{color:#EDF0FD;} + .d2-153681122 .color-AA5{color:#F7F8FE;} + .d2-153681122 .color-AB4{color:#EDF0FD;} + .d2-153681122 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker-d2-153681122);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker-d2-153681122);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright-d2-153681122);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright-d2-153681122);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright-d2-153681122);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright-d2-153681122);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark-d2-153681122);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright-d2-153681122);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright-d2-153681122);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright-d2-153681122);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright-d2-153681122);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker-d2-153681122);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark-d2-153681122);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal-d2-153681122);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal-d2-153681122);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright-d2-153681122);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright-d2-153681122);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright-d2-153681122);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>abcdabcab diff --git a/e2etests/testdata/txtar/cycle-diagram/elk/board.exp.json b/e2etests/testdata/txtar/cycle-diagram/elk/board.exp.json index 94712ff99d..6eb058a841 100644 --- a/e2etests/testdata/txtar/cycle-diagram/elk/board.exp.json +++ b/e2etests/testdata/txtar/cycle-diagram/elk/board.exp.json @@ -864,8 +864,8 @@ "y": -25.47599983215332 }, { - "x": 207.6020050048828, - "y": -30.86199951171875 + "x": 209.02099609375, + "y": -22.385000228881836 }, { "x": 209.2519989013672, @@ -1228,8 +1228,8 @@ "y": 209.53700256347656 }, { - "x": 48.4109992980957, - "y": 208.90499877929688 + "x": 40.18000030517578, + "y": 210.00399780273438 }, { "x": 38.5, @@ -1592,8 +1592,8 @@ "y": 49.47600173950195 }, { - "x": -183.6020050048828, - "y": 54.86199951171875 + "x": -185.02099609375, + "y": 46.3849983215332 }, { "x": -185.2519989013672, @@ -1972,8 +1972,8 @@ "y": 123.8030014038086 }, { - "x": 677.2830200195312, - "y": 119.5770034790039 + "x": 674.375, + "y": 127.77300262451172 }, { "x": 673.9329833984375, @@ -2336,8 +2336,8 @@ "y": 198.90899658203125 }, { - "x": 342.7919921875, - "y": 202.46800231933594 + "x": 336.8710021972656, + "y": 195.8260040283203 }, { "x": 336.1419982910156, @@ -2740,8 +2740,8 @@ "y": 208.45700073242188 }, { - "x": 941.3209838867188, - "y": 208.89300537109375 + "x": 936.197021484375, + "y": 209.53700256347656 }, { "x": 931.4099731445312, diff --git a/e2etests/testdata/txtar/cycle-diagram/elk/sketch.exp.svg b/e2etests/testdata/txtar/cycle-diagram/elk/sketch.exp.svg index c894e3d67f..21e65f752a 100644 --- a/e2etests/testdata/txtar/cycle-diagram/elk/sketch.exp.svg +++ b/e2etests/testdata/txtar/cycle-diagram/elk/sketch.exp.svg @@ -1,9 +1,9 @@ -abcdabcab + .d2-2891159010 .fill-N1{fill:#0A0F25;} + .d2-2891159010 .fill-N2{fill:#676C7E;} + .d2-2891159010 .fill-N3{fill:#9499AB;} + .d2-2891159010 .fill-N4{fill:#CFD2DD;} + .d2-2891159010 .fill-N5{fill:#DEE1EB;} + .d2-2891159010 .fill-N6{fill:#EEF1F8;} + .d2-2891159010 .fill-N7{fill:#FFFFFF;} + .d2-2891159010 .fill-B1{fill:#0D32B2;} + .d2-2891159010 .fill-B2{fill:#0D32B2;} + .d2-2891159010 .fill-B3{fill:#E3E9FD;} + .d2-2891159010 .fill-B4{fill:#E3E9FD;} + .d2-2891159010 .fill-B5{fill:#EDF0FD;} + .d2-2891159010 .fill-B6{fill:#F7F8FE;} + .d2-2891159010 .fill-AA2{fill:#4A6FF3;} + .d2-2891159010 .fill-AA4{fill:#EDF0FD;} + .d2-2891159010 .fill-AA5{fill:#F7F8FE;} + .d2-2891159010 .fill-AB4{fill:#EDF0FD;} + .d2-2891159010 .fill-AB5{fill:#F7F8FE;} + .d2-2891159010 .stroke-N1{stroke:#0A0F25;} + .d2-2891159010 .stroke-N2{stroke:#676C7E;} + .d2-2891159010 .stroke-N3{stroke:#9499AB;} + .d2-2891159010 .stroke-N4{stroke:#CFD2DD;} + .d2-2891159010 .stroke-N5{stroke:#DEE1EB;} + .d2-2891159010 .stroke-N6{stroke:#EEF1F8;} + .d2-2891159010 .stroke-N7{stroke:#FFFFFF;} + .d2-2891159010 .stroke-B1{stroke:#0D32B2;} + .d2-2891159010 .stroke-B2{stroke:#0D32B2;} + .d2-2891159010 .stroke-B3{stroke:#E3E9FD;} + .d2-2891159010 .stroke-B4{stroke:#E3E9FD;} + .d2-2891159010 .stroke-B5{stroke:#EDF0FD;} + .d2-2891159010 .stroke-B6{stroke:#F7F8FE;} + .d2-2891159010 .stroke-AA2{stroke:#4A6FF3;} + .d2-2891159010 .stroke-AA4{stroke:#EDF0FD;} + .d2-2891159010 .stroke-AA5{stroke:#F7F8FE;} + .d2-2891159010 .stroke-AB4{stroke:#EDF0FD;} + .d2-2891159010 .stroke-AB5{stroke:#F7F8FE;} + .d2-2891159010 .background-color-N1{background-color:#0A0F25;} + .d2-2891159010 .background-color-N2{background-color:#676C7E;} + .d2-2891159010 .background-color-N3{background-color:#9499AB;} + .d2-2891159010 .background-color-N4{background-color:#CFD2DD;} + .d2-2891159010 .background-color-N5{background-color:#DEE1EB;} + .d2-2891159010 .background-color-N6{background-color:#EEF1F8;} + .d2-2891159010 .background-color-N7{background-color:#FFFFFF;} + .d2-2891159010 .background-color-B1{background-color:#0D32B2;} + .d2-2891159010 .background-color-B2{background-color:#0D32B2;} + .d2-2891159010 .background-color-B3{background-color:#E3E9FD;} + .d2-2891159010 .background-color-B4{background-color:#E3E9FD;} + .d2-2891159010 .background-color-B5{background-color:#EDF0FD;} + .d2-2891159010 .background-color-B6{background-color:#F7F8FE;} + .d2-2891159010 .background-color-AA2{background-color:#4A6FF3;} + .d2-2891159010 .background-color-AA4{background-color:#EDF0FD;} + .d2-2891159010 .background-color-AA5{background-color:#F7F8FE;} + .d2-2891159010 .background-color-AB4{background-color:#EDF0FD;} + .d2-2891159010 .background-color-AB5{background-color:#F7F8FE;} + .d2-2891159010 .color-N1{color:#0A0F25;} + .d2-2891159010 .color-N2{color:#676C7E;} + .d2-2891159010 .color-N3{color:#9499AB;} + .d2-2891159010 .color-N4{color:#CFD2DD;} + .d2-2891159010 .color-N5{color:#DEE1EB;} + .d2-2891159010 .color-N6{color:#EEF1F8;} + .d2-2891159010 .color-N7{color:#FFFFFF;} + .d2-2891159010 .color-B1{color:#0D32B2;} + .d2-2891159010 .color-B2{color:#0D32B2;} + .d2-2891159010 .color-B3{color:#E3E9FD;} + .d2-2891159010 .color-B4{color:#E3E9FD;} + .d2-2891159010 .color-B5{color:#EDF0FD;} + .d2-2891159010 .color-B6{color:#F7F8FE;} + .d2-2891159010 .color-AA2{color:#4A6FF3;} + .d2-2891159010 .color-AA4{color:#EDF0FD;} + .d2-2891159010 .color-AA5{color:#F7F8FE;} + .d2-2891159010 .color-AB4{color:#EDF0FD;} + .d2-2891159010 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker-d2-2891159010);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker-d2-2891159010);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright-d2-2891159010);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright-d2-2891159010);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright-d2-2891159010);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright-d2-2891159010);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark-d2-2891159010);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright-d2-2891159010);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright-d2-2891159010);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright-d2-2891159010);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright-d2-2891159010);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker-d2-2891159010);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark-d2-2891159010);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal-d2-2891159010);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal-d2-2891159010);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright-d2-2891159010);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright-d2-2891159010);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright-d2-2891159010);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>abcdabcab From 703ab3300b89ef18453b605adbc8c7a210665fa6 Mon Sep 17 00:00:00 2001 From: Mayank Mohapatra <125661248+Mayank77maruti@users.noreply.github.com> Date: Sat, 22 Feb 2025 11:05:45 +0000 Subject: [PATCH 27/73] try --- d2layouts/d2cycle/layout.go | 98 +++- .../txtar/cycle-diagram/dagre/board.exp.json | 424 +++++++++++++++++- .../txtar/cycle-diagram/dagre/sketch.exp.svg | 152 +++---- .../txtar/cycle-diagram/elk/board.exp.json | 424 +++++++++++++++++- .../txtar/cycle-diagram/elk/sketch.exp.svg | 152 +++---- 5 files changed, 1036 insertions(+), 214 deletions(-) diff --git a/d2layouts/d2cycle/layout.go b/d2layouts/d2cycle/layout.go index 0e9036f748..a7a4ad36d2 100644 --- a/d2layouts/d2cycle/layout.go +++ b/d2layouts/d2cycle/layout.go @@ -65,6 +65,46 @@ func positionObjects(objects []*d2graph.Object, radius float64) { } } +// func createCircularArc(edge *d2graph.Edge) { +// if edge.Src == nil || edge.Dst == nil { +// return +// } + +// srcCenter := edge.Src.Center() +// dstCenter := edge.Dst.Center() + +// srcAngle := math.Atan2(srcCenter.Y, srcCenter.X) +// dstAngle := math.Atan2(dstCenter.Y, dstCenter.X) +// if dstAngle < srcAngle { +// dstAngle += 2 * math.Pi +// } + +// arcRadius := math.Hypot(srcCenter.X, srcCenter.Y) + +// path := make([]*geo.Point, 0, ARC_STEPS+1) +// 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) +// path = append(path, geo.NewPoint(x, y)) +// } +// path[0] = srcCenter +// path[len(path)-1] = dstCenter + +// // Clamp endpoints to the boundaries of the source and destination 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. +// path = trimPathPoints(path, edge.Src.Box) +// path = trimPathPoints(path, edge.Dst.Box) + +// edge.Route = path +// edge.IsCurve = true +// } func createCircularArc(edge *d2graph.Edge) { if edge.Src == nil || edge.Dst == nil { return @@ -73,15 +113,27 @@ func createCircularArc(edge *d2graph.Edge) { srcCenter := edge.Src.Center() dstCenter := edge.Dst.Center() + // Calculate angles and ensure we take the shortest arc srcAngle := math.Atan2(srcCenter.Y, srcCenter.X) dstAngle := math.Atan2(dstCenter.Y, dstCenter.X) - if dstAngle < srcAngle { - dstAngle += 2 * math.Pi + + // Calculate angular distance for both directions + clockwiseDist := dstAngle - srcAngle + + + // Choose shortest path + if math.Abs(clockwiseDist) > math.Pi { + if clockwiseDist > 0 { + dstAngle -= 2 * math.Pi + } else { + dstAngle += 2 * math.Pi + } } arcRadius := math.Hypot(srcCenter.X, srcCenter.Y) - path := make([]*geo.Point, 0, ARC_STEPS+1) + + // Generate path with corrected direction for i := 0; i <= ARC_STEPS; i++ { t := float64(i) / float64(ARC_STEPS) angle := srcAngle + t*(dstAngle-srcAngle) @@ -89,23 +141,41 @@ func createCircularArc(edge *d2graph.Edge) { y := arcRadius * math.Sin(angle) path = append(path, geo.NewPoint(x, y)) } - path[0] = srcCenter - path[len(path)-1] = dstCenter - // Clamp endpoints to the boundaries of the source and destination 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 + // [Keep existing clamping and trimming code...] + + // Calculate tangent direction based on arc direction + if len(path) >= 2 { + last := path[len(path)-1] + var tangentX, tangentY float64 + + // Determine direction using angular difference + if (dstAngle - srcAngle) > 0 { + // Counter-clockwise direction + tangentX = -last.Y + tangentY = last.X + } else { + // Clockwise direction + tangentX = last.Y + tangentY = -last.X + } - // Trim redundant path points that fall inside node boundaries. - path = trimPathPoints(path, edge.Src.Box) - path = trimPathPoints(path, edge.Dst.Box) + // Normalize and adjust second-to-last point + tangentLength := math.Hypot(tangentX, tangentY) + if tangentLength > 0 { + tangentDir := geo.NewPoint(tangentX/tangentLength, tangentY/tangentLength) + delta := 10.0 + newSecondLast := geo.NewPoint( + last.X-delta*tangentDir.X, + last.Y-delta*tangentDir.Y, + ) + path[len(path)-2] = newSecondLast + } + } edge.Route = path edge.IsCurve = true } - // clampPointOutsideBox walks forward along the path until it finds a point outside the box, // then replaces the point with a precise intersection. func clampPointOutsideBox(box *geo.Box, path []*geo.Point, startIdx int) (int, *geo.Point) { diff --git a/e2etests/testdata/txtar/cycle-diagram/dagre/board.exp.json b/e2etests/testdata/txtar/cycle-diagram/dagre/board.exp.json index 78ed2dffeb..c29fd74eec 100644 --- a/e2etests/testdata/txtar/cycle-diagram/dagre/board.exp.json +++ b/e2etests/testdata/txtar/cycle-diagram/dagre/board.exp.json @@ -540,8 +540,40 @@ "link": "", "route": [ { - "x": 26.5, - "y": -198.22999572753906 + "x": 0, + "y": -200 + }, + { + "x": 3.1410000324249268, + "y": -199.97500610351562 + }, + { + "x": 6.2820000648498535, + "y": -199.9010009765625 + }, + { + "x": 9.420999526977539, + "y": -199.77699279785156 + }, + { + "x": 12.557999610900879, + "y": -199.60499572753906 + }, + { + "x": 15.690999984741211, + "y": -199.38299560546875 + }, + { + "x": 18.820999145507812, + "y": -199.11199951171875 + }, + { + "x": 21.945999145507812, + "y": -198.79200744628906 + }, + { + "x": 25.06599998474121, + "y": -198.4219970703125 }, { "x": 28.18000030517578, @@ -868,8 +900,48 @@ "y": -34.3849983215332 }, { - "x": 197.2519989013672, - "y": -33 + "x": 197.53700256347656, + "y": -31.285999298095703 + }, + { + "x": 198.00399780273438, + "y": -28.18000030517578 + }, + { + "x": 198.4219970703125, + "y": -25.06599998474121 + }, + { + "x": 198.79200744628906, + "y": -21.945999145507812 + }, + { + "x": 199.11199951171875, + "y": -18.820999145507812 + }, + { + "x": 199.38299560546875, + "y": -15.690999984741211 + }, + { + "x": 199.60499572753906, + "y": -12.557999610900879 + }, + { + "x": 199.77699279785156, + "y": -9.420999526977539 + }, + { + "x": 199.9010009765625, + "y": -6.2820000648498535 + }, + { + "x": 200, + "y": -10 + }, + { + "x": 200, + "y": 0 } ], "isCurve": true, @@ -904,8 +976,48 @@ "link": "", "route": [ { - "x": 197.2519989013672, - "y": 33 + "x": 200, + "y": 0 + }, + { + "x": 199.97500610351562, + "y": 3.1410000324249268 + }, + { + "x": 199.9010009765625, + "y": 6.2820000648498535 + }, + { + "x": 199.77699279785156, + "y": 9.420999526977539 + }, + { + "x": 199.60499572753906, + "y": 12.557999610900879 + }, + { + "x": 199.38299560546875, + "y": 15.690999984741211 + }, + { + "x": 199.11199951171875, + "y": 18.820999145507812 + }, + { + "x": 198.79200744628906, + "y": 21.945999145507812 + }, + { + "x": 198.4219970703125, + "y": 25.06599998474121 + }, + { + "x": 198.00399780273438, + "y": 28.18000030517578 + }, + { + "x": 197.53700256347656, + "y": 31.285999298095703 }, { "x": 197.02099609375, @@ -1232,8 +1344,40 @@ "y": 198.00399780273438 }, { - "x": 26.5, - "y": 198.22999572753906 + "x": 25.06599998474121, + "y": 198.4219970703125 + }, + { + "x": 21.945999145507812, + "y": 198.79200744628906 + }, + { + "x": 18.820999145507812, + "y": 199.11199951171875 + }, + { + "x": 15.690999984741211, + "y": 199.38299560546875 + }, + { + "x": 12.557999610900879, + "y": 199.60499572753906 + }, + { + "x": 9.420999526977539, + "y": 199.77699279785156 + }, + { + "x": 6.2820000648498535, + "y": 199.9010009765625 + }, + { + "x": 10, + "y": 200 + }, + { + "x": 0, + "y": 200 } ], "isCurve": true, @@ -1268,8 +1412,40 @@ "link": "", "route": [ { - "x": -26.499000549316406, - "y": 198.22999572753906 + "x": 0, + "y": 200 + }, + { + "x": -3.1410000324249268, + "y": 199.97500610351562 + }, + { + "x": -6.2820000648498535, + "y": 199.9010009765625 + }, + { + "x": -9.420999526977539, + "y": 199.77699279785156 + }, + { + "x": -12.557999610900879, + "y": 199.60499572753906 + }, + { + "x": -15.690999984741211, + "y": 199.38299560546875 + }, + { + "x": -18.820999145507812, + "y": 199.11199951171875 + }, + { + "x": -21.945999145507812, + "y": 198.79200744628906 + }, + { + "x": -25.06599998474121, + "y": 198.4219970703125 }, { "x": -28.18000030517578, @@ -1596,8 +1772,48 @@ "y": 34.3849983215332 }, { - "x": -197.2519989013672, - "y": 33 + "x": -197.53700256347656, + "y": 31.285999298095703 + }, + { + "x": -198.00399780273438, + "y": 28.18000030517578 + }, + { + "x": -198.4219970703125, + "y": 25.06599998474121 + }, + { + "x": -198.79200744628906, + "y": 21.945999145507812 + }, + { + "x": -199.11199951171875, + "y": 18.820999145507812 + }, + { + "x": -199.38299560546875, + "y": 15.690999984741211 + }, + { + "x": -199.60499572753906, + "y": 12.557999610900879 + }, + { + "x": -199.77699279785156, + "y": 9.420999526977539 + }, + { + "x": -199.9010009765625, + "y": 6.2820000648498535 + }, + { + "x": -200, + "y": 10 + }, + { + "x": -200, + "y": 0 } ], "isCurve": true, @@ -1632,8 +1848,32 @@ "link": "", "route": [ { - "x": 539.5, - "y": -148.2259979248047 + "x": 513, + "y": -150 + }, + { + "x": 517.18798828125, + "y": -149.95599365234375 + }, + { + "x": 521.375, + "y": -149.82400512695312 + }, + { + "x": 525.5579833984375, + "y": -149.60499572753906 + }, + { + "x": 529.7349853515625, + "y": -149.29800415039062 + }, + { + "x": 533.905029296875, + "y": -148.9040069580078 + }, + { + "x": 538.0659790039062, + "y": -148.4219970703125 }, { "x": 542.2160034179688, @@ -1976,8 +2216,40 @@ "y": 115.77300262451172 }, { - "x": 701.4329833984375, - "y": 116.9990005493164 + "x": 700.4559936523438, + "y": 119.71399688720703 + }, + { + "x": 698.9550170898438, + "y": 123.6240005493164 + }, + { + "x": 697.3720092773438, + "y": 127.50299835205078 + }, + { + "x": 695.708984375, + "y": 131.3470001220703 + }, + { + "x": 693.9650268554688, + "y": 135.15499877929688 + }, + { + "x": 692.1420288085938, + "y": 138.927001953125 + }, + { + "x": 690.239990234375, + "y": 142.65899658203125 + }, + { + "x": 691.2050170898438, + "y": 141.33900451660156 + }, + { + "x": 686.2050170898438, + "y": 149.99899291992188 } ], "isCurve": true, @@ -2012,8 +2284,44 @@ "link": "", "route": [ { - "x": 662.3569946289062, - "y": 182.99899291992188 + "x": 686.2050170898438, + "y": 150 + }, + { + "x": 684.072021484375, + "y": 153.60499572753906 + }, + { + "x": 681.864990234375, + "y": 157.1649932861328 + }, + { + "x": 679.583984375, + "y": 160.67799377441406 + }, + { + "x": 677.22900390625, + "y": 164.14199829101562 + }, + { + "x": 674.802978515625, + "y": 167.5570068359375 + }, + { + "x": 672.3049926757812, + "y": 170.91900634765625 + }, + { + "x": 669.7379760742188, + "y": 174.22900390625 + }, + { + "x": 667.1019897460938, + "y": 177.48399353027344 + }, + { + "x": 664.3989868164062, + "y": 180.6840057373047 }, { "x": 661.6279907226562, @@ -2340,8 +2648,44 @@ "y": 183.8260040283203 }, { - "x": 363.6419982910156, - "y": 183 + "x": 361.6000061035156, + "y": 180.6840057373047 + }, + { + "x": 358.8970031738281, + "y": 177.48399353027344 + }, + { + "x": 356.260986328125, + "y": 174.22900390625 + }, + { + "x": 353.6940002441406, + "y": 170.91900634765625 + }, + { + "x": 351.1960144042969, + "y": 167.5570068359375 + }, + { + "x": 348.7699890136719, + "y": 164.14199829101562 + }, + { + "x": 346.4150085449219, + "y": 160.67799377441406 + }, + { + "x": 344.1340026855469, + "y": 157.1649932861328 + }, + { + "x": 344.79400634765625, + "y": 158.66000366210938 + }, + { + "x": 339.79400634765625, + "y": 150 } ], "isCurve": true, @@ -2376,8 +2720,24 @@ "link": "", "route": [ { - "x": 998.5, - "y": -198.21800231933594 + "x": 972, + "y": -200 + }, + { + "x": 978.281982421875, + "y": -199.9010009765625 + }, + { + "x": 984.5579833984375, + "y": -199.60499572753906 + }, + { + "x": 990.8209838867188, + "y": -199.11199951171875 + }, + { + "x": 997.0659790039062, + "y": -198.4219970703125 }, { "x": 1003.2860107421875, @@ -2744,8 +3104,24 @@ "y": 197.53700256347656 }, { - "x": 998.5, - "y": 198.21800231933594 + "x": 997.0659790039062, + "y": 198.4219970703125 + }, + { + "x": 990.8209838867188, + "y": 199.11199951171875 + }, + { + "x": 984.5579833984375, + "y": 199.60499572753906 + }, + { + "x": 982, + "y": 200 + }, + { + "x": 972, + "y": 200 } ], "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 015478d741..8d34eb7ff8 100644 --- a/e2etests/testdata/txtar/cycle-diagram/dagre/sketch.exp.svg +++ b/e2etests/testdata/txtar/cycle-diagram/dagre/sketch.exp.svg @@ -1,9 +1,9 @@ -abcdabcab + .d2-3985017530 .fill-N1{fill:#0A0F25;} + .d2-3985017530 .fill-N2{fill:#676C7E;} + .d2-3985017530 .fill-N3{fill:#9499AB;} + .d2-3985017530 .fill-N4{fill:#CFD2DD;} + .d2-3985017530 .fill-N5{fill:#DEE1EB;} + .d2-3985017530 .fill-N6{fill:#EEF1F8;} + .d2-3985017530 .fill-N7{fill:#FFFFFF;} + .d2-3985017530 .fill-B1{fill:#0D32B2;} + .d2-3985017530 .fill-B2{fill:#0D32B2;} + .d2-3985017530 .fill-B3{fill:#E3E9FD;} + .d2-3985017530 .fill-B4{fill:#E3E9FD;} + .d2-3985017530 .fill-B5{fill:#EDF0FD;} + .d2-3985017530 .fill-B6{fill:#F7F8FE;} + .d2-3985017530 .fill-AA2{fill:#4A6FF3;} + .d2-3985017530 .fill-AA4{fill:#EDF0FD;} + .d2-3985017530 .fill-AA5{fill:#F7F8FE;} + .d2-3985017530 .fill-AB4{fill:#EDF0FD;} + .d2-3985017530 .fill-AB5{fill:#F7F8FE;} + .d2-3985017530 .stroke-N1{stroke:#0A0F25;} + .d2-3985017530 .stroke-N2{stroke:#676C7E;} + .d2-3985017530 .stroke-N3{stroke:#9499AB;} + .d2-3985017530 .stroke-N4{stroke:#CFD2DD;} + .d2-3985017530 .stroke-N5{stroke:#DEE1EB;} + .d2-3985017530 .stroke-N6{stroke:#EEF1F8;} + .d2-3985017530 .stroke-N7{stroke:#FFFFFF;} + .d2-3985017530 .stroke-B1{stroke:#0D32B2;} + .d2-3985017530 .stroke-B2{stroke:#0D32B2;} + .d2-3985017530 .stroke-B3{stroke:#E3E9FD;} + .d2-3985017530 .stroke-B4{stroke:#E3E9FD;} + .d2-3985017530 .stroke-B5{stroke:#EDF0FD;} + .d2-3985017530 .stroke-B6{stroke:#F7F8FE;} + .d2-3985017530 .stroke-AA2{stroke:#4A6FF3;} + .d2-3985017530 .stroke-AA4{stroke:#EDF0FD;} + .d2-3985017530 .stroke-AA5{stroke:#F7F8FE;} + .d2-3985017530 .stroke-AB4{stroke:#EDF0FD;} + .d2-3985017530 .stroke-AB5{stroke:#F7F8FE;} + .d2-3985017530 .background-color-N1{background-color:#0A0F25;} + .d2-3985017530 .background-color-N2{background-color:#676C7E;} + .d2-3985017530 .background-color-N3{background-color:#9499AB;} + .d2-3985017530 .background-color-N4{background-color:#CFD2DD;} + .d2-3985017530 .background-color-N5{background-color:#DEE1EB;} + .d2-3985017530 .background-color-N6{background-color:#EEF1F8;} + .d2-3985017530 .background-color-N7{background-color:#FFFFFF;} + .d2-3985017530 .background-color-B1{background-color:#0D32B2;} + .d2-3985017530 .background-color-B2{background-color:#0D32B2;} + .d2-3985017530 .background-color-B3{background-color:#E3E9FD;} + .d2-3985017530 .background-color-B4{background-color:#E3E9FD;} + .d2-3985017530 .background-color-B5{background-color:#EDF0FD;} + .d2-3985017530 .background-color-B6{background-color:#F7F8FE;} + .d2-3985017530 .background-color-AA2{background-color:#4A6FF3;} + .d2-3985017530 .background-color-AA4{background-color:#EDF0FD;} + .d2-3985017530 .background-color-AA5{background-color:#F7F8FE;} + .d2-3985017530 .background-color-AB4{background-color:#EDF0FD;} + .d2-3985017530 .background-color-AB5{background-color:#F7F8FE;} + .d2-3985017530 .color-N1{color:#0A0F25;} + .d2-3985017530 .color-N2{color:#676C7E;} + .d2-3985017530 .color-N3{color:#9499AB;} + .d2-3985017530 .color-N4{color:#CFD2DD;} + .d2-3985017530 .color-N5{color:#DEE1EB;} + .d2-3985017530 .color-N6{color:#EEF1F8;} + .d2-3985017530 .color-N7{color:#FFFFFF;} + .d2-3985017530 .color-B1{color:#0D32B2;} + .d2-3985017530 .color-B2{color:#0D32B2;} + .d2-3985017530 .color-B3{color:#E3E9FD;} + .d2-3985017530 .color-B4{color:#E3E9FD;} + .d2-3985017530 .color-B5{color:#EDF0FD;} + .d2-3985017530 .color-B6{color:#F7F8FE;} + .d2-3985017530 .color-AA2{color:#4A6FF3;} + .d2-3985017530 .color-AA4{color:#EDF0FD;} + .d2-3985017530 .color-AA5{color:#F7F8FE;} + .d2-3985017530 .color-AB4{color:#EDF0FD;} + .d2-3985017530 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker-d2-3985017530);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker-d2-3985017530);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright-d2-3985017530);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright-d2-3985017530);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright-d2-3985017530);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright-d2-3985017530);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark-d2-3985017530);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright-d2-3985017530);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright-d2-3985017530);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright-d2-3985017530);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright-d2-3985017530);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker-d2-3985017530);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark-d2-3985017530);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal-d2-3985017530);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal-d2-3985017530);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright-d2-3985017530);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright-d2-3985017530);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright-d2-3985017530);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>abcdabcab diff --git a/e2etests/testdata/txtar/cycle-diagram/elk/board.exp.json b/e2etests/testdata/txtar/cycle-diagram/elk/board.exp.json index 6eb058a841..61b81e2e8b 100644 --- a/e2etests/testdata/txtar/cycle-diagram/elk/board.exp.json +++ b/e2etests/testdata/txtar/cycle-diagram/elk/board.exp.json @@ -540,8 +540,40 @@ "link": "", "route": [ { - "x": 38.5, - "y": -186.22999572753906 + "x": 12, + "y": -188 + }, + { + "x": 15.140999794006348, + "y": -187.97500610351562 + }, + { + "x": 18.281999588012695, + "y": -187.9010009765625 + }, + { + "x": 21.42099952697754, + "y": -187.77699279785156 + }, + { + "x": 24.558000564575195, + "y": -187.60499572753906 + }, + { + "x": 27.69099998474121, + "y": -187.38299560546875 + }, + { + "x": 30.820999145507812, + "y": -187.11199951171875 + }, + { + "x": 33.94599914550781, + "y": -186.79200744628906 + }, + { + "x": 37.066001892089844, + "y": -186.4219970703125 }, { "x": 40.18000030517578, @@ -868,8 +900,48 @@ "y": -22.385000228881836 }, { - "x": 209.2519989013672, - "y": -21 + "x": 209.53700256347656, + "y": -19.285999298095703 + }, + { + "x": 210.00399780273438, + "y": -16.18000030517578 + }, + { + "x": 210.4219970703125, + "y": -13.065999984741211 + }, + { + "x": 210.79200744628906, + "y": -9.946000099182129 + }, + { + "x": 211.11199951171875, + "y": -6.821000099182129 + }, + { + "x": 211.38299560546875, + "y": -3.690999984741211 + }, + { + "x": 211.60499572753906, + "y": -0.5580000281333923 + }, + { + "x": 211.77699279785156, + "y": 2.578000068664551 + }, + { + "x": 211.9010009765625, + "y": 5.7170000076293945 + }, + { + "x": 212, + "y": 2 + }, + { + "x": 212, + "y": 12 } ], "isCurve": true, @@ -904,8 +976,48 @@ "link": "", "route": [ { - "x": 209.2519989013672, - "y": 45 + "x": 212, + "y": 12 + }, + { + "x": 211.97500610351562, + "y": 15.140999794006348 + }, + { + "x": 211.9010009765625, + "y": 18.281999588012695 + }, + { + "x": 211.77699279785156, + "y": 21.42099952697754 + }, + { + "x": 211.60499572753906, + "y": 24.558000564575195 + }, + { + "x": 211.38299560546875, + "y": 27.69099998474121 + }, + { + "x": 211.11199951171875, + "y": 30.820999145507812 + }, + { + "x": 210.79200744628906, + "y": 33.94599914550781 + }, + { + "x": 210.4219970703125, + "y": 37.066001892089844 + }, + { + "x": 210.00399780273438, + "y": 40.18000030517578 + }, + { + "x": 209.53700256347656, + "y": 43.2859992980957 }, { "x": 209.02099609375, @@ -1232,8 +1344,40 @@ "y": 210.00399780273438 }, { - "x": 38.5, - "y": 210.22999572753906 + "x": 37.066001892089844, + "y": 210.4219970703125 + }, + { + "x": 33.94599914550781, + "y": 210.79200744628906 + }, + { + "x": 30.820999145507812, + "y": 211.11199951171875 + }, + { + "x": 27.69099998474121, + "y": 211.38299560546875 + }, + { + "x": 24.558000564575195, + "y": 211.60499572753906 + }, + { + "x": 21.42099952697754, + "y": 211.77699279785156 + }, + { + "x": 18.281999588012695, + "y": 211.9010009765625 + }, + { + "x": 22, + "y": 212 + }, + { + "x": 12, + "y": 212 } ], "isCurve": true, @@ -1268,8 +1412,40 @@ "link": "", "route": [ { - "x": -14.49899959564209, - "y": 210.22999572753906 + "x": 12, + "y": 212 + }, + { + "x": 8.857999801635742, + "y": 211.97500610351562 + }, + { + "x": 5.7170000076293945, + "y": 211.9010009765625 + }, + { + "x": 2.578000068664551, + "y": 211.77699279785156 + }, + { + "x": -0.5580000281333923, + "y": 211.60499572753906 + }, + { + "x": -3.690999984741211, + "y": 211.38299560546875 + }, + { + "x": -6.821000099182129, + "y": 211.11199951171875 + }, + { + "x": -9.946000099182129, + "y": 210.79200744628906 + }, + { + "x": -13.065999984741211, + "y": 210.4219970703125 }, { "x": -16.18000030517578, @@ -1596,8 +1772,48 @@ "y": 46.3849983215332 }, { - "x": -185.2519989013672, - "y": 45 + "x": -185.53700256347656, + "y": 43.2859992980957 + }, + { + "x": -186.00399780273438, + "y": 40.18000030517578 + }, + { + "x": -186.4219970703125, + "y": 37.066001892089844 + }, + { + "x": -186.79200744628906, + "y": 33.94599914550781 + }, + { + "x": -187.11199951171875, + "y": 30.820999145507812 + }, + { + "x": -187.38299560546875, + "y": 27.69099998474121 + }, + { + "x": -187.60499572753906, + "y": 24.558000564575195 + }, + { + "x": -187.77699279785156, + "y": 21.42099952697754 + }, + { + "x": -187.9010009765625, + "y": 18.281999588012695 + }, + { + "x": -188, + "y": 22 + }, + { + "x": -188, + "y": 12 } ], "isCurve": true, @@ -1632,8 +1848,32 @@ "link": "", "route": [ { - "x": 512, - "y": -136.2259979248047 + "x": 485.5, + "y": -138 + }, + { + "x": 489.68798828125, + "y": -137.95599365234375 + }, + { + "x": 493.875, + "y": -137.82400512695312 + }, + { + "x": 498.0580139160156, + "y": -137.60499572753906 + }, + { + "x": 502.2349853515625, + "y": -137.29800415039062 + }, + { + "x": 506.4049987792969, + "y": -136.9040069580078 + }, + { + "x": 510.5660095214844, + "y": -136.4219970703125 }, { "x": 514.7160034179688, @@ -1976,8 +2216,40 @@ "y": 127.77300262451172 }, { - "x": 673.9329833984375, - "y": 128.99899291992188 + "x": 672.9559936523438, + "y": 131.71400451660156 + }, + { + "x": 671.4550170898438, + "y": 135.62399291992188 + }, + { + "x": 669.8720092773438, + "y": 139.5030059814453 + }, + { + "x": 668.208984375, + "y": 143.3470001220703 + }, + { + "x": 666.4650268554688, + "y": 147.15499877929688 + }, + { + "x": 664.6420288085938, + "y": 150.927001953125 + }, + { + "x": 662.739990234375, + "y": 154.65899658203125 + }, + { + "x": 663.7050170898438, + "y": 153.33900451660156 + }, + { + "x": 658.7050170898438, + "y": 161.99899291992188 } ], "isCurve": true, @@ -2012,8 +2284,44 @@ "link": "", "route": [ { - "x": 634.8569946289062, - "y": 194.99899291992188 + "x": 658.7050170898438, + "y": 161.99899291992188 + }, + { + "x": 656.572021484375, + "y": 165.60499572753906 + }, + { + "x": 654.364990234375, + "y": 169.1649932861328 + }, + { + "x": 652.083984375, + "y": 172.67799377441406 + }, + { + "x": 649.72900390625, + "y": 176.14199829101562 + }, + { + "x": 647.302978515625, + "y": 179.5570068359375 + }, + { + "x": 644.8049926757812, + "y": 182.91900634765625 + }, + { + "x": 642.2379760742188, + "y": 186.22900390625 + }, + { + "x": 639.6019897460938, + "y": 189.48399353027344 + }, + { + "x": 636.8989868164062, + "y": 192.6840057373047 }, { "x": 634.1279907226562, @@ -2340,8 +2648,44 @@ "y": 195.8260040283203 }, { - "x": 336.1419982910156, - "y": 195 + "x": 334.1000061035156, + "y": 192.6840057373047 + }, + { + "x": 331.3970031738281, + "y": 189.48399353027344 + }, + { + "x": 328.760986328125, + "y": 186.22900390625 + }, + { + "x": 326.1940002441406, + "y": 182.91900634765625 + }, + { + "x": 323.6960144042969, + "y": 179.5570068359375 + }, + { + "x": 321.2699890136719, + "y": 176.14199829101562 + }, + { + "x": 318.9150085449219, + "y": 172.67799377441406 + }, + { + "x": 316.6340026855469, + "y": 169.1649932861328 + }, + { + "x": 317.29400634765625, + "y": 170.66000366210938 + }, + { + "x": 312.29400634765625, + "y": 162 } ], "isCurve": true, @@ -2376,8 +2720,24 @@ "link": "", "route": [ { - "x": 931.4099731445312, - "y": -186.21800231933594 + "x": 904.9099731445312, + "y": -188 + }, + { + "x": 911.1920166015625, + "y": -187.9010009765625 + }, + { + "x": 917.468017578125, + "y": -187.60499572753906 + }, + { + "x": 923.7310180664062, + "y": -187.11199951171875 + }, + { + "x": 929.9760131835938, + "y": -186.4219970703125 }, { "x": 936.197021484375, @@ -2744,8 +3104,24 @@ "y": 209.53700256347656 }, { - "x": 931.4099731445312, - "y": 210.21800231933594 + "x": 929.9760131835938, + "y": 210.4219970703125 + }, + { + "x": 923.7310180664062, + "y": 211.11199951171875 + }, + { + "x": 917.468017578125, + "y": 211.60499572753906 + }, + { + "x": 914.9099731445312, + "y": 212 + }, + { + "x": 904.9099731445312, + "y": 212 } ], "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 21e65f752a..0dd507b75b 100644 --- a/e2etests/testdata/txtar/cycle-diagram/elk/sketch.exp.svg +++ b/e2etests/testdata/txtar/cycle-diagram/elk/sketch.exp.svg @@ -1,9 +1,9 @@ -abcdabcab + .d2-2879875917 .fill-N1{fill:#0A0F25;} + .d2-2879875917 .fill-N2{fill:#676C7E;} + .d2-2879875917 .fill-N3{fill:#9499AB;} + .d2-2879875917 .fill-N4{fill:#CFD2DD;} + .d2-2879875917 .fill-N5{fill:#DEE1EB;} + .d2-2879875917 .fill-N6{fill:#EEF1F8;} + .d2-2879875917 .fill-N7{fill:#FFFFFF;} + .d2-2879875917 .fill-B1{fill:#0D32B2;} + .d2-2879875917 .fill-B2{fill:#0D32B2;} + .d2-2879875917 .fill-B3{fill:#E3E9FD;} + .d2-2879875917 .fill-B4{fill:#E3E9FD;} + .d2-2879875917 .fill-B5{fill:#EDF0FD;} + .d2-2879875917 .fill-B6{fill:#F7F8FE;} + .d2-2879875917 .fill-AA2{fill:#4A6FF3;} + .d2-2879875917 .fill-AA4{fill:#EDF0FD;} + .d2-2879875917 .fill-AA5{fill:#F7F8FE;} + .d2-2879875917 .fill-AB4{fill:#EDF0FD;} + .d2-2879875917 .fill-AB5{fill:#F7F8FE;} + .d2-2879875917 .stroke-N1{stroke:#0A0F25;} + .d2-2879875917 .stroke-N2{stroke:#676C7E;} + .d2-2879875917 .stroke-N3{stroke:#9499AB;} + .d2-2879875917 .stroke-N4{stroke:#CFD2DD;} + .d2-2879875917 .stroke-N5{stroke:#DEE1EB;} + .d2-2879875917 .stroke-N6{stroke:#EEF1F8;} + .d2-2879875917 .stroke-N7{stroke:#FFFFFF;} + .d2-2879875917 .stroke-B1{stroke:#0D32B2;} + .d2-2879875917 .stroke-B2{stroke:#0D32B2;} + .d2-2879875917 .stroke-B3{stroke:#E3E9FD;} + .d2-2879875917 .stroke-B4{stroke:#E3E9FD;} + .d2-2879875917 .stroke-B5{stroke:#EDF0FD;} + .d2-2879875917 .stroke-B6{stroke:#F7F8FE;} + .d2-2879875917 .stroke-AA2{stroke:#4A6FF3;} + .d2-2879875917 .stroke-AA4{stroke:#EDF0FD;} + .d2-2879875917 .stroke-AA5{stroke:#F7F8FE;} + .d2-2879875917 .stroke-AB4{stroke:#EDF0FD;} + .d2-2879875917 .stroke-AB5{stroke:#F7F8FE;} + .d2-2879875917 .background-color-N1{background-color:#0A0F25;} + .d2-2879875917 .background-color-N2{background-color:#676C7E;} + .d2-2879875917 .background-color-N3{background-color:#9499AB;} + .d2-2879875917 .background-color-N4{background-color:#CFD2DD;} + .d2-2879875917 .background-color-N5{background-color:#DEE1EB;} + .d2-2879875917 .background-color-N6{background-color:#EEF1F8;} + .d2-2879875917 .background-color-N7{background-color:#FFFFFF;} + .d2-2879875917 .background-color-B1{background-color:#0D32B2;} + .d2-2879875917 .background-color-B2{background-color:#0D32B2;} + .d2-2879875917 .background-color-B3{background-color:#E3E9FD;} + .d2-2879875917 .background-color-B4{background-color:#E3E9FD;} + .d2-2879875917 .background-color-B5{background-color:#EDF0FD;} + .d2-2879875917 .background-color-B6{background-color:#F7F8FE;} + .d2-2879875917 .background-color-AA2{background-color:#4A6FF3;} + .d2-2879875917 .background-color-AA4{background-color:#EDF0FD;} + .d2-2879875917 .background-color-AA5{background-color:#F7F8FE;} + .d2-2879875917 .background-color-AB4{background-color:#EDF0FD;} + .d2-2879875917 .background-color-AB5{background-color:#F7F8FE;} + .d2-2879875917 .color-N1{color:#0A0F25;} + .d2-2879875917 .color-N2{color:#676C7E;} + .d2-2879875917 .color-N3{color:#9499AB;} + .d2-2879875917 .color-N4{color:#CFD2DD;} + .d2-2879875917 .color-N5{color:#DEE1EB;} + .d2-2879875917 .color-N6{color:#EEF1F8;} + .d2-2879875917 .color-N7{color:#FFFFFF;} + .d2-2879875917 .color-B1{color:#0D32B2;} + .d2-2879875917 .color-B2{color:#0D32B2;} + .d2-2879875917 .color-B3{color:#E3E9FD;} + .d2-2879875917 .color-B4{color:#E3E9FD;} + .d2-2879875917 .color-B5{color:#EDF0FD;} + .d2-2879875917 .color-B6{color:#F7F8FE;} + .d2-2879875917 .color-AA2{color:#4A6FF3;} + .d2-2879875917 .color-AA4{color:#EDF0FD;} + .d2-2879875917 .color-AA5{color:#F7F8FE;} + .d2-2879875917 .color-AB4{color:#EDF0FD;} + .d2-2879875917 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker-d2-2879875917);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker-d2-2879875917);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright-d2-2879875917);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright-d2-2879875917);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright-d2-2879875917);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright-d2-2879875917);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark-d2-2879875917);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright-d2-2879875917);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright-d2-2879875917);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright-d2-2879875917);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright-d2-2879875917);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker-d2-2879875917);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark-d2-2879875917);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal-d2-2879875917);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal-d2-2879875917);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright-d2-2879875917);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright-d2-2879875917);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright-d2-2879875917);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>abcdabcab From 9eaa03cb36a2a6a754390deee357f4be7fe24bbc Mon Sep 17 00:00:00 2001 From: Mayank Mohapatra <125661248+Mayank77maruti@users.noreply.github.com> Date: Sat, 22 Feb 2025 11:06:24 +0000 Subject: [PATCH 28/73] try --- d2layouts/d2cycle/layout.go | 98 +--- .../txtar/cycle-diagram/dagre/board.exp.json | 424 +----------------- .../txtar/cycle-diagram/dagre/sketch.exp.svg | 152 +++---- .../txtar/cycle-diagram/elk/board.exp.json | 424 +----------------- .../txtar/cycle-diagram/elk/sketch.exp.svg | 152 +++---- 5 files changed, 214 insertions(+), 1036 deletions(-) diff --git a/d2layouts/d2cycle/layout.go b/d2layouts/d2cycle/layout.go index a7a4ad36d2..0e9036f748 100644 --- a/d2layouts/d2cycle/layout.go +++ b/d2layouts/d2cycle/layout.go @@ -65,46 +65,6 @@ func positionObjects(objects []*d2graph.Object, radius float64) { } } -// func createCircularArc(edge *d2graph.Edge) { -// if edge.Src == nil || edge.Dst == nil { -// return -// } - -// srcCenter := edge.Src.Center() -// dstCenter := edge.Dst.Center() - -// srcAngle := math.Atan2(srcCenter.Y, srcCenter.X) -// dstAngle := math.Atan2(dstCenter.Y, dstCenter.X) -// if dstAngle < srcAngle { -// dstAngle += 2 * math.Pi -// } - -// arcRadius := math.Hypot(srcCenter.X, srcCenter.Y) - -// path := make([]*geo.Point, 0, ARC_STEPS+1) -// 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) -// path = append(path, geo.NewPoint(x, y)) -// } -// path[0] = srcCenter -// path[len(path)-1] = dstCenter - -// // Clamp endpoints to the boundaries of the source and destination 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. -// path = trimPathPoints(path, edge.Src.Box) -// path = trimPathPoints(path, edge.Dst.Box) - -// edge.Route = path -// edge.IsCurve = true -// } func createCircularArc(edge *d2graph.Edge) { if edge.Src == nil || edge.Dst == nil { return @@ -113,27 +73,15 @@ func createCircularArc(edge *d2graph.Edge) { srcCenter := edge.Src.Center() dstCenter := edge.Dst.Center() - // Calculate angles and ensure we take the shortest arc srcAngle := math.Atan2(srcCenter.Y, srcCenter.X) dstAngle := math.Atan2(dstCenter.Y, dstCenter.X) - - // Calculate angular distance for both directions - clockwiseDist := dstAngle - srcAngle - - - // Choose shortest path - if math.Abs(clockwiseDist) > math.Pi { - if clockwiseDist > 0 { - dstAngle -= 2 * math.Pi - } else { - dstAngle += 2 * math.Pi - } + if dstAngle < srcAngle { + dstAngle += 2 * math.Pi } arcRadius := math.Hypot(srcCenter.X, srcCenter.Y) - path := make([]*geo.Point, 0, ARC_STEPS+1) - // Generate path with corrected direction + path := make([]*geo.Point, 0, ARC_STEPS+1) for i := 0; i <= ARC_STEPS; i++ { t := float64(i) / float64(ARC_STEPS) angle := srcAngle + t*(dstAngle-srcAngle) @@ -141,41 +89,23 @@ func createCircularArc(edge *d2graph.Edge) { y := arcRadius * math.Sin(angle) path = append(path, geo.NewPoint(x, y)) } + path[0] = srcCenter + path[len(path)-1] = dstCenter - // [Keep existing clamping and trimming code...] - - // Calculate tangent direction based on arc direction - if len(path) >= 2 { - last := path[len(path)-1] - var tangentX, tangentY float64 - - // Determine direction using angular difference - if (dstAngle - srcAngle) > 0 { - // Counter-clockwise direction - tangentX = -last.Y - tangentY = last.X - } else { - // Clockwise direction - tangentX = last.Y - tangentY = -last.X - } + // Clamp endpoints to the boundaries of the source and destination 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 - // Normalize and adjust second-to-last point - tangentLength := math.Hypot(tangentX, tangentY) - if tangentLength > 0 { - tangentDir := geo.NewPoint(tangentX/tangentLength, tangentY/tangentLength) - delta := 10.0 - newSecondLast := geo.NewPoint( - last.X-delta*tangentDir.X, - last.Y-delta*tangentDir.Y, - ) - path[len(path)-2] = newSecondLast - } - } + // Trim redundant path points that fall inside node boundaries. + path = trimPathPoints(path, edge.Src.Box) + path = trimPathPoints(path, edge.Dst.Box) edge.Route = path edge.IsCurve = true } + // clampPointOutsideBox walks forward along the path until it finds a point outside the box, // then replaces the point with a precise intersection. func clampPointOutsideBox(box *geo.Box, path []*geo.Point, startIdx int) (int, *geo.Point) { diff --git a/e2etests/testdata/txtar/cycle-diagram/dagre/board.exp.json b/e2etests/testdata/txtar/cycle-diagram/dagre/board.exp.json index c29fd74eec..78ed2dffeb 100644 --- a/e2etests/testdata/txtar/cycle-diagram/dagre/board.exp.json +++ b/e2etests/testdata/txtar/cycle-diagram/dagre/board.exp.json @@ -540,40 +540,8 @@ "link": "", "route": [ { - "x": 0, - "y": -200 - }, - { - "x": 3.1410000324249268, - "y": -199.97500610351562 - }, - { - "x": 6.2820000648498535, - "y": -199.9010009765625 - }, - { - "x": 9.420999526977539, - "y": -199.77699279785156 - }, - { - "x": 12.557999610900879, - "y": -199.60499572753906 - }, - { - "x": 15.690999984741211, - "y": -199.38299560546875 - }, - { - "x": 18.820999145507812, - "y": -199.11199951171875 - }, - { - "x": 21.945999145507812, - "y": -198.79200744628906 - }, - { - "x": 25.06599998474121, - "y": -198.4219970703125 + "x": 26.5, + "y": -198.22999572753906 }, { "x": 28.18000030517578, @@ -900,48 +868,8 @@ "y": -34.3849983215332 }, { - "x": 197.53700256347656, - "y": -31.285999298095703 - }, - { - "x": 198.00399780273438, - "y": -28.18000030517578 - }, - { - "x": 198.4219970703125, - "y": -25.06599998474121 - }, - { - "x": 198.79200744628906, - "y": -21.945999145507812 - }, - { - "x": 199.11199951171875, - "y": -18.820999145507812 - }, - { - "x": 199.38299560546875, - "y": -15.690999984741211 - }, - { - "x": 199.60499572753906, - "y": -12.557999610900879 - }, - { - "x": 199.77699279785156, - "y": -9.420999526977539 - }, - { - "x": 199.9010009765625, - "y": -6.2820000648498535 - }, - { - "x": 200, - "y": -10 - }, - { - "x": 200, - "y": 0 + "x": 197.2519989013672, + "y": -33 } ], "isCurve": true, @@ -976,48 +904,8 @@ "link": "", "route": [ { - "x": 200, - "y": 0 - }, - { - "x": 199.97500610351562, - "y": 3.1410000324249268 - }, - { - "x": 199.9010009765625, - "y": 6.2820000648498535 - }, - { - "x": 199.77699279785156, - "y": 9.420999526977539 - }, - { - "x": 199.60499572753906, - "y": 12.557999610900879 - }, - { - "x": 199.38299560546875, - "y": 15.690999984741211 - }, - { - "x": 199.11199951171875, - "y": 18.820999145507812 - }, - { - "x": 198.79200744628906, - "y": 21.945999145507812 - }, - { - "x": 198.4219970703125, - "y": 25.06599998474121 - }, - { - "x": 198.00399780273438, - "y": 28.18000030517578 - }, - { - "x": 197.53700256347656, - "y": 31.285999298095703 + "x": 197.2519989013672, + "y": 33 }, { "x": 197.02099609375, @@ -1344,40 +1232,8 @@ "y": 198.00399780273438 }, { - "x": 25.06599998474121, - "y": 198.4219970703125 - }, - { - "x": 21.945999145507812, - "y": 198.79200744628906 - }, - { - "x": 18.820999145507812, - "y": 199.11199951171875 - }, - { - "x": 15.690999984741211, - "y": 199.38299560546875 - }, - { - "x": 12.557999610900879, - "y": 199.60499572753906 - }, - { - "x": 9.420999526977539, - "y": 199.77699279785156 - }, - { - "x": 6.2820000648498535, - "y": 199.9010009765625 - }, - { - "x": 10, - "y": 200 - }, - { - "x": 0, - "y": 200 + "x": 26.5, + "y": 198.22999572753906 } ], "isCurve": true, @@ -1412,40 +1268,8 @@ "link": "", "route": [ { - "x": 0, - "y": 200 - }, - { - "x": -3.1410000324249268, - "y": 199.97500610351562 - }, - { - "x": -6.2820000648498535, - "y": 199.9010009765625 - }, - { - "x": -9.420999526977539, - "y": 199.77699279785156 - }, - { - "x": -12.557999610900879, - "y": 199.60499572753906 - }, - { - "x": -15.690999984741211, - "y": 199.38299560546875 - }, - { - "x": -18.820999145507812, - "y": 199.11199951171875 - }, - { - "x": -21.945999145507812, - "y": 198.79200744628906 - }, - { - "x": -25.06599998474121, - "y": 198.4219970703125 + "x": -26.499000549316406, + "y": 198.22999572753906 }, { "x": -28.18000030517578, @@ -1772,48 +1596,8 @@ "y": 34.3849983215332 }, { - "x": -197.53700256347656, - "y": 31.285999298095703 - }, - { - "x": -198.00399780273438, - "y": 28.18000030517578 - }, - { - "x": -198.4219970703125, - "y": 25.06599998474121 - }, - { - "x": -198.79200744628906, - "y": 21.945999145507812 - }, - { - "x": -199.11199951171875, - "y": 18.820999145507812 - }, - { - "x": -199.38299560546875, - "y": 15.690999984741211 - }, - { - "x": -199.60499572753906, - "y": 12.557999610900879 - }, - { - "x": -199.77699279785156, - "y": 9.420999526977539 - }, - { - "x": -199.9010009765625, - "y": 6.2820000648498535 - }, - { - "x": -200, - "y": 10 - }, - { - "x": -200, - "y": 0 + "x": -197.2519989013672, + "y": 33 } ], "isCurve": true, @@ -1848,32 +1632,8 @@ "link": "", "route": [ { - "x": 513, - "y": -150 - }, - { - "x": 517.18798828125, - "y": -149.95599365234375 - }, - { - "x": 521.375, - "y": -149.82400512695312 - }, - { - "x": 525.5579833984375, - "y": -149.60499572753906 - }, - { - "x": 529.7349853515625, - "y": -149.29800415039062 - }, - { - "x": 533.905029296875, - "y": -148.9040069580078 - }, - { - "x": 538.0659790039062, - "y": -148.4219970703125 + "x": 539.5, + "y": -148.2259979248047 }, { "x": 542.2160034179688, @@ -2216,40 +1976,8 @@ "y": 115.77300262451172 }, { - "x": 700.4559936523438, - "y": 119.71399688720703 - }, - { - "x": 698.9550170898438, - "y": 123.6240005493164 - }, - { - "x": 697.3720092773438, - "y": 127.50299835205078 - }, - { - "x": 695.708984375, - "y": 131.3470001220703 - }, - { - "x": 693.9650268554688, - "y": 135.15499877929688 - }, - { - "x": 692.1420288085938, - "y": 138.927001953125 - }, - { - "x": 690.239990234375, - "y": 142.65899658203125 - }, - { - "x": 691.2050170898438, - "y": 141.33900451660156 - }, - { - "x": 686.2050170898438, - "y": 149.99899291992188 + "x": 701.4329833984375, + "y": 116.9990005493164 } ], "isCurve": true, @@ -2284,44 +2012,8 @@ "link": "", "route": [ { - "x": 686.2050170898438, - "y": 150 - }, - { - "x": 684.072021484375, - "y": 153.60499572753906 - }, - { - "x": 681.864990234375, - "y": 157.1649932861328 - }, - { - "x": 679.583984375, - "y": 160.67799377441406 - }, - { - "x": 677.22900390625, - "y": 164.14199829101562 - }, - { - "x": 674.802978515625, - "y": 167.5570068359375 - }, - { - "x": 672.3049926757812, - "y": 170.91900634765625 - }, - { - "x": 669.7379760742188, - "y": 174.22900390625 - }, - { - "x": 667.1019897460938, - "y": 177.48399353027344 - }, - { - "x": 664.3989868164062, - "y": 180.6840057373047 + "x": 662.3569946289062, + "y": 182.99899291992188 }, { "x": 661.6279907226562, @@ -2648,44 +2340,8 @@ "y": 183.8260040283203 }, { - "x": 361.6000061035156, - "y": 180.6840057373047 - }, - { - "x": 358.8970031738281, - "y": 177.48399353027344 - }, - { - "x": 356.260986328125, - "y": 174.22900390625 - }, - { - "x": 353.6940002441406, - "y": 170.91900634765625 - }, - { - "x": 351.1960144042969, - "y": 167.5570068359375 - }, - { - "x": 348.7699890136719, - "y": 164.14199829101562 - }, - { - "x": 346.4150085449219, - "y": 160.67799377441406 - }, - { - "x": 344.1340026855469, - "y": 157.1649932861328 - }, - { - "x": 344.79400634765625, - "y": 158.66000366210938 - }, - { - "x": 339.79400634765625, - "y": 150 + "x": 363.6419982910156, + "y": 183 } ], "isCurve": true, @@ -2720,24 +2376,8 @@ "link": "", "route": [ { - "x": 972, - "y": -200 - }, - { - "x": 978.281982421875, - "y": -199.9010009765625 - }, - { - "x": 984.5579833984375, - "y": -199.60499572753906 - }, - { - "x": 990.8209838867188, - "y": -199.11199951171875 - }, - { - "x": 997.0659790039062, - "y": -198.4219970703125 + "x": 998.5, + "y": -198.21800231933594 }, { "x": 1003.2860107421875, @@ -3104,24 +2744,8 @@ "y": 197.53700256347656 }, { - "x": 997.0659790039062, - "y": 198.4219970703125 - }, - { - "x": 990.8209838867188, - "y": 199.11199951171875 - }, - { - "x": 984.5579833984375, - "y": 199.60499572753906 - }, - { - "x": 982, - "y": 200 - }, - { - "x": 972, - "y": 200 + "x": 998.5, + "y": 198.21800231933594 } ], "isCurve": true, diff --git a/e2etests/testdata/txtar/cycle-diagram/dagre/sketch.exp.svg b/e2etests/testdata/txtar/cycle-diagram/dagre/sketch.exp.svg index 8d34eb7ff8..015478d741 100644 --- a/e2etests/testdata/txtar/cycle-diagram/dagre/sketch.exp.svg +++ b/e2etests/testdata/txtar/cycle-diagram/dagre/sketch.exp.svg @@ -1,9 +1,9 @@ -abcdabcab + .d2-153681122 .fill-N1{fill:#0A0F25;} + .d2-153681122 .fill-N2{fill:#676C7E;} + .d2-153681122 .fill-N3{fill:#9499AB;} + .d2-153681122 .fill-N4{fill:#CFD2DD;} + .d2-153681122 .fill-N5{fill:#DEE1EB;} + .d2-153681122 .fill-N6{fill:#EEF1F8;} + .d2-153681122 .fill-N7{fill:#FFFFFF;} + .d2-153681122 .fill-B1{fill:#0D32B2;} + .d2-153681122 .fill-B2{fill:#0D32B2;} + .d2-153681122 .fill-B3{fill:#E3E9FD;} + .d2-153681122 .fill-B4{fill:#E3E9FD;} + .d2-153681122 .fill-B5{fill:#EDF0FD;} + .d2-153681122 .fill-B6{fill:#F7F8FE;} + .d2-153681122 .fill-AA2{fill:#4A6FF3;} + .d2-153681122 .fill-AA4{fill:#EDF0FD;} + .d2-153681122 .fill-AA5{fill:#F7F8FE;} + .d2-153681122 .fill-AB4{fill:#EDF0FD;} + .d2-153681122 .fill-AB5{fill:#F7F8FE;} + .d2-153681122 .stroke-N1{stroke:#0A0F25;} + .d2-153681122 .stroke-N2{stroke:#676C7E;} + .d2-153681122 .stroke-N3{stroke:#9499AB;} + .d2-153681122 .stroke-N4{stroke:#CFD2DD;} + .d2-153681122 .stroke-N5{stroke:#DEE1EB;} + .d2-153681122 .stroke-N6{stroke:#EEF1F8;} + .d2-153681122 .stroke-N7{stroke:#FFFFFF;} + .d2-153681122 .stroke-B1{stroke:#0D32B2;} + .d2-153681122 .stroke-B2{stroke:#0D32B2;} + .d2-153681122 .stroke-B3{stroke:#E3E9FD;} + .d2-153681122 .stroke-B4{stroke:#E3E9FD;} + .d2-153681122 .stroke-B5{stroke:#EDF0FD;} + .d2-153681122 .stroke-B6{stroke:#F7F8FE;} + .d2-153681122 .stroke-AA2{stroke:#4A6FF3;} + .d2-153681122 .stroke-AA4{stroke:#EDF0FD;} + .d2-153681122 .stroke-AA5{stroke:#F7F8FE;} + .d2-153681122 .stroke-AB4{stroke:#EDF0FD;} + .d2-153681122 .stroke-AB5{stroke:#F7F8FE;} + .d2-153681122 .background-color-N1{background-color:#0A0F25;} + .d2-153681122 .background-color-N2{background-color:#676C7E;} + .d2-153681122 .background-color-N3{background-color:#9499AB;} + .d2-153681122 .background-color-N4{background-color:#CFD2DD;} + .d2-153681122 .background-color-N5{background-color:#DEE1EB;} + .d2-153681122 .background-color-N6{background-color:#EEF1F8;} + .d2-153681122 .background-color-N7{background-color:#FFFFFF;} + .d2-153681122 .background-color-B1{background-color:#0D32B2;} + .d2-153681122 .background-color-B2{background-color:#0D32B2;} + .d2-153681122 .background-color-B3{background-color:#E3E9FD;} + .d2-153681122 .background-color-B4{background-color:#E3E9FD;} + .d2-153681122 .background-color-B5{background-color:#EDF0FD;} + .d2-153681122 .background-color-B6{background-color:#F7F8FE;} + .d2-153681122 .background-color-AA2{background-color:#4A6FF3;} + .d2-153681122 .background-color-AA4{background-color:#EDF0FD;} + .d2-153681122 .background-color-AA5{background-color:#F7F8FE;} + .d2-153681122 .background-color-AB4{background-color:#EDF0FD;} + .d2-153681122 .background-color-AB5{background-color:#F7F8FE;} + .d2-153681122 .color-N1{color:#0A0F25;} + .d2-153681122 .color-N2{color:#676C7E;} + .d2-153681122 .color-N3{color:#9499AB;} + .d2-153681122 .color-N4{color:#CFD2DD;} + .d2-153681122 .color-N5{color:#DEE1EB;} + .d2-153681122 .color-N6{color:#EEF1F8;} + .d2-153681122 .color-N7{color:#FFFFFF;} + .d2-153681122 .color-B1{color:#0D32B2;} + .d2-153681122 .color-B2{color:#0D32B2;} + .d2-153681122 .color-B3{color:#E3E9FD;} + .d2-153681122 .color-B4{color:#E3E9FD;} + .d2-153681122 .color-B5{color:#EDF0FD;} + .d2-153681122 .color-B6{color:#F7F8FE;} + .d2-153681122 .color-AA2{color:#4A6FF3;} + .d2-153681122 .color-AA4{color:#EDF0FD;} + .d2-153681122 .color-AA5{color:#F7F8FE;} + .d2-153681122 .color-AB4{color:#EDF0FD;} + .d2-153681122 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker-d2-153681122);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker-d2-153681122);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright-d2-153681122);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright-d2-153681122);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright-d2-153681122);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright-d2-153681122);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark-d2-153681122);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright-d2-153681122);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright-d2-153681122);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright-d2-153681122);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright-d2-153681122);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker-d2-153681122);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark-d2-153681122);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal-d2-153681122);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal-d2-153681122);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright-d2-153681122);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright-d2-153681122);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright-d2-153681122);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>abcdabcab diff --git a/e2etests/testdata/txtar/cycle-diagram/elk/board.exp.json b/e2etests/testdata/txtar/cycle-diagram/elk/board.exp.json index 61b81e2e8b..6eb058a841 100644 --- a/e2etests/testdata/txtar/cycle-diagram/elk/board.exp.json +++ b/e2etests/testdata/txtar/cycle-diagram/elk/board.exp.json @@ -540,40 +540,8 @@ "link": "", "route": [ { - "x": 12, - "y": -188 - }, - { - "x": 15.140999794006348, - "y": -187.97500610351562 - }, - { - "x": 18.281999588012695, - "y": -187.9010009765625 - }, - { - "x": 21.42099952697754, - "y": -187.77699279785156 - }, - { - "x": 24.558000564575195, - "y": -187.60499572753906 - }, - { - "x": 27.69099998474121, - "y": -187.38299560546875 - }, - { - "x": 30.820999145507812, - "y": -187.11199951171875 - }, - { - "x": 33.94599914550781, - "y": -186.79200744628906 - }, - { - "x": 37.066001892089844, - "y": -186.4219970703125 + "x": 38.5, + "y": -186.22999572753906 }, { "x": 40.18000030517578, @@ -900,48 +868,8 @@ "y": -22.385000228881836 }, { - "x": 209.53700256347656, - "y": -19.285999298095703 - }, - { - "x": 210.00399780273438, - "y": -16.18000030517578 - }, - { - "x": 210.4219970703125, - "y": -13.065999984741211 - }, - { - "x": 210.79200744628906, - "y": -9.946000099182129 - }, - { - "x": 211.11199951171875, - "y": -6.821000099182129 - }, - { - "x": 211.38299560546875, - "y": -3.690999984741211 - }, - { - "x": 211.60499572753906, - "y": -0.5580000281333923 - }, - { - "x": 211.77699279785156, - "y": 2.578000068664551 - }, - { - "x": 211.9010009765625, - "y": 5.7170000076293945 - }, - { - "x": 212, - "y": 2 - }, - { - "x": 212, - "y": 12 + "x": 209.2519989013672, + "y": -21 } ], "isCurve": true, @@ -976,48 +904,8 @@ "link": "", "route": [ { - "x": 212, - "y": 12 - }, - { - "x": 211.97500610351562, - "y": 15.140999794006348 - }, - { - "x": 211.9010009765625, - "y": 18.281999588012695 - }, - { - "x": 211.77699279785156, - "y": 21.42099952697754 - }, - { - "x": 211.60499572753906, - "y": 24.558000564575195 - }, - { - "x": 211.38299560546875, - "y": 27.69099998474121 - }, - { - "x": 211.11199951171875, - "y": 30.820999145507812 - }, - { - "x": 210.79200744628906, - "y": 33.94599914550781 - }, - { - "x": 210.4219970703125, - "y": 37.066001892089844 - }, - { - "x": 210.00399780273438, - "y": 40.18000030517578 - }, - { - "x": 209.53700256347656, - "y": 43.2859992980957 + "x": 209.2519989013672, + "y": 45 }, { "x": 209.02099609375, @@ -1344,40 +1232,8 @@ "y": 210.00399780273438 }, { - "x": 37.066001892089844, - "y": 210.4219970703125 - }, - { - "x": 33.94599914550781, - "y": 210.79200744628906 - }, - { - "x": 30.820999145507812, - "y": 211.11199951171875 - }, - { - "x": 27.69099998474121, - "y": 211.38299560546875 - }, - { - "x": 24.558000564575195, - "y": 211.60499572753906 - }, - { - "x": 21.42099952697754, - "y": 211.77699279785156 - }, - { - "x": 18.281999588012695, - "y": 211.9010009765625 - }, - { - "x": 22, - "y": 212 - }, - { - "x": 12, - "y": 212 + "x": 38.5, + "y": 210.22999572753906 } ], "isCurve": true, @@ -1412,40 +1268,8 @@ "link": "", "route": [ { - "x": 12, - "y": 212 - }, - { - "x": 8.857999801635742, - "y": 211.97500610351562 - }, - { - "x": 5.7170000076293945, - "y": 211.9010009765625 - }, - { - "x": 2.578000068664551, - "y": 211.77699279785156 - }, - { - "x": -0.5580000281333923, - "y": 211.60499572753906 - }, - { - "x": -3.690999984741211, - "y": 211.38299560546875 - }, - { - "x": -6.821000099182129, - "y": 211.11199951171875 - }, - { - "x": -9.946000099182129, - "y": 210.79200744628906 - }, - { - "x": -13.065999984741211, - "y": 210.4219970703125 + "x": -14.49899959564209, + "y": 210.22999572753906 }, { "x": -16.18000030517578, @@ -1772,48 +1596,8 @@ "y": 46.3849983215332 }, { - "x": -185.53700256347656, - "y": 43.2859992980957 - }, - { - "x": -186.00399780273438, - "y": 40.18000030517578 - }, - { - "x": -186.4219970703125, - "y": 37.066001892089844 - }, - { - "x": -186.79200744628906, - "y": 33.94599914550781 - }, - { - "x": -187.11199951171875, - "y": 30.820999145507812 - }, - { - "x": -187.38299560546875, - "y": 27.69099998474121 - }, - { - "x": -187.60499572753906, - "y": 24.558000564575195 - }, - { - "x": -187.77699279785156, - "y": 21.42099952697754 - }, - { - "x": -187.9010009765625, - "y": 18.281999588012695 - }, - { - "x": -188, - "y": 22 - }, - { - "x": -188, - "y": 12 + "x": -185.2519989013672, + "y": 45 } ], "isCurve": true, @@ -1848,32 +1632,8 @@ "link": "", "route": [ { - "x": 485.5, - "y": -138 - }, - { - "x": 489.68798828125, - "y": -137.95599365234375 - }, - { - "x": 493.875, - "y": -137.82400512695312 - }, - { - "x": 498.0580139160156, - "y": -137.60499572753906 - }, - { - "x": 502.2349853515625, - "y": -137.29800415039062 - }, - { - "x": 506.4049987792969, - "y": -136.9040069580078 - }, - { - "x": 510.5660095214844, - "y": -136.4219970703125 + "x": 512, + "y": -136.2259979248047 }, { "x": 514.7160034179688, @@ -2216,40 +1976,8 @@ "y": 127.77300262451172 }, { - "x": 672.9559936523438, - "y": 131.71400451660156 - }, - { - "x": 671.4550170898438, - "y": 135.62399291992188 - }, - { - "x": 669.8720092773438, - "y": 139.5030059814453 - }, - { - "x": 668.208984375, - "y": 143.3470001220703 - }, - { - "x": 666.4650268554688, - "y": 147.15499877929688 - }, - { - "x": 664.6420288085938, - "y": 150.927001953125 - }, - { - "x": 662.739990234375, - "y": 154.65899658203125 - }, - { - "x": 663.7050170898438, - "y": 153.33900451660156 - }, - { - "x": 658.7050170898438, - "y": 161.99899291992188 + "x": 673.9329833984375, + "y": 128.99899291992188 } ], "isCurve": true, @@ -2284,44 +2012,8 @@ "link": "", "route": [ { - "x": 658.7050170898438, - "y": 161.99899291992188 - }, - { - "x": 656.572021484375, - "y": 165.60499572753906 - }, - { - "x": 654.364990234375, - "y": 169.1649932861328 - }, - { - "x": 652.083984375, - "y": 172.67799377441406 - }, - { - "x": 649.72900390625, - "y": 176.14199829101562 - }, - { - "x": 647.302978515625, - "y": 179.5570068359375 - }, - { - "x": 644.8049926757812, - "y": 182.91900634765625 - }, - { - "x": 642.2379760742188, - "y": 186.22900390625 - }, - { - "x": 639.6019897460938, - "y": 189.48399353027344 - }, - { - "x": 636.8989868164062, - "y": 192.6840057373047 + "x": 634.8569946289062, + "y": 194.99899291992188 }, { "x": 634.1279907226562, @@ -2648,44 +2340,8 @@ "y": 195.8260040283203 }, { - "x": 334.1000061035156, - "y": 192.6840057373047 - }, - { - "x": 331.3970031738281, - "y": 189.48399353027344 - }, - { - "x": 328.760986328125, - "y": 186.22900390625 - }, - { - "x": 326.1940002441406, - "y": 182.91900634765625 - }, - { - "x": 323.6960144042969, - "y": 179.5570068359375 - }, - { - "x": 321.2699890136719, - "y": 176.14199829101562 - }, - { - "x": 318.9150085449219, - "y": 172.67799377441406 - }, - { - "x": 316.6340026855469, - "y": 169.1649932861328 - }, - { - "x": 317.29400634765625, - "y": 170.66000366210938 - }, - { - "x": 312.29400634765625, - "y": 162 + "x": 336.1419982910156, + "y": 195 } ], "isCurve": true, @@ -2720,24 +2376,8 @@ "link": "", "route": [ { - "x": 904.9099731445312, - "y": -188 - }, - { - "x": 911.1920166015625, - "y": -187.9010009765625 - }, - { - "x": 917.468017578125, - "y": -187.60499572753906 - }, - { - "x": 923.7310180664062, - "y": -187.11199951171875 - }, - { - "x": 929.9760131835938, - "y": -186.4219970703125 + "x": 931.4099731445312, + "y": -186.21800231933594 }, { "x": 936.197021484375, @@ -3104,24 +2744,8 @@ "y": 209.53700256347656 }, { - "x": 929.9760131835938, - "y": 210.4219970703125 - }, - { - "x": 923.7310180664062, - "y": 211.11199951171875 - }, - { - "x": 917.468017578125, - "y": 211.60499572753906 - }, - { - "x": 914.9099731445312, - "y": 212 - }, - { - "x": 904.9099731445312, - "y": 212 + "x": 931.4099731445312, + "y": 210.21800231933594 } ], "isCurve": true, diff --git a/e2etests/testdata/txtar/cycle-diagram/elk/sketch.exp.svg b/e2etests/testdata/txtar/cycle-diagram/elk/sketch.exp.svg index 0dd507b75b..21e65f752a 100644 --- a/e2etests/testdata/txtar/cycle-diagram/elk/sketch.exp.svg +++ b/e2etests/testdata/txtar/cycle-diagram/elk/sketch.exp.svg @@ -1,9 +1,9 @@ -abcdabcab + .d2-2891159010 .fill-N1{fill:#0A0F25;} + .d2-2891159010 .fill-N2{fill:#676C7E;} + .d2-2891159010 .fill-N3{fill:#9499AB;} + .d2-2891159010 .fill-N4{fill:#CFD2DD;} + .d2-2891159010 .fill-N5{fill:#DEE1EB;} + .d2-2891159010 .fill-N6{fill:#EEF1F8;} + .d2-2891159010 .fill-N7{fill:#FFFFFF;} + .d2-2891159010 .fill-B1{fill:#0D32B2;} + .d2-2891159010 .fill-B2{fill:#0D32B2;} + .d2-2891159010 .fill-B3{fill:#E3E9FD;} + .d2-2891159010 .fill-B4{fill:#E3E9FD;} + .d2-2891159010 .fill-B5{fill:#EDF0FD;} + .d2-2891159010 .fill-B6{fill:#F7F8FE;} + .d2-2891159010 .fill-AA2{fill:#4A6FF3;} + .d2-2891159010 .fill-AA4{fill:#EDF0FD;} + .d2-2891159010 .fill-AA5{fill:#F7F8FE;} + .d2-2891159010 .fill-AB4{fill:#EDF0FD;} + .d2-2891159010 .fill-AB5{fill:#F7F8FE;} + .d2-2891159010 .stroke-N1{stroke:#0A0F25;} + .d2-2891159010 .stroke-N2{stroke:#676C7E;} + .d2-2891159010 .stroke-N3{stroke:#9499AB;} + .d2-2891159010 .stroke-N4{stroke:#CFD2DD;} + .d2-2891159010 .stroke-N5{stroke:#DEE1EB;} + .d2-2891159010 .stroke-N6{stroke:#EEF1F8;} + .d2-2891159010 .stroke-N7{stroke:#FFFFFF;} + .d2-2891159010 .stroke-B1{stroke:#0D32B2;} + .d2-2891159010 .stroke-B2{stroke:#0D32B2;} + .d2-2891159010 .stroke-B3{stroke:#E3E9FD;} + .d2-2891159010 .stroke-B4{stroke:#E3E9FD;} + .d2-2891159010 .stroke-B5{stroke:#EDF0FD;} + .d2-2891159010 .stroke-B6{stroke:#F7F8FE;} + .d2-2891159010 .stroke-AA2{stroke:#4A6FF3;} + .d2-2891159010 .stroke-AA4{stroke:#EDF0FD;} + .d2-2891159010 .stroke-AA5{stroke:#F7F8FE;} + .d2-2891159010 .stroke-AB4{stroke:#EDF0FD;} + .d2-2891159010 .stroke-AB5{stroke:#F7F8FE;} + .d2-2891159010 .background-color-N1{background-color:#0A0F25;} + .d2-2891159010 .background-color-N2{background-color:#676C7E;} + .d2-2891159010 .background-color-N3{background-color:#9499AB;} + .d2-2891159010 .background-color-N4{background-color:#CFD2DD;} + .d2-2891159010 .background-color-N5{background-color:#DEE1EB;} + .d2-2891159010 .background-color-N6{background-color:#EEF1F8;} + .d2-2891159010 .background-color-N7{background-color:#FFFFFF;} + .d2-2891159010 .background-color-B1{background-color:#0D32B2;} + .d2-2891159010 .background-color-B2{background-color:#0D32B2;} + .d2-2891159010 .background-color-B3{background-color:#E3E9FD;} + .d2-2891159010 .background-color-B4{background-color:#E3E9FD;} + .d2-2891159010 .background-color-B5{background-color:#EDF0FD;} + .d2-2891159010 .background-color-B6{background-color:#F7F8FE;} + .d2-2891159010 .background-color-AA2{background-color:#4A6FF3;} + .d2-2891159010 .background-color-AA4{background-color:#EDF0FD;} + .d2-2891159010 .background-color-AA5{background-color:#F7F8FE;} + .d2-2891159010 .background-color-AB4{background-color:#EDF0FD;} + .d2-2891159010 .background-color-AB5{background-color:#F7F8FE;} + .d2-2891159010 .color-N1{color:#0A0F25;} + .d2-2891159010 .color-N2{color:#676C7E;} + .d2-2891159010 .color-N3{color:#9499AB;} + .d2-2891159010 .color-N4{color:#CFD2DD;} + .d2-2891159010 .color-N5{color:#DEE1EB;} + .d2-2891159010 .color-N6{color:#EEF1F8;} + .d2-2891159010 .color-N7{color:#FFFFFF;} + .d2-2891159010 .color-B1{color:#0D32B2;} + .d2-2891159010 .color-B2{color:#0D32B2;} + .d2-2891159010 .color-B3{color:#E3E9FD;} + .d2-2891159010 .color-B4{color:#E3E9FD;} + .d2-2891159010 .color-B5{color:#EDF0FD;} + .d2-2891159010 .color-B6{color:#F7F8FE;} + .d2-2891159010 .color-AA2{color:#4A6FF3;} + .d2-2891159010 .color-AA4{color:#EDF0FD;} + .d2-2891159010 .color-AA5{color:#F7F8FE;} + .d2-2891159010 .color-AB4{color:#EDF0FD;} + .d2-2891159010 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker-d2-2891159010);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker-d2-2891159010);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright-d2-2891159010);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright-d2-2891159010);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright-d2-2891159010);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright-d2-2891159010);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark-d2-2891159010);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright-d2-2891159010);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright-d2-2891159010);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright-d2-2891159010);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright-d2-2891159010);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker-d2-2891159010);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark-d2-2891159010);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal-d2-2891159010);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal-d2-2891159010);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright-d2-2891159010);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright-d2-2891159010);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright-d2-2891159010);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>abcdabcab From 36ccdb62bdbdda31255b2762b1947ff1322ea959 Mon Sep 17 00:00:00 2001 From: Mayank Mohapatra <125661248+Mayank77maruti@users.noreply.github.com> Date: Sat, 22 Feb 2025 13:26:11 +0000 Subject: [PATCH 29/73] try --- d2layouts/d2cycle/layout.go | 49 +++++++++++++++++++++++++++++++++++-- 1 file changed, 47 insertions(+), 2 deletions(-) diff --git a/d2layouts/d2cycle/layout.go b/d2layouts/d2cycle/layout.go index 0e9036f748..4adb43fb68 100644 --- a/d2layouts/d2cycle/layout.go +++ b/d2layouts/d2cycle/layout.go @@ -65,6 +65,46 @@ func positionObjects(objects []*d2graph.Object, radius float64) { } } +// func createCircularArc(edge *d2graph.Edge) { +// if edge.Src == nil || edge.Dst == nil { +// return +// } + +// srcCenter := edge.Src.Center() +// dstCenter := edge.Dst.Center() + +// srcAngle := math.Atan2(srcCenter.Y, srcCenter.X) +// dstAngle := math.Atan2(dstCenter.Y, dstCenter.X) +// if dstAngle < srcAngle { +// dstAngle += 2 * math.Pi +// } + +// arcRadius := math.Hypot(srcCenter.X, srcCenter.Y) + +// path := make([]*geo.Point, 0, ARC_STEPS+1) +// 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) +// path = append(path, geo.NewPoint(x, y)) +// } +// path[0] = srcCenter +// path[len(path)-1] = dstCenter + +// // Clamp endpoints to the boundaries of the source and destination 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. +// path = trimPathPoints(path, edge.Src.Box) +// path = trimPathPoints(path, edge.Dst.Box) + +// edge.Route = path +// edge.IsCurve = true +// } func createCircularArc(edge *d2graph.Edge) { if edge.Src == nil || edge.Dst == nil { return @@ -75,8 +115,13 @@ func createCircularArc(edge *d2graph.Edge) { srcAngle := math.Atan2(srcCenter.Y, srcCenter.X) dstAngle := math.Atan2(dstCenter.Y, dstCenter.X) - if dstAngle < srcAngle { - dstAngle += 2 * math.Pi + diff := dstAngle - srcAngle + if math.Abs(diff) > math.Pi { + if diff > 0 { + dstAngle -= 2 * math.Pi + } else { + dstAngle += 2 * math.Pi + } } arcRadius := math.Hypot(srcCenter.X, srcCenter.Y) From a8526432dfbef56cb23b678cdc60dbb1a66e536b Mon Sep 17 00:00:00 2001 From: Mayank Mohapatra <125661248+Mayank77maruti@users.noreply.github.com> Date: Sat, 22 Feb 2025 13:35:53 +0000 Subject: [PATCH 30/73] try --- d2layouts/d2cycle/layout.go | 82 ++++------ .../txtar/cycle-diagram/dagre/board.exp.json | 24 +-- .../txtar/cycle-diagram/dagre/sketch.exp.svg | 152 +++++++++--------- .../txtar/cycle-diagram/elk/board.exp.json | 24 +-- .../txtar/cycle-diagram/elk/sketch.exp.svg | 152 +++++++++--------- 5 files changed, 207 insertions(+), 227 deletions(-) diff --git a/d2layouts/d2cycle/layout.go b/d2layouts/d2cycle/layout.go index 4adb43fb68..f80fecb64b 100644 --- a/d2layouts/d2cycle/layout.go +++ b/d2layouts/d2cycle/layout.go @@ -65,46 +65,6 @@ func positionObjects(objects []*d2graph.Object, radius float64) { } } -// func createCircularArc(edge *d2graph.Edge) { -// if edge.Src == nil || edge.Dst == nil { -// return -// } - -// srcCenter := edge.Src.Center() -// dstCenter := edge.Dst.Center() - -// srcAngle := math.Atan2(srcCenter.Y, srcCenter.X) -// dstAngle := math.Atan2(dstCenter.Y, dstCenter.X) -// if dstAngle < srcAngle { -// dstAngle += 2 * math.Pi -// } - -// arcRadius := math.Hypot(srcCenter.X, srcCenter.Y) - -// path := make([]*geo.Point, 0, ARC_STEPS+1) -// 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) -// path = append(path, geo.NewPoint(x, y)) -// } -// path[0] = srcCenter -// path[len(path)-1] = dstCenter - -// // Clamp endpoints to the boundaries of the source and destination 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. -// path = trimPathPoints(path, edge.Src.Box) -// path = trimPathPoints(path, edge.Dst.Box) - -// edge.Route = path -// edge.IsCurve = true -// } func createCircularArc(edge *d2graph.Edge) { if edge.Src == nil || edge.Dst == nil { return @@ -115,13 +75,8 @@ func createCircularArc(edge *d2graph.Edge) { srcAngle := math.Atan2(srcCenter.Y, srcCenter.X) dstAngle := math.Atan2(dstCenter.Y, dstCenter.X) - diff := dstAngle - srcAngle - if math.Abs(diff) > math.Pi { - if diff > 0 { - dstAngle -= 2 * math.Pi - } else { - dstAngle += 2 * math.Pi - } + if dstAngle < srcAngle { + dstAngle += 2 * math.Pi } arcRadius := math.Hypot(srcCenter.X, srcCenter.Y) @@ -144,11 +99,36 @@ func createCircularArc(edge *d2graph.Edge) { path[len(path)-1] = newDst // Trim redundant path points that fall inside node boundaries. - path = trimPathPoints(path, edge.Src.Box) - path = trimPathPoints(path, edge.Dst.Box) +// path = trimPathPoints(path, edge.Src.Box) +// path = trimPathPoints(path, edge.Dst.Box) + +// edge.Route = path +// edge.IsCurve = true +// } +path = trimPathPoints(path, edge.Src.Box) +path = trimPathPoints(path, edge.Dst.Box) + +// Adjust the last two points to align the arrow direction with the arc's tangent at the destination. +if len(path) >= 2 { + dstPoint := path[len(path)-1] + // Calculate the tangent direction at the destination point (counter-clockwise) + tangentX := -dstPoint.Y + tangentY := dstPoint.X + // Normalize the tangent vector + length := math.Hypot(tangentX, tangentY) + if length > 0 { + tangentX /= length + tangentY /= length + } + // Adjust the penultimate point to be a small step back along the tangent direction + step := 10.0 + prevX := dstPoint.X - tangentX*step + prevY := dstPoint.Y - tangentY*step + path[len(path)-2] = geo.NewPoint(prevX, prevY) +} - edge.Route = path - edge.IsCurve = true +edge.Route = path +edge.IsCurve = true } // clampPointOutsideBox walks forward along the path until it finds a point outside the box, diff --git a/e2etests/testdata/txtar/cycle-diagram/dagre/board.exp.json b/e2etests/testdata/txtar/cycle-diagram/dagre/board.exp.json index 78ed2dffeb..f260b08863 100644 --- a/e2etests/testdata/txtar/cycle-diagram/dagre/board.exp.json +++ b/e2etests/testdata/txtar/cycle-diagram/dagre/board.exp.json @@ -864,8 +864,8 @@ "y": -37.47600173950195 }, { - "x": 197.02099609375, - "y": -34.3849983215332 + "x": 195.6020050048828, + "y": -42.86199951171875 }, { "x": 197.2519989013672, @@ -1228,8 +1228,8 @@ "y": 197.53700256347656 }, { - "x": 28.18000030517578, - "y": 198.00399780273438 + "x": 36.4109992980957, + "y": 196.90499877929688 }, { "x": 26.5, @@ -1592,8 +1592,8 @@ "y": 37.47600173950195 }, { - "x": -197.02099609375, - "y": 34.3849983215332 + "x": -195.6020050048828, + "y": 42.86199951171875 }, { "x": -197.2519989013672, @@ -1972,8 +1972,8 @@ "y": 111.8030014038086 }, { - "x": 701.875, - "y": 115.77300262451172 + "x": 704.7830200195312, + "y": 107.5770034790039 }, { "x": 701.4329833984375, @@ -2336,8 +2336,8 @@ "y": 186.90899658203125 }, { - "x": 364.3710021972656, - "y": 183.8260040283203 + "x": 370.2919921875, + "y": 190.46800231933594 }, { "x": 363.6419982910156, @@ -2740,8 +2740,8 @@ "y": 196.45700073242188 }, { - "x": 1003.2860107421875, - "y": 197.53700256347656 + "x": 1008.4110107421875, + "y": 196.89300537109375 }, { "x": 998.5, diff --git a/e2etests/testdata/txtar/cycle-diagram/dagre/sketch.exp.svg b/e2etests/testdata/txtar/cycle-diagram/dagre/sketch.exp.svg index 015478d741..037adcdace 100644 --- a/e2etests/testdata/txtar/cycle-diagram/dagre/sketch.exp.svg +++ b/e2etests/testdata/txtar/cycle-diagram/dagre/sketch.exp.svg @@ -1,9 +1,9 @@ -abcdabcab + .d2-2450559997 .fill-N1{fill:#0A0F25;} + .d2-2450559997 .fill-N2{fill:#676C7E;} + .d2-2450559997 .fill-N3{fill:#9499AB;} + .d2-2450559997 .fill-N4{fill:#CFD2DD;} + .d2-2450559997 .fill-N5{fill:#DEE1EB;} + .d2-2450559997 .fill-N6{fill:#EEF1F8;} + .d2-2450559997 .fill-N7{fill:#FFFFFF;} + .d2-2450559997 .fill-B1{fill:#0D32B2;} + .d2-2450559997 .fill-B2{fill:#0D32B2;} + .d2-2450559997 .fill-B3{fill:#E3E9FD;} + .d2-2450559997 .fill-B4{fill:#E3E9FD;} + .d2-2450559997 .fill-B5{fill:#EDF0FD;} + .d2-2450559997 .fill-B6{fill:#F7F8FE;} + .d2-2450559997 .fill-AA2{fill:#4A6FF3;} + .d2-2450559997 .fill-AA4{fill:#EDF0FD;} + .d2-2450559997 .fill-AA5{fill:#F7F8FE;} + .d2-2450559997 .fill-AB4{fill:#EDF0FD;} + .d2-2450559997 .fill-AB5{fill:#F7F8FE;} + .d2-2450559997 .stroke-N1{stroke:#0A0F25;} + .d2-2450559997 .stroke-N2{stroke:#676C7E;} + .d2-2450559997 .stroke-N3{stroke:#9499AB;} + .d2-2450559997 .stroke-N4{stroke:#CFD2DD;} + .d2-2450559997 .stroke-N5{stroke:#DEE1EB;} + .d2-2450559997 .stroke-N6{stroke:#EEF1F8;} + .d2-2450559997 .stroke-N7{stroke:#FFFFFF;} + .d2-2450559997 .stroke-B1{stroke:#0D32B2;} + .d2-2450559997 .stroke-B2{stroke:#0D32B2;} + .d2-2450559997 .stroke-B3{stroke:#E3E9FD;} + .d2-2450559997 .stroke-B4{stroke:#E3E9FD;} + .d2-2450559997 .stroke-B5{stroke:#EDF0FD;} + .d2-2450559997 .stroke-B6{stroke:#F7F8FE;} + .d2-2450559997 .stroke-AA2{stroke:#4A6FF3;} + .d2-2450559997 .stroke-AA4{stroke:#EDF0FD;} + .d2-2450559997 .stroke-AA5{stroke:#F7F8FE;} + .d2-2450559997 .stroke-AB4{stroke:#EDF0FD;} + .d2-2450559997 .stroke-AB5{stroke:#F7F8FE;} + .d2-2450559997 .background-color-N1{background-color:#0A0F25;} + .d2-2450559997 .background-color-N2{background-color:#676C7E;} + .d2-2450559997 .background-color-N3{background-color:#9499AB;} + .d2-2450559997 .background-color-N4{background-color:#CFD2DD;} + .d2-2450559997 .background-color-N5{background-color:#DEE1EB;} + .d2-2450559997 .background-color-N6{background-color:#EEF1F8;} + .d2-2450559997 .background-color-N7{background-color:#FFFFFF;} + .d2-2450559997 .background-color-B1{background-color:#0D32B2;} + .d2-2450559997 .background-color-B2{background-color:#0D32B2;} + .d2-2450559997 .background-color-B3{background-color:#E3E9FD;} + .d2-2450559997 .background-color-B4{background-color:#E3E9FD;} + .d2-2450559997 .background-color-B5{background-color:#EDF0FD;} + .d2-2450559997 .background-color-B6{background-color:#F7F8FE;} + .d2-2450559997 .background-color-AA2{background-color:#4A6FF3;} + .d2-2450559997 .background-color-AA4{background-color:#EDF0FD;} + .d2-2450559997 .background-color-AA5{background-color:#F7F8FE;} + .d2-2450559997 .background-color-AB4{background-color:#EDF0FD;} + .d2-2450559997 .background-color-AB5{background-color:#F7F8FE;} + .d2-2450559997 .color-N1{color:#0A0F25;} + .d2-2450559997 .color-N2{color:#676C7E;} + .d2-2450559997 .color-N3{color:#9499AB;} + .d2-2450559997 .color-N4{color:#CFD2DD;} + .d2-2450559997 .color-N5{color:#DEE1EB;} + .d2-2450559997 .color-N6{color:#EEF1F8;} + .d2-2450559997 .color-N7{color:#FFFFFF;} + .d2-2450559997 .color-B1{color:#0D32B2;} + .d2-2450559997 .color-B2{color:#0D32B2;} + .d2-2450559997 .color-B3{color:#E3E9FD;} + .d2-2450559997 .color-B4{color:#E3E9FD;} + .d2-2450559997 .color-B5{color:#EDF0FD;} + .d2-2450559997 .color-B6{color:#F7F8FE;} + .d2-2450559997 .color-AA2{color:#4A6FF3;} + .d2-2450559997 .color-AA4{color:#EDF0FD;} + .d2-2450559997 .color-AA5{color:#F7F8FE;} + .d2-2450559997 .color-AB4{color:#EDF0FD;} + .d2-2450559997 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker-d2-2450559997);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker-d2-2450559997);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright-d2-2450559997);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright-d2-2450559997);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright-d2-2450559997);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright-d2-2450559997);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark-d2-2450559997);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright-d2-2450559997);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright-d2-2450559997);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright-d2-2450559997);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright-d2-2450559997);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker-d2-2450559997);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark-d2-2450559997);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal-d2-2450559997);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal-d2-2450559997);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright-d2-2450559997);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright-d2-2450559997);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright-d2-2450559997);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>abcdabcab diff --git a/e2etests/testdata/txtar/cycle-diagram/elk/board.exp.json b/e2etests/testdata/txtar/cycle-diagram/elk/board.exp.json index 6eb058a841..94712ff99d 100644 --- a/e2etests/testdata/txtar/cycle-diagram/elk/board.exp.json +++ b/e2etests/testdata/txtar/cycle-diagram/elk/board.exp.json @@ -864,8 +864,8 @@ "y": -25.47599983215332 }, { - "x": 209.02099609375, - "y": -22.385000228881836 + "x": 207.6020050048828, + "y": -30.86199951171875 }, { "x": 209.2519989013672, @@ -1228,8 +1228,8 @@ "y": 209.53700256347656 }, { - "x": 40.18000030517578, - "y": 210.00399780273438 + "x": 48.4109992980957, + "y": 208.90499877929688 }, { "x": 38.5, @@ -1592,8 +1592,8 @@ "y": 49.47600173950195 }, { - "x": -185.02099609375, - "y": 46.3849983215332 + "x": -183.6020050048828, + "y": 54.86199951171875 }, { "x": -185.2519989013672, @@ -1972,8 +1972,8 @@ "y": 123.8030014038086 }, { - "x": 674.375, - "y": 127.77300262451172 + "x": 677.2830200195312, + "y": 119.5770034790039 }, { "x": 673.9329833984375, @@ -2336,8 +2336,8 @@ "y": 198.90899658203125 }, { - "x": 336.8710021972656, - "y": 195.8260040283203 + "x": 342.7919921875, + "y": 202.46800231933594 }, { "x": 336.1419982910156, @@ -2740,8 +2740,8 @@ "y": 208.45700073242188 }, { - "x": 936.197021484375, - "y": 209.53700256347656 + "x": 941.3209838867188, + "y": 208.89300537109375 }, { "x": 931.4099731445312, diff --git a/e2etests/testdata/txtar/cycle-diagram/elk/sketch.exp.svg b/e2etests/testdata/txtar/cycle-diagram/elk/sketch.exp.svg index 21e65f752a..c894e3d67f 100644 --- a/e2etests/testdata/txtar/cycle-diagram/elk/sketch.exp.svg +++ b/e2etests/testdata/txtar/cycle-diagram/elk/sketch.exp.svg @@ -1,9 +1,9 @@ -abcdabcab + .d2-3675916959 .fill-N1{fill:#0A0F25;} + .d2-3675916959 .fill-N2{fill:#676C7E;} + .d2-3675916959 .fill-N3{fill:#9499AB;} + .d2-3675916959 .fill-N4{fill:#CFD2DD;} + .d2-3675916959 .fill-N5{fill:#DEE1EB;} + .d2-3675916959 .fill-N6{fill:#EEF1F8;} + .d2-3675916959 .fill-N7{fill:#FFFFFF;} + .d2-3675916959 .fill-B1{fill:#0D32B2;} + .d2-3675916959 .fill-B2{fill:#0D32B2;} + .d2-3675916959 .fill-B3{fill:#E3E9FD;} + .d2-3675916959 .fill-B4{fill:#E3E9FD;} + .d2-3675916959 .fill-B5{fill:#EDF0FD;} + .d2-3675916959 .fill-B6{fill:#F7F8FE;} + .d2-3675916959 .fill-AA2{fill:#4A6FF3;} + .d2-3675916959 .fill-AA4{fill:#EDF0FD;} + .d2-3675916959 .fill-AA5{fill:#F7F8FE;} + .d2-3675916959 .fill-AB4{fill:#EDF0FD;} + .d2-3675916959 .fill-AB5{fill:#F7F8FE;} + .d2-3675916959 .stroke-N1{stroke:#0A0F25;} + .d2-3675916959 .stroke-N2{stroke:#676C7E;} + .d2-3675916959 .stroke-N3{stroke:#9499AB;} + .d2-3675916959 .stroke-N4{stroke:#CFD2DD;} + .d2-3675916959 .stroke-N5{stroke:#DEE1EB;} + .d2-3675916959 .stroke-N6{stroke:#EEF1F8;} + .d2-3675916959 .stroke-N7{stroke:#FFFFFF;} + .d2-3675916959 .stroke-B1{stroke:#0D32B2;} + .d2-3675916959 .stroke-B2{stroke:#0D32B2;} + .d2-3675916959 .stroke-B3{stroke:#E3E9FD;} + .d2-3675916959 .stroke-B4{stroke:#E3E9FD;} + .d2-3675916959 .stroke-B5{stroke:#EDF0FD;} + .d2-3675916959 .stroke-B6{stroke:#F7F8FE;} + .d2-3675916959 .stroke-AA2{stroke:#4A6FF3;} + .d2-3675916959 .stroke-AA4{stroke:#EDF0FD;} + .d2-3675916959 .stroke-AA5{stroke:#F7F8FE;} + .d2-3675916959 .stroke-AB4{stroke:#EDF0FD;} + .d2-3675916959 .stroke-AB5{stroke:#F7F8FE;} + .d2-3675916959 .background-color-N1{background-color:#0A0F25;} + .d2-3675916959 .background-color-N2{background-color:#676C7E;} + .d2-3675916959 .background-color-N3{background-color:#9499AB;} + .d2-3675916959 .background-color-N4{background-color:#CFD2DD;} + .d2-3675916959 .background-color-N5{background-color:#DEE1EB;} + .d2-3675916959 .background-color-N6{background-color:#EEF1F8;} + .d2-3675916959 .background-color-N7{background-color:#FFFFFF;} + .d2-3675916959 .background-color-B1{background-color:#0D32B2;} + .d2-3675916959 .background-color-B2{background-color:#0D32B2;} + .d2-3675916959 .background-color-B3{background-color:#E3E9FD;} + .d2-3675916959 .background-color-B4{background-color:#E3E9FD;} + .d2-3675916959 .background-color-B5{background-color:#EDF0FD;} + .d2-3675916959 .background-color-B6{background-color:#F7F8FE;} + .d2-3675916959 .background-color-AA2{background-color:#4A6FF3;} + .d2-3675916959 .background-color-AA4{background-color:#EDF0FD;} + .d2-3675916959 .background-color-AA5{background-color:#F7F8FE;} + .d2-3675916959 .background-color-AB4{background-color:#EDF0FD;} + .d2-3675916959 .background-color-AB5{background-color:#F7F8FE;} + .d2-3675916959 .color-N1{color:#0A0F25;} + .d2-3675916959 .color-N2{color:#676C7E;} + .d2-3675916959 .color-N3{color:#9499AB;} + .d2-3675916959 .color-N4{color:#CFD2DD;} + .d2-3675916959 .color-N5{color:#DEE1EB;} + .d2-3675916959 .color-N6{color:#EEF1F8;} + .d2-3675916959 .color-N7{color:#FFFFFF;} + .d2-3675916959 .color-B1{color:#0D32B2;} + .d2-3675916959 .color-B2{color:#0D32B2;} + .d2-3675916959 .color-B3{color:#E3E9FD;} + .d2-3675916959 .color-B4{color:#E3E9FD;} + .d2-3675916959 .color-B5{color:#EDF0FD;} + .d2-3675916959 .color-B6{color:#F7F8FE;} + .d2-3675916959 .color-AA2{color:#4A6FF3;} + .d2-3675916959 .color-AA4{color:#EDF0FD;} + .d2-3675916959 .color-AA5{color:#F7F8FE;} + .d2-3675916959 .color-AB4{color:#EDF0FD;} + .d2-3675916959 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker-d2-3675916959);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker-d2-3675916959);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright-d2-3675916959);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright-d2-3675916959);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright-d2-3675916959);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright-d2-3675916959);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark-d2-3675916959);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright-d2-3675916959);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright-d2-3675916959);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright-d2-3675916959);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright-d2-3675916959);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker-d2-3675916959);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark-d2-3675916959);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal-d2-3675916959);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal-d2-3675916959);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright-d2-3675916959);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright-d2-3675916959);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright-d2-3675916959);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>abcdabcab From 17cca5ee89068c60f7721626b90554cd50c154d4 Mon Sep 17 00:00:00 2001 From: Mayank Mohapatra <125661248+Mayank77maruti@users.noreply.github.com> Date: Sat, 22 Feb 2025 13:39:54 +0000 Subject: [PATCH 31/73] try --- d2layouts/d2cycle/layout.go | 2 +- .../txtar/cycle-diagram/dagre/board.exp.json | 12 +- .../txtar/cycle-diagram/dagre/sketch.exp.svg | 152 +++++++++--------- .../txtar/cycle-diagram/elk/board.exp.json | 12 +- .../txtar/cycle-diagram/elk/sketch.exp.svg | 152 +++++++++--------- 5 files changed, 165 insertions(+), 165 deletions(-) diff --git a/d2layouts/d2cycle/layout.go b/d2layouts/d2cycle/layout.go index f80fecb64b..a085eb7db0 100644 --- a/d2layouts/d2cycle/layout.go +++ b/d2layouts/d2cycle/layout.go @@ -112,7 +112,7 @@ path = trimPathPoints(path, edge.Dst.Box) if len(path) >= 2 { dstPoint := path[len(path)-1] // Calculate the tangent direction at the destination point (counter-clockwise) - tangentX := -dstPoint.Y + tangentX := dstPoint.Y tangentY := dstPoint.X // Normalize the tangent vector length := math.Hypot(tangentX, tangentY) diff --git a/e2etests/testdata/txtar/cycle-diagram/dagre/board.exp.json b/e2etests/testdata/txtar/cycle-diagram/dagre/board.exp.json index f260b08863..789be8290c 100644 --- a/e2etests/testdata/txtar/cycle-diagram/dagre/board.exp.json +++ b/e2etests/testdata/txtar/cycle-diagram/dagre/board.exp.json @@ -864,7 +864,7 @@ "y": -37.47600173950195 }, { - "x": 195.6020050048828, + "x": 198.90199279785156, "y": -42.86199951171875 }, { @@ -1228,7 +1228,7 @@ "y": 197.53700256347656 }, { - "x": 36.4109992980957, + "x": 16.58799934387207, "y": 196.90499877929688 }, { @@ -1592,7 +1592,7 @@ "y": 37.47600173950195 }, { - "x": -195.6020050048828, + "x": -198.90199279785156, "y": 42.86199951171875 }, { @@ -1972,7 +1972,7 @@ "y": 111.8030014038086 }, { - "x": 704.7830200195312, + "x": 698.0830078125, "y": 107.5770034790039 }, { @@ -2336,7 +2336,7 @@ "y": 186.90899658203125 }, { - "x": 370.2919921875, + "x": 356.99200439453125, "y": 190.46800231933594 }, { @@ -2740,7 +2740,7 @@ "y": 196.45700073242188 }, { - "x": 1008.4110107421875, + "x": 988.5880126953125, "y": 196.89300537109375 }, { diff --git a/e2etests/testdata/txtar/cycle-diagram/dagre/sketch.exp.svg b/e2etests/testdata/txtar/cycle-diagram/dagre/sketch.exp.svg index 037adcdace..5569c4f34a 100644 --- a/e2etests/testdata/txtar/cycle-diagram/dagre/sketch.exp.svg +++ b/e2etests/testdata/txtar/cycle-diagram/dagre/sketch.exp.svg @@ -1,9 +1,9 @@ -abcdabcab + .d2-3418838250 .fill-N1{fill:#0A0F25;} + .d2-3418838250 .fill-N2{fill:#676C7E;} + .d2-3418838250 .fill-N3{fill:#9499AB;} + .d2-3418838250 .fill-N4{fill:#CFD2DD;} + .d2-3418838250 .fill-N5{fill:#DEE1EB;} + .d2-3418838250 .fill-N6{fill:#EEF1F8;} + .d2-3418838250 .fill-N7{fill:#FFFFFF;} + .d2-3418838250 .fill-B1{fill:#0D32B2;} + .d2-3418838250 .fill-B2{fill:#0D32B2;} + .d2-3418838250 .fill-B3{fill:#E3E9FD;} + .d2-3418838250 .fill-B4{fill:#E3E9FD;} + .d2-3418838250 .fill-B5{fill:#EDF0FD;} + .d2-3418838250 .fill-B6{fill:#F7F8FE;} + .d2-3418838250 .fill-AA2{fill:#4A6FF3;} + .d2-3418838250 .fill-AA4{fill:#EDF0FD;} + .d2-3418838250 .fill-AA5{fill:#F7F8FE;} + .d2-3418838250 .fill-AB4{fill:#EDF0FD;} + .d2-3418838250 .fill-AB5{fill:#F7F8FE;} + .d2-3418838250 .stroke-N1{stroke:#0A0F25;} + .d2-3418838250 .stroke-N2{stroke:#676C7E;} + .d2-3418838250 .stroke-N3{stroke:#9499AB;} + .d2-3418838250 .stroke-N4{stroke:#CFD2DD;} + .d2-3418838250 .stroke-N5{stroke:#DEE1EB;} + .d2-3418838250 .stroke-N6{stroke:#EEF1F8;} + .d2-3418838250 .stroke-N7{stroke:#FFFFFF;} + .d2-3418838250 .stroke-B1{stroke:#0D32B2;} + .d2-3418838250 .stroke-B2{stroke:#0D32B2;} + .d2-3418838250 .stroke-B3{stroke:#E3E9FD;} + .d2-3418838250 .stroke-B4{stroke:#E3E9FD;} + .d2-3418838250 .stroke-B5{stroke:#EDF0FD;} + .d2-3418838250 .stroke-B6{stroke:#F7F8FE;} + .d2-3418838250 .stroke-AA2{stroke:#4A6FF3;} + .d2-3418838250 .stroke-AA4{stroke:#EDF0FD;} + .d2-3418838250 .stroke-AA5{stroke:#F7F8FE;} + .d2-3418838250 .stroke-AB4{stroke:#EDF0FD;} + .d2-3418838250 .stroke-AB5{stroke:#F7F8FE;} + .d2-3418838250 .background-color-N1{background-color:#0A0F25;} + .d2-3418838250 .background-color-N2{background-color:#676C7E;} + .d2-3418838250 .background-color-N3{background-color:#9499AB;} + .d2-3418838250 .background-color-N4{background-color:#CFD2DD;} + .d2-3418838250 .background-color-N5{background-color:#DEE1EB;} + .d2-3418838250 .background-color-N6{background-color:#EEF1F8;} + .d2-3418838250 .background-color-N7{background-color:#FFFFFF;} + .d2-3418838250 .background-color-B1{background-color:#0D32B2;} + .d2-3418838250 .background-color-B2{background-color:#0D32B2;} + .d2-3418838250 .background-color-B3{background-color:#E3E9FD;} + .d2-3418838250 .background-color-B4{background-color:#E3E9FD;} + .d2-3418838250 .background-color-B5{background-color:#EDF0FD;} + .d2-3418838250 .background-color-B6{background-color:#F7F8FE;} + .d2-3418838250 .background-color-AA2{background-color:#4A6FF3;} + .d2-3418838250 .background-color-AA4{background-color:#EDF0FD;} + .d2-3418838250 .background-color-AA5{background-color:#F7F8FE;} + .d2-3418838250 .background-color-AB4{background-color:#EDF0FD;} + .d2-3418838250 .background-color-AB5{background-color:#F7F8FE;} + .d2-3418838250 .color-N1{color:#0A0F25;} + .d2-3418838250 .color-N2{color:#676C7E;} + .d2-3418838250 .color-N3{color:#9499AB;} + .d2-3418838250 .color-N4{color:#CFD2DD;} + .d2-3418838250 .color-N5{color:#DEE1EB;} + .d2-3418838250 .color-N6{color:#EEF1F8;} + .d2-3418838250 .color-N7{color:#FFFFFF;} + .d2-3418838250 .color-B1{color:#0D32B2;} + .d2-3418838250 .color-B2{color:#0D32B2;} + .d2-3418838250 .color-B3{color:#E3E9FD;} + .d2-3418838250 .color-B4{color:#E3E9FD;} + .d2-3418838250 .color-B5{color:#EDF0FD;} + .d2-3418838250 .color-B6{color:#F7F8FE;} + .d2-3418838250 .color-AA2{color:#4A6FF3;} + .d2-3418838250 .color-AA4{color:#EDF0FD;} + .d2-3418838250 .color-AA5{color:#F7F8FE;} + .d2-3418838250 .color-AB4{color:#EDF0FD;} + .d2-3418838250 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker-d2-3418838250);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker-d2-3418838250);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright-d2-3418838250);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright-d2-3418838250);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright-d2-3418838250);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright-d2-3418838250);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark-d2-3418838250);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright-d2-3418838250);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright-d2-3418838250);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright-d2-3418838250);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright-d2-3418838250);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker-d2-3418838250);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark-d2-3418838250);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal-d2-3418838250);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal-d2-3418838250);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright-d2-3418838250);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright-d2-3418838250);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright-d2-3418838250);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>abcdabcab diff --git a/e2etests/testdata/txtar/cycle-diagram/elk/board.exp.json b/e2etests/testdata/txtar/cycle-diagram/elk/board.exp.json index 94712ff99d..3e6b5ac272 100644 --- a/e2etests/testdata/txtar/cycle-diagram/elk/board.exp.json +++ b/e2etests/testdata/txtar/cycle-diagram/elk/board.exp.json @@ -864,7 +864,7 @@ "y": -25.47599983215332 }, { - "x": 207.6020050048828, + "x": 210.90199279785156, "y": -30.86199951171875 }, { @@ -1228,7 +1228,7 @@ "y": 209.53700256347656 }, { - "x": 48.4109992980957, + "x": 28.58799934387207, "y": 208.90499877929688 }, { @@ -1592,7 +1592,7 @@ "y": 49.47600173950195 }, { - "x": -183.6020050048828, + "x": -186.90199279785156, "y": 54.86199951171875 }, { @@ -1972,7 +1972,7 @@ "y": 123.8030014038086 }, { - "x": 677.2830200195312, + "x": 670.5830078125, "y": 119.5770034790039 }, { @@ -2336,7 +2336,7 @@ "y": 198.90899658203125 }, { - "x": 342.7919921875, + "x": 329.49200439453125, "y": 202.46800231933594 }, { @@ -2740,7 +2740,7 @@ "y": 208.45700073242188 }, { - "x": 941.3209838867188, + "x": 921.4979858398438, "y": 208.89300537109375 }, { diff --git a/e2etests/testdata/txtar/cycle-diagram/elk/sketch.exp.svg b/e2etests/testdata/txtar/cycle-diagram/elk/sketch.exp.svg index c894e3d67f..705b7e769b 100644 --- a/e2etests/testdata/txtar/cycle-diagram/elk/sketch.exp.svg +++ b/e2etests/testdata/txtar/cycle-diagram/elk/sketch.exp.svg @@ -1,9 +1,9 @@ -abcdabcab + .d2-4040176331 .fill-N1{fill:#0A0F25;} + .d2-4040176331 .fill-N2{fill:#676C7E;} + .d2-4040176331 .fill-N3{fill:#9499AB;} + .d2-4040176331 .fill-N4{fill:#CFD2DD;} + .d2-4040176331 .fill-N5{fill:#DEE1EB;} + .d2-4040176331 .fill-N6{fill:#EEF1F8;} + .d2-4040176331 .fill-N7{fill:#FFFFFF;} + .d2-4040176331 .fill-B1{fill:#0D32B2;} + .d2-4040176331 .fill-B2{fill:#0D32B2;} + .d2-4040176331 .fill-B3{fill:#E3E9FD;} + .d2-4040176331 .fill-B4{fill:#E3E9FD;} + .d2-4040176331 .fill-B5{fill:#EDF0FD;} + .d2-4040176331 .fill-B6{fill:#F7F8FE;} + .d2-4040176331 .fill-AA2{fill:#4A6FF3;} + .d2-4040176331 .fill-AA4{fill:#EDF0FD;} + .d2-4040176331 .fill-AA5{fill:#F7F8FE;} + .d2-4040176331 .fill-AB4{fill:#EDF0FD;} + .d2-4040176331 .fill-AB5{fill:#F7F8FE;} + .d2-4040176331 .stroke-N1{stroke:#0A0F25;} + .d2-4040176331 .stroke-N2{stroke:#676C7E;} + .d2-4040176331 .stroke-N3{stroke:#9499AB;} + .d2-4040176331 .stroke-N4{stroke:#CFD2DD;} + .d2-4040176331 .stroke-N5{stroke:#DEE1EB;} + .d2-4040176331 .stroke-N6{stroke:#EEF1F8;} + .d2-4040176331 .stroke-N7{stroke:#FFFFFF;} + .d2-4040176331 .stroke-B1{stroke:#0D32B2;} + .d2-4040176331 .stroke-B2{stroke:#0D32B2;} + .d2-4040176331 .stroke-B3{stroke:#E3E9FD;} + .d2-4040176331 .stroke-B4{stroke:#E3E9FD;} + .d2-4040176331 .stroke-B5{stroke:#EDF0FD;} + .d2-4040176331 .stroke-B6{stroke:#F7F8FE;} + .d2-4040176331 .stroke-AA2{stroke:#4A6FF3;} + .d2-4040176331 .stroke-AA4{stroke:#EDF0FD;} + .d2-4040176331 .stroke-AA5{stroke:#F7F8FE;} + .d2-4040176331 .stroke-AB4{stroke:#EDF0FD;} + .d2-4040176331 .stroke-AB5{stroke:#F7F8FE;} + .d2-4040176331 .background-color-N1{background-color:#0A0F25;} + .d2-4040176331 .background-color-N2{background-color:#676C7E;} + .d2-4040176331 .background-color-N3{background-color:#9499AB;} + .d2-4040176331 .background-color-N4{background-color:#CFD2DD;} + .d2-4040176331 .background-color-N5{background-color:#DEE1EB;} + .d2-4040176331 .background-color-N6{background-color:#EEF1F8;} + .d2-4040176331 .background-color-N7{background-color:#FFFFFF;} + .d2-4040176331 .background-color-B1{background-color:#0D32B2;} + .d2-4040176331 .background-color-B2{background-color:#0D32B2;} + .d2-4040176331 .background-color-B3{background-color:#E3E9FD;} + .d2-4040176331 .background-color-B4{background-color:#E3E9FD;} + .d2-4040176331 .background-color-B5{background-color:#EDF0FD;} + .d2-4040176331 .background-color-B6{background-color:#F7F8FE;} + .d2-4040176331 .background-color-AA2{background-color:#4A6FF3;} + .d2-4040176331 .background-color-AA4{background-color:#EDF0FD;} + .d2-4040176331 .background-color-AA5{background-color:#F7F8FE;} + .d2-4040176331 .background-color-AB4{background-color:#EDF0FD;} + .d2-4040176331 .background-color-AB5{background-color:#F7F8FE;} + .d2-4040176331 .color-N1{color:#0A0F25;} + .d2-4040176331 .color-N2{color:#676C7E;} + .d2-4040176331 .color-N3{color:#9499AB;} + .d2-4040176331 .color-N4{color:#CFD2DD;} + .d2-4040176331 .color-N5{color:#DEE1EB;} + .d2-4040176331 .color-N6{color:#EEF1F8;} + .d2-4040176331 .color-N7{color:#FFFFFF;} + .d2-4040176331 .color-B1{color:#0D32B2;} + .d2-4040176331 .color-B2{color:#0D32B2;} + .d2-4040176331 .color-B3{color:#E3E9FD;} + .d2-4040176331 .color-B4{color:#E3E9FD;} + .d2-4040176331 .color-B5{color:#EDF0FD;} + .d2-4040176331 .color-B6{color:#F7F8FE;} + .d2-4040176331 .color-AA2{color:#4A6FF3;} + .d2-4040176331 .color-AA4{color:#EDF0FD;} + .d2-4040176331 .color-AA5{color:#F7F8FE;} + .d2-4040176331 .color-AB4{color:#EDF0FD;} + .d2-4040176331 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker-d2-4040176331);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker-d2-4040176331);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright-d2-4040176331);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright-d2-4040176331);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright-d2-4040176331);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright-d2-4040176331);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark-d2-4040176331);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright-d2-4040176331);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright-d2-4040176331);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright-d2-4040176331);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright-d2-4040176331);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker-d2-4040176331);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark-d2-4040176331);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal-d2-4040176331);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal-d2-4040176331);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright-d2-4040176331);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright-d2-4040176331);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright-d2-4040176331);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>abcdabcab From 578d5bc231496fa08890ab7d277f1e54ff8f31d8 Mon Sep 17 00:00:00 2001 From: Mayank Mohapatra <125661248+Mayank77maruti@users.noreply.github.com> Date: Sat, 22 Feb 2025 13:40:50 +0000 Subject: [PATCH 32/73] try --- d2layouts/d2cycle/layout.go | 28 +- .../txtar/cycle-diagram/dagre/board.exp.json | 400 +++++++++++++++++- .../txtar/cycle-diagram/dagre/sketch.exp.svg | 152 +++---- .../txtar/cycle-diagram/elk/board.exp.json | 400 +++++++++++++++++- .../txtar/cycle-diagram/elk/sketch.exp.svg | 152 +++---- 5 files changed, 930 insertions(+), 202 deletions(-) diff --git a/d2layouts/d2cycle/layout.go b/d2layouts/d2cycle/layout.go index a085eb7db0..d6b3a984a2 100644 --- a/d2layouts/d2cycle/layout.go +++ b/d2layouts/d2cycle/layout.go @@ -102,34 +102,10 @@ func createCircularArc(edge *d2graph.Edge) { // path = trimPathPoints(path, edge.Src.Box) // path = trimPathPoints(path, edge.Dst.Box) -// edge.Route = path -// edge.IsCurve = true -// } -path = trimPathPoints(path, edge.Src.Box) -path = trimPathPoints(path, edge.Dst.Box) - -// Adjust the last two points to align the arrow direction with the arc's tangent at the destination. -if len(path) >= 2 { - dstPoint := path[len(path)-1] - // Calculate the tangent direction at the destination point (counter-clockwise) - tangentX := dstPoint.Y - tangentY := dstPoint.X - // Normalize the tangent vector - length := math.Hypot(tangentX, tangentY) - if length > 0 { - tangentX /= length - tangentY /= length - } - // Adjust the penultimate point to be a small step back along the tangent direction - step := 10.0 - prevX := dstPoint.X - tangentX*step - prevY := dstPoint.Y - tangentY*step - path[len(path)-2] = geo.NewPoint(prevX, prevY) + edge.Route = path + edge.IsCurve = true } -edge.Route = path -edge.IsCurve = true -} // clampPointOutsideBox walks forward along the path until it finds a point outside the box, // then replaces the point with a precise intersection. diff --git a/e2etests/testdata/txtar/cycle-diagram/dagre/board.exp.json b/e2etests/testdata/txtar/cycle-diagram/dagre/board.exp.json index 789be8290c..3f9a491438 100644 --- a/e2etests/testdata/txtar/cycle-diagram/dagre/board.exp.json +++ b/e2etests/testdata/txtar/cycle-diagram/dagre/board.exp.json @@ -543,6 +543,38 @@ "x": 26.5, "y": -198.22999572753906 }, + { + "x": 3.1410000324249268, + "y": -199.97500610351562 + }, + { + "x": 6.2820000648498535, + "y": -199.9010009765625 + }, + { + "x": 9.420999526977539, + "y": -199.77699279785156 + }, + { + "x": 12.557999610900879, + "y": -199.60499572753906 + }, + { + "x": 15.690999984741211, + "y": -199.38299560546875 + }, + { + "x": 18.820999145507812, + "y": -199.11199951171875 + }, + { + "x": 21.945999145507812, + "y": -198.79200744628906 + }, + { + "x": 25.06599998474121, + "y": -198.4219970703125 + }, { "x": 28.18000030517578, "y": -198.00399780273438 @@ -864,8 +896,48 @@ "y": -37.47600173950195 }, { - "x": 198.90199279785156, - "y": -42.86199951171875 + "x": 197.02099609375, + "y": -34.3849983215332 + }, + { + "x": 197.53700256347656, + "y": -31.285999298095703 + }, + { + "x": 198.00399780273438, + "y": -28.18000030517578 + }, + { + "x": 198.4219970703125, + "y": -25.06599998474121 + }, + { + "x": 198.79200744628906, + "y": -21.945999145507812 + }, + { + "x": 199.11199951171875, + "y": -18.820999145507812 + }, + { + "x": 199.38299560546875, + "y": -15.690999984741211 + }, + { + "x": 199.60499572753906, + "y": -12.557999610900879 + }, + { + "x": 199.77699279785156, + "y": -9.420999526977539 + }, + { + "x": 199.9010009765625, + "y": -6.2820000648498535 + }, + { + "x": 199.97500610351562, + "y": -3.1410000324249268 }, { "x": 197.2519989013672, @@ -907,6 +979,46 @@ "x": 197.2519989013672, "y": 33 }, + { + "x": 199.97500610351562, + "y": 3.1410000324249268 + }, + { + "x": 199.9010009765625, + "y": 6.2820000648498535 + }, + { + "x": 199.77699279785156, + "y": 9.420999526977539 + }, + { + "x": 199.60499572753906, + "y": 12.557999610900879 + }, + { + "x": 199.38299560546875, + "y": 15.690999984741211 + }, + { + "x": 199.11199951171875, + "y": 18.820999145507812 + }, + { + "x": 198.79200744628906, + "y": 21.945999145507812 + }, + { + "x": 198.4219970703125, + "y": 25.06599998474121 + }, + { + "x": 198.00399780273438, + "y": 28.18000030517578 + }, + { + "x": 197.53700256347656, + "y": 31.285999298095703 + }, { "x": 197.02099609375, "y": 34.3849983215332 @@ -1228,8 +1340,40 @@ "y": 197.53700256347656 }, { - "x": 16.58799934387207, - "y": 196.90499877929688 + "x": 28.18000030517578, + "y": 198.00399780273438 + }, + { + "x": 25.06599998474121, + "y": 198.4219970703125 + }, + { + "x": 21.945999145507812, + "y": 198.79200744628906 + }, + { + "x": 18.820999145507812, + "y": 199.11199951171875 + }, + { + "x": 15.690999984741211, + "y": 199.38299560546875 + }, + { + "x": 12.557999610900879, + "y": 199.60499572753906 + }, + { + "x": 9.420999526977539, + "y": 199.77699279785156 + }, + { + "x": 6.2820000648498535, + "y": 199.9010009765625 + }, + { + "x": 3.1410000324249268, + "y": 199.97500610351562 }, { "x": 26.5, @@ -1271,6 +1415,38 @@ "x": -26.499000549316406, "y": 198.22999572753906 }, + { + "x": -3.1410000324249268, + "y": 199.97500610351562 + }, + { + "x": -6.2820000648498535, + "y": 199.9010009765625 + }, + { + "x": -9.420999526977539, + "y": 199.77699279785156 + }, + { + "x": -12.557999610900879, + "y": 199.60499572753906 + }, + { + "x": -15.690999984741211, + "y": 199.38299560546875 + }, + { + "x": -18.820999145507812, + "y": 199.11199951171875 + }, + { + "x": -21.945999145507812, + "y": 198.79200744628906 + }, + { + "x": -25.06599998474121, + "y": 198.4219970703125 + }, { "x": -28.18000030517578, "y": 198.00399780273438 @@ -1592,8 +1768,48 @@ "y": 37.47600173950195 }, { - "x": -198.90199279785156, - "y": 42.86199951171875 + "x": -197.02099609375, + "y": 34.3849983215332 + }, + { + "x": -197.53700256347656, + "y": 31.285999298095703 + }, + { + "x": -198.00399780273438, + "y": 28.18000030517578 + }, + { + "x": -198.4219970703125, + "y": 25.06599998474121 + }, + { + "x": -198.79200744628906, + "y": 21.945999145507812 + }, + { + "x": -199.11199951171875, + "y": 18.820999145507812 + }, + { + "x": -199.38299560546875, + "y": 15.690999984741211 + }, + { + "x": -199.60499572753906, + "y": 12.557999610900879 + }, + { + "x": -199.77699279785156, + "y": 9.420999526977539 + }, + { + "x": -199.9010009765625, + "y": 6.2820000648498535 + }, + { + "x": -199.97500610351562, + "y": 3.1410000324249268 }, { "x": -197.2519989013672, @@ -1635,6 +1851,30 @@ "x": 539.5, "y": -148.2259979248047 }, + { + "x": 517.18798828125, + "y": -149.95599365234375 + }, + { + "x": 521.375, + "y": -149.82400512695312 + }, + { + "x": 525.5579833984375, + "y": -149.60499572753906 + }, + { + "x": 529.7349853515625, + "y": -149.29800415039062 + }, + { + "x": 533.905029296875, + "y": -148.9040069580078 + }, + { + "x": 538.0659790039062, + "y": -148.4219970703125 + }, { "x": 542.2160034179688, "y": -147.85400390625 @@ -1972,8 +2212,40 @@ "y": 111.8030014038086 }, { - "x": 698.0830078125, - "y": 107.5770034790039 + "x": 701.875, + "y": 115.77300262451172 + }, + { + "x": 700.4559936523438, + "y": 119.71399688720703 + }, + { + "x": 698.9550170898438, + "y": 123.6240005493164 + }, + { + "x": 697.3720092773438, + "y": 127.50299835205078 + }, + { + "x": 695.708984375, + "y": 131.3470001220703 + }, + { + "x": 693.9650268554688, + "y": 135.15499877929688 + }, + { + "x": 692.1420288085938, + "y": 138.927001953125 + }, + { + "x": 690.239990234375, + "y": 142.65899658203125 + }, + { + "x": 688.260986328125, + "y": 146.35000610351562 }, { "x": 701.4329833984375, @@ -2015,6 +2287,42 @@ "x": 662.3569946289062, "y": 182.99899291992188 }, + { + "x": 684.072021484375, + "y": 153.60499572753906 + }, + { + "x": 681.864990234375, + "y": 157.1649932861328 + }, + { + "x": 679.583984375, + "y": 160.67799377441406 + }, + { + "x": 677.22900390625, + "y": 164.14199829101562 + }, + { + "x": 674.802978515625, + "y": 167.5570068359375 + }, + { + "x": 672.3049926757812, + "y": 170.91900634765625 + }, + { + "x": 669.7379760742188, + "y": 174.22900390625 + }, + { + "x": 667.1019897460938, + "y": 177.48399353027344 + }, + { + "x": 664.3989868164062, + "y": 180.6840057373047 + }, { "x": 661.6279907226562, "y": 183.8260040283203 @@ -2336,8 +2644,44 @@ "y": 186.90899658203125 }, { - "x": 356.99200439453125, - "y": 190.46800231933594 + "x": 364.3710021972656, + "y": 183.8260040283203 + }, + { + "x": 361.6000061035156, + "y": 180.6840057373047 + }, + { + "x": 358.8970031738281, + "y": 177.48399353027344 + }, + { + "x": 356.260986328125, + "y": 174.22900390625 + }, + { + "x": 353.6940002441406, + "y": 170.91900634765625 + }, + { + "x": 351.1960144042969, + "y": 167.5570068359375 + }, + { + "x": 348.7699890136719, + "y": 164.14199829101562 + }, + { + "x": 346.4150085449219, + "y": 160.67799377441406 + }, + { + "x": 344.1340026855469, + "y": 157.1649932861328 + }, + { + "x": 341.927001953125, + "y": 153.60499572753906 }, { "x": 363.6419982910156, @@ -2379,6 +2723,22 @@ "x": 998.5, "y": -198.21800231933594 }, + { + "x": 978.281982421875, + "y": -199.9010009765625 + }, + { + "x": 984.5579833984375, + "y": -199.60499572753906 + }, + { + "x": 990.8209838867188, + "y": -199.11199951171875 + }, + { + "x": 997.0659790039062, + "y": -198.4219970703125 + }, { "x": 1003.2860107421875, "y": -197.53700256347656 @@ -2740,8 +3100,24 @@ "y": 196.45700073242188 }, { - "x": 988.5880126953125, - "y": 196.89300537109375 + "x": 1003.2860107421875, + "y": 197.53700256347656 + }, + { + "x": 997.0659790039062, + "y": 198.4219970703125 + }, + { + "x": 990.8209838867188, + "y": 199.11199951171875 + }, + { + "x": 984.5579833984375, + "y": 199.60499572753906 + }, + { + "x": 978.281982421875, + "y": 199.9010009765625 }, { "x": 998.5, diff --git a/e2etests/testdata/txtar/cycle-diagram/dagre/sketch.exp.svg b/e2etests/testdata/txtar/cycle-diagram/dagre/sketch.exp.svg index 5569c4f34a..56a9cf1f37 100644 --- a/e2etests/testdata/txtar/cycle-diagram/dagre/sketch.exp.svg +++ b/e2etests/testdata/txtar/cycle-diagram/dagre/sketch.exp.svg @@ -1,9 +1,9 @@ -abcdabcab + .d2-671326991 .fill-N1{fill:#0A0F25;} + .d2-671326991 .fill-N2{fill:#676C7E;} + .d2-671326991 .fill-N3{fill:#9499AB;} + .d2-671326991 .fill-N4{fill:#CFD2DD;} + .d2-671326991 .fill-N5{fill:#DEE1EB;} + .d2-671326991 .fill-N6{fill:#EEF1F8;} + .d2-671326991 .fill-N7{fill:#FFFFFF;} + .d2-671326991 .fill-B1{fill:#0D32B2;} + .d2-671326991 .fill-B2{fill:#0D32B2;} + .d2-671326991 .fill-B3{fill:#E3E9FD;} + .d2-671326991 .fill-B4{fill:#E3E9FD;} + .d2-671326991 .fill-B5{fill:#EDF0FD;} + .d2-671326991 .fill-B6{fill:#F7F8FE;} + .d2-671326991 .fill-AA2{fill:#4A6FF3;} + .d2-671326991 .fill-AA4{fill:#EDF0FD;} + .d2-671326991 .fill-AA5{fill:#F7F8FE;} + .d2-671326991 .fill-AB4{fill:#EDF0FD;} + .d2-671326991 .fill-AB5{fill:#F7F8FE;} + .d2-671326991 .stroke-N1{stroke:#0A0F25;} + .d2-671326991 .stroke-N2{stroke:#676C7E;} + .d2-671326991 .stroke-N3{stroke:#9499AB;} + .d2-671326991 .stroke-N4{stroke:#CFD2DD;} + .d2-671326991 .stroke-N5{stroke:#DEE1EB;} + .d2-671326991 .stroke-N6{stroke:#EEF1F8;} + .d2-671326991 .stroke-N7{stroke:#FFFFFF;} + .d2-671326991 .stroke-B1{stroke:#0D32B2;} + .d2-671326991 .stroke-B2{stroke:#0D32B2;} + .d2-671326991 .stroke-B3{stroke:#E3E9FD;} + .d2-671326991 .stroke-B4{stroke:#E3E9FD;} + .d2-671326991 .stroke-B5{stroke:#EDF0FD;} + .d2-671326991 .stroke-B6{stroke:#F7F8FE;} + .d2-671326991 .stroke-AA2{stroke:#4A6FF3;} + .d2-671326991 .stroke-AA4{stroke:#EDF0FD;} + .d2-671326991 .stroke-AA5{stroke:#F7F8FE;} + .d2-671326991 .stroke-AB4{stroke:#EDF0FD;} + .d2-671326991 .stroke-AB5{stroke:#F7F8FE;} + .d2-671326991 .background-color-N1{background-color:#0A0F25;} + .d2-671326991 .background-color-N2{background-color:#676C7E;} + .d2-671326991 .background-color-N3{background-color:#9499AB;} + .d2-671326991 .background-color-N4{background-color:#CFD2DD;} + .d2-671326991 .background-color-N5{background-color:#DEE1EB;} + .d2-671326991 .background-color-N6{background-color:#EEF1F8;} + .d2-671326991 .background-color-N7{background-color:#FFFFFF;} + .d2-671326991 .background-color-B1{background-color:#0D32B2;} + .d2-671326991 .background-color-B2{background-color:#0D32B2;} + .d2-671326991 .background-color-B3{background-color:#E3E9FD;} + .d2-671326991 .background-color-B4{background-color:#E3E9FD;} + .d2-671326991 .background-color-B5{background-color:#EDF0FD;} + .d2-671326991 .background-color-B6{background-color:#F7F8FE;} + .d2-671326991 .background-color-AA2{background-color:#4A6FF3;} + .d2-671326991 .background-color-AA4{background-color:#EDF0FD;} + .d2-671326991 .background-color-AA5{background-color:#F7F8FE;} + .d2-671326991 .background-color-AB4{background-color:#EDF0FD;} + .d2-671326991 .background-color-AB5{background-color:#F7F8FE;} + .d2-671326991 .color-N1{color:#0A0F25;} + .d2-671326991 .color-N2{color:#676C7E;} + .d2-671326991 .color-N3{color:#9499AB;} + .d2-671326991 .color-N4{color:#CFD2DD;} + .d2-671326991 .color-N5{color:#DEE1EB;} + .d2-671326991 .color-N6{color:#EEF1F8;} + .d2-671326991 .color-N7{color:#FFFFFF;} + .d2-671326991 .color-B1{color:#0D32B2;} + .d2-671326991 .color-B2{color:#0D32B2;} + .d2-671326991 .color-B3{color:#E3E9FD;} + .d2-671326991 .color-B4{color:#E3E9FD;} + .d2-671326991 .color-B5{color:#EDF0FD;} + .d2-671326991 .color-B6{color:#F7F8FE;} + .d2-671326991 .color-AA2{color:#4A6FF3;} + .d2-671326991 .color-AA4{color:#EDF0FD;} + .d2-671326991 .color-AA5{color:#F7F8FE;} + .d2-671326991 .color-AB4{color:#EDF0FD;} + .d2-671326991 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker-d2-671326991);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker-d2-671326991);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright-d2-671326991);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright-d2-671326991);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright-d2-671326991);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright-d2-671326991);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark-d2-671326991);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright-d2-671326991);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright-d2-671326991);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright-d2-671326991);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright-d2-671326991);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker-d2-671326991);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark-d2-671326991);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal-d2-671326991);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal-d2-671326991);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright-d2-671326991);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright-d2-671326991);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright-d2-671326991);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>abcdabcab diff --git a/e2etests/testdata/txtar/cycle-diagram/elk/board.exp.json b/e2etests/testdata/txtar/cycle-diagram/elk/board.exp.json index 3e6b5ac272..7f5a0553f8 100644 --- a/e2etests/testdata/txtar/cycle-diagram/elk/board.exp.json +++ b/e2etests/testdata/txtar/cycle-diagram/elk/board.exp.json @@ -543,6 +543,38 @@ "x": 38.5, "y": -186.22999572753906 }, + { + "x": 15.140999794006348, + "y": -187.97500610351562 + }, + { + "x": 18.281999588012695, + "y": -187.9010009765625 + }, + { + "x": 21.42099952697754, + "y": -187.77699279785156 + }, + { + "x": 24.558000564575195, + "y": -187.60499572753906 + }, + { + "x": 27.69099998474121, + "y": -187.38299560546875 + }, + { + "x": 30.820999145507812, + "y": -187.11199951171875 + }, + { + "x": 33.94599914550781, + "y": -186.79200744628906 + }, + { + "x": 37.066001892089844, + "y": -186.4219970703125 + }, { "x": 40.18000030517578, "y": -186.00399780273438 @@ -864,8 +896,48 @@ "y": -25.47599983215332 }, { - "x": 210.90199279785156, - "y": -30.86199951171875 + "x": 209.02099609375, + "y": -22.385000228881836 + }, + { + "x": 209.53700256347656, + "y": -19.285999298095703 + }, + { + "x": 210.00399780273438, + "y": -16.18000030517578 + }, + { + "x": 210.4219970703125, + "y": -13.065999984741211 + }, + { + "x": 210.79200744628906, + "y": -9.946000099182129 + }, + { + "x": 211.11199951171875, + "y": -6.821000099182129 + }, + { + "x": 211.38299560546875, + "y": -3.690999984741211 + }, + { + "x": 211.60499572753906, + "y": -0.5580000281333923 + }, + { + "x": 211.77699279785156, + "y": 2.578000068664551 + }, + { + "x": 211.9010009765625, + "y": 5.7170000076293945 + }, + { + "x": 211.97500610351562, + "y": 8.857999801635742 }, { "x": 209.2519989013672, @@ -907,6 +979,46 @@ "x": 209.2519989013672, "y": 45 }, + { + "x": 211.97500610351562, + "y": 15.140999794006348 + }, + { + "x": 211.9010009765625, + "y": 18.281999588012695 + }, + { + "x": 211.77699279785156, + "y": 21.42099952697754 + }, + { + "x": 211.60499572753906, + "y": 24.558000564575195 + }, + { + "x": 211.38299560546875, + "y": 27.69099998474121 + }, + { + "x": 211.11199951171875, + "y": 30.820999145507812 + }, + { + "x": 210.79200744628906, + "y": 33.94599914550781 + }, + { + "x": 210.4219970703125, + "y": 37.066001892089844 + }, + { + "x": 210.00399780273438, + "y": 40.18000030517578 + }, + { + "x": 209.53700256347656, + "y": 43.2859992980957 + }, { "x": 209.02099609375, "y": 46.3849983215332 @@ -1228,8 +1340,40 @@ "y": 209.53700256347656 }, { - "x": 28.58799934387207, - "y": 208.90499877929688 + "x": 40.18000030517578, + "y": 210.00399780273438 + }, + { + "x": 37.066001892089844, + "y": 210.4219970703125 + }, + { + "x": 33.94599914550781, + "y": 210.79200744628906 + }, + { + "x": 30.820999145507812, + "y": 211.11199951171875 + }, + { + "x": 27.69099998474121, + "y": 211.38299560546875 + }, + { + "x": 24.558000564575195, + "y": 211.60499572753906 + }, + { + "x": 21.42099952697754, + "y": 211.77699279785156 + }, + { + "x": 18.281999588012695, + "y": 211.9010009765625 + }, + { + "x": 15.140999794006348, + "y": 211.97500610351562 }, { "x": 38.5, @@ -1271,6 +1415,38 @@ "x": -14.49899959564209, "y": 210.22999572753906 }, + { + "x": 8.857999801635742, + "y": 211.97500610351562 + }, + { + "x": 5.7170000076293945, + "y": 211.9010009765625 + }, + { + "x": 2.578000068664551, + "y": 211.77699279785156 + }, + { + "x": -0.5580000281333923, + "y": 211.60499572753906 + }, + { + "x": -3.690999984741211, + "y": 211.38299560546875 + }, + { + "x": -6.821000099182129, + "y": 211.11199951171875 + }, + { + "x": -9.946000099182129, + "y": 210.79200744628906 + }, + { + "x": -13.065999984741211, + "y": 210.4219970703125 + }, { "x": -16.18000030517578, "y": 210.00399780273438 @@ -1592,8 +1768,48 @@ "y": 49.47600173950195 }, { - "x": -186.90199279785156, - "y": 54.86199951171875 + "x": -185.02099609375, + "y": 46.3849983215332 + }, + { + "x": -185.53700256347656, + "y": 43.2859992980957 + }, + { + "x": -186.00399780273438, + "y": 40.18000030517578 + }, + { + "x": -186.4219970703125, + "y": 37.066001892089844 + }, + { + "x": -186.79200744628906, + "y": 33.94599914550781 + }, + { + "x": -187.11199951171875, + "y": 30.820999145507812 + }, + { + "x": -187.38299560546875, + "y": 27.69099998474121 + }, + { + "x": -187.60499572753906, + "y": 24.558000564575195 + }, + { + "x": -187.77699279785156, + "y": 21.42099952697754 + }, + { + "x": -187.9010009765625, + "y": 18.281999588012695 + }, + { + "x": -187.97500610351562, + "y": 15.140999794006348 }, { "x": -185.2519989013672, @@ -1635,6 +1851,30 @@ "x": 512, "y": -136.2259979248047 }, + { + "x": 489.68798828125, + "y": -137.95599365234375 + }, + { + "x": 493.875, + "y": -137.82400512695312 + }, + { + "x": 498.0580139160156, + "y": -137.60499572753906 + }, + { + "x": 502.2349853515625, + "y": -137.29800415039062 + }, + { + "x": 506.4049987792969, + "y": -136.9040069580078 + }, + { + "x": 510.5660095214844, + "y": -136.4219970703125 + }, { "x": 514.7160034179688, "y": -135.85400390625 @@ -1972,8 +2212,40 @@ "y": 123.8030014038086 }, { - "x": 670.5830078125, - "y": 119.5770034790039 + "x": 674.375, + "y": 127.77300262451172 + }, + { + "x": 672.9559936523438, + "y": 131.71400451660156 + }, + { + "x": 671.4550170898438, + "y": 135.62399291992188 + }, + { + "x": 669.8720092773438, + "y": 139.5030059814453 + }, + { + "x": 668.208984375, + "y": 143.3470001220703 + }, + { + "x": 666.4650268554688, + "y": 147.15499877929688 + }, + { + "x": 664.6420288085938, + "y": 150.927001953125 + }, + { + "x": 662.739990234375, + "y": 154.65899658203125 + }, + { + "x": 660.760986328125, + "y": 158.35000610351562 }, { "x": 673.9329833984375, @@ -2015,6 +2287,42 @@ "x": 634.8569946289062, "y": 194.99899291992188 }, + { + "x": 656.572021484375, + "y": 165.60499572753906 + }, + { + "x": 654.364990234375, + "y": 169.1649932861328 + }, + { + "x": 652.083984375, + "y": 172.67799377441406 + }, + { + "x": 649.72900390625, + "y": 176.14199829101562 + }, + { + "x": 647.302978515625, + "y": 179.5570068359375 + }, + { + "x": 644.8049926757812, + "y": 182.91900634765625 + }, + { + "x": 642.2379760742188, + "y": 186.22900390625 + }, + { + "x": 639.6019897460938, + "y": 189.48399353027344 + }, + { + "x": 636.8989868164062, + "y": 192.6840057373047 + }, { "x": 634.1279907226562, "y": 195.8260040283203 @@ -2336,8 +2644,44 @@ "y": 198.90899658203125 }, { - "x": 329.49200439453125, - "y": 202.46800231933594 + "x": 336.8710021972656, + "y": 195.8260040283203 + }, + { + "x": 334.1000061035156, + "y": 192.6840057373047 + }, + { + "x": 331.3970031738281, + "y": 189.48399353027344 + }, + { + "x": 328.760986328125, + "y": 186.22900390625 + }, + { + "x": 326.1940002441406, + "y": 182.91900634765625 + }, + { + "x": 323.6960144042969, + "y": 179.5570068359375 + }, + { + "x": 321.2699890136719, + "y": 176.14199829101562 + }, + { + "x": 318.9150085449219, + "y": 172.67799377441406 + }, + { + "x": 316.6340026855469, + "y": 169.1649932861328 + }, + { + "x": 314.427001953125, + "y": 165.60499572753906 }, { "x": 336.1419982910156, @@ -2379,6 +2723,22 @@ "x": 931.4099731445312, "y": -186.21800231933594 }, + { + "x": 911.1920166015625, + "y": -187.9010009765625 + }, + { + "x": 917.468017578125, + "y": -187.60499572753906 + }, + { + "x": 923.7310180664062, + "y": -187.11199951171875 + }, + { + "x": 929.9760131835938, + "y": -186.4219970703125 + }, { "x": 936.197021484375, "y": -185.53700256347656 @@ -2740,8 +3100,24 @@ "y": 208.45700073242188 }, { - "x": 921.4979858398438, - "y": 208.89300537109375 + "x": 936.197021484375, + "y": 209.53700256347656 + }, + { + "x": 929.9760131835938, + "y": 210.4219970703125 + }, + { + "x": 923.7310180664062, + "y": 211.11199951171875 + }, + { + "x": 917.468017578125, + "y": 211.60499572753906 + }, + { + "x": 911.1920166015625, + "y": 211.9010009765625 }, { "x": 931.4099731445312, diff --git a/e2etests/testdata/txtar/cycle-diagram/elk/sketch.exp.svg b/e2etests/testdata/txtar/cycle-diagram/elk/sketch.exp.svg index 705b7e769b..1a53f8d0cc 100644 --- a/e2etests/testdata/txtar/cycle-diagram/elk/sketch.exp.svg +++ b/e2etests/testdata/txtar/cycle-diagram/elk/sketch.exp.svg @@ -1,9 +1,9 @@ -abcdabcab + .d2-364931106 .fill-N1{fill:#0A0F25;} + .d2-364931106 .fill-N2{fill:#676C7E;} + .d2-364931106 .fill-N3{fill:#9499AB;} + .d2-364931106 .fill-N4{fill:#CFD2DD;} + .d2-364931106 .fill-N5{fill:#DEE1EB;} + .d2-364931106 .fill-N6{fill:#EEF1F8;} + .d2-364931106 .fill-N7{fill:#FFFFFF;} + .d2-364931106 .fill-B1{fill:#0D32B2;} + .d2-364931106 .fill-B2{fill:#0D32B2;} + .d2-364931106 .fill-B3{fill:#E3E9FD;} + .d2-364931106 .fill-B4{fill:#E3E9FD;} + .d2-364931106 .fill-B5{fill:#EDF0FD;} + .d2-364931106 .fill-B6{fill:#F7F8FE;} + .d2-364931106 .fill-AA2{fill:#4A6FF3;} + .d2-364931106 .fill-AA4{fill:#EDF0FD;} + .d2-364931106 .fill-AA5{fill:#F7F8FE;} + .d2-364931106 .fill-AB4{fill:#EDF0FD;} + .d2-364931106 .fill-AB5{fill:#F7F8FE;} + .d2-364931106 .stroke-N1{stroke:#0A0F25;} + .d2-364931106 .stroke-N2{stroke:#676C7E;} + .d2-364931106 .stroke-N3{stroke:#9499AB;} + .d2-364931106 .stroke-N4{stroke:#CFD2DD;} + .d2-364931106 .stroke-N5{stroke:#DEE1EB;} + .d2-364931106 .stroke-N6{stroke:#EEF1F8;} + .d2-364931106 .stroke-N7{stroke:#FFFFFF;} + .d2-364931106 .stroke-B1{stroke:#0D32B2;} + .d2-364931106 .stroke-B2{stroke:#0D32B2;} + .d2-364931106 .stroke-B3{stroke:#E3E9FD;} + .d2-364931106 .stroke-B4{stroke:#E3E9FD;} + .d2-364931106 .stroke-B5{stroke:#EDF0FD;} + .d2-364931106 .stroke-B6{stroke:#F7F8FE;} + .d2-364931106 .stroke-AA2{stroke:#4A6FF3;} + .d2-364931106 .stroke-AA4{stroke:#EDF0FD;} + .d2-364931106 .stroke-AA5{stroke:#F7F8FE;} + .d2-364931106 .stroke-AB4{stroke:#EDF0FD;} + .d2-364931106 .stroke-AB5{stroke:#F7F8FE;} + .d2-364931106 .background-color-N1{background-color:#0A0F25;} + .d2-364931106 .background-color-N2{background-color:#676C7E;} + .d2-364931106 .background-color-N3{background-color:#9499AB;} + .d2-364931106 .background-color-N4{background-color:#CFD2DD;} + .d2-364931106 .background-color-N5{background-color:#DEE1EB;} + .d2-364931106 .background-color-N6{background-color:#EEF1F8;} + .d2-364931106 .background-color-N7{background-color:#FFFFFF;} + .d2-364931106 .background-color-B1{background-color:#0D32B2;} + .d2-364931106 .background-color-B2{background-color:#0D32B2;} + .d2-364931106 .background-color-B3{background-color:#E3E9FD;} + .d2-364931106 .background-color-B4{background-color:#E3E9FD;} + .d2-364931106 .background-color-B5{background-color:#EDF0FD;} + .d2-364931106 .background-color-B6{background-color:#F7F8FE;} + .d2-364931106 .background-color-AA2{background-color:#4A6FF3;} + .d2-364931106 .background-color-AA4{background-color:#EDF0FD;} + .d2-364931106 .background-color-AA5{background-color:#F7F8FE;} + .d2-364931106 .background-color-AB4{background-color:#EDF0FD;} + .d2-364931106 .background-color-AB5{background-color:#F7F8FE;} + .d2-364931106 .color-N1{color:#0A0F25;} + .d2-364931106 .color-N2{color:#676C7E;} + .d2-364931106 .color-N3{color:#9499AB;} + .d2-364931106 .color-N4{color:#CFD2DD;} + .d2-364931106 .color-N5{color:#DEE1EB;} + .d2-364931106 .color-N6{color:#EEF1F8;} + .d2-364931106 .color-N7{color:#FFFFFF;} + .d2-364931106 .color-B1{color:#0D32B2;} + .d2-364931106 .color-B2{color:#0D32B2;} + .d2-364931106 .color-B3{color:#E3E9FD;} + .d2-364931106 .color-B4{color:#E3E9FD;} + .d2-364931106 .color-B5{color:#EDF0FD;} + .d2-364931106 .color-B6{color:#F7F8FE;} + .d2-364931106 .color-AA2{color:#4A6FF3;} + .d2-364931106 .color-AA4{color:#EDF0FD;} + .d2-364931106 .color-AA5{color:#F7F8FE;} + .d2-364931106 .color-AB4{color:#EDF0FD;} + .d2-364931106 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker-d2-364931106);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker-d2-364931106);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright-d2-364931106);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright-d2-364931106);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright-d2-364931106);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright-d2-364931106);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark-d2-364931106);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright-d2-364931106);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright-d2-364931106);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright-d2-364931106);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright-d2-364931106);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker-d2-364931106);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark-d2-364931106);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal-d2-364931106);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal-d2-364931106);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright-d2-364931106);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright-d2-364931106);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright-d2-364931106);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>abcdabcab From 48771906b179cf4c3f7f5da7229c12d9342fd22e Mon Sep 17 00:00:00 2001 From: Mayank Mohapatra <125661248+Mayank77maruti@users.noreply.github.com> Date: Sat, 22 Feb 2025 13:42:00 +0000 Subject: [PATCH 33/73] try --- d2layouts/d2cycle/layout.go | 4 +- .../txtar/cycle-diagram/dagre/board.exp.json | 376 ------------------ .../txtar/cycle-diagram/dagre/sketch.exp.svg | 152 +++---- .../txtar/cycle-diagram/elk/board.exp.json | 376 ------------------ .../txtar/cycle-diagram/elk/sketch.exp.svg | 152 +++---- 5 files changed, 154 insertions(+), 906 deletions(-) diff --git a/d2layouts/d2cycle/layout.go b/d2layouts/d2cycle/layout.go index d6b3a984a2..c63eb20397 100644 --- a/d2layouts/d2cycle/layout.go +++ b/d2layouts/d2cycle/layout.go @@ -99,8 +99,8 @@ func createCircularArc(edge *d2graph.Edge) { path[len(path)-1] = newDst // Trim redundant path points that fall inside node boundaries. -// path = trimPathPoints(path, edge.Src.Box) -// path = trimPathPoints(path, edge.Dst.Box) + path = trimPathPoints(path, edge.Src.Box) + path = trimPathPoints(path, edge.Dst.Box) edge.Route = path edge.IsCurve = true diff --git a/e2etests/testdata/txtar/cycle-diagram/dagre/board.exp.json b/e2etests/testdata/txtar/cycle-diagram/dagre/board.exp.json index 3f9a491438..78ed2dffeb 100644 --- a/e2etests/testdata/txtar/cycle-diagram/dagre/board.exp.json +++ b/e2etests/testdata/txtar/cycle-diagram/dagre/board.exp.json @@ -543,38 +543,6 @@ "x": 26.5, "y": -198.22999572753906 }, - { - "x": 3.1410000324249268, - "y": -199.97500610351562 - }, - { - "x": 6.2820000648498535, - "y": -199.9010009765625 - }, - { - "x": 9.420999526977539, - "y": -199.77699279785156 - }, - { - "x": 12.557999610900879, - "y": -199.60499572753906 - }, - { - "x": 15.690999984741211, - "y": -199.38299560546875 - }, - { - "x": 18.820999145507812, - "y": -199.11199951171875 - }, - { - "x": 21.945999145507812, - "y": -198.79200744628906 - }, - { - "x": 25.06599998474121, - "y": -198.4219970703125 - }, { "x": 28.18000030517578, "y": -198.00399780273438 @@ -899,46 +867,6 @@ "x": 197.02099609375, "y": -34.3849983215332 }, - { - "x": 197.53700256347656, - "y": -31.285999298095703 - }, - { - "x": 198.00399780273438, - "y": -28.18000030517578 - }, - { - "x": 198.4219970703125, - "y": -25.06599998474121 - }, - { - "x": 198.79200744628906, - "y": -21.945999145507812 - }, - { - "x": 199.11199951171875, - "y": -18.820999145507812 - }, - { - "x": 199.38299560546875, - "y": -15.690999984741211 - }, - { - "x": 199.60499572753906, - "y": -12.557999610900879 - }, - { - "x": 199.77699279785156, - "y": -9.420999526977539 - }, - { - "x": 199.9010009765625, - "y": -6.2820000648498535 - }, - { - "x": 199.97500610351562, - "y": -3.1410000324249268 - }, { "x": 197.2519989013672, "y": -33 @@ -979,46 +907,6 @@ "x": 197.2519989013672, "y": 33 }, - { - "x": 199.97500610351562, - "y": 3.1410000324249268 - }, - { - "x": 199.9010009765625, - "y": 6.2820000648498535 - }, - { - "x": 199.77699279785156, - "y": 9.420999526977539 - }, - { - "x": 199.60499572753906, - "y": 12.557999610900879 - }, - { - "x": 199.38299560546875, - "y": 15.690999984741211 - }, - { - "x": 199.11199951171875, - "y": 18.820999145507812 - }, - { - "x": 198.79200744628906, - "y": 21.945999145507812 - }, - { - "x": 198.4219970703125, - "y": 25.06599998474121 - }, - { - "x": 198.00399780273438, - "y": 28.18000030517578 - }, - { - "x": 197.53700256347656, - "y": 31.285999298095703 - }, { "x": 197.02099609375, "y": 34.3849983215332 @@ -1343,38 +1231,6 @@ "x": 28.18000030517578, "y": 198.00399780273438 }, - { - "x": 25.06599998474121, - "y": 198.4219970703125 - }, - { - "x": 21.945999145507812, - "y": 198.79200744628906 - }, - { - "x": 18.820999145507812, - "y": 199.11199951171875 - }, - { - "x": 15.690999984741211, - "y": 199.38299560546875 - }, - { - "x": 12.557999610900879, - "y": 199.60499572753906 - }, - { - "x": 9.420999526977539, - "y": 199.77699279785156 - }, - { - "x": 6.2820000648498535, - "y": 199.9010009765625 - }, - { - "x": 3.1410000324249268, - "y": 199.97500610351562 - }, { "x": 26.5, "y": 198.22999572753906 @@ -1415,38 +1271,6 @@ "x": -26.499000549316406, "y": 198.22999572753906 }, - { - "x": -3.1410000324249268, - "y": 199.97500610351562 - }, - { - "x": -6.2820000648498535, - "y": 199.9010009765625 - }, - { - "x": -9.420999526977539, - "y": 199.77699279785156 - }, - { - "x": -12.557999610900879, - "y": 199.60499572753906 - }, - { - "x": -15.690999984741211, - "y": 199.38299560546875 - }, - { - "x": -18.820999145507812, - "y": 199.11199951171875 - }, - { - "x": -21.945999145507812, - "y": 198.79200744628906 - }, - { - "x": -25.06599998474121, - "y": 198.4219970703125 - }, { "x": -28.18000030517578, "y": 198.00399780273438 @@ -1771,46 +1595,6 @@ "x": -197.02099609375, "y": 34.3849983215332 }, - { - "x": -197.53700256347656, - "y": 31.285999298095703 - }, - { - "x": -198.00399780273438, - "y": 28.18000030517578 - }, - { - "x": -198.4219970703125, - "y": 25.06599998474121 - }, - { - "x": -198.79200744628906, - "y": 21.945999145507812 - }, - { - "x": -199.11199951171875, - "y": 18.820999145507812 - }, - { - "x": -199.38299560546875, - "y": 15.690999984741211 - }, - { - "x": -199.60499572753906, - "y": 12.557999610900879 - }, - { - "x": -199.77699279785156, - "y": 9.420999526977539 - }, - { - "x": -199.9010009765625, - "y": 6.2820000648498535 - }, - { - "x": -199.97500610351562, - "y": 3.1410000324249268 - }, { "x": -197.2519989013672, "y": 33 @@ -1851,30 +1635,6 @@ "x": 539.5, "y": -148.2259979248047 }, - { - "x": 517.18798828125, - "y": -149.95599365234375 - }, - { - "x": 521.375, - "y": -149.82400512695312 - }, - { - "x": 525.5579833984375, - "y": -149.60499572753906 - }, - { - "x": 529.7349853515625, - "y": -149.29800415039062 - }, - { - "x": 533.905029296875, - "y": -148.9040069580078 - }, - { - "x": 538.0659790039062, - "y": -148.4219970703125 - }, { "x": 542.2160034179688, "y": -147.85400390625 @@ -2215,38 +1975,6 @@ "x": 701.875, "y": 115.77300262451172 }, - { - "x": 700.4559936523438, - "y": 119.71399688720703 - }, - { - "x": 698.9550170898438, - "y": 123.6240005493164 - }, - { - "x": 697.3720092773438, - "y": 127.50299835205078 - }, - { - "x": 695.708984375, - "y": 131.3470001220703 - }, - { - "x": 693.9650268554688, - "y": 135.15499877929688 - }, - { - "x": 692.1420288085938, - "y": 138.927001953125 - }, - { - "x": 690.239990234375, - "y": 142.65899658203125 - }, - { - "x": 688.260986328125, - "y": 146.35000610351562 - }, { "x": 701.4329833984375, "y": 116.9990005493164 @@ -2287,42 +2015,6 @@ "x": 662.3569946289062, "y": 182.99899291992188 }, - { - "x": 684.072021484375, - "y": 153.60499572753906 - }, - { - "x": 681.864990234375, - "y": 157.1649932861328 - }, - { - "x": 679.583984375, - "y": 160.67799377441406 - }, - { - "x": 677.22900390625, - "y": 164.14199829101562 - }, - { - "x": 674.802978515625, - "y": 167.5570068359375 - }, - { - "x": 672.3049926757812, - "y": 170.91900634765625 - }, - { - "x": 669.7379760742188, - "y": 174.22900390625 - }, - { - "x": 667.1019897460938, - "y": 177.48399353027344 - }, - { - "x": 664.3989868164062, - "y": 180.6840057373047 - }, { "x": 661.6279907226562, "y": 183.8260040283203 @@ -2647,42 +2339,6 @@ "x": 364.3710021972656, "y": 183.8260040283203 }, - { - "x": 361.6000061035156, - "y": 180.6840057373047 - }, - { - "x": 358.8970031738281, - "y": 177.48399353027344 - }, - { - "x": 356.260986328125, - "y": 174.22900390625 - }, - { - "x": 353.6940002441406, - "y": 170.91900634765625 - }, - { - "x": 351.1960144042969, - "y": 167.5570068359375 - }, - { - "x": 348.7699890136719, - "y": 164.14199829101562 - }, - { - "x": 346.4150085449219, - "y": 160.67799377441406 - }, - { - "x": 344.1340026855469, - "y": 157.1649932861328 - }, - { - "x": 341.927001953125, - "y": 153.60499572753906 - }, { "x": 363.6419982910156, "y": 183 @@ -2723,22 +2379,6 @@ "x": 998.5, "y": -198.21800231933594 }, - { - "x": 978.281982421875, - "y": -199.9010009765625 - }, - { - "x": 984.5579833984375, - "y": -199.60499572753906 - }, - { - "x": 990.8209838867188, - "y": -199.11199951171875 - }, - { - "x": 997.0659790039062, - "y": -198.4219970703125 - }, { "x": 1003.2860107421875, "y": -197.53700256347656 @@ -3103,22 +2743,6 @@ "x": 1003.2860107421875, "y": 197.53700256347656 }, - { - "x": 997.0659790039062, - "y": 198.4219970703125 - }, - { - "x": 990.8209838867188, - "y": 199.11199951171875 - }, - { - "x": 984.5579833984375, - "y": 199.60499572753906 - }, - { - "x": 978.281982421875, - "y": 199.9010009765625 - }, { "x": 998.5, "y": 198.21800231933594 diff --git a/e2etests/testdata/txtar/cycle-diagram/dagre/sketch.exp.svg b/e2etests/testdata/txtar/cycle-diagram/dagre/sketch.exp.svg index 56a9cf1f37..015478d741 100644 --- a/e2etests/testdata/txtar/cycle-diagram/dagre/sketch.exp.svg +++ b/e2etests/testdata/txtar/cycle-diagram/dagre/sketch.exp.svg @@ -1,9 +1,9 @@ -abcdabcab + .d2-153681122 .fill-N1{fill:#0A0F25;} + .d2-153681122 .fill-N2{fill:#676C7E;} + .d2-153681122 .fill-N3{fill:#9499AB;} + .d2-153681122 .fill-N4{fill:#CFD2DD;} + .d2-153681122 .fill-N5{fill:#DEE1EB;} + .d2-153681122 .fill-N6{fill:#EEF1F8;} + .d2-153681122 .fill-N7{fill:#FFFFFF;} + .d2-153681122 .fill-B1{fill:#0D32B2;} + .d2-153681122 .fill-B2{fill:#0D32B2;} + .d2-153681122 .fill-B3{fill:#E3E9FD;} + .d2-153681122 .fill-B4{fill:#E3E9FD;} + .d2-153681122 .fill-B5{fill:#EDF0FD;} + .d2-153681122 .fill-B6{fill:#F7F8FE;} + .d2-153681122 .fill-AA2{fill:#4A6FF3;} + .d2-153681122 .fill-AA4{fill:#EDF0FD;} + .d2-153681122 .fill-AA5{fill:#F7F8FE;} + .d2-153681122 .fill-AB4{fill:#EDF0FD;} + .d2-153681122 .fill-AB5{fill:#F7F8FE;} + .d2-153681122 .stroke-N1{stroke:#0A0F25;} + .d2-153681122 .stroke-N2{stroke:#676C7E;} + .d2-153681122 .stroke-N3{stroke:#9499AB;} + .d2-153681122 .stroke-N4{stroke:#CFD2DD;} + .d2-153681122 .stroke-N5{stroke:#DEE1EB;} + .d2-153681122 .stroke-N6{stroke:#EEF1F8;} + .d2-153681122 .stroke-N7{stroke:#FFFFFF;} + .d2-153681122 .stroke-B1{stroke:#0D32B2;} + .d2-153681122 .stroke-B2{stroke:#0D32B2;} + .d2-153681122 .stroke-B3{stroke:#E3E9FD;} + .d2-153681122 .stroke-B4{stroke:#E3E9FD;} + .d2-153681122 .stroke-B5{stroke:#EDF0FD;} + .d2-153681122 .stroke-B6{stroke:#F7F8FE;} + .d2-153681122 .stroke-AA2{stroke:#4A6FF3;} + .d2-153681122 .stroke-AA4{stroke:#EDF0FD;} + .d2-153681122 .stroke-AA5{stroke:#F7F8FE;} + .d2-153681122 .stroke-AB4{stroke:#EDF0FD;} + .d2-153681122 .stroke-AB5{stroke:#F7F8FE;} + .d2-153681122 .background-color-N1{background-color:#0A0F25;} + .d2-153681122 .background-color-N2{background-color:#676C7E;} + .d2-153681122 .background-color-N3{background-color:#9499AB;} + .d2-153681122 .background-color-N4{background-color:#CFD2DD;} + .d2-153681122 .background-color-N5{background-color:#DEE1EB;} + .d2-153681122 .background-color-N6{background-color:#EEF1F8;} + .d2-153681122 .background-color-N7{background-color:#FFFFFF;} + .d2-153681122 .background-color-B1{background-color:#0D32B2;} + .d2-153681122 .background-color-B2{background-color:#0D32B2;} + .d2-153681122 .background-color-B3{background-color:#E3E9FD;} + .d2-153681122 .background-color-B4{background-color:#E3E9FD;} + .d2-153681122 .background-color-B5{background-color:#EDF0FD;} + .d2-153681122 .background-color-B6{background-color:#F7F8FE;} + .d2-153681122 .background-color-AA2{background-color:#4A6FF3;} + .d2-153681122 .background-color-AA4{background-color:#EDF0FD;} + .d2-153681122 .background-color-AA5{background-color:#F7F8FE;} + .d2-153681122 .background-color-AB4{background-color:#EDF0FD;} + .d2-153681122 .background-color-AB5{background-color:#F7F8FE;} + .d2-153681122 .color-N1{color:#0A0F25;} + .d2-153681122 .color-N2{color:#676C7E;} + .d2-153681122 .color-N3{color:#9499AB;} + .d2-153681122 .color-N4{color:#CFD2DD;} + .d2-153681122 .color-N5{color:#DEE1EB;} + .d2-153681122 .color-N6{color:#EEF1F8;} + .d2-153681122 .color-N7{color:#FFFFFF;} + .d2-153681122 .color-B1{color:#0D32B2;} + .d2-153681122 .color-B2{color:#0D32B2;} + .d2-153681122 .color-B3{color:#E3E9FD;} + .d2-153681122 .color-B4{color:#E3E9FD;} + .d2-153681122 .color-B5{color:#EDF0FD;} + .d2-153681122 .color-B6{color:#F7F8FE;} + .d2-153681122 .color-AA2{color:#4A6FF3;} + .d2-153681122 .color-AA4{color:#EDF0FD;} + .d2-153681122 .color-AA5{color:#F7F8FE;} + .d2-153681122 .color-AB4{color:#EDF0FD;} + .d2-153681122 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker-d2-153681122);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker-d2-153681122);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright-d2-153681122);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright-d2-153681122);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright-d2-153681122);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright-d2-153681122);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark-d2-153681122);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright-d2-153681122);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright-d2-153681122);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright-d2-153681122);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright-d2-153681122);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker-d2-153681122);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark-d2-153681122);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal-d2-153681122);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal-d2-153681122);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright-d2-153681122);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright-d2-153681122);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright-d2-153681122);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>abcdabcab diff --git a/e2etests/testdata/txtar/cycle-diagram/elk/board.exp.json b/e2etests/testdata/txtar/cycle-diagram/elk/board.exp.json index 7f5a0553f8..6eb058a841 100644 --- a/e2etests/testdata/txtar/cycle-diagram/elk/board.exp.json +++ b/e2etests/testdata/txtar/cycle-diagram/elk/board.exp.json @@ -543,38 +543,6 @@ "x": 38.5, "y": -186.22999572753906 }, - { - "x": 15.140999794006348, - "y": -187.97500610351562 - }, - { - "x": 18.281999588012695, - "y": -187.9010009765625 - }, - { - "x": 21.42099952697754, - "y": -187.77699279785156 - }, - { - "x": 24.558000564575195, - "y": -187.60499572753906 - }, - { - "x": 27.69099998474121, - "y": -187.38299560546875 - }, - { - "x": 30.820999145507812, - "y": -187.11199951171875 - }, - { - "x": 33.94599914550781, - "y": -186.79200744628906 - }, - { - "x": 37.066001892089844, - "y": -186.4219970703125 - }, { "x": 40.18000030517578, "y": -186.00399780273438 @@ -899,46 +867,6 @@ "x": 209.02099609375, "y": -22.385000228881836 }, - { - "x": 209.53700256347656, - "y": -19.285999298095703 - }, - { - "x": 210.00399780273438, - "y": -16.18000030517578 - }, - { - "x": 210.4219970703125, - "y": -13.065999984741211 - }, - { - "x": 210.79200744628906, - "y": -9.946000099182129 - }, - { - "x": 211.11199951171875, - "y": -6.821000099182129 - }, - { - "x": 211.38299560546875, - "y": -3.690999984741211 - }, - { - "x": 211.60499572753906, - "y": -0.5580000281333923 - }, - { - "x": 211.77699279785156, - "y": 2.578000068664551 - }, - { - "x": 211.9010009765625, - "y": 5.7170000076293945 - }, - { - "x": 211.97500610351562, - "y": 8.857999801635742 - }, { "x": 209.2519989013672, "y": -21 @@ -979,46 +907,6 @@ "x": 209.2519989013672, "y": 45 }, - { - "x": 211.97500610351562, - "y": 15.140999794006348 - }, - { - "x": 211.9010009765625, - "y": 18.281999588012695 - }, - { - "x": 211.77699279785156, - "y": 21.42099952697754 - }, - { - "x": 211.60499572753906, - "y": 24.558000564575195 - }, - { - "x": 211.38299560546875, - "y": 27.69099998474121 - }, - { - "x": 211.11199951171875, - "y": 30.820999145507812 - }, - { - "x": 210.79200744628906, - "y": 33.94599914550781 - }, - { - "x": 210.4219970703125, - "y": 37.066001892089844 - }, - { - "x": 210.00399780273438, - "y": 40.18000030517578 - }, - { - "x": 209.53700256347656, - "y": 43.2859992980957 - }, { "x": 209.02099609375, "y": 46.3849983215332 @@ -1343,38 +1231,6 @@ "x": 40.18000030517578, "y": 210.00399780273438 }, - { - "x": 37.066001892089844, - "y": 210.4219970703125 - }, - { - "x": 33.94599914550781, - "y": 210.79200744628906 - }, - { - "x": 30.820999145507812, - "y": 211.11199951171875 - }, - { - "x": 27.69099998474121, - "y": 211.38299560546875 - }, - { - "x": 24.558000564575195, - "y": 211.60499572753906 - }, - { - "x": 21.42099952697754, - "y": 211.77699279785156 - }, - { - "x": 18.281999588012695, - "y": 211.9010009765625 - }, - { - "x": 15.140999794006348, - "y": 211.97500610351562 - }, { "x": 38.5, "y": 210.22999572753906 @@ -1415,38 +1271,6 @@ "x": -14.49899959564209, "y": 210.22999572753906 }, - { - "x": 8.857999801635742, - "y": 211.97500610351562 - }, - { - "x": 5.7170000076293945, - "y": 211.9010009765625 - }, - { - "x": 2.578000068664551, - "y": 211.77699279785156 - }, - { - "x": -0.5580000281333923, - "y": 211.60499572753906 - }, - { - "x": -3.690999984741211, - "y": 211.38299560546875 - }, - { - "x": -6.821000099182129, - "y": 211.11199951171875 - }, - { - "x": -9.946000099182129, - "y": 210.79200744628906 - }, - { - "x": -13.065999984741211, - "y": 210.4219970703125 - }, { "x": -16.18000030517578, "y": 210.00399780273438 @@ -1771,46 +1595,6 @@ "x": -185.02099609375, "y": 46.3849983215332 }, - { - "x": -185.53700256347656, - "y": 43.2859992980957 - }, - { - "x": -186.00399780273438, - "y": 40.18000030517578 - }, - { - "x": -186.4219970703125, - "y": 37.066001892089844 - }, - { - "x": -186.79200744628906, - "y": 33.94599914550781 - }, - { - "x": -187.11199951171875, - "y": 30.820999145507812 - }, - { - "x": -187.38299560546875, - "y": 27.69099998474121 - }, - { - "x": -187.60499572753906, - "y": 24.558000564575195 - }, - { - "x": -187.77699279785156, - "y": 21.42099952697754 - }, - { - "x": -187.9010009765625, - "y": 18.281999588012695 - }, - { - "x": -187.97500610351562, - "y": 15.140999794006348 - }, { "x": -185.2519989013672, "y": 45 @@ -1851,30 +1635,6 @@ "x": 512, "y": -136.2259979248047 }, - { - "x": 489.68798828125, - "y": -137.95599365234375 - }, - { - "x": 493.875, - "y": -137.82400512695312 - }, - { - "x": 498.0580139160156, - "y": -137.60499572753906 - }, - { - "x": 502.2349853515625, - "y": -137.29800415039062 - }, - { - "x": 506.4049987792969, - "y": -136.9040069580078 - }, - { - "x": 510.5660095214844, - "y": -136.4219970703125 - }, { "x": 514.7160034179688, "y": -135.85400390625 @@ -2215,38 +1975,6 @@ "x": 674.375, "y": 127.77300262451172 }, - { - "x": 672.9559936523438, - "y": 131.71400451660156 - }, - { - "x": 671.4550170898438, - "y": 135.62399291992188 - }, - { - "x": 669.8720092773438, - "y": 139.5030059814453 - }, - { - "x": 668.208984375, - "y": 143.3470001220703 - }, - { - "x": 666.4650268554688, - "y": 147.15499877929688 - }, - { - "x": 664.6420288085938, - "y": 150.927001953125 - }, - { - "x": 662.739990234375, - "y": 154.65899658203125 - }, - { - "x": 660.760986328125, - "y": 158.35000610351562 - }, { "x": 673.9329833984375, "y": 128.99899291992188 @@ -2287,42 +2015,6 @@ "x": 634.8569946289062, "y": 194.99899291992188 }, - { - "x": 656.572021484375, - "y": 165.60499572753906 - }, - { - "x": 654.364990234375, - "y": 169.1649932861328 - }, - { - "x": 652.083984375, - "y": 172.67799377441406 - }, - { - "x": 649.72900390625, - "y": 176.14199829101562 - }, - { - "x": 647.302978515625, - "y": 179.5570068359375 - }, - { - "x": 644.8049926757812, - "y": 182.91900634765625 - }, - { - "x": 642.2379760742188, - "y": 186.22900390625 - }, - { - "x": 639.6019897460938, - "y": 189.48399353027344 - }, - { - "x": 636.8989868164062, - "y": 192.6840057373047 - }, { "x": 634.1279907226562, "y": 195.8260040283203 @@ -2647,42 +2339,6 @@ "x": 336.8710021972656, "y": 195.8260040283203 }, - { - "x": 334.1000061035156, - "y": 192.6840057373047 - }, - { - "x": 331.3970031738281, - "y": 189.48399353027344 - }, - { - "x": 328.760986328125, - "y": 186.22900390625 - }, - { - "x": 326.1940002441406, - "y": 182.91900634765625 - }, - { - "x": 323.6960144042969, - "y": 179.5570068359375 - }, - { - "x": 321.2699890136719, - "y": 176.14199829101562 - }, - { - "x": 318.9150085449219, - "y": 172.67799377441406 - }, - { - "x": 316.6340026855469, - "y": 169.1649932861328 - }, - { - "x": 314.427001953125, - "y": 165.60499572753906 - }, { "x": 336.1419982910156, "y": 195 @@ -2723,22 +2379,6 @@ "x": 931.4099731445312, "y": -186.21800231933594 }, - { - "x": 911.1920166015625, - "y": -187.9010009765625 - }, - { - "x": 917.468017578125, - "y": -187.60499572753906 - }, - { - "x": 923.7310180664062, - "y": -187.11199951171875 - }, - { - "x": 929.9760131835938, - "y": -186.4219970703125 - }, { "x": 936.197021484375, "y": -185.53700256347656 @@ -3103,22 +2743,6 @@ "x": 936.197021484375, "y": 209.53700256347656 }, - { - "x": 929.9760131835938, - "y": 210.4219970703125 - }, - { - "x": 923.7310180664062, - "y": 211.11199951171875 - }, - { - "x": 917.468017578125, - "y": 211.60499572753906 - }, - { - "x": 911.1920166015625, - "y": 211.9010009765625 - }, { "x": 931.4099731445312, "y": 210.21800231933594 diff --git a/e2etests/testdata/txtar/cycle-diagram/elk/sketch.exp.svg b/e2etests/testdata/txtar/cycle-diagram/elk/sketch.exp.svg index 1a53f8d0cc..21e65f752a 100644 --- a/e2etests/testdata/txtar/cycle-diagram/elk/sketch.exp.svg +++ b/e2etests/testdata/txtar/cycle-diagram/elk/sketch.exp.svg @@ -1,9 +1,9 @@ -abcdabcab + .d2-2891159010 .fill-N1{fill:#0A0F25;} + .d2-2891159010 .fill-N2{fill:#676C7E;} + .d2-2891159010 .fill-N3{fill:#9499AB;} + .d2-2891159010 .fill-N4{fill:#CFD2DD;} + .d2-2891159010 .fill-N5{fill:#DEE1EB;} + .d2-2891159010 .fill-N6{fill:#EEF1F8;} + .d2-2891159010 .fill-N7{fill:#FFFFFF;} + .d2-2891159010 .fill-B1{fill:#0D32B2;} + .d2-2891159010 .fill-B2{fill:#0D32B2;} + .d2-2891159010 .fill-B3{fill:#E3E9FD;} + .d2-2891159010 .fill-B4{fill:#E3E9FD;} + .d2-2891159010 .fill-B5{fill:#EDF0FD;} + .d2-2891159010 .fill-B6{fill:#F7F8FE;} + .d2-2891159010 .fill-AA2{fill:#4A6FF3;} + .d2-2891159010 .fill-AA4{fill:#EDF0FD;} + .d2-2891159010 .fill-AA5{fill:#F7F8FE;} + .d2-2891159010 .fill-AB4{fill:#EDF0FD;} + .d2-2891159010 .fill-AB5{fill:#F7F8FE;} + .d2-2891159010 .stroke-N1{stroke:#0A0F25;} + .d2-2891159010 .stroke-N2{stroke:#676C7E;} + .d2-2891159010 .stroke-N3{stroke:#9499AB;} + .d2-2891159010 .stroke-N4{stroke:#CFD2DD;} + .d2-2891159010 .stroke-N5{stroke:#DEE1EB;} + .d2-2891159010 .stroke-N6{stroke:#EEF1F8;} + .d2-2891159010 .stroke-N7{stroke:#FFFFFF;} + .d2-2891159010 .stroke-B1{stroke:#0D32B2;} + .d2-2891159010 .stroke-B2{stroke:#0D32B2;} + .d2-2891159010 .stroke-B3{stroke:#E3E9FD;} + .d2-2891159010 .stroke-B4{stroke:#E3E9FD;} + .d2-2891159010 .stroke-B5{stroke:#EDF0FD;} + .d2-2891159010 .stroke-B6{stroke:#F7F8FE;} + .d2-2891159010 .stroke-AA2{stroke:#4A6FF3;} + .d2-2891159010 .stroke-AA4{stroke:#EDF0FD;} + .d2-2891159010 .stroke-AA5{stroke:#F7F8FE;} + .d2-2891159010 .stroke-AB4{stroke:#EDF0FD;} + .d2-2891159010 .stroke-AB5{stroke:#F7F8FE;} + .d2-2891159010 .background-color-N1{background-color:#0A0F25;} + .d2-2891159010 .background-color-N2{background-color:#676C7E;} + .d2-2891159010 .background-color-N3{background-color:#9499AB;} + .d2-2891159010 .background-color-N4{background-color:#CFD2DD;} + .d2-2891159010 .background-color-N5{background-color:#DEE1EB;} + .d2-2891159010 .background-color-N6{background-color:#EEF1F8;} + .d2-2891159010 .background-color-N7{background-color:#FFFFFF;} + .d2-2891159010 .background-color-B1{background-color:#0D32B2;} + .d2-2891159010 .background-color-B2{background-color:#0D32B2;} + .d2-2891159010 .background-color-B3{background-color:#E3E9FD;} + .d2-2891159010 .background-color-B4{background-color:#E3E9FD;} + .d2-2891159010 .background-color-B5{background-color:#EDF0FD;} + .d2-2891159010 .background-color-B6{background-color:#F7F8FE;} + .d2-2891159010 .background-color-AA2{background-color:#4A6FF3;} + .d2-2891159010 .background-color-AA4{background-color:#EDF0FD;} + .d2-2891159010 .background-color-AA5{background-color:#F7F8FE;} + .d2-2891159010 .background-color-AB4{background-color:#EDF0FD;} + .d2-2891159010 .background-color-AB5{background-color:#F7F8FE;} + .d2-2891159010 .color-N1{color:#0A0F25;} + .d2-2891159010 .color-N2{color:#676C7E;} + .d2-2891159010 .color-N3{color:#9499AB;} + .d2-2891159010 .color-N4{color:#CFD2DD;} + .d2-2891159010 .color-N5{color:#DEE1EB;} + .d2-2891159010 .color-N6{color:#EEF1F8;} + .d2-2891159010 .color-N7{color:#FFFFFF;} + .d2-2891159010 .color-B1{color:#0D32B2;} + .d2-2891159010 .color-B2{color:#0D32B2;} + .d2-2891159010 .color-B3{color:#E3E9FD;} + .d2-2891159010 .color-B4{color:#E3E9FD;} + .d2-2891159010 .color-B5{color:#EDF0FD;} + .d2-2891159010 .color-B6{color:#F7F8FE;} + .d2-2891159010 .color-AA2{color:#4A6FF3;} + .d2-2891159010 .color-AA4{color:#EDF0FD;} + .d2-2891159010 .color-AA5{color:#F7F8FE;} + .d2-2891159010 .color-AB4{color:#EDF0FD;} + .d2-2891159010 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker-d2-2891159010);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker-d2-2891159010);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright-d2-2891159010);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright-d2-2891159010);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright-d2-2891159010);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright-d2-2891159010);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark-d2-2891159010);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright-d2-2891159010);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright-d2-2891159010);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright-d2-2891159010);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright-d2-2891159010);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker-d2-2891159010);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark-d2-2891159010);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal-d2-2891159010);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal-d2-2891159010);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright-d2-2891159010);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright-d2-2891159010);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright-d2-2891159010);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>abcdabcab From da8f3bf2cf2e4656442018d4368125c6f64fa318 Mon Sep 17 00:00:00 2001 From: Mayank Mohapatra <125661248+Mayank77maruti@users.noreply.github.com> Date: Sat, 22 Feb 2025 13:46:43 +0000 Subject: [PATCH 34/73] try --- d2layouts/d2cycle/layout.go | 2 +- .../txtar/cycle-diagram/dagre/board.exp.json | 1620 +++++++---------- .../txtar/cycle-diagram/dagre/sketch.exp.svg | 152 +- .../txtar/cycle-diagram/elk/board.exp.json | 1620 +++++++---------- .../txtar/cycle-diagram/elk/sketch.exp.svg | 152 +- 5 files changed, 1377 insertions(+), 2169 deletions(-) diff --git a/d2layouts/d2cycle/layout.go b/d2layouts/d2cycle/layout.go index c63eb20397..cdea39a493 100644 --- a/d2layouts/d2cycle/layout.go +++ b/d2layouts/d2cycle/layout.go @@ -15,7 +15,7 @@ const ( MIN_RADIUS = 200 PADDING = 20 MIN_SEGMENT_LEN = 10 - ARC_STEPS = 100 + ARC_STEPS = 80 ) // Layout lays out the graph and computes curved edge routes. diff --git a/e2etests/testdata/txtar/cycle-diagram/dagre/board.exp.json b/e2etests/testdata/txtar/cycle-diagram/dagre/board.exp.json index 78ed2dffeb..4f79d35bb0 100644 --- a/e2etests/testdata/txtar/cycle-diagram/dagre/board.exp.json +++ b/e2etests/testdata/txtar/cycle-diagram/dagre/board.exp.json @@ -541,334 +541,270 @@ "route": [ { "x": 26.5, - "y": -198.22999572753906 + "y": -198.22900390625 }, { - "x": 28.18000030517578, - "y": -198.00399780273438 + "x": 27.402000427246094, + "y": -198.11300659179688 }, { "x": 31.285999298095703, "y": -197.53700256347656 }, { - "x": 34.3849983215332, - "y": -197.02099609375 + "x": 35.159000396728516, + "y": -196.88499450683594 }, { - "x": 37.47600173950195, - "y": -196.45700073242188 + "x": 39.018001556396484, + "y": -196.15699768066406 }, { - "x": 40.55699920654297, - "y": -195.843994140625 - }, - { - "x": 43.62799835205078, - "y": -195.18299865722656 + "x": 42.861000061035156, + "y": -195.35299682617188 }, { "x": 46.68899917602539, "y": -194.47300720214844 }, { - "x": 49.73699951171875, - "y": -193.71600341796875 - }, - { - "x": 52.77399826049805, - "y": -192.91099548339844 + "x": 50.49800109863281, + "y": -193.5189971923828 }, { - "x": 55.79800033569336, - "y": -192.05799865722656 + "x": 54.28799819946289, + "y": -192.49099731445312 }, { - "x": 58.80799865722656, - "y": -191.1580047607422 + "x": 58.055999755859375, + "y": -191.38800048828125 }, { "x": 61.803001403808594, "y": -190.21099853515625 }, { - "x": 64.78299713134766, - "y": -189.2169952392578 + "x": 65.5260009765625, + "y": -188.96099853515625 }, { - "x": 67.74700164794922, - "y": -188.17599487304688 + "x": 69.2229995727539, + "y": -187.63800048828125 }, { - "x": 70.69400024414062, - "y": -187.08799743652344 - }, - { - "x": 73.6240005493164, - "y": -185.9550018310547 + "x": 72.89399719238281, + "y": -186.24200439453125 }, { "x": 76.53600311279297, "y": -184.77499389648438 }, { - "x": 79.42900085449219, - "y": -183.5500030517578 - }, - { - "x": 82.302001953125, - "y": -182.27999877929688 + "x": 80.14900207519531, + "y": -183.23699951171875 }, { - "x": 85.15499877929688, - "y": -180.96499633789062 + "x": 83.73100280761719, + "y": -181.6280059814453 }, { - "x": 87.98699951171875, - "y": -179.60499572753906 + "x": 87.28099822998047, + "y": -179.94900512695312 }, { "x": 90.7979965209961, "y": -178.2010040283203 }, { - "x": 93.58499908447266, - "y": -176.7530059814453 - }, - { - "x": 96.3499984741211, - "y": -175.26100158691406 + "x": 94.27899932861328, + "y": -176.38400268554688 }, { - "x": 99.09100341796875, - "y": -173.7259979248047 + "x": 97.7239990234375, + "y": -174.49899291992188 }, { - "x": 101.80799865722656, - "y": -172.1479949951172 + "x": 101.13099670410156, + "y": -172.54600524902344 }, { "x": 104.4990005493164, "y": -170.5279998779297 }, { - "x": 107.16500091552734, - "y": -168.86500549316406 + "x": 107.8270034790039, + "y": -168.4429931640625 }, { - "x": 109.80400085449219, - "y": -167.16099548339844 + "x": 111.11399841308594, + "y": -166.29299926757812 }, { - "x": 112.41600036621094, - "y": -165.41600036621094 - }, - { - "x": 115.0009994506836, - "y": -163.62899780273438 + "x": 114.35700225830078, + "y": -164.0800018310547 }, { "x": 117.55699920654297, "y": -161.80299377441406 }, { - "x": 120.08399963378906, - "y": -159.93600463867188 - }, - { - "x": 122.58100128173828, - "y": -158.031005859375 + "x": 120.71099853515625, + "y": -159.46400451660156 }, { - "x": 125.0479965209961, - "y": -156.08599853515625 + "x": 123.81800079345703, + "y": -157.06300354003906 }, { - "x": 127.48400115966797, - "y": -154.1020050048828 + "x": 126.87799835205078, + "y": -154.6020050048828 }, { "x": 129.88900756835938, "y": -152.08099365234375 }, { - "x": 132.26199340820312, - "y": -150.02200317382812 + "x": 132.85000610351562, + "y": -149.50100708007812 }, { - "x": 134.6020050048828, - "y": -147.92599487304688 + "x": 135.75999450683594, + "y": -146.86399841308594 }, { - "x": 136.90899658203125, - "y": -145.79299926757812 - }, - { - "x": 139.1820068359375, - "y": -143.625 + "x": 138.61700439453125, + "y": -144.1699981689453 }, { "x": 141.42100524902344, "y": -141.42100524902344 }, { - "x": 143.625, - "y": -139.1820068359375 - }, - { - "x": 145.79299926757812, - "y": -136.90899658203125 + "x": 144.1699981689453, + "y": -138.61700439453125 }, { - "x": 147.92599487304688, - "y": -134.6020050048828 + "x": 146.86399841308594, + "y": -135.75999450683594 }, { - "x": 150.02200317382812, - "y": -132.26199340820312 + "x": 149.50100708007812, + "y": -132.85000610351562 }, { "x": 152.08099365234375, "y": -129.88900756835938 }, { - "x": 154.1020050048828, - "y": -127.48400115966797 + "x": 154.6020050048828, + "y": -126.87799835205078 }, { - "x": 156.08599853515625, - "y": -125.0479965209961 + "x": 157.06300354003906, + "y": -123.81800079345703 }, { - "x": 158.031005859375, - "y": -122.58100128173828 - }, - { - "x": 159.93600463867188, - "y": -120.08399963378906 + "x": 159.46400451660156, + "y": -120.71099853515625 }, { "x": 161.80299377441406, "y": -117.55699920654297 }, { - "x": 163.62899780273438, - "y": -115.0009994506836 + "x": 164.0800018310547, + "y": -114.35700225830078 }, { - "x": 165.41600036621094, - "y": -112.41600036621094 + "x": 166.29299926757812, + "y": -111.11399841308594 }, { - "x": 167.16099548339844, - "y": -109.80400085449219 - }, - { - "x": 168.86500549316406, - "y": -107.16500091552734 + "x": 168.4429931640625, + "y": -107.8270034790039 }, { "x": 170.5279998779297, "y": -104.4990005493164 }, { - "x": 172.1479949951172, - "y": -101.80799865722656 - }, - { - "x": 173.7259979248047, - "y": -99.09100341796875 + "x": 172.54600524902344, + "y": -101.13099670410156 }, { - "x": 175.26100158691406, - "y": -96.3499984741211 + "x": 174.49899291992188, + "y": -97.7239990234375 }, { - "x": 176.7530059814453, - "y": -93.58499908447266 + "x": 176.38400268554688, + "y": -94.27899932861328 }, { "x": 178.2010040283203, "y": -90.7979965209961 }, { - "x": 179.60499572753906, - "y": -87.98699951171875 + "x": 179.94900512695312, + "y": -87.28099822998047 }, { - "x": 180.96499633789062, - "y": -85.15499877929688 + "x": 181.6280059814453, + "y": -83.73100280761719 }, { - "x": 182.27999877929688, - "y": -82.302001953125 - }, - { - "x": 183.5500030517578, - "y": -79.42900085449219 + "x": 183.23699951171875, + "y": -80.14900207519531 }, { "x": 184.77499389648438, "y": -76.53600311279297 }, { - "x": 185.9550018310547, - "y": -73.6240005493164 - }, - { - "x": 187.08799743652344, - "y": -70.69400024414062 + "x": 186.24200439453125, + "y": -72.89399719238281 }, { - "x": 188.17599487304688, - "y": -67.74700164794922 + "x": 187.63800048828125, + "y": -69.2229995727539 }, { - "x": 189.2169952392578, - "y": -64.78299713134766 + "x": 188.96099853515625, + "y": -65.5260009765625 }, { "x": 190.21099853515625, "y": -61.803001403808594 }, { - "x": 191.1580047607422, - "y": -58.80799865722656 - }, - { - "x": 192.05799865722656, - "y": -55.79800033569336 + "x": 191.38800048828125, + "y": -58.055999755859375 }, { - "x": 192.91099548339844, - "y": -52.77399826049805 + "x": 192.49099731445312, + "y": -54.28799819946289 }, { - "x": 193.71600341796875, - "y": -49.73699951171875 + "x": 193.5189971923828, + "y": -50.49800109863281 }, { "x": 194.47300720214844, "y": -46.68899917602539 }, { - "x": 195.18299865722656, - "y": -43.62799835205078 + "x": 195.35299682617188, + "y": -42.861000061035156 }, { - "x": 195.843994140625, - "y": -40.55699920654297 + "x": 196.15699768066406, + "y": -39.018001556396484 }, { - "x": 196.45700073242188, - "y": -37.47600173950195 + "x": 196.88499450683594, + "y": -35.159000396728516 }, { - "x": 197.02099609375, - "y": -34.3849983215332 - }, - { - "x": 197.2519989013672, + "x": 197.24899291992188, "y": -33 } ], @@ -904,336 +840,272 @@ "link": "", "route": [ { - "x": 197.2519989013672, + "x": 197.24899291992188, "y": 33 }, { - "x": 197.02099609375, - "y": 34.3849983215332 - }, - { - "x": 196.45700073242188, - "y": 37.47600173950195 + "x": 196.88499450683594, + "y": 35.159000396728516 }, { - "x": 195.843994140625, - "y": 40.55699920654297 + "x": 196.15699768066406, + "y": 39.018001556396484 }, { - "x": 195.18299865722656, - "y": 43.62799835205078 + "x": 195.35299682617188, + "y": 42.861000061035156 }, { "x": 194.47300720214844, "y": 46.68899917602539 }, { - "x": 193.71600341796875, - "y": 49.73699951171875 + "x": 193.5189971923828, + "y": 50.49800109863281 }, { - "x": 192.91099548339844, - "y": 52.77399826049805 + "x": 192.49099731445312, + "y": 54.28799819946289 }, { - "x": 192.05799865722656, - "y": 55.79800033569336 - }, - { - "x": 191.1580047607422, - "y": 58.80799865722656 + "x": 191.38800048828125, + "y": 58.055999755859375 }, { "x": 190.21099853515625, "y": 61.803001403808594 }, { - "x": 189.2169952392578, - "y": 64.78299713134766 - }, - { - "x": 188.17599487304688, - "y": 67.74700164794922 + "x": 188.96099853515625, + "y": 65.5260009765625 }, { - "x": 187.08799743652344, - "y": 70.69400024414062 + "x": 187.63800048828125, + "y": 69.2229995727539 }, { - "x": 185.9550018310547, - "y": 73.6240005493164 + "x": 186.24200439453125, + "y": 72.89399719238281 }, { "x": 184.77499389648438, "y": 76.53600311279297 }, { - "x": 183.5500030517578, - "y": 79.42900085449219 + "x": 183.23699951171875, + "y": 80.14900207519531 }, { - "x": 182.27999877929688, - "y": 82.302001953125 + "x": 181.6280059814453, + "y": 83.73100280761719 }, { - "x": 180.96499633789062, - "y": 85.15499877929688 - }, - { - "x": 179.60499572753906, - "y": 87.98699951171875 + "x": 179.94900512695312, + "y": 87.28099822998047 }, { "x": 178.2010040283203, "y": 90.7979965209961 }, { - "x": 176.7530059814453, - "y": 93.58499908447266 + "x": 176.38400268554688, + "y": 94.27899932861328 }, { - "x": 175.26100158691406, - "y": 96.3499984741211 + "x": 174.49899291992188, + "y": 97.7239990234375 }, { - "x": 173.7259979248047, - "y": 99.09100341796875 - }, - { - "x": 172.1479949951172, - "y": 101.80799865722656 + "x": 172.54600524902344, + "y": 101.13099670410156 }, { "x": 170.5279998779297, "y": 104.4990005493164 }, { - "x": 168.86500549316406, - "y": 107.16500091552734 - }, - { - "x": 167.16099548339844, - "y": 109.80400085449219 + "x": 168.4429931640625, + "y": 107.8270034790039 }, { - "x": 165.41600036621094, - "y": 112.41600036621094 + "x": 166.29299926757812, + "y": 111.11399841308594 }, { - "x": 163.62899780273438, - "y": 115.0009994506836 + "x": 164.0800018310547, + "y": 114.35700225830078 }, { "x": 161.80299377441406, "y": 117.55699920654297 }, { - "x": 159.93600463867188, - "y": 120.08399963378906 + "x": 159.46400451660156, + "y": 120.71099853515625 }, { - "x": 158.031005859375, - "y": 122.58100128173828 + "x": 157.06300354003906, + "y": 123.81800079345703 }, { - "x": 156.08599853515625, - "y": 125.0479965209961 - }, - { - "x": 154.1020050048828, - "y": 127.48400115966797 + "x": 154.6020050048828, + "y": 126.87799835205078 }, { "x": 152.08099365234375, "y": 129.88900756835938 }, { - "x": 150.02200317382812, - "y": 132.26199340820312 - }, - { - "x": 147.92599487304688, - "y": 134.6020050048828 + "x": 149.50100708007812, + "y": 132.85000610351562 }, { - "x": 145.79299926757812, - "y": 136.90899658203125 + "x": 146.86399841308594, + "y": 135.75999450683594 }, { - "x": 143.625, - "y": 139.1820068359375 + "x": 144.1699981689453, + "y": 138.61700439453125 }, { "x": 141.42100524902344, "y": 141.42100524902344 }, { - "x": 139.1820068359375, - "y": 143.625 + "x": 138.61700439453125, + "y": 144.1699981689453 }, { - "x": 136.90899658203125, - "y": 145.79299926757812 + "x": 135.75999450683594, + "y": 146.86399841308594 }, { - "x": 134.6020050048828, - "y": 147.92599487304688 - }, - { - "x": 132.26199340820312, - "y": 150.02200317382812 + "x": 132.85000610351562, + "y": 149.50100708007812 }, { "x": 129.88900756835938, "y": 152.08099365234375 }, { - "x": 127.48400115966797, - "y": 154.1020050048828 - }, - { - "x": 125.0479965209961, - "y": 156.08599853515625 + "x": 126.87799835205078, + "y": 154.6020050048828 }, { - "x": 122.58100128173828, - "y": 158.031005859375 + "x": 123.81800079345703, + "y": 157.06300354003906 }, { - "x": 120.08399963378906, - "y": 159.93600463867188 + "x": 120.71099853515625, + "y": 159.46400451660156 }, { "x": 117.55699920654297, "y": 161.80299377441406 }, { - "x": 115.0009994506836, - "y": 163.62899780273438 - }, - { - "x": 112.41600036621094, - "y": 165.41600036621094 + "x": 114.35700225830078, + "y": 164.0800018310547 }, { - "x": 109.80400085449219, - "y": 167.16099548339844 + "x": 111.11399841308594, + "y": 166.29299926757812 }, { - "x": 107.16500091552734, - "y": 168.86500549316406 + "x": 107.8270034790039, + "y": 168.4429931640625 }, { "x": 104.4990005493164, "y": 170.5279998779297 }, { - "x": 101.80799865722656, - "y": 172.1479949951172 + "x": 101.13099670410156, + "y": 172.54600524902344 }, { - "x": 99.09100341796875, - "y": 173.7259979248047 + "x": 97.7239990234375, + "y": 174.49899291992188 }, { - "x": 96.3499984741211, - "y": 175.26100158691406 - }, - { - "x": 93.58499908447266, - "y": 176.7530059814453 + "x": 94.27899932861328, + "y": 176.38400268554688 }, { "x": 90.7979965209961, "y": 178.2010040283203 }, { - "x": 87.98699951171875, - "y": 179.60499572753906 - }, - { - "x": 85.15499877929688, - "y": 180.96499633789062 + "x": 87.28099822998047, + "y": 179.94900512695312 }, { - "x": 82.302001953125, - "y": 182.27999877929688 + "x": 83.73100280761719, + "y": 181.6280059814453 }, { - "x": 79.42900085449219, - "y": 183.5500030517578 + "x": 80.14900207519531, + "y": 183.23699951171875 }, { "x": 76.53600311279297, "y": 184.77499389648438 }, { - "x": 73.6240005493164, - "y": 185.9550018310547 + "x": 72.89399719238281, + "y": 186.24200439453125 }, { - "x": 70.69400024414062, - "y": 187.08799743652344 + "x": 69.2229995727539, + "y": 187.63800048828125 }, { - "x": 67.74700164794922, - "y": 188.17599487304688 - }, - { - "x": 64.78299713134766, - "y": 189.2169952392578 + "x": 65.5260009765625, + "y": 188.96099853515625 }, { "x": 61.803001403808594, "y": 190.21099853515625 }, { - "x": 58.80799865722656, - "y": 191.1580047607422 - }, - { - "x": 55.79800033569336, - "y": 192.05799865722656 + "x": 58.055999755859375, + "y": 191.38800048828125 }, { - "x": 52.77399826049805, - "y": 192.91099548339844 + "x": 54.28799819946289, + "y": 192.49099731445312 }, { - "x": 49.73699951171875, - "y": 193.71600341796875 + "x": 50.49800109863281, + "y": 193.5189971923828 }, { "x": 46.68899917602539, "y": 194.47300720214844 }, { - "x": 43.62799835205078, - "y": 195.18299865722656 - }, - { - "x": 40.55699920654297, - "y": 195.843994140625 + "x": 42.861000061035156, + "y": 195.35299682617188 }, { - "x": 37.47600173950195, - "y": 196.45700073242188 + "x": 39.018001556396484, + "y": 196.15699768066406 }, { - "x": 34.3849983215332, - "y": 197.02099609375 + "x": 35.159000396728516, + "y": 196.88499450683594 }, { "x": 31.285999298095703, "y": 197.53700256347656 }, { - "x": 28.18000030517578, - "y": 198.00399780273438 + "x": 27.402000427246094, + "y": 198.11300659179688 }, { "x": 26.5, - "y": 198.22999572753906 + "y": 198.22900390625 } ], "isCurve": true, @@ -1269,334 +1141,270 @@ "route": [ { "x": -26.499000549316406, - "y": 198.22999572753906 + "y": 198.22900390625 }, { - "x": -28.18000030517578, - "y": 198.00399780273438 + "x": -27.402000427246094, + "y": 198.11300659179688 }, { "x": -31.285999298095703, "y": 197.53700256347656 }, { - "x": -34.3849983215332, - "y": 197.02099609375 + "x": -35.159000396728516, + "y": 196.88499450683594 }, { - "x": -37.47600173950195, - "y": 196.45700073242188 + "x": -39.018001556396484, + "y": 196.15699768066406 }, { - "x": -40.55699920654297, - "y": 195.843994140625 - }, - { - "x": -43.62799835205078, - "y": 195.18299865722656 + "x": -42.861000061035156, + "y": 195.35299682617188 }, { "x": -46.68899917602539, "y": 194.47300720214844 }, { - "x": -49.73699951171875, - "y": 193.71600341796875 - }, - { - "x": -52.77399826049805, - "y": 192.91099548339844 + "x": -50.49800109863281, + "y": 193.5189971923828 }, { - "x": -55.79800033569336, - "y": 192.05799865722656 + "x": -54.28799819946289, + "y": 192.49099731445312 }, { - "x": -58.80799865722656, - "y": 191.1580047607422 + "x": -58.055999755859375, + "y": 191.38800048828125 }, { "x": -61.803001403808594, "y": 190.21099853515625 }, { - "x": -64.78299713134766, - "y": 189.2169952392578 + "x": -65.5260009765625, + "y": 188.96099853515625 }, { - "x": -67.74700164794922, - "y": 188.17599487304688 + "x": -69.2229995727539, + "y": 187.63800048828125 }, { - "x": -70.69400024414062, - "y": 187.08799743652344 - }, - { - "x": -73.6240005493164, - "y": 185.9550018310547 + "x": -72.89399719238281, + "y": 186.24200439453125 }, { "x": -76.53600311279297, "y": 184.77499389648438 }, { - "x": -79.42900085449219, - "y": 183.5500030517578 - }, - { - "x": -82.302001953125, - "y": 182.27999877929688 + "x": -80.14900207519531, + "y": 183.23699951171875 }, { - "x": -85.15499877929688, - "y": 180.96499633789062 + "x": -83.73100280761719, + "y": 181.6280059814453 }, { - "x": -87.98699951171875, - "y": 179.60499572753906 + "x": -87.28099822998047, + "y": 179.94900512695312 }, { "x": -90.7979965209961, "y": 178.2010040283203 }, { - "x": -93.58499908447266, - "y": 176.7530059814453 + "x": -94.27899932861328, + "y": 176.38400268554688 }, { - "x": -96.3499984741211, - "y": 175.26100158691406 + "x": -97.7239990234375, + "y": 174.49899291992188 }, { - "x": -99.09100341796875, - "y": 173.7259979248047 - }, - { - "x": -101.80799865722656, - "y": 172.1479949951172 + "x": -101.13099670410156, + "y": 172.54600524902344 }, { "x": -104.4990005493164, "y": 170.5279998779297 }, { - "x": -107.16500091552734, - "y": 168.86500549316406 + "x": -107.8270034790039, + "y": 168.4429931640625 }, { - "x": -109.80400085449219, - "y": 167.16099548339844 + "x": -111.11399841308594, + "y": 166.29299926757812 }, { - "x": -112.41600036621094, - "y": 165.41600036621094 - }, - { - "x": -115.0009994506836, - "y": 163.62899780273438 + "x": -114.35700225830078, + "y": 164.0800018310547 }, { "x": -117.55699920654297, "y": 161.80299377441406 }, { - "x": -120.08399963378906, - "y": 159.93600463867188 - }, - { - "x": -122.58100128173828, - "y": 158.031005859375 + "x": -120.71099853515625, + "y": 159.46400451660156 }, { - "x": -125.0479965209961, - "y": 156.08599853515625 + "x": -123.81800079345703, + "y": 157.06300354003906 }, { - "x": -127.48400115966797, - "y": 154.1020050048828 + "x": -126.87799835205078, + "y": 154.6020050048828 }, { "x": -129.88900756835938, "y": 152.08099365234375 }, { - "x": -132.26199340820312, - "y": 150.02200317382812 + "x": -132.85000610351562, + "y": 149.50100708007812 }, { - "x": -134.6020050048828, - "y": 147.92599487304688 + "x": -135.75999450683594, + "y": 146.86399841308594 }, { - "x": -136.90899658203125, - "y": 145.79299926757812 - }, - { - "x": -139.1820068359375, - "y": 143.625 + "x": -138.61700439453125, + "y": 144.1699981689453 }, { "x": -141.42100524902344, "y": 141.42100524902344 }, { - "x": -143.625, - "y": 139.1820068359375 + "x": -144.1699981689453, + "y": 138.61700439453125 }, { - "x": -145.79299926757812, - "y": 136.90899658203125 + "x": -146.86399841308594, + "y": 135.75999450683594 }, { - "x": -147.92599487304688, - "y": 134.6020050048828 - }, - { - "x": -150.02200317382812, - "y": 132.26199340820312 + "x": -149.50100708007812, + "y": 132.85000610351562 }, { "x": -152.08099365234375, "y": 129.88900756835938 }, { - "x": -154.1020050048828, - "y": 127.48400115966797 - }, - { - "x": -156.08599853515625, - "y": 125.0479965209961 + "x": -154.6020050048828, + "y": 126.87799835205078 }, { - "x": -158.031005859375, - "y": 122.58100128173828 + "x": -157.06300354003906, + "y": 123.81800079345703 }, { - "x": -159.93600463867188, - "y": 120.08399963378906 + "x": -159.46400451660156, + "y": 120.71099853515625 }, { "x": -161.80299377441406, "y": 117.55699920654297 }, { - "x": -163.62899780273438, - "y": 115.0009994506836 + "x": -164.0800018310547, + "y": 114.35700225830078 }, { - "x": -165.41600036621094, - "y": 112.41600036621094 + "x": -166.29299926757812, + "y": 111.11399841308594 }, { - "x": -167.16099548339844, - "y": 109.80400085449219 - }, - { - "x": -168.86500549316406, - "y": 107.16500091552734 + "x": -168.4429931640625, + "y": 107.8270034790039 }, { "x": -170.5279998779297, "y": 104.4990005493164 }, { - "x": -172.1479949951172, - "y": 101.80799865722656 - }, - { - "x": -173.7259979248047, - "y": 99.09100341796875 + "x": -172.54600524902344, + "y": 101.13099670410156 }, { - "x": -175.26100158691406, - "y": 96.3499984741211 + "x": -174.49899291992188, + "y": 97.7239990234375 }, { - "x": -176.7530059814453, - "y": 93.58499908447266 + "x": -176.38400268554688, + "y": 94.27899932861328 }, { "x": -178.2010040283203, "y": 90.7979965209961 }, { - "x": -179.60499572753906, - "y": 87.98699951171875 + "x": -179.94900512695312, + "y": 87.28099822998047 }, { - "x": -180.96499633789062, - "y": 85.15499877929688 + "x": -181.6280059814453, + "y": 83.73100280761719 }, { - "x": -182.27999877929688, - "y": 82.302001953125 - }, - { - "x": -183.5500030517578, - "y": 79.42900085449219 + "x": -183.23699951171875, + "y": 80.14900207519531 }, { "x": -184.77499389648438, "y": 76.53600311279297 }, { - "x": -185.9550018310547, - "y": 73.6240005493164 - }, - { - "x": -187.08799743652344, - "y": 70.69400024414062 + "x": -186.24200439453125, + "y": 72.89399719238281 }, { - "x": -188.17599487304688, - "y": 67.74700164794922 + "x": -187.63800048828125, + "y": 69.2229995727539 }, { - "x": -189.2169952392578, - "y": 64.78299713134766 + "x": -188.96099853515625, + "y": 65.5260009765625 }, { "x": -190.21099853515625, "y": 61.803001403808594 }, { - "x": -191.1580047607422, - "y": 58.80799865722656 - }, - { - "x": -192.05799865722656, - "y": 55.79800033569336 + "x": -191.38800048828125, + "y": 58.055999755859375 }, { - "x": -192.91099548339844, - "y": 52.77399826049805 + "x": -192.49099731445312, + "y": 54.28799819946289 }, { - "x": -193.71600341796875, - "y": 49.73699951171875 + "x": -193.5189971923828, + "y": 50.49800109863281 }, { "x": -194.47300720214844, "y": 46.68899917602539 }, { - "x": -195.18299865722656, - "y": 43.62799835205078 + "x": -195.35299682617188, + "y": 42.861000061035156 }, { - "x": -195.843994140625, - "y": 40.55699920654297 + "x": -196.15699768066406, + "y": 39.018001556396484 }, { - "x": -196.45700073242188, - "y": 37.47600173950195 + "x": -196.88499450683594, + "y": 35.159000396728516 }, { - "x": -197.02099609375, - "y": 34.3849983215332 - }, - { - "x": -197.2519989013672, + "x": -197.24899291992188, "y": 33 } ], @@ -1633,350 +1441,282 @@ "route": [ { "x": 539.5, - "y": -148.2259979248047 - }, - { - "x": 542.2160034179688, - "y": -147.85400390625 + "y": -148.2310028076172 }, { - "x": 546.35302734375, - "y": -147.19900512695312 + "x": 544.2860107421875, + "y": -147.53700256347656 }, { - "x": 550.4760131835938, - "y": -146.45700073242188 + "x": 549.447021484375, + "y": -146.64999389648438 }, { "x": 554.5819702148438, "y": -145.62899780273438 }, { - "x": 558.6699829101562, - "y": -144.71499633789062 + "x": 559.6890258789062, + "y": -144.47300720214844 }, { - "x": 562.7369995117188, - "y": -143.71600341796875 + "x": 564.7630004882812, + "y": -143.18499755859375 }, { - "x": 566.7830200195312, - "y": -142.6320037841797 - }, - { - "x": 570.8060302734375, - "y": -141.46299743652344 + "x": 569.802978515625, + "y": -141.76300048828125 }, { "x": 574.802978515625, "y": -140.21099853515625 }, { - "x": 578.7730102539062, - "y": -138.875 + "x": 579.760986328125, + "y": -138.5279998779297 }, { - "x": 582.7139892578125, - "y": -137.45599365234375 + "x": 584.6729736328125, + "y": -136.71600341796875 }, { - "x": 586.6240234375, - "y": -135.9550018310547 - }, - { - "x": 590.5029907226562, - "y": -134.3719940185547 + "x": 589.5360107421875, + "y": -134.77499389648438 }, { "x": 594.3469848632812, "y": -132.70899963378906 }, { - "x": 598.155029296875, - "y": -130.96499633789062 - }, - { - "x": 601.927001953125, - "y": -129.14199829101562 + "x": 599.1019897460938, + "y": -130.51699829101562 }, { - "x": 605.6589965820312, - "y": -127.23999786376953 + "x": 603.7979736328125, + "y": -128.2010040283203 }, { - "x": 609.3499755859375, - "y": -125.26100158691406 + "x": 608.4310302734375, + "y": -125.76300048828125 }, { "x": 613, "y": -123.20500183105469 }, { - "x": 616.60498046875, - "y": -121.0719985961914 + "x": 617.4990234375, + "y": -120.52799987792969 }, { - "x": 620.1649780273438, - "y": -118.86499786376953 + "x": 621.927001953125, + "y": -117.73400115966797 }, { - "x": 623.677978515625, - "y": -116.58399963378906 - }, - { - "x": 627.1420288085938, - "y": -114.22899627685547 + "x": 626.281005859375, + "y": -114.82499694824219 }, { "x": 630.5570068359375, "y": -111.8030014038086 }, { - "x": 633.9190063476562, - "y": -109.30500030517578 - }, - { - "x": 637.22900390625, - "y": -106.73799896240234 + "x": 634.7520141601562, + "y": -108.66999816894531 }, { - "x": 640.4840087890625, - "y": -104.10199737548828 + "x": 638.864013671875, + "y": -105.42900085449219 }, { - "x": 643.6840209960938, - "y": -101.39900207519531 + "x": 642.8889770507812, + "y": -102.08100128173828 }, { "x": 646.8259887695312, "y": -98.62799835205078 }, { - "x": 649.9089965820312, - "y": -95.79299926757812 - }, - { - "x": 652.9320068359375, - "y": -92.89399719238281 + "x": 650.6699829101562, + "y": -95.0739974975586 }, { - "x": 655.8939819335938, - "y": -89.93199920654297 + "x": 654.4210205078125, + "y": -91.4209976196289 }, { - "x": 658.7930297851562, - "y": -86.90899658203125 + "x": 658.073974609375, + "y": -87.66999816894531 }, { "x": 661.6279907226562, "y": -83.82599639892578 }, { - "x": 664.3989868164062, - "y": -80.68399810791016 + "x": 665.0809936523438, + "y": -79.88899993896484 }, { - "x": 667.1019897460938, - "y": -77.48400115966797 + "x": 668.4290161132812, + "y": -75.86399841308594 }, { - "x": 669.7379760742188, - "y": -74.22899627685547 - }, - { - "x": 672.3049926757812, - "y": -70.91899871826172 + "x": 671.6699829101562, + "y": -71.75199890136719 }, { "x": 674.802978515625, "y": -67.55699920654297 }, { - "x": 677.22900390625, - "y": -64.14199829101562 - }, - { - "x": 679.583984375, - "y": -60.678001403808594 + "x": 677.8250122070312, + "y": -63.28099822998047 }, { - "x": 681.864990234375, - "y": -57.165000915527344 + "x": 680.7340087890625, + "y": -58.926998138427734 }, { - "x": 684.072021484375, - "y": -53.60499954223633 + "x": 683.5280151367188, + "y": -54.499000549316406 }, { "x": 686.2050170898438, "y": -50 }, { - "x": 688.260986328125, - "y": -46.349998474121094 + "x": 688.7630004882812, + "y": -45.430999755859375 }, { - "x": 690.239990234375, - "y": -42.659000396728516 + "x": 691.2009887695312, + "y": -40.79800033569336 }, { - "x": 692.1420288085938, - "y": -38.926998138427734 - }, - { - "x": 693.9650268554688, - "y": -35.154998779296875 + "x": 693.5170288085938, + "y": -36.10200119018555 }, { "x": 695.708984375, "y": -31.347000122070312 }, { - "x": 697.3720092773438, - "y": -27.503000259399414 - }, - { - "x": 698.9550170898438, - "y": -23.624000549316406 + "x": 697.7750244140625, + "y": -26.535999298095703 }, { - "x": 700.4559936523438, - "y": -19.714000701904297 + "x": 699.7160034179688, + "y": -21.67300033569336 }, { - "x": 701.875, - "y": -15.77299976348877 + "x": 701.5280151367188, + "y": -16.76099967956543 }, { "x": 703.2109985351562, "y": -11.803000450134277 }, { - "x": 704.4630126953125, - "y": -7.806000232696533 + "x": 704.7630004882812, + "y": -6.802999973297119 }, { - "x": 705.6320190429688, - "y": -3.7829999923706055 + "x": 706.1849975585938, + "y": -1.7630000114440918 }, { - "x": 706.7160034179688, - "y": 0.2619999945163727 - }, - { - "x": 707.7150268554688, - "y": 4.328999996185303 + "x": 707.4730224609375, + "y": 3.309999942779541 }, { "x": 708.6290283203125, "y": 8.416999816894531 }, { - "x": 709.4569702148438, - "y": 12.52299976348877 + "x": 709.6500244140625, + "y": 13.552000045776367 }, { - "x": 710.198974609375, - "y": 16.645999908447266 + "x": 710.5369873046875, + "y": 18.71299934387207 }, { - "x": 710.85400390625, - "y": 20.783000946044922 - }, - { - "x": 711.4219970703125, - "y": 24.933000564575195 + "x": 711.2880249023438, + "y": 23.893999099731445 }, { "x": 711.9039916992188, "y": 29.0939998626709 }, { - "x": 712.2979736328125, - "y": 33.263999938964844 - }, - { - "x": 712.60498046875, - "y": 37.441001892089844 + "x": 712.3829956054688, + "y": 34.30799865722656 }, { - "x": 712.823974609375, - "y": 41.624000549316406 + "x": 712.7249755859375, + "y": 39.53200149536133 }, { - "x": 712.9559936523438, - "y": 45.81100082397461 + "x": 712.9310302734375, + "y": 44.763999938964844 }, { "x": 713, "y": 50 }, { - "x": 712.9559936523438, - "y": 54.1879997253418 + "x": 712.9310302734375, + "y": 55.23500061035156 }, { - "x": 712.823974609375, - "y": 58.375 + "x": 712.7249755859375, + "y": 60.46699905395508 }, { - "x": 712.60498046875, - "y": 62.55799865722656 - }, - { - "x": 712.2979736328125, - "y": 66.73500061035156 + "x": 712.3829956054688, + "y": 65.69100189208984 }, { "x": 711.9039916992188, "y": 70.90499877929688 }, { - "x": 711.4219970703125, - "y": 75.06600189208984 - }, - { - "x": 710.85400390625, - "y": 79.21600341796875 + "x": 711.2880249023438, + "y": 76.1050033569336 }, { - "x": 710.198974609375, - "y": 83.35299682617188 + "x": 710.5369873046875, + "y": 81.28600311279297 }, { - "x": 709.4569702148438, - "y": 87.47599792480469 + "x": 709.6500244140625, + "y": 86.4469985961914 }, { "x": 708.6290283203125, "y": 91.58200073242188 }, { - "x": 707.7150268554688, - "y": 95.66999816894531 + "x": 707.4730224609375, + "y": 96.68900299072266 }, { - "x": 706.7160034179688, - "y": 99.73699951171875 + "x": 706.1849975585938, + "y": 101.76300048828125 }, { - "x": 705.6320190429688, - "y": 103.78299713134766 - }, - { - "x": 704.4630126953125, - "y": 107.80599975585938 + "x": 704.7630004882812, + "y": 106.8030014038086 }, { "x": 703.2109985351562, "y": 111.8030014038086 }, { - "x": 701.875, - "y": 115.77300262451172 + "x": 701.5280151367188, + "y": 116.76100158691406 }, { - "x": 701.4329833984375, + "x": 701.4400024414062, "y": 116.9990005493164 } ], @@ -2012,7 +1752,7 @@ "link": "", "route": [ { - "x": 662.3569946289062, + "x": 662.35302734375, "y": 182.99899291992188 }, { @@ -2020,327 +1760,263 @@ "y": 183.8260040283203 }, { - "x": 658.7930297851562, - "y": 186.90899658203125 - }, - { - "x": 655.8939819335938, - "y": 189.9320068359375 + "x": 658.073974609375, + "y": 187.6699981689453 }, { - "x": 652.9320068359375, - "y": 192.8939971923828 + "x": 654.4210205078125, + "y": 191.42100524902344 }, { - "x": 649.9089965820312, - "y": 195.79299926757812 + "x": 650.6699829101562, + "y": 195.07400512695312 }, { "x": 646.8259887695312, "y": 198.6280059814453 }, { - "x": 643.6840209960938, - "y": 201.3990020751953 - }, - { - "x": 640.4840087890625, - "y": 204.1020050048828 + "x": 642.8889770507812, + "y": 202.08099365234375 }, { - "x": 637.22900390625, - "y": 206.73800659179688 + "x": 638.864013671875, + "y": 205.4290008544922 }, { - "x": 633.9190063476562, - "y": 209.30499267578125 + "x": 634.7520141601562, + "y": 208.6699981689453 }, { "x": 630.5570068359375, "y": 211.80299377441406 }, { - "x": 627.1420288085938, - "y": 214.22900390625 + "x": 626.281005859375, + "y": 214.8249969482422 }, { - "x": 623.677978515625, - "y": 216.58399963378906 + "x": 621.927001953125, + "y": 217.73399353027344 }, { - "x": 620.1649780273438, - "y": 218.86500549316406 - }, - { - "x": 616.60498046875, - "y": 221.07200622558594 + "x": 617.4990234375, + "y": 220.5279998779297 }, { "x": 613, "y": 223.2050018310547 }, { - "x": 609.3499755859375, - "y": 225.26100158691406 - }, - { - "x": 605.6589965820312, - "y": 227.24000549316406 + "x": 608.4310302734375, + "y": 225.76300048828125 }, { - "x": 601.927001953125, - "y": 229.14199829101562 + "x": 603.7979736328125, + "y": 228.2010040283203 }, { - "x": 598.155029296875, - "y": 230.96499633789062 + "x": 599.1019897460938, + "y": 230.51699829101562 }, { "x": 594.3469848632812, "y": 232.70899963378906 }, { - "x": 590.5029907226562, - "y": 234.3719940185547 + "x": 589.5360107421875, + "y": 234.77499389648438 }, { - "x": 586.6240234375, - "y": 235.9550018310547 + "x": 584.6729736328125, + "y": 236.71600341796875 }, { - "x": 582.7139892578125, - "y": 237.45599365234375 - }, - { - "x": 578.7730102539062, - "y": 238.875 + "x": 579.760986328125, + "y": 238.5279998779297 }, { "x": 574.802978515625, "y": 240.21099853515625 }, { - "x": 570.8060302734375, - "y": 241.46299743652344 - }, - { - "x": 566.7830200195312, - "y": 242.6320037841797 + "x": 569.802978515625, + "y": 241.76300048828125 }, { - "x": 562.7369995117188, - "y": 243.71600341796875 + "x": 564.7630004882812, + "y": 243.18499755859375 }, { - "x": 558.6699829101562, - "y": 244.71499633789062 + "x": 559.6890258789062, + "y": 244.47300720214844 }, { "x": 554.5819702148438, "y": 245.62899780273438 }, { - "x": 550.4760131835938, - "y": 246.45700073242188 - }, - { - "x": 546.35302734375, - "y": 247.19900512695312 + "x": 549.447021484375, + "y": 246.64999389648438 }, { - "x": 542.2160034179688, - "y": 247.85400390625 + "x": 544.2860107421875, + "y": 247.53700256347656 }, { - "x": 538.0659790039062, - "y": 248.4219970703125 + "x": 539.10498046875, + "y": 248.28799438476562 }, { "x": 533.905029296875, "y": 248.9040069580078 }, { - "x": 529.7349853515625, - "y": 249.29800415039062 + "x": 528.6909790039062, + "y": 249.38299560546875 }, { - "x": 525.5579833984375, - "y": 249.60499572753906 + "x": 523.4669799804688, + "y": 249.72500610351562 }, { - "x": 521.375, - "y": 249.82400512695312 - }, - { - "x": 517.18798828125, - "y": 249.95599365234375 + "x": 518.2349853515625, + "y": 249.93099975585938 }, { "x": 513, "y": 250 }, { - "x": 508.8110046386719, - "y": 249.95599365234375 - }, - { - "x": 504.6239929199219, - "y": 249.82400512695312 + "x": 507.7640075683594, + "y": 249.93099975585938 }, { - "x": 500.4410095214844, - "y": 249.60499572753906 + "x": 502.5320129394531, + "y": 249.72500610351562 }, { - "x": 496.2640075683594, - "y": 249.29800415039062 + "x": 497.3080139160156, + "y": 249.38299560546875 }, { "x": 492.093994140625, "y": 248.9040069580078 }, { - "x": 487.9330139160156, - "y": 248.4219970703125 + "x": 486.8940124511719, + "y": 248.28799438476562 }, { - "x": 483.7829895019531, - "y": 247.85400390625 + "x": 481.7130126953125, + "y": 247.53700256347656 }, { - "x": 479.64599609375, - "y": 247.19900512695312 - }, - { - "x": 475.52301025390625, - "y": 246.45700073242188 + "x": 476.552001953125, + "y": 246.64999389648438 }, { "x": 471.4169921875, "y": 245.62899780273438 }, { - "x": 467.3290100097656, - "y": 244.71499633789062 - }, - { - "x": 463.2619934082031, - "y": 243.71600341796875 + "x": 466.30999755859375, + "y": 244.47300720214844 }, { - "x": 459.21600341796875, - "y": 242.6320037841797 + "x": 461.2359924316406, + "y": 243.18499755859375 }, { - "x": 455.1929931640625, - "y": 241.46299743652344 + "x": 456.1960144042969, + "y": 241.76300048828125 }, { "x": 451.1960144042969, "y": 240.21099853515625 }, { - "x": 447.22601318359375, - "y": 238.875 + "x": 446.2380065917969, + "y": 238.5279998779297 }, { - "x": 443.2850036621094, - "y": 237.45599365234375 + "x": 441.32598876953125, + "y": 236.71600341796875 }, { - "x": 439.375, - "y": 235.9550018310547 - }, - { - "x": 435.4960021972656, - "y": 234.3719940185547 + "x": 436.4630126953125, + "y": 234.77499389648438 }, { "x": 431.6520080566406, "y": 232.70899963378906 }, { - "x": 427.843994140625, - "y": 230.96499633789062 + "x": 426.8970031738281, + "y": 230.51699829101562 }, { - "x": 424.0719909667969, - "y": 229.14199829101562 + "x": 422.20098876953125, + "y": 228.2010040283203 }, { - "x": 420.3399963378906, - "y": 227.24000549316406 - }, - { - "x": 416.64898681640625, - "y": 225.26100158691406 + "x": 417.5679931640625, + "y": 225.76300048828125 }, { "x": 413, "y": 223.2050018310547 }, { - "x": 409.3940124511719, - "y": 221.07200622558594 - }, - { - "x": 405.8340148925781, - "y": 218.86500549316406 + "x": 408.5, + "y": 220.5279998779297 }, { - "x": 402.3210144042969, - "y": 216.58399963378906 + "x": 404.0719909667969, + "y": 217.73399353027344 }, { - "x": 398.85699462890625, - "y": 214.22900390625 + "x": 399.7179870605469, + "y": 214.8249969482422 }, { "x": 395.4419860839844, "y": 211.80299377441406 }, { - "x": 392.0799865722656, - "y": 209.30499267578125 + "x": 391.24700927734375, + "y": 208.6699981689453 }, { - "x": 388.7699890136719, - "y": 206.73800659179688 + "x": 387.135009765625, + "y": 205.4290008544922 }, { - "x": 385.5150146484375, - "y": 204.1020050048828 - }, - { - "x": 382.31500244140625, - "y": 201.3990020751953 + "x": 383.1099853515625, + "y": 202.08099365234375 }, { "x": 379.1730041503906, "y": 198.6280059814453 }, { - "x": 376.0899963378906, - "y": 195.79299926757812 + "x": 375.3290100097656, + "y": 195.07400512695312 }, { - "x": 373.0669860839844, - "y": 192.8939971923828 + "x": 371.5780029296875, + "y": 191.42100524902344 }, { - "x": 370.1050109863281, - "y": 189.9320068359375 - }, - { - "x": 367.20599365234375, - "y": 186.90899658203125 + "x": 367.92498779296875, + "y": 187.6699981689453 }, { "x": 364.3710021972656, "y": 183.8260040283203 }, { - "x": 363.6419982910156, + "x": 363.64599609375, "y": 183 } ], @@ -2377,367 +2053,295 @@ "route": [ { "x": 998.5, - "y": -198.21800231933594 + "y": -198.19900512695312 }, { "x": 1003.2860107421875, "y": -197.53700256347656 }, { - "x": 1009.4760131835938, - "y": -196.45700073242188 - }, - { - "x": 1015.6279907226562, - "y": -195.18299865722656 + "x": 1011.0180053710938, + "y": -196.15699768066406 }, { - "x": 1021.7369995117188, - "y": -193.71600341796875 + "x": 1018.6890258789062, + "y": -194.47300720214844 }, { - "x": 1027.7979736328125, - "y": -192.05799865722656 + "x": 1026.2879638671875, + "y": -192.49099731445312 }, { "x": 1033.802978515625, "y": -190.21099853515625 }, { - "x": 1039.7469482421875, - "y": -188.17599487304688 + "x": 1041.2230224609375, + "y": -187.63800048828125 }, { - "x": 1045.6240234375, - "y": -185.9550018310547 - }, - { - "x": 1051.428955078125, - "y": -183.5500030517578 + "x": 1048.5360107421875, + "y": -184.77499389648438 }, { - "x": 1057.155029296875, - "y": -180.96499633789062 + "x": 1055.73095703125, + "y": -181.6280059814453 }, { "x": 1062.7979736328125, "y": -178.2010040283203 }, { - "x": 1068.3499755859375, - "y": -175.26100158691406 + "x": 1069.7239990234375, + "y": -174.49899291992188 }, { - "x": 1073.8079833984375, - "y": -172.1479949951172 - }, - { - "x": 1079.1650390625, - "y": -168.86500549316406 + "x": 1076.4990234375, + "y": -170.5279998779297 }, { - "x": 1084.416015625, - "y": -165.41600036621094 + "x": 1083.114013671875, + "y": -166.29299926757812 }, { "x": 1089.5570068359375, "y": -161.80299377441406 }, { - "x": 1094.5810546875, - "y": -158.031005859375 + "x": 1095.8179931640625, + "y": -157.06300354003906 }, { - "x": 1099.4840087890625, - "y": -154.1020050048828 - }, - { - "x": 1104.261962890625, - "y": -150.02200317382812 + "x": 1101.8890380859375, + "y": -152.08099365234375 }, { - "x": 1108.9090576171875, - "y": -145.79299926757812 + "x": 1107.760009765625, + "y": -146.86399841308594 }, { "x": 1113.4210205078125, "y": -141.42100524902344 }, { - "x": 1117.79296875, - "y": -136.90899658203125 + "x": 1118.864013671875, + "y": -135.75999450683594 }, { - "x": 1122.02197265625, - "y": -132.26199340820312 - }, - { - "x": 1126.10205078125, - "y": -127.48400115966797 + "x": 1124.0810546875, + "y": -129.88900756835938 }, { - "x": 1130.031005859375, - "y": -122.58100128173828 + "x": 1129.06298828125, + "y": -123.81800079345703 }, { "x": 1133.802978515625, "y": -117.55699920654297 }, { - "x": 1137.416015625, - "y": -112.41600036621094 - }, - { - "x": 1140.864990234375, - "y": -107.16500091552734 + "x": 1138.29296875, + "y": -111.11399841308594 }, { - "x": 1144.14794921875, - "y": -101.80799865722656 + "x": 1142.5279541015625, + "y": -104.4990005493164 }, { - "x": 1147.260986328125, - "y": -96.3499984741211 + "x": 1146.4990234375, + "y": -97.7239990234375 }, { "x": 1150.2010498046875, "y": -90.7979965209961 }, { - "x": 1152.9649658203125, - "y": -85.15499877929688 - }, - { - "x": 1155.550048828125, - "y": -79.42900085449219 + "x": 1153.6280517578125, + "y": -83.73100280761719 }, { - "x": 1157.9549560546875, - "y": -73.6240005493164 + "x": 1156.7750244140625, + "y": -76.53600311279297 }, { - "x": 1160.176025390625, - "y": -67.74700164794922 + "x": 1159.637939453125, + "y": -69.2229995727539 }, { "x": 1162.2110595703125, "y": -61.803001403808594 }, { - "x": 1164.0579833984375, - "y": -55.79800033569336 - }, - { - "x": 1165.7159423828125, - "y": -49.73699951171875 + "x": 1164.490966796875, + "y": -54.28799819946289 }, { - "x": 1167.1829833984375, - "y": -43.62799835205078 + "x": 1166.4730224609375, + "y": -46.68899917602539 }, { - "x": 1168.45703125, - "y": -37.47600173950195 + "x": 1168.156982421875, + "y": -39.018001556396484 }, { "x": 1169.5369873046875, "y": -31.285999298095703 }, { - "x": 1170.4219970703125, - "y": -25.06599998474121 - }, - { - "x": 1171.112060546875, - "y": -18.820999145507812 + "x": 1170.613037109375, + "y": -23.506999969482422 }, { - "x": 1171.60498046875, - "y": -12.557999610900879 + "x": 1171.383056640625, + "y": -15.690999984741211 }, { - "x": 1171.9010009765625, - "y": -6.2820000648498535 + "x": 1171.844970703125, + "y": -7.85099983215332 }, { "x": 1172, "y": 0 }, { - "x": 1171.9010009765625, - "y": 6.2820000648498535 + "x": 1171.844970703125, + "y": 7.85099983215332 }, { - "x": 1171.60498046875, - "y": 12.557999610900879 + "x": 1171.383056640625, + "y": 15.690999984741211 }, { - "x": 1171.112060546875, - "y": 18.820999145507812 - }, - { - "x": 1170.4219970703125, - "y": 25.06599998474121 + "x": 1170.613037109375, + "y": 23.506999969482422 }, { "x": 1169.5369873046875, "y": 31.285999298095703 }, { - "x": 1168.45703125, - "y": 37.47600173950195 - }, - { - "x": 1167.1829833984375, - "y": 43.62799835205078 + "x": 1168.156982421875, + "y": 39.018001556396484 }, { - "x": 1165.7159423828125, - "y": 49.73699951171875 + "x": 1166.4730224609375, + "y": 46.68899917602539 }, { - "x": 1164.0579833984375, - "y": 55.79800033569336 + "x": 1164.490966796875, + "y": 54.28799819946289 }, { "x": 1162.2110595703125, "y": 61.803001403808594 }, { - "x": 1160.176025390625, - "y": 67.74700164794922 - }, - { - "x": 1157.9549560546875, - "y": 73.6240005493164 + "x": 1159.637939453125, + "y": 69.2229995727539 }, { - "x": 1155.550048828125, - "y": 79.42900085449219 + "x": 1156.7750244140625, + "y": 76.53600311279297 }, { - "x": 1152.9649658203125, - "y": 85.15499877929688 + "x": 1153.6280517578125, + "y": 83.73100280761719 }, { "x": 1150.2010498046875, "y": 90.7979965209961 }, { - "x": 1147.260986328125, - "y": 96.3499984741211 - }, - { - "x": 1144.14794921875, - "y": 101.80799865722656 + "x": 1146.4990234375, + "y": 97.7239990234375 }, { - "x": 1140.864990234375, - "y": 107.16500091552734 + "x": 1142.5279541015625, + "y": 104.4990005493164 }, { - "x": 1137.416015625, - "y": 112.41600036621094 + "x": 1138.29296875, + "y": 111.11399841308594 }, { "x": 1133.802978515625, "y": 117.55699920654297 }, { - "x": 1130.031005859375, - "y": 122.58100128173828 - }, - { - "x": 1126.10205078125, - "y": 127.48400115966797 + "x": 1129.06298828125, + "y": 123.81800079345703 }, { - "x": 1122.02197265625, - "y": 132.26199340820312 + "x": 1124.0810546875, + "y": 129.88900756835938 }, { - "x": 1117.79296875, - "y": 136.90899658203125 + "x": 1118.864013671875, + "y": 135.75999450683594 }, { "x": 1113.4210205078125, "y": 141.42100524902344 }, { - "x": 1108.9090576171875, - "y": 145.79299926757812 - }, - { - "x": 1104.261962890625, - "y": 150.02200317382812 + "x": 1107.760009765625, + "y": 146.86399841308594 }, { - "x": 1099.4840087890625, - "y": 154.1020050048828 + "x": 1101.8890380859375, + "y": 152.08099365234375 }, { - "x": 1094.5810546875, - "y": 158.031005859375 + "x": 1095.8179931640625, + "y": 157.06300354003906 }, { "x": 1089.5570068359375, "y": 161.80299377441406 }, { - "x": 1084.416015625, - "y": 165.41600036621094 + "x": 1083.114013671875, + "y": 166.29299926757812 }, { - "x": 1079.1650390625, - "y": 168.86500549316406 - }, - { - "x": 1073.8079833984375, - "y": 172.1479949951172 + "x": 1076.4990234375, + "y": 170.5279998779297 }, { - "x": 1068.3499755859375, - "y": 175.26100158691406 + "x": 1069.7239990234375, + "y": 174.49899291992188 }, { "x": 1062.7979736328125, "y": 178.2010040283203 }, { - "x": 1057.155029296875, - "y": 180.96499633789062 + "x": 1055.73095703125, + "y": 181.6280059814453 }, { - "x": 1051.428955078125, - "y": 183.5500030517578 - }, - { - "x": 1045.6240234375, - "y": 185.9550018310547 + "x": 1048.5360107421875, + "y": 184.77499389648438 }, { - "x": 1039.7469482421875, - "y": 188.17599487304688 + "x": 1041.2230224609375, + "y": 187.63800048828125 }, { "x": 1033.802978515625, "y": 190.21099853515625 }, { - "x": 1027.7979736328125, - "y": 192.05799865722656 + "x": 1026.2879638671875, + "y": 192.49099731445312 }, { - "x": 1021.7369995117188, - "y": 193.71600341796875 - }, - { - "x": 1015.6279907226562, - "y": 195.18299865722656 + "x": 1018.6890258789062, + "y": 194.47300720214844 }, { - "x": 1009.4760131835938, - "y": 196.45700073242188 + "x": 1011.0180053710938, + "y": 196.15699768066406 }, { "x": 1003.2860107421875, @@ -2745,7 +2349,7 @@ }, { "x": 998.5, - "y": 198.21800231933594 + "y": 198.19900512695312 } ], "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 015478d741..cbcfebd418 100644 --- a/e2etests/testdata/txtar/cycle-diagram/dagre/sketch.exp.svg +++ b/e2etests/testdata/txtar/cycle-diagram/dagre/sketch.exp.svg @@ -1,9 +1,9 @@ -abcdabcab + .d2-3996695831 .fill-N1{fill:#0A0F25;} + .d2-3996695831 .fill-N2{fill:#676C7E;} + .d2-3996695831 .fill-N3{fill:#9499AB;} + .d2-3996695831 .fill-N4{fill:#CFD2DD;} + .d2-3996695831 .fill-N5{fill:#DEE1EB;} + .d2-3996695831 .fill-N6{fill:#EEF1F8;} + .d2-3996695831 .fill-N7{fill:#FFFFFF;} + .d2-3996695831 .fill-B1{fill:#0D32B2;} + .d2-3996695831 .fill-B2{fill:#0D32B2;} + .d2-3996695831 .fill-B3{fill:#E3E9FD;} + .d2-3996695831 .fill-B4{fill:#E3E9FD;} + .d2-3996695831 .fill-B5{fill:#EDF0FD;} + .d2-3996695831 .fill-B6{fill:#F7F8FE;} + .d2-3996695831 .fill-AA2{fill:#4A6FF3;} + .d2-3996695831 .fill-AA4{fill:#EDF0FD;} + .d2-3996695831 .fill-AA5{fill:#F7F8FE;} + .d2-3996695831 .fill-AB4{fill:#EDF0FD;} + .d2-3996695831 .fill-AB5{fill:#F7F8FE;} + .d2-3996695831 .stroke-N1{stroke:#0A0F25;} + .d2-3996695831 .stroke-N2{stroke:#676C7E;} + .d2-3996695831 .stroke-N3{stroke:#9499AB;} + .d2-3996695831 .stroke-N4{stroke:#CFD2DD;} + .d2-3996695831 .stroke-N5{stroke:#DEE1EB;} + .d2-3996695831 .stroke-N6{stroke:#EEF1F8;} + .d2-3996695831 .stroke-N7{stroke:#FFFFFF;} + .d2-3996695831 .stroke-B1{stroke:#0D32B2;} + .d2-3996695831 .stroke-B2{stroke:#0D32B2;} + .d2-3996695831 .stroke-B3{stroke:#E3E9FD;} + .d2-3996695831 .stroke-B4{stroke:#E3E9FD;} + .d2-3996695831 .stroke-B5{stroke:#EDF0FD;} + .d2-3996695831 .stroke-B6{stroke:#F7F8FE;} + .d2-3996695831 .stroke-AA2{stroke:#4A6FF3;} + .d2-3996695831 .stroke-AA4{stroke:#EDF0FD;} + .d2-3996695831 .stroke-AA5{stroke:#F7F8FE;} + .d2-3996695831 .stroke-AB4{stroke:#EDF0FD;} + .d2-3996695831 .stroke-AB5{stroke:#F7F8FE;} + .d2-3996695831 .background-color-N1{background-color:#0A0F25;} + .d2-3996695831 .background-color-N2{background-color:#676C7E;} + .d2-3996695831 .background-color-N3{background-color:#9499AB;} + .d2-3996695831 .background-color-N4{background-color:#CFD2DD;} + .d2-3996695831 .background-color-N5{background-color:#DEE1EB;} + .d2-3996695831 .background-color-N6{background-color:#EEF1F8;} + .d2-3996695831 .background-color-N7{background-color:#FFFFFF;} + .d2-3996695831 .background-color-B1{background-color:#0D32B2;} + .d2-3996695831 .background-color-B2{background-color:#0D32B2;} + .d2-3996695831 .background-color-B3{background-color:#E3E9FD;} + .d2-3996695831 .background-color-B4{background-color:#E3E9FD;} + .d2-3996695831 .background-color-B5{background-color:#EDF0FD;} + .d2-3996695831 .background-color-B6{background-color:#F7F8FE;} + .d2-3996695831 .background-color-AA2{background-color:#4A6FF3;} + .d2-3996695831 .background-color-AA4{background-color:#EDF0FD;} + .d2-3996695831 .background-color-AA5{background-color:#F7F8FE;} + .d2-3996695831 .background-color-AB4{background-color:#EDF0FD;} + .d2-3996695831 .background-color-AB5{background-color:#F7F8FE;} + .d2-3996695831 .color-N1{color:#0A0F25;} + .d2-3996695831 .color-N2{color:#676C7E;} + .d2-3996695831 .color-N3{color:#9499AB;} + .d2-3996695831 .color-N4{color:#CFD2DD;} + .d2-3996695831 .color-N5{color:#DEE1EB;} + .d2-3996695831 .color-N6{color:#EEF1F8;} + .d2-3996695831 .color-N7{color:#FFFFFF;} + .d2-3996695831 .color-B1{color:#0D32B2;} + .d2-3996695831 .color-B2{color:#0D32B2;} + .d2-3996695831 .color-B3{color:#E3E9FD;} + .d2-3996695831 .color-B4{color:#E3E9FD;} + .d2-3996695831 .color-B5{color:#EDF0FD;} + .d2-3996695831 .color-B6{color:#F7F8FE;} + .d2-3996695831 .color-AA2{color:#4A6FF3;} + .d2-3996695831 .color-AA4{color:#EDF0FD;} + .d2-3996695831 .color-AA5{color:#F7F8FE;} + .d2-3996695831 .color-AB4{color:#EDF0FD;} + .d2-3996695831 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker-d2-3996695831);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker-d2-3996695831);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright-d2-3996695831);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright-d2-3996695831);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright-d2-3996695831);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright-d2-3996695831);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark-d2-3996695831);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright-d2-3996695831);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright-d2-3996695831);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright-d2-3996695831);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright-d2-3996695831);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker-d2-3996695831);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark-d2-3996695831);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal-d2-3996695831);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal-d2-3996695831);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright-d2-3996695831);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright-d2-3996695831);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright-d2-3996695831);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>abcdabcab diff --git a/e2etests/testdata/txtar/cycle-diagram/elk/board.exp.json b/e2etests/testdata/txtar/cycle-diagram/elk/board.exp.json index 6eb058a841..8f19b558ca 100644 --- a/e2etests/testdata/txtar/cycle-diagram/elk/board.exp.json +++ b/e2etests/testdata/txtar/cycle-diagram/elk/board.exp.json @@ -541,334 +541,270 @@ "route": [ { "x": 38.5, - "y": -186.22999572753906 + "y": -186.22900390625 }, { - "x": 40.18000030517578, - "y": -186.00399780273438 + "x": 39.402000427246094, + "y": -186.11300659179688 }, { "x": 43.2859992980957, "y": -185.53700256347656 }, { - "x": 46.3849983215332, - "y": -185.02099609375 + "x": 47.159000396728516, + "y": -184.88499450683594 }, { - "x": 49.47600173950195, - "y": -184.45700073242188 + "x": 51.018001556396484, + "y": -184.15699768066406 }, { - "x": 52.55699920654297, - "y": -183.843994140625 - }, - { - "x": 55.62799835205078, - "y": -183.18299865722656 + "x": 54.861000061035156, + "y": -183.35299682617188 }, { "x": 58.68899917602539, "y": -182.47300720214844 }, { - "x": 61.73699951171875, - "y": -181.71600341796875 - }, - { - "x": 64.77400207519531, - "y": -180.91099548339844 + "x": 62.49800109863281, + "y": -181.5189971923828 }, { - "x": 67.7979965209961, - "y": -180.05799865722656 + "x": 66.28800201416016, + "y": -180.49099731445312 }, { - "x": 70.80799865722656, - "y": -179.1580047607422 + "x": 70.05599975585938, + "y": -179.38800048828125 }, { "x": 73.8030014038086, "y": -178.21099853515625 }, { - "x": 76.78299713134766, - "y": -177.2169952392578 + "x": 77.5260009765625, + "y": -176.96099853515625 }, { - "x": 79.74700164794922, - "y": -176.17599487304688 + "x": 81.2229995727539, + "y": -175.63800048828125 }, { - "x": 82.69400024414062, - "y": -175.08799743652344 - }, - { - "x": 85.6240005493164, - "y": -173.9550018310547 + "x": 84.89399719238281, + "y": -174.24200439453125 }, { "x": 88.53600311279297, "y": -172.77499389648438 }, { - "x": 91.42900085449219, - "y": -171.5500030517578 - }, - { - "x": 94.302001953125, - "y": -170.27999877929688 + "x": 92.14900207519531, + "y": -171.23699951171875 }, { - "x": 97.15499877929688, - "y": -168.96499633789062 + "x": 95.73100280761719, + "y": -169.6280059814453 }, { - "x": 99.98699951171875, - "y": -167.60499572753906 + "x": 99.28099822998047, + "y": -167.94900512695312 }, { "x": 102.7979965209961, "y": -166.2010040283203 }, { - "x": 105.58499908447266, - "y": -164.7530059814453 - }, - { - "x": 108.3499984741211, - "y": -163.26100158691406 + "x": 106.27899932861328, + "y": -164.38400268554688 }, { - "x": 111.09100341796875, - "y": -161.7259979248047 + "x": 109.7239990234375, + "y": -162.49899291992188 }, { - "x": 113.80799865722656, - "y": -160.1479949951172 + "x": 113.13099670410156, + "y": -160.54600524902344 }, { "x": 116.4990005493164, "y": -158.5279998779297 }, { - "x": 119.16500091552734, - "y": -156.86500549316406 + "x": 119.8270034790039, + "y": -156.4429931640625 }, { - "x": 121.80400085449219, - "y": -155.16099548339844 + "x": 123.11399841308594, + "y": -154.29299926757812 }, { - "x": 124.41600036621094, - "y": -153.41600036621094 - }, - { - "x": 127.0009994506836, - "y": -151.62899780273438 + "x": 126.35700225830078, + "y": -152.0800018310547 }, { "x": 129.5570068359375, "y": -149.80299377441406 }, { - "x": 132.08399963378906, - "y": -147.93600463867188 - }, - { - "x": 134.58099365234375, - "y": -146.031005859375 + "x": 132.71099853515625, + "y": -147.46400451660156 }, { - "x": 137.04800415039062, - "y": -144.08599853515625 + "x": 135.8179931640625, + "y": -145.06300354003906 }, { - "x": 139.48399353027344, - "y": -142.1020050048828 + "x": 138.8780059814453, + "y": -142.6020050048828 }, { "x": 141.88900756835938, "y": -140.08099365234375 }, { - "x": 144.26199340820312, - "y": -138.02200317382812 + "x": 144.85000610351562, + "y": -137.50100708007812 }, { - "x": 146.6020050048828, - "y": -135.92599487304688 + "x": 147.75999450683594, + "y": -134.86399841308594 }, { - "x": 148.90899658203125, - "y": -133.79299926757812 - }, - { - "x": 151.1820068359375, - "y": -131.625 + "x": 150.61700439453125, + "y": -132.1699981689453 }, { "x": 153.42100524902344, "y": -129.42100524902344 }, { - "x": 155.625, - "y": -127.18199920654297 - }, - { - "x": 157.79299926757812, - "y": -124.90899658203125 + "x": 156.1699981689453, + "y": -126.61699676513672 }, { - "x": 159.92599487304688, - "y": -122.60199737548828 + "x": 158.86399841308594, + "y": -123.76000213623047 }, { - "x": 162.02200317382812, - "y": -120.26200103759766 + "x": 161.50100708007812, + "y": -120.8499984741211 }, { "x": 164.08099365234375, "y": -117.88899993896484 }, { - "x": 166.1020050048828, - "y": -115.48400115966797 + "x": 166.6020050048828, + "y": -114.87799835205078 }, { - "x": 168.08599853515625, - "y": -113.0479965209961 + "x": 169.06300354003906, + "y": -111.81800079345703 }, { - "x": 170.031005859375, - "y": -110.58100128173828 - }, - { - "x": 171.93600463867188, - "y": -108.08399963378906 + "x": 171.46400451660156, + "y": -108.71099853515625 }, { "x": 173.80299377441406, "y": -105.55699920654297 }, { - "x": 175.62899780273438, - "y": -103.0009994506836 + "x": 176.0800018310547, + "y": -102.35700225830078 }, { - "x": 177.41600036621094, - "y": -100.41600036621094 + "x": 178.29299926757812, + "y": -99.11399841308594 }, { - "x": 179.16099548339844, - "y": -97.80400085449219 - }, - { - "x": 180.86500549316406, - "y": -95.16500091552734 + "x": 180.4429931640625, + "y": -95.8270034790039 }, { "x": 182.5279998779297, "y": -92.4990005493164 }, { - "x": 184.1479949951172, - "y": -89.80799865722656 - }, - { - "x": 185.7259979248047, - "y": -87.09100341796875 + "x": 184.54600524902344, + "y": -89.13099670410156 }, { - "x": 187.26100158691406, - "y": -84.3499984741211 + "x": 186.49899291992188, + "y": -85.7239990234375 }, { - "x": 188.7530059814453, - "y": -81.58499908447266 + "x": 188.38400268554688, + "y": -82.27899932861328 }, { "x": 190.2010040283203, "y": -78.7979965209961 }, { - "x": 191.60499572753906, - "y": -75.98699951171875 + "x": 191.94900512695312, + "y": -75.28099822998047 }, { - "x": 192.96499633789062, - "y": -73.15499877929688 + "x": 193.6280059814453, + "y": -71.73100280761719 }, { - "x": 194.27999877929688, - "y": -70.302001953125 - }, - { - "x": 195.5500030517578, - "y": -67.42900085449219 + "x": 195.23699951171875, + "y": -68.14900207519531 }, { "x": 196.77499389648438, "y": -64.53600311279297 }, { - "x": 197.9550018310547, - "y": -61.624000549316406 - }, - { - "x": 199.08799743652344, - "y": -58.694000244140625 + "x": 198.24200439453125, + "y": -60.89400100708008 }, { - "x": 200.17599487304688, - "y": -55.74700164794922 + "x": 199.63800048828125, + "y": -57.222999572753906 }, { - "x": 201.2169952392578, - "y": -52.78300094604492 + "x": 200.96099853515625, + "y": -53.5260009765625 }, { "x": 202.21099853515625, "y": -49.803001403808594 }, { - "x": 203.1580047607422, - "y": -46.80799865722656 - }, - { - "x": 204.05799865722656, - "y": -43.79800033569336 + "x": 203.38800048828125, + "y": -46.055999755859375 }, { - "x": 204.91099548339844, - "y": -40.77399826049805 + "x": 204.49099731445312, + "y": -42.28799819946289 }, { - "x": 205.71600341796875, - "y": -37.73699951171875 + "x": 205.5189971923828, + "y": -38.49800109863281 }, { "x": 206.47300720214844, "y": -34.68899917602539 }, { - "x": 207.18299865722656, - "y": -31.628000259399414 + "x": 207.35299682617188, + "y": -30.861000061035156 }, { - "x": 207.843994140625, - "y": -28.55699920654297 + "x": 208.15699768066406, + "y": -27.01799964904785 }, { - "x": 208.45700073242188, - "y": -25.47599983215332 + "x": 208.88499450683594, + "y": -23.159000396728516 }, { - "x": 209.02099609375, - "y": -22.385000228881836 - }, - { - "x": 209.2519989013672, + "x": 209.24899291992188, "y": -21 } ], @@ -904,336 +840,272 @@ "link": "", "route": [ { - "x": 209.2519989013672, + "x": 209.24899291992188, "y": 45 }, { - "x": 209.02099609375, - "y": 46.3849983215332 - }, - { - "x": 208.45700073242188, - "y": 49.47600173950195 + "x": 208.88499450683594, + "y": 47.159000396728516 }, { - "x": 207.843994140625, - "y": 52.55699920654297 + "x": 208.15699768066406, + "y": 51.018001556396484 }, { - "x": 207.18299865722656, - "y": 55.62799835205078 + "x": 207.35299682617188, + "y": 54.861000061035156 }, { "x": 206.47300720214844, "y": 58.68899917602539 }, { - "x": 205.71600341796875, - "y": 61.73699951171875 + "x": 205.5189971923828, + "y": 62.49800109863281 }, { - "x": 204.91099548339844, - "y": 64.77400207519531 + "x": 204.49099731445312, + "y": 66.28800201416016 }, { - "x": 204.05799865722656, - "y": 67.7979965209961 - }, - { - "x": 203.1580047607422, - "y": 70.80799865722656 + "x": 203.38800048828125, + "y": 70.05599975585938 }, { "x": 202.21099853515625, "y": 73.8030014038086 }, { - "x": 201.2169952392578, - "y": 76.78299713134766 - }, - { - "x": 200.17599487304688, - "y": 79.74700164794922 + "x": 200.96099853515625, + "y": 77.5260009765625 }, { - "x": 199.08799743652344, - "y": 82.69400024414062 + "x": 199.63800048828125, + "y": 81.2229995727539 }, { - "x": 197.9550018310547, - "y": 85.6240005493164 + "x": 198.24200439453125, + "y": 84.89399719238281 }, { "x": 196.77499389648438, "y": 88.53600311279297 }, { - "x": 195.5500030517578, - "y": 91.42900085449219 + "x": 195.23699951171875, + "y": 92.14900207519531 }, { - "x": 194.27999877929688, - "y": 94.302001953125 + "x": 193.6280059814453, + "y": 95.73100280761719 }, { - "x": 192.96499633789062, - "y": 97.15499877929688 - }, - { - "x": 191.60499572753906, - "y": 99.98699951171875 + "x": 191.94900512695312, + "y": 99.28099822998047 }, { "x": 190.2010040283203, "y": 102.7979965209961 }, { - "x": 188.7530059814453, - "y": 105.58499908447266 + "x": 188.38400268554688, + "y": 106.27899932861328 }, { - "x": 187.26100158691406, - "y": 108.3499984741211 + "x": 186.49899291992188, + "y": 109.7239990234375 }, { - "x": 185.7259979248047, - "y": 111.09100341796875 - }, - { - "x": 184.1479949951172, - "y": 113.80799865722656 + "x": 184.54600524902344, + "y": 113.13099670410156 }, { "x": 182.5279998779297, "y": 116.4990005493164 }, { - "x": 180.86500549316406, - "y": 119.16500091552734 - }, - { - "x": 179.16099548339844, - "y": 121.80400085449219 + "x": 180.4429931640625, + "y": 119.8270034790039 }, { - "x": 177.41600036621094, - "y": 124.41600036621094 + "x": 178.29299926757812, + "y": 123.11399841308594 }, { - "x": 175.62899780273438, - "y": 127.0009994506836 + "x": 176.0800018310547, + "y": 126.35700225830078 }, { "x": 173.80299377441406, "y": 129.5570068359375 }, { - "x": 171.93600463867188, - "y": 132.08399963378906 + "x": 171.46400451660156, + "y": 132.71099853515625 }, { - "x": 170.031005859375, - "y": 134.58099365234375 + "x": 169.06300354003906, + "y": 135.8179931640625 }, { - "x": 168.08599853515625, - "y": 137.04800415039062 - }, - { - "x": 166.1020050048828, - "y": 139.48399353027344 + "x": 166.6020050048828, + "y": 138.8780059814453 }, { "x": 164.08099365234375, "y": 141.88900756835938 }, { - "x": 162.02200317382812, - "y": 144.26199340820312 - }, - { - "x": 159.92599487304688, - "y": 146.6020050048828 + "x": 161.50100708007812, + "y": 144.85000610351562 }, { - "x": 157.79299926757812, - "y": 148.90899658203125 + "x": 158.86399841308594, + "y": 147.75999450683594 }, { - "x": 155.625, - "y": 151.1820068359375 + "x": 156.1699981689453, + "y": 150.61700439453125 }, { "x": 153.42100524902344, "y": 153.42100524902344 }, { - "x": 151.1820068359375, - "y": 155.625 + "x": 150.61700439453125, + "y": 156.1699981689453 }, { - "x": 148.90899658203125, - "y": 157.79299926757812 + "x": 147.75999450683594, + "y": 158.86399841308594 }, { - "x": 146.6020050048828, - "y": 159.92599487304688 - }, - { - "x": 144.26199340820312, - "y": 162.02200317382812 + "x": 144.85000610351562, + "y": 161.50100708007812 }, { "x": 141.88900756835938, "y": 164.08099365234375 }, { - "x": 139.48399353027344, - "y": 166.1020050048828 - }, - { - "x": 137.04800415039062, - "y": 168.08599853515625 + "x": 138.8780059814453, + "y": 166.6020050048828 }, { - "x": 134.58099365234375, - "y": 170.031005859375 + "x": 135.8179931640625, + "y": 169.06300354003906 }, { - "x": 132.08399963378906, - "y": 171.93600463867188 + "x": 132.71099853515625, + "y": 171.46400451660156 }, { "x": 129.5570068359375, "y": 173.80299377441406 }, { - "x": 127.0009994506836, - "y": 175.62899780273438 - }, - { - "x": 124.41600036621094, - "y": 177.41600036621094 + "x": 126.35700225830078, + "y": 176.0800018310547 }, { - "x": 121.80400085449219, - "y": 179.16099548339844 + "x": 123.11399841308594, + "y": 178.29299926757812 }, { - "x": 119.16500091552734, - "y": 180.86500549316406 + "x": 119.8270034790039, + "y": 180.4429931640625 }, { "x": 116.4990005493164, "y": 182.5279998779297 }, { - "x": 113.80799865722656, - "y": 184.1479949951172 + "x": 113.13099670410156, + "y": 184.54600524902344 }, { - "x": 111.09100341796875, - "y": 185.7259979248047 + "x": 109.7239990234375, + "y": 186.49899291992188 }, { - "x": 108.3499984741211, - "y": 187.26100158691406 - }, - { - "x": 105.58499908447266, - "y": 188.7530059814453 + "x": 106.27899932861328, + "y": 188.38400268554688 }, { "x": 102.7979965209961, "y": 190.2010040283203 }, { - "x": 99.98699951171875, - "y": 191.60499572753906 - }, - { - "x": 97.15499877929688, - "y": 192.96499633789062 + "x": 99.28099822998047, + "y": 191.94900512695312 }, { - "x": 94.302001953125, - "y": 194.27999877929688 + "x": 95.73100280761719, + "y": 193.6280059814453 }, { - "x": 91.42900085449219, - "y": 195.5500030517578 + "x": 92.14900207519531, + "y": 195.23699951171875 }, { "x": 88.53600311279297, "y": 196.77499389648438 }, { - "x": 85.6240005493164, - "y": 197.9550018310547 + "x": 84.89399719238281, + "y": 198.24200439453125 }, { - "x": 82.69400024414062, - "y": 199.08799743652344 + "x": 81.2229995727539, + "y": 199.63800048828125 }, { - "x": 79.74700164794922, - "y": 200.17599487304688 - }, - { - "x": 76.78299713134766, - "y": 201.2169952392578 + "x": 77.5260009765625, + "y": 200.96099853515625 }, { "x": 73.8030014038086, "y": 202.21099853515625 }, { - "x": 70.80799865722656, - "y": 203.1580047607422 - }, - { - "x": 67.7979965209961, - "y": 204.05799865722656 + "x": 70.05599975585938, + "y": 203.38800048828125 }, { - "x": 64.77400207519531, - "y": 204.91099548339844 + "x": 66.28800201416016, + "y": 204.49099731445312 }, { - "x": 61.73699951171875, - "y": 205.71600341796875 + "x": 62.49800109863281, + "y": 205.5189971923828 }, { "x": 58.68899917602539, "y": 206.47300720214844 }, { - "x": 55.62799835205078, - "y": 207.18299865722656 - }, - { - "x": 52.55699920654297, - "y": 207.843994140625 + "x": 54.861000061035156, + "y": 207.35299682617188 }, { - "x": 49.47600173950195, - "y": 208.45700073242188 + "x": 51.018001556396484, + "y": 208.15699768066406 }, { - "x": 46.3849983215332, - "y": 209.02099609375 + "x": 47.159000396728516, + "y": 208.88499450683594 }, { "x": 43.2859992980957, "y": 209.53700256347656 }, { - "x": 40.18000030517578, - "y": 210.00399780273438 + "x": 39.402000427246094, + "y": 210.11300659179688 }, { "x": 38.5, - "y": 210.22999572753906 + "y": 210.22900390625 } ], "isCurve": true, @@ -1269,334 +1141,270 @@ "route": [ { "x": -14.49899959564209, - "y": 210.22999572753906 + "y": 210.22900390625 }, { - "x": -16.18000030517578, - "y": 210.00399780273438 + "x": -15.402000427246094, + "y": 210.11300659179688 }, { "x": -19.285999298095703, "y": 209.53700256347656 }, { - "x": -22.385000228881836, - "y": 209.02099609375 + "x": -23.159000396728516, + "y": 208.88499450683594 }, { - "x": -25.47599983215332, - "y": 208.45700073242188 + "x": -27.01799964904785, + "y": 208.15699768066406 }, { - "x": -28.55699920654297, - "y": 207.843994140625 - }, - { - "x": -31.628000259399414, - "y": 207.18299865722656 + "x": -30.861000061035156, + "y": 207.35299682617188 }, { "x": -34.68899917602539, "y": 206.47300720214844 }, { - "x": -37.73699951171875, - "y": 205.71600341796875 - }, - { - "x": -40.77399826049805, - "y": 204.91099548339844 + "x": -38.49800109863281, + "y": 205.5189971923828 }, { - "x": -43.79800033569336, - "y": 204.05799865722656 + "x": -42.28799819946289, + "y": 204.49099731445312 }, { - "x": -46.80799865722656, - "y": 203.1580047607422 + "x": -46.055999755859375, + "y": 203.38800048828125 }, { "x": -49.803001403808594, "y": 202.21099853515625 }, { - "x": -52.78300094604492, - "y": 201.2169952392578 + "x": -53.5260009765625, + "y": 200.96099853515625 }, { - "x": -55.74700164794922, - "y": 200.17599487304688 + "x": -57.222999572753906, + "y": 199.63800048828125 }, { - "x": -58.694000244140625, - "y": 199.08799743652344 - }, - { - "x": -61.624000549316406, - "y": 197.9550018310547 + "x": -60.89400100708008, + "y": 198.24200439453125 }, { "x": -64.53600311279297, "y": 196.77499389648438 }, { - "x": -67.42900085449219, - "y": 195.5500030517578 - }, - { - "x": -70.302001953125, - "y": 194.27999877929688 + "x": -68.14900207519531, + "y": 195.23699951171875 }, { - "x": -73.15499877929688, - "y": 192.96499633789062 + "x": -71.73100280761719, + "y": 193.6280059814453 }, { - "x": -75.98699951171875, - "y": 191.60499572753906 + "x": -75.28099822998047, + "y": 191.94900512695312 }, { "x": -78.7979965209961, "y": 190.2010040283203 }, { - "x": -81.58499908447266, - "y": 188.7530059814453 + "x": -82.27899932861328, + "y": 188.38400268554688 }, { - "x": -84.3499984741211, - "y": 187.26100158691406 + "x": -85.7239990234375, + "y": 186.49899291992188 }, { - "x": -87.09100341796875, - "y": 185.7259979248047 - }, - { - "x": -89.80799865722656, - "y": 184.1479949951172 + "x": -89.13099670410156, + "y": 184.54600524902344 }, { "x": -92.4990005493164, "y": 182.5279998779297 }, { - "x": -95.16500091552734, - "y": 180.86500549316406 + "x": -95.8270034790039, + "y": 180.4429931640625 }, { - "x": -97.80400085449219, - "y": 179.16099548339844 + "x": -99.11399841308594, + "y": 178.29299926757812 }, { - "x": -100.41600036621094, - "y": 177.41600036621094 - }, - { - "x": -103.0009994506836, - "y": 175.62899780273438 + "x": -102.35700225830078, + "y": 176.0800018310547 }, { "x": -105.55699920654297, "y": 173.80299377441406 }, { - "x": -108.08399963378906, - "y": 171.93600463867188 - }, - { - "x": -110.58100128173828, - "y": 170.031005859375 + "x": -108.71099853515625, + "y": 171.46400451660156 }, { - "x": -113.0479965209961, - "y": 168.08599853515625 + "x": -111.81800079345703, + "y": 169.06300354003906 }, { - "x": -115.48400115966797, - "y": 166.1020050048828 + "x": -114.87799835205078, + "y": 166.6020050048828 }, { "x": -117.88899993896484, "y": 164.08099365234375 }, { - "x": -120.26200103759766, - "y": 162.02200317382812 + "x": -120.8499984741211, + "y": 161.50100708007812 }, { - "x": -122.60199737548828, - "y": 159.92599487304688 + "x": -123.76000213623047, + "y": 158.86399841308594 }, { - "x": -124.90899658203125, - "y": 157.79299926757812 - }, - { - "x": -127.18199920654297, - "y": 155.625 + "x": -126.61699676513672, + "y": 156.1699981689453 }, { "x": -129.42100524902344, "y": 153.42100524902344 }, { - "x": -131.625, - "y": 151.1820068359375 + "x": -132.1699981689453, + "y": 150.61700439453125 }, { - "x": -133.79299926757812, - "y": 148.90899658203125 + "x": -134.86399841308594, + "y": 147.75999450683594 }, { - "x": -135.92599487304688, - "y": 146.6020050048828 - }, - { - "x": -138.02200317382812, - "y": 144.26199340820312 + "x": -137.50100708007812, + "y": 144.85000610351562 }, { "x": -140.08099365234375, "y": 141.88900756835938 }, { - "x": -142.1020050048828, - "y": 139.48399353027344 - }, - { - "x": -144.08599853515625, - "y": 137.04800415039062 + "x": -142.6020050048828, + "y": 138.8780059814453 }, { - "x": -146.031005859375, - "y": 134.58099365234375 + "x": -145.06300354003906, + "y": 135.8179931640625 }, { - "x": -147.93600463867188, - "y": 132.08399963378906 + "x": -147.46400451660156, + "y": 132.71099853515625 }, { "x": -149.80299377441406, "y": 129.5570068359375 }, { - "x": -151.62899780273438, - "y": 127.0009994506836 + "x": -152.0800018310547, + "y": 126.35700225830078 }, { - "x": -153.41600036621094, - "y": 124.41600036621094 + "x": -154.29299926757812, + "y": 123.11399841308594 }, { - "x": -155.16099548339844, - "y": 121.80400085449219 - }, - { - "x": -156.86500549316406, - "y": 119.16500091552734 + "x": -156.4429931640625, + "y": 119.8270034790039 }, { "x": -158.5279998779297, "y": 116.4990005493164 }, { - "x": -160.1479949951172, - "y": 113.80799865722656 - }, - { - "x": -161.7259979248047, - "y": 111.09100341796875 + "x": -160.54600524902344, + "y": 113.13099670410156 }, { - "x": -163.26100158691406, - "y": 108.3499984741211 + "x": -162.49899291992188, + "y": 109.7239990234375 }, { - "x": -164.7530059814453, - "y": 105.58499908447266 + "x": -164.38400268554688, + "y": 106.27899932861328 }, { "x": -166.2010040283203, "y": 102.7979965209961 }, { - "x": -167.60499572753906, - "y": 99.98699951171875 + "x": -167.94900512695312, + "y": 99.28099822998047 }, { - "x": -168.96499633789062, - "y": 97.15499877929688 + "x": -169.6280059814453, + "y": 95.73100280761719 }, { - "x": -170.27999877929688, - "y": 94.302001953125 - }, - { - "x": -171.5500030517578, - "y": 91.42900085449219 + "x": -171.23699951171875, + "y": 92.14900207519531 }, { "x": -172.77499389648438, "y": 88.53600311279297 }, { - "x": -173.9550018310547, - "y": 85.6240005493164 - }, - { - "x": -175.08799743652344, - "y": 82.69400024414062 + "x": -174.24200439453125, + "y": 84.89399719238281 }, { - "x": -176.17599487304688, - "y": 79.74700164794922 + "x": -175.63800048828125, + "y": 81.2229995727539 }, { - "x": -177.2169952392578, - "y": 76.78299713134766 + "x": -176.96099853515625, + "y": 77.5260009765625 }, { "x": -178.21099853515625, "y": 73.8030014038086 }, { - "x": -179.1580047607422, - "y": 70.80799865722656 - }, - { - "x": -180.05799865722656, - "y": 67.7979965209961 + "x": -179.38800048828125, + "y": 70.05599975585938 }, { - "x": -180.91099548339844, - "y": 64.77400207519531 + "x": -180.49099731445312, + "y": 66.28800201416016 }, { - "x": -181.71600341796875, - "y": 61.73699951171875 + "x": -181.5189971923828, + "y": 62.49800109863281 }, { "x": -182.47300720214844, "y": 58.68899917602539 }, { - "x": -183.18299865722656, - "y": 55.62799835205078 + "x": -183.35299682617188, + "y": 54.861000061035156 }, { - "x": -183.843994140625, - "y": 52.55699920654297 + "x": -184.15699768066406, + "y": 51.018001556396484 }, { - "x": -184.45700073242188, - "y": 49.47600173950195 + "x": -184.88499450683594, + "y": 47.159000396728516 }, { - "x": -185.02099609375, - "y": 46.3849983215332 - }, - { - "x": -185.2519989013672, + "x": -185.24899291992188, "y": 45 } ], @@ -1633,350 +1441,282 @@ "route": [ { "x": 512, - "y": -136.2259979248047 - }, - { - "x": 514.7160034179688, - "y": -135.85400390625 + "y": -136.2310028076172 }, { - "x": 518.85302734375, - "y": -135.19900512695312 + "x": 516.7860107421875, + "y": -135.53700256347656 }, { - "x": 522.9760131835938, - "y": -134.45700073242188 + "x": 521.947021484375, + "y": -134.64999389648438 }, { "x": 527.0819702148438, "y": -133.62899780273438 }, { - "x": 531.1699829101562, - "y": -132.71499633789062 + "x": 532.1890258789062, + "y": -132.47300720214844 }, { - "x": 535.2369995117188, - "y": -131.71600341796875 + "x": 537.2630004882812, + "y": -131.18499755859375 }, { - "x": 539.2830200195312, - "y": -130.6320037841797 - }, - { - "x": 543.3060302734375, - "y": -129.46299743652344 + "x": 542.302978515625, + "y": -129.76300048828125 }, { "x": 547.302978515625, "y": -128.21099853515625 }, { - "x": 551.2730102539062, - "y": -126.875 + "x": 552.260986328125, + "y": -126.52799987792969 }, { - "x": 555.2139892578125, - "y": -125.45600128173828 + "x": 557.1729736328125, + "y": -124.71600341796875 }, { - "x": 559.1240234375, - "y": -123.95500183105469 - }, - { - "x": 563.0029907226562, - "y": -122.37200164794922 + "x": 562.0360107421875, + "y": -122.7750015258789 }, { "x": 566.8469848632812, "y": -120.70899963378906 }, { - "x": 570.655029296875, - "y": -118.96499633789062 - }, - { - "x": 574.427001953125, - "y": -117.14199829101562 + "x": 571.6019897460938, + "y": -118.51699829101562 }, { - "x": 578.1589965820312, - "y": -115.23999786376953 + "x": 576.2979736328125, + "y": -116.20099639892578 }, { - "x": 581.8499755859375, - "y": -113.26100158691406 + "x": 580.9310302734375, + "y": -113.76300048828125 }, { "x": 585.5, "y": -111.20500183105469 }, { - "x": 589.10498046875, - "y": -109.0719985961914 + "x": 589.9990234375, + "y": -108.52799987792969 }, { - "x": 592.6649780273438, - "y": -106.86499786376953 + "x": 594.427001953125, + "y": -105.73400115966797 }, { - "x": 596.177978515625, - "y": -104.58399963378906 - }, - { - "x": 599.6420288085938, - "y": -102.22899627685547 + "x": 598.781005859375, + "y": -102.82499694824219 }, { "x": 603.0570068359375, "y": -99.8030014038086 }, { - "x": 606.4190063476562, - "y": -97.30500030517578 - }, - { - "x": 609.72900390625, - "y": -94.73799896240234 + "x": 607.2520141601562, + "y": -96.66999816894531 }, { - "x": 612.9840087890625, - "y": -92.10199737548828 + "x": 611.364013671875, + "y": -93.42900085449219 }, { - "x": 616.1840209960938, - "y": -89.39900207519531 + "x": 615.3889770507812, + "y": -90.08100128173828 }, { "x": 619.3259887695312, "y": -86.62799835205078 }, { - "x": 622.4089965820312, - "y": -83.79299926757812 - }, - { - "x": 625.4320068359375, - "y": -80.89399719238281 + "x": 623.1699829101562, + "y": -83.0739974975586 }, { - "x": 628.3939819335938, - "y": -77.93199920654297 + "x": 626.9210205078125, + "y": -79.4209976196289 }, { - "x": 631.2930297851562, - "y": -74.90899658203125 + "x": 630.573974609375, + "y": -75.66999816894531 }, { "x": 634.1279907226562, "y": -71.82599639892578 }, { - "x": 636.8989868164062, - "y": -68.68399810791016 + "x": 637.5809936523438, + "y": -67.88899993896484 }, { - "x": 639.6019897460938, - "y": -65.48400115966797 + "x": 640.9290161132812, + "y": -63.86399841308594 }, { - "x": 642.2379760742188, - "y": -62.229000091552734 - }, - { - "x": 644.8049926757812, - "y": -58.91899871826172 + "x": 644.1699829101562, + "y": -59.75199890136719 }, { "x": 647.302978515625, "y": -55.55699920654297 }, { - "x": 649.72900390625, - "y": -52.141998291015625 - }, - { - "x": 652.083984375, - "y": -48.678001403808594 + "x": 650.3250122070312, + "y": -51.28099822998047 }, { - "x": 654.364990234375, - "y": -45.165000915527344 + "x": 653.2340087890625, + "y": -46.926998138427734 }, { - "x": 656.572021484375, - "y": -41.60499954223633 + "x": 656.0280151367188, + "y": -42.499000549316406 }, { "x": 658.7050170898438, "y": -38 }, { - "x": 660.760986328125, - "y": -34.349998474121094 + "x": 661.2630004882812, + "y": -33.430999755859375 }, { - "x": 662.739990234375, - "y": -30.659000396728516 + "x": 663.7009887695312, + "y": -28.79800033569336 }, { - "x": 664.6420288085938, - "y": -26.927000045776367 - }, - { - "x": 666.4650268554688, - "y": -23.155000686645508 + "x": 666.0170288085938, + "y": -24.101999282836914 }, { "x": 668.208984375, "y": -19.347000122070312 }, { - "x": 669.8720092773438, - "y": -15.503000259399414 - }, - { - "x": 671.4550170898438, - "y": -11.62399959564209 + "x": 670.2750244140625, + "y": -14.53600025177002 }, { - "x": 672.9559936523438, - "y": -7.714000225067139 + "x": 672.2160034179688, + "y": -9.67300033569336 }, { - "x": 674.375, - "y": -3.7730000019073486 + "x": 674.0280151367188, + "y": -4.761000156402588 }, { "x": 675.7109985351562, "y": 0.19599999487400055 }, { - "x": 676.9630126953125, - "y": 4.192999839782715 + "x": 677.2630004882812, + "y": 5.196000099182129 }, { - "x": 678.1320190429688, - "y": 8.215999603271484 + "x": 678.6849975585938, + "y": 10.236000061035156 }, { - "x": 679.2160034179688, - "y": 12.26200008392334 - }, - { - "x": 680.2150268554688, - "y": 16.32900047302246 + "x": 679.9730224609375, + "y": 15.3100004196167 }, { "x": 681.1290283203125, "y": 20.41699981689453 }, { - "x": 681.9569702148438, - "y": 24.523000717163086 + "x": 682.1500244140625, + "y": 25.552000045776367 }, { - "x": 682.698974609375, - "y": 28.645999908447266 + "x": 683.0369873046875, + "y": 30.71299934387207 }, { - "x": 683.35400390625, - "y": 32.78300094604492 - }, - { - "x": 683.9219970703125, - "y": 36.93299865722656 + "x": 683.7880249023438, + "y": 35.89400100708008 }, { "x": 684.4039916992188, "y": 41.09400177001953 }, { - "x": 684.7979736328125, - "y": 45.263999938964844 - }, - { - "x": 685.10498046875, - "y": 49.441001892089844 + "x": 684.8829956054688, + "y": 46.30799865722656 }, { - "x": 685.323974609375, - "y": 53.624000549316406 + "x": 685.2249755859375, + "y": 51.53200149536133 }, { - "x": 685.4559936523438, - "y": 57.81100082397461 + "x": 685.4310302734375, + "y": 56.763999938964844 }, { "x": 685.5, "y": 61.999000549316406 }, { - "x": 685.4559936523438, - "y": 66.18800354003906 + "x": 685.4310302734375, + "y": 67.23500061035156 }, { - "x": 685.323974609375, - "y": 70.375 + "x": 685.2249755859375, + "y": 72.46700286865234 }, { - "x": 685.10498046875, - "y": 74.55799865722656 - }, - { - "x": 684.7979736328125, - "y": 78.73500061035156 + "x": 684.8829956054688, + "y": 77.69100189208984 }, { "x": 684.4039916992188, "y": 82.90499877929688 }, { - "x": 683.9219970703125, - "y": 87.06600189208984 - }, - { - "x": 683.35400390625, - "y": 91.21600341796875 + "x": 683.7880249023438, + "y": 88.1050033569336 }, { - "x": 682.698974609375, - "y": 95.35299682617188 + "x": 683.0369873046875, + "y": 93.28600311279297 }, { - "x": 681.9569702148438, - "y": 99.47599792480469 + "x": 682.1500244140625, + "y": 98.4469985961914 }, { "x": 681.1290283203125, "y": 103.58200073242188 }, { - "x": 680.2150268554688, - "y": 107.66999816894531 + "x": 679.9730224609375, + "y": 108.68900299072266 }, { - "x": 679.2160034179688, - "y": 111.73699951171875 + "x": 678.6849975585938, + "y": 113.76300048828125 }, { - "x": 678.1320190429688, - "y": 115.78299713134766 - }, - { - "x": 676.9630126953125, - "y": 119.80599975585938 + "x": 677.2630004882812, + "y": 118.8030014038086 }, { "x": 675.7109985351562, "y": 123.8030014038086 }, { - "x": 674.375, - "y": 127.77300262451172 + "x": 674.0280151367188, + "y": 128.76100158691406 }, { - "x": 673.9329833984375, + "x": 673.9400024414062, "y": 128.99899291992188 } ], @@ -2012,7 +1752,7 @@ "link": "", "route": [ { - "x": 634.8569946289062, + "x": 634.85302734375, "y": 194.99899291992188 }, { @@ -2020,327 +1760,263 @@ "y": 195.8260040283203 }, { - "x": 631.2930297851562, - "y": 198.90899658203125 - }, - { - "x": 628.3939819335938, - "y": 201.9320068359375 + "x": 630.573974609375, + "y": 199.6699981689453 }, { - "x": 625.4320068359375, - "y": 204.8939971923828 + "x": 626.9210205078125, + "y": 203.42100524902344 }, { - "x": 622.4089965820312, - "y": 207.79299926757812 + "x": 623.1699829101562, + "y": 207.07400512695312 }, { "x": 619.3259887695312, "y": 210.6280059814453 }, { - "x": 616.1840209960938, - "y": 213.3990020751953 - }, - { - "x": 612.9840087890625, - "y": 216.1020050048828 + "x": 615.3889770507812, + "y": 214.08099365234375 }, { - "x": 609.72900390625, - "y": 218.73800659179688 + "x": 611.364013671875, + "y": 217.4290008544922 }, { - "x": 606.4190063476562, - "y": 221.30499267578125 + "x": 607.2520141601562, + "y": 220.6699981689453 }, { "x": 603.0570068359375, "y": 223.80299377441406 }, { - "x": 599.6420288085938, - "y": 226.22900390625 + "x": 598.781005859375, + "y": 226.8249969482422 }, { - "x": 596.177978515625, - "y": 228.58399963378906 + "x": 594.427001953125, + "y": 229.73399353027344 }, { - "x": 592.6649780273438, - "y": 230.86500549316406 - }, - { - "x": 589.10498046875, - "y": 233.07200622558594 + "x": 589.9990234375, + "y": 232.5279998779297 }, { "x": 585.5, "y": 235.2050018310547 }, { - "x": 581.8499755859375, - "y": 237.26100158691406 - }, - { - "x": 578.1589965820312, - "y": 239.24000549316406 + "x": 580.9310302734375, + "y": 237.76300048828125 }, { - "x": 574.427001953125, - "y": 241.14199829101562 + "x": 576.2979736328125, + "y": 240.2010040283203 }, { - "x": 570.655029296875, - "y": 242.96499633789062 + "x": 571.6019897460938, + "y": 242.51699829101562 }, { "x": 566.8469848632812, "y": 244.70899963378906 }, { - "x": 563.0029907226562, - "y": 246.3719940185547 + "x": 562.0360107421875, + "y": 246.77499389648438 }, { - "x": 559.1240234375, - "y": 247.9550018310547 + "x": 557.1729736328125, + "y": 248.71600341796875 }, { - "x": 555.2139892578125, - "y": 249.45599365234375 - }, - { - "x": 551.2730102539062, - "y": 250.875 + "x": 552.260986328125, + "y": 250.5279998779297 }, { "x": 547.302978515625, "y": 252.21099853515625 }, { - "x": 543.3060302734375, - "y": 253.46299743652344 - }, - { - "x": 539.2830200195312, - "y": 254.6320037841797 + "x": 542.302978515625, + "y": 253.76300048828125 }, { - "x": 535.2369995117188, - "y": 255.71600341796875 + "x": 537.2630004882812, + "y": 255.18499755859375 }, { - "x": 531.1699829101562, - "y": 256.7149963378906 + "x": 532.1890258789062, + "y": 256.4729919433594 }, { "x": 527.0819702148438, "y": 257.6289978027344 }, { - "x": 522.9760131835938, - "y": 258.4570007324219 - }, - { - "x": 518.85302734375, - "y": 259.1990051269531 + "x": 521.947021484375, + "y": 258.6499938964844 }, { - "x": 514.7160034179688, - "y": 259.85400390625 + "x": 516.7860107421875, + "y": 259.5369873046875 }, { - "x": 510.5660095214844, - "y": 260.4219970703125 + "x": 511.6050109863281, + "y": 260.2879943847656 }, { "x": 506.4049987792969, "y": 260.90399169921875 }, { - "x": 502.2349853515625, - "y": 261.2980041503906 + "x": 501.1910095214844, + "y": 261.38299560546875 }, { - "x": 498.0580139160156, - "y": 261.6050109863281 + "x": 495.9670104980469, + "y": 261.7250061035156 }, { - "x": 493.875, - "y": 261.8240051269531 - }, - { - "x": 489.68798828125, - "y": 261.95599365234375 + "x": 490.7349853515625, + "y": 261.9309997558594 }, { "x": 485.5, "y": 262 }, { - "x": 481.3110046386719, - "y": 261.95599365234375 - }, - { - "x": 477.1239929199219, - "y": 261.8240051269531 + "x": 480.2640075683594, + "y": 261.9309997558594 }, { - "x": 472.9410095214844, - "y": 261.6050109863281 + "x": 475.0320129394531, + "y": 261.7250061035156 }, { - "x": 468.7640075683594, - "y": 261.2980041503906 + "x": 469.8080139160156, + "y": 261.38299560546875 }, { "x": 464.593994140625, "y": 260.90399169921875 }, { - "x": 460.4330139160156, - "y": 260.4219970703125 + "x": 459.3940124511719, + "y": 260.2879943847656 }, { - "x": 456.2829895019531, - "y": 259.85400390625 + "x": 454.2130126953125, + "y": 259.5369873046875 }, { - "x": 452.14599609375, - "y": 259.1990051269531 - }, - { - "x": 448.02301025390625, - "y": 258.4570007324219 + "x": 449.052001953125, + "y": 258.6499938964844 }, { "x": 443.9169921875, "y": 257.6289978027344 }, { - "x": 439.8290100097656, - "y": 256.7149963378906 - }, - { - "x": 435.7619934082031, - "y": 255.71600341796875 + "x": 438.80999755859375, + "y": 256.4729919433594 }, { - "x": 431.71600341796875, - "y": 254.6320037841797 + "x": 433.7359924316406, + "y": 255.18499755859375 }, { - "x": 427.6929931640625, - "y": 253.46299743652344 + "x": 428.6960144042969, + "y": 253.76300048828125 }, { "x": 423.6960144042969, "y": 252.21099853515625 }, { - "x": 419.72601318359375, - "y": 250.875 + "x": 418.7380065917969, + "y": 250.5279998779297 }, { - "x": 415.7850036621094, - "y": 249.45599365234375 + "x": 413.82598876953125, + "y": 248.71600341796875 }, { - "x": 411.875, - "y": 247.9550018310547 - }, - { - "x": 407.9960021972656, - "y": 246.3719940185547 + "x": 408.9630126953125, + "y": 246.77499389648438 }, { "x": 404.1520080566406, "y": 244.70899963378906 }, { - "x": 400.343994140625, - "y": 242.96499633789062 + "x": 399.3970031738281, + "y": 242.51699829101562 }, { - "x": 396.5719909667969, - "y": 241.14199829101562 + "x": 394.70098876953125, + "y": 240.2010040283203 }, { - "x": 392.8399963378906, - "y": 239.24000549316406 - }, - { - "x": 389.14898681640625, - "y": 237.26100158691406 + "x": 390.0679931640625, + "y": 237.76300048828125 }, { "x": 385.5, "y": 235.2050018310547 }, { - "x": 381.8940124511719, - "y": 233.07200622558594 - }, - { - "x": 378.3340148925781, - "y": 230.86500549316406 + "x": 381, + "y": 232.5279998779297 }, { - "x": 374.8210144042969, - "y": 228.58399963378906 + "x": 376.5719909667969, + "y": 229.73399353027344 }, { - "x": 371.35699462890625, - "y": 226.22900390625 + "x": 372.2179870605469, + "y": 226.8249969482422 }, { "x": 367.9419860839844, "y": 223.80299377441406 }, { - "x": 364.5799865722656, - "y": 221.30499267578125 + "x": 363.74700927734375, + "y": 220.6699981689453 }, { - "x": 361.2699890136719, - "y": 218.73800659179688 + "x": 359.635009765625, + "y": 217.4290008544922 }, { - "x": 358.0150146484375, - "y": 216.1020050048828 - }, - { - "x": 354.81500244140625, - "y": 213.3990020751953 + "x": 355.6099853515625, + "y": 214.08099365234375 }, { "x": 351.6730041503906, "y": 210.6280059814453 }, { - "x": 348.5899963378906, - "y": 207.79299926757812 + "x": 347.8290100097656, + "y": 207.07400512695312 }, { - "x": 345.5669860839844, - "y": 204.8939971923828 + "x": 344.0780029296875, + "y": 203.42100524902344 }, { - "x": 342.6050109863281, - "y": 201.9320068359375 - }, - { - "x": 339.70599365234375, - "y": 198.90899658203125 + "x": 340.42498779296875, + "y": 199.6699981689453 }, { "x": 336.8710021972656, "y": 195.8260040283203 }, { - "x": 336.1419982910156, + "x": 336.14599609375, "y": 195 } ], @@ -2377,367 +2053,295 @@ "route": [ { "x": 931.4099731445312, - "y": -186.21800231933594 + "y": -186.19900512695312 }, { "x": 936.197021484375, "y": -185.53700256347656 }, { - "x": 942.385986328125, - "y": -184.45700073242188 - }, - { - "x": 948.5380249023438, - "y": -183.18299865722656 + "x": 943.927978515625, + "y": -184.15699768066406 }, { - "x": 954.6480102539062, - "y": -181.71600341796875 + "x": 951.5989990234375, + "y": -182.47300720214844 }, { - "x": 960.7080078125, - "y": -180.05799865722656 + "x": 959.197998046875, + "y": -180.49099731445312 }, { "x": 966.7130126953125, "y": -178.21099853515625 }, { - "x": 972.656982421875, - "y": -176.17599487304688 + "x": 974.1329956054688, + "y": -175.63800048828125 }, { - "x": 978.5349731445312, - "y": -173.9550018310547 - }, - { - "x": 984.3389892578125, - "y": -171.5500030517578 + "x": 981.4459838867188, + "y": -172.77499389648438 }, { - "x": 990.0659790039062, - "y": -168.96499633789062 + "x": 988.6420288085938, + "y": -169.6280059814453 }, { "x": 995.7080078125, "y": -166.2010040283203 }, { - "x": 1001.260009765625, - "y": -163.26100158691406 + "x": 1002.6339721679688, + "y": -162.49899291992188 }, { - "x": 1006.718017578125, - "y": -160.1479949951172 - }, - { - "x": 1012.0750122070312, - "y": -156.86500549316406 + "x": 1009.4089965820312, + "y": -158.5279998779297 }, { - "x": 1017.3259887695312, - "y": -153.41600036621094 + "x": 1016.0239868164062, + "y": -154.29299926757812 }, { "x": 1022.4669799804688, "y": -149.80299377441406 }, { - "x": 1027.490966796875, - "y": -146.031005859375 + "x": 1028.72802734375, + "y": -145.06300354003906 }, { - "x": 1032.39404296875, - "y": -142.1020050048828 - }, - { - "x": 1037.1719970703125, - "y": -138.02200317382812 + "x": 1034.7989501953125, + "y": -140.08099365234375 }, { - "x": 1041.8189697265625, - "y": -133.79299926757812 + "x": 1040.6700439453125, + "y": -134.86399841308594 }, { "x": 1046.3310546875, "y": -129.42100524902344 }, { - "x": 1050.7030029296875, - "y": -124.90899658203125 + "x": 1051.7740478515625, + "y": -123.76000213623047 }, { - "x": 1054.9320068359375, - "y": -120.26200103759766 - }, - { - "x": 1059.011962890625, - "y": -115.48400115966797 + "x": 1056.990966796875, + "y": -117.88899993896484 }, { - "x": 1062.9410400390625, - "y": -110.58100128173828 + "x": 1061.9730224609375, + "y": -111.81800079345703 }, { "x": 1066.7130126953125, "y": -105.55699920654297 }, { - "x": 1070.3260498046875, - "y": -100.41600036621094 - }, - { - "x": 1073.7750244140625, - "y": -95.16500091552734 + "x": 1071.2039794921875, + "y": -99.11399841308594 }, { - "x": 1077.0579833984375, - "y": -89.80799865722656 + "x": 1075.43798828125, + "y": -92.4990005493164 }, { - "x": 1080.1710205078125, - "y": -84.3499984741211 + "x": 1079.4090576171875, + "y": -85.7239990234375 }, { "x": 1083.1109619140625, "y": -78.7979965209961 }, { - "x": 1085.875, - "y": -73.15499877929688 - }, - { - "x": 1088.4610595703125, - "y": -67.42900085449219 + "x": 1086.5379638671875, + "y": -71.73100280761719 }, { - "x": 1090.864990234375, - "y": -61.624000549316406 + "x": 1089.68603515625, + "y": -64.53600311279297 }, { - "x": 1093.0860595703125, - "y": -55.74700164794922 + "x": 1092.5479736328125, + "y": -57.222999572753906 }, { "x": 1095.1209716796875, "y": -49.803001403808594 }, { - "x": 1096.968017578125, - "y": -43.79800033569336 - }, - { - "x": 1098.6259765625, - "y": -37.73699951171875 + "x": 1097.4010009765625, + "y": -42.28799819946289 }, { - "x": 1100.093017578125, - "y": -31.628000259399414 + "x": 1099.384033203125, + "y": -34.68899917602539 }, { - "x": 1101.366943359375, - "y": -25.47599983215332 + "x": 1101.0670166015625, + "y": -27.01799964904785 }, { "x": 1102.447021484375, "y": -19.285999298095703 }, { - "x": 1103.3330078125, - "y": -13.065999984741211 - }, - { - "x": 1104.02197265625, - "y": -6.821000099182129 + "x": 1103.52294921875, + "y": -11.506999969482422 }, { - "x": 1104.5150146484375, - "y": -0.5580000281333923 + "x": 1104.29296875, + "y": -3.690999984741211 }, { - "x": 1104.81103515625, - "y": 5.7170000076293945 + "x": 1104.7550048828125, + "y": 4.1479997634887695 }, { "x": 1104.9100341796875, "y": 12 }, { - "x": 1104.81103515625, - "y": 18.281999588012695 + "x": 1104.7550048828125, + "y": 19.85099983215332 }, { - "x": 1104.5150146484375, - "y": 24.558000564575195 + "x": 1104.29296875, + "y": 27.69099998474121 }, { - "x": 1104.02197265625, - "y": 30.820999145507812 - }, - { - "x": 1103.3330078125, - "y": 37.066001892089844 + "x": 1103.52294921875, + "y": 35.50699996948242 }, { "x": 1102.447021484375, "y": 43.2859992980957 }, { - "x": 1101.366943359375, - "y": 49.47600173950195 - }, - { - "x": 1100.093017578125, - "y": 55.62799835205078 + "x": 1101.0670166015625, + "y": 51.018001556396484 }, { - "x": 1098.6259765625, - "y": 61.73699951171875 + "x": 1099.384033203125, + "y": 58.68899917602539 }, { - "x": 1096.968017578125, - "y": 67.7979965209961 + "x": 1097.4010009765625, + "y": 66.28800201416016 }, { "x": 1095.1209716796875, "y": 73.8030014038086 }, { - "x": 1093.0860595703125, - "y": 79.74700164794922 - }, - { - "x": 1090.864990234375, - "y": 85.6240005493164 + "x": 1092.5479736328125, + "y": 81.2229995727539 }, { - "x": 1088.4610595703125, - "y": 91.42900085449219 + "x": 1089.68603515625, + "y": 88.53600311279297 }, { - "x": 1085.875, - "y": 97.15499877929688 + "x": 1086.5379638671875, + "y": 95.73100280761719 }, { "x": 1083.1109619140625, "y": 102.7979965209961 }, { - "x": 1080.1710205078125, - "y": 108.3499984741211 - }, - { - "x": 1077.0579833984375, - "y": 113.80799865722656 + "x": 1079.4090576171875, + "y": 109.7239990234375 }, { - "x": 1073.7750244140625, - "y": 119.16500091552734 + "x": 1075.43798828125, + "y": 116.4990005493164 }, { - "x": 1070.3260498046875, - "y": 124.41600036621094 + "x": 1071.2039794921875, + "y": 123.11399841308594 }, { "x": 1066.7130126953125, "y": 129.5570068359375 }, { - "x": 1062.9410400390625, - "y": 134.58099365234375 - }, - { - "x": 1059.011962890625, - "y": 139.48399353027344 + "x": 1061.9730224609375, + "y": 135.8179931640625 }, { - "x": 1054.9320068359375, - "y": 144.26199340820312 + "x": 1056.990966796875, + "y": 141.88900756835938 }, { - "x": 1050.7030029296875, - "y": 148.90899658203125 + "x": 1051.7740478515625, + "y": 147.75999450683594 }, { "x": 1046.3310546875, "y": 153.42100524902344 }, { - "x": 1041.8189697265625, - "y": 157.79299926757812 - }, - { - "x": 1037.1719970703125, - "y": 162.02200317382812 + "x": 1040.6700439453125, + "y": 158.86399841308594 }, { - "x": 1032.39404296875, - "y": 166.1020050048828 + "x": 1034.7989501953125, + "y": 164.08099365234375 }, { - "x": 1027.490966796875, - "y": 170.031005859375 + "x": 1028.72802734375, + "y": 169.06300354003906 }, { "x": 1022.4669799804688, "y": 173.80299377441406 }, { - "x": 1017.3259887695312, - "y": 177.41600036621094 + "x": 1016.0239868164062, + "y": 178.29299926757812 }, { - "x": 1012.0750122070312, - "y": 180.86500549316406 - }, - { - "x": 1006.718017578125, - "y": 184.1479949951172 + "x": 1009.4089965820312, + "y": 182.5279998779297 }, { - "x": 1001.260009765625, - "y": 187.26100158691406 + "x": 1002.6339721679688, + "y": 186.49899291992188 }, { "x": 995.7080078125, "y": 190.2010040283203 }, { - "x": 990.0659790039062, - "y": 192.96499633789062 + "x": 988.6420288085938, + "y": 193.6280059814453 }, { - "x": 984.3389892578125, - "y": 195.5500030517578 - }, - { - "x": 978.5349731445312, - "y": 197.9550018310547 + "x": 981.4459838867188, + "y": 196.77499389648438 }, { - "x": 972.656982421875, - "y": 200.17599487304688 + "x": 974.1329956054688, + "y": 199.63800048828125 }, { "x": 966.7130126953125, "y": 202.21099853515625 }, { - "x": 960.7080078125, - "y": 204.05799865722656 + "x": 959.197998046875, + "y": 204.49099731445312 }, { - "x": 954.6480102539062, - "y": 205.71600341796875 - }, - { - "x": 948.5380249023438, - "y": 207.18299865722656 + "x": 951.5989990234375, + "y": 206.47300720214844 }, { - "x": 942.385986328125, - "y": 208.45700073242188 + "x": 943.927978515625, + "y": 208.15699768066406 }, { "x": 936.197021484375, @@ -2745,7 +2349,7 @@ }, { "x": 931.4099731445312, - "y": 210.21800231933594 + "y": 210.19900512695312 } ], "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 21e65f752a..f9882c89da 100644 --- a/e2etests/testdata/txtar/cycle-diagram/elk/sketch.exp.svg +++ b/e2etests/testdata/txtar/cycle-diagram/elk/sketch.exp.svg @@ -1,9 +1,9 @@ -abcdabcab + .d2-3436162818 .fill-N1{fill:#0A0F25;} + .d2-3436162818 .fill-N2{fill:#676C7E;} + .d2-3436162818 .fill-N3{fill:#9499AB;} + .d2-3436162818 .fill-N4{fill:#CFD2DD;} + .d2-3436162818 .fill-N5{fill:#DEE1EB;} + .d2-3436162818 .fill-N6{fill:#EEF1F8;} + .d2-3436162818 .fill-N7{fill:#FFFFFF;} + .d2-3436162818 .fill-B1{fill:#0D32B2;} + .d2-3436162818 .fill-B2{fill:#0D32B2;} + .d2-3436162818 .fill-B3{fill:#E3E9FD;} + .d2-3436162818 .fill-B4{fill:#E3E9FD;} + .d2-3436162818 .fill-B5{fill:#EDF0FD;} + .d2-3436162818 .fill-B6{fill:#F7F8FE;} + .d2-3436162818 .fill-AA2{fill:#4A6FF3;} + .d2-3436162818 .fill-AA4{fill:#EDF0FD;} + .d2-3436162818 .fill-AA5{fill:#F7F8FE;} + .d2-3436162818 .fill-AB4{fill:#EDF0FD;} + .d2-3436162818 .fill-AB5{fill:#F7F8FE;} + .d2-3436162818 .stroke-N1{stroke:#0A0F25;} + .d2-3436162818 .stroke-N2{stroke:#676C7E;} + .d2-3436162818 .stroke-N3{stroke:#9499AB;} + .d2-3436162818 .stroke-N4{stroke:#CFD2DD;} + .d2-3436162818 .stroke-N5{stroke:#DEE1EB;} + .d2-3436162818 .stroke-N6{stroke:#EEF1F8;} + .d2-3436162818 .stroke-N7{stroke:#FFFFFF;} + .d2-3436162818 .stroke-B1{stroke:#0D32B2;} + .d2-3436162818 .stroke-B2{stroke:#0D32B2;} + .d2-3436162818 .stroke-B3{stroke:#E3E9FD;} + .d2-3436162818 .stroke-B4{stroke:#E3E9FD;} + .d2-3436162818 .stroke-B5{stroke:#EDF0FD;} + .d2-3436162818 .stroke-B6{stroke:#F7F8FE;} + .d2-3436162818 .stroke-AA2{stroke:#4A6FF3;} + .d2-3436162818 .stroke-AA4{stroke:#EDF0FD;} + .d2-3436162818 .stroke-AA5{stroke:#F7F8FE;} + .d2-3436162818 .stroke-AB4{stroke:#EDF0FD;} + .d2-3436162818 .stroke-AB5{stroke:#F7F8FE;} + .d2-3436162818 .background-color-N1{background-color:#0A0F25;} + .d2-3436162818 .background-color-N2{background-color:#676C7E;} + .d2-3436162818 .background-color-N3{background-color:#9499AB;} + .d2-3436162818 .background-color-N4{background-color:#CFD2DD;} + .d2-3436162818 .background-color-N5{background-color:#DEE1EB;} + .d2-3436162818 .background-color-N6{background-color:#EEF1F8;} + .d2-3436162818 .background-color-N7{background-color:#FFFFFF;} + .d2-3436162818 .background-color-B1{background-color:#0D32B2;} + .d2-3436162818 .background-color-B2{background-color:#0D32B2;} + .d2-3436162818 .background-color-B3{background-color:#E3E9FD;} + .d2-3436162818 .background-color-B4{background-color:#E3E9FD;} + .d2-3436162818 .background-color-B5{background-color:#EDF0FD;} + .d2-3436162818 .background-color-B6{background-color:#F7F8FE;} + .d2-3436162818 .background-color-AA2{background-color:#4A6FF3;} + .d2-3436162818 .background-color-AA4{background-color:#EDF0FD;} + .d2-3436162818 .background-color-AA5{background-color:#F7F8FE;} + .d2-3436162818 .background-color-AB4{background-color:#EDF0FD;} + .d2-3436162818 .background-color-AB5{background-color:#F7F8FE;} + .d2-3436162818 .color-N1{color:#0A0F25;} + .d2-3436162818 .color-N2{color:#676C7E;} + .d2-3436162818 .color-N3{color:#9499AB;} + .d2-3436162818 .color-N4{color:#CFD2DD;} + .d2-3436162818 .color-N5{color:#DEE1EB;} + .d2-3436162818 .color-N6{color:#EEF1F8;} + .d2-3436162818 .color-N7{color:#FFFFFF;} + .d2-3436162818 .color-B1{color:#0D32B2;} + .d2-3436162818 .color-B2{color:#0D32B2;} + .d2-3436162818 .color-B3{color:#E3E9FD;} + .d2-3436162818 .color-B4{color:#E3E9FD;} + .d2-3436162818 .color-B5{color:#EDF0FD;} + .d2-3436162818 .color-B6{color:#F7F8FE;} + .d2-3436162818 .color-AA2{color:#4A6FF3;} + .d2-3436162818 .color-AA4{color:#EDF0FD;} + .d2-3436162818 .color-AA5{color:#F7F8FE;} + .d2-3436162818 .color-AB4{color:#EDF0FD;} + .d2-3436162818 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker-d2-3436162818);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker-d2-3436162818);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright-d2-3436162818);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright-d2-3436162818);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright-d2-3436162818);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright-d2-3436162818);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark-d2-3436162818);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright-d2-3436162818);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright-d2-3436162818);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright-d2-3436162818);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright-d2-3436162818);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker-d2-3436162818);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark-d2-3436162818);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal-d2-3436162818);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal-d2-3436162818);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright-d2-3436162818);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright-d2-3436162818);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright-d2-3436162818);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>abcdabcab From 6ec83ff541d39865b17a40bd2308cec36d11dab6 Mon Sep 17 00:00:00 2001 From: Mayank Mohapatra <125661248+Mayank77maruti@users.noreply.github.com> Date: Sat, 22 Feb 2025 13:47:57 +0000 Subject: [PATCH 35/73] try --- d2layouts/d2cycle/layout.go | 2 +- .../txtar/cycle-diagram/dagre/board.exp.json | 1620 ++++++++++------- .../txtar/cycle-diagram/dagre/sketch.exp.svg | 152 +- .../txtar/cycle-diagram/elk/board.exp.json | 1620 ++++++++++------- .../txtar/cycle-diagram/elk/sketch.exp.svg | 152 +- 5 files changed, 2169 insertions(+), 1377 deletions(-) diff --git a/d2layouts/d2cycle/layout.go b/d2layouts/d2cycle/layout.go index cdea39a493..c63eb20397 100644 --- a/d2layouts/d2cycle/layout.go +++ b/d2layouts/d2cycle/layout.go @@ -15,7 +15,7 @@ const ( MIN_RADIUS = 200 PADDING = 20 MIN_SEGMENT_LEN = 10 - ARC_STEPS = 80 + ARC_STEPS = 100 ) // Layout lays out the graph and computes curved edge routes. diff --git a/e2etests/testdata/txtar/cycle-diagram/dagre/board.exp.json b/e2etests/testdata/txtar/cycle-diagram/dagre/board.exp.json index 4f79d35bb0..78ed2dffeb 100644 --- a/e2etests/testdata/txtar/cycle-diagram/dagre/board.exp.json +++ b/e2etests/testdata/txtar/cycle-diagram/dagre/board.exp.json @@ -541,270 +541,334 @@ "route": [ { "x": 26.5, - "y": -198.22900390625 + "y": -198.22999572753906 }, { - "x": 27.402000427246094, - "y": -198.11300659179688 + "x": 28.18000030517578, + "y": -198.00399780273438 }, { "x": 31.285999298095703, "y": -197.53700256347656 }, { - "x": 35.159000396728516, - "y": -196.88499450683594 + "x": 34.3849983215332, + "y": -197.02099609375 }, { - "x": 39.018001556396484, - "y": -196.15699768066406 + "x": 37.47600173950195, + "y": -196.45700073242188 }, { - "x": 42.861000061035156, - "y": -195.35299682617188 + "x": 40.55699920654297, + "y": -195.843994140625 + }, + { + "x": 43.62799835205078, + "y": -195.18299865722656 }, { "x": 46.68899917602539, "y": -194.47300720214844 }, { - "x": 50.49800109863281, - "y": -193.5189971923828 + "x": 49.73699951171875, + "y": -193.71600341796875 + }, + { + "x": 52.77399826049805, + "y": -192.91099548339844 }, { - "x": 54.28799819946289, - "y": -192.49099731445312 + "x": 55.79800033569336, + "y": -192.05799865722656 }, { - "x": 58.055999755859375, - "y": -191.38800048828125 + "x": 58.80799865722656, + "y": -191.1580047607422 }, { "x": 61.803001403808594, "y": -190.21099853515625 }, { - "x": 65.5260009765625, - "y": -188.96099853515625 + "x": 64.78299713134766, + "y": -189.2169952392578 }, { - "x": 69.2229995727539, - "y": -187.63800048828125 + "x": 67.74700164794922, + "y": -188.17599487304688 }, { - "x": 72.89399719238281, - "y": -186.24200439453125 + "x": 70.69400024414062, + "y": -187.08799743652344 + }, + { + "x": 73.6240005493164, + "y": -185.9550018310547 }, { "x": 76.53600311279297, "y": -184.77499389648438 }, { - "x": 80.14900207519531, - "y": -183.23699951171875 + "x": 79.42900085449219, + "y": -183.5500030517578 + }, + { + "x": 82.302001953125, + "y": -182.27999877929688 }, { - "x": 83.73100280761719, - "y": -181.6280059814453 + "x": 85.15499877929688, + "y": -180.96499633789062 }, { - "x": 87.28099822998047, - "y": -179.94900512695312 + "x": 87.98699951171875, + "y": -179.60499572753906 }, { "x": 90.7979965209961, "y": -178.2010040283203 }, { - "x": 94.27899932861328, - "y": -176.38400268554688 + "x": 93.58499908447266, + "y": -176.7530059814453 + }, + { + "x": 96.3499984741211, + "y": -175.26100158691406 }, { - "x": 97.7239990234375, - "y": -174.49899291992188 + "x": 99.09100341796875, + "y": -173.7259979248047 }, { - "x": 101.13099670410156, - "y": -172.54600524902344 + "x": 101.80799865722656, + "y": -172.1479949951172 }, { "x": 104.4990005493164, "y": -170.5279998779297 }, { - "x": 107.8270034790039, - "y": -168.4429931640625 + "x": 107.16500091552734, + "y": -168.86500549316406 }, { - "x": 111.11399841308594, - "y": -166.29299926757812 + "x": 109.80400085449219, + "y": -167.16099548339844 }, { - "x": 114.35700225830078, - "y": -164.0800018310547 + "x": 112.41600036621094, + "y": -165.41600036621094 + }, + { + "x": 115.0009994506836, + "y": -163.62899780273438 }, { "x": 117.55699920654297, "y": -161.80299377441406 }, { - "x": 120.71099853515625, - "y": -159.46400451660156 + "x": 120.08399963378906, + "y": -159.93600463867188 + }, + { + "x": 122.58100128173828, + "y": -158.031005859375 }, { - "x": 123.81800079345703, - "y": -157.06300354003906 + "x": 125.0479965209961, + "y": -156.08599853515625 }, { - "x": 126.87799835205078, - "y": -154.6020050048828 + "x": 127.48400115966797, + "y": -154.1020050048828 }, { "x": 129.88900756835938, "y": -152.08099365234375 }, { - "x": 132.85000610351562, - "y": -149.50100708007812 + "x": 132.26199340820312, + "y": -150.02200317382812 }, { - "x": 135.75999450683594, - "y": -146.86399841308594 + "x": 134.6020050048828, + "y": -147.92599487304688 }, { - "x": 138.61700439453125, - "y": -144.1699981689453 + "x": 136.90899658203125, + "y": -145.79299926757812 + }, + { + "x": 139.1820068359375, + "y": -143.625 }, { "x": 141.42100524902344, "y": -141.42100524902344 }, { - "x": 144.1699981689453, - "y": -138.61700439453125 + "x": 143.625, + "y": -139.1820068359375 + }, + { + "x": 145.79299926757812, + "y": -136.90899658203125 }, { - "x": 146.86399841308594, - "y": -135.75999450683594 + "x": 147.92599487304688, + "y": -134.6020050048828 }, { - "x": 149.50100708007812, - "y": -132.85000610351562 + "x": 150.02200317382812, + "y": -132.26199340820312 }, { "x": 152.08099365234375, "y": -129.88900756835938 }, { - "x": 154.6020050048828, - "y": -126.87799835205078 + "x": 154.1020050048828, + "y": -127.48400115966797 }, { - "x": 157.06300354003906, - "y": -123.81800079345703 + "x": 156.08599853515625, + "y": -125.0479965209961 }, { - "x": 159.46400451660156, - "y": -120.71099853515625 + "x": 158.031005859375, + "y": -122.58100128173828 + }, + { + "x": 159.93600463867188, + "y": -120.08399963378906 }, { "x": 161.80299377441406, "y": -117.55699920654297 }, { - "x": 164.0800018310547, - "y": -114.35700225830078 + "x": 163.62899780273438, + "y": -115.0009994506836 }, { - "x": 166.29299926757812, - "y": -111.11399841308594 + "x": 165.41600036621094, + "y": -112.41600036621094 }, { - "x": 168.4429931640625, - "y": -107.8270034790039 + "x": 167.16099548339844, + "y": -109.80400085449219 + }, + { + "x": 168.86500549316406, + "y": -107.16500091552734 }, { "x": 170.5279998779297, "y": -104.4990005493164 }, { - "x": 172.54600524902344, - "y": -101.13099670410156 + "x": 172.1479949951172, + "y": -101.80799865722656 + }, + { + "x": 173.7259979248047, + "y": -99.09100341796875 }, { - "x": 174.49899291992188, - "y": -97.7239990234375 + "x": 175.26100158691406, + "y": -96.3499984741211 }, { - "x": 176.38400268554688, - "y": -94.27899932861328 + "x": 176.7530059814453, + "y": -93.58499908447266 }, { "x": 178.2010040283203, "y": -90.7979965209961 }, { - "x": 179.94900512695312, - "y": -87.28099822998047 + "x": 179.60499572753906, + "y": -87.98699951171875 }, { - "x": 181.6280059814453, - "y": -83.73100280761719 + "x": 180.96499633789062, + "y": -85.15499877929688 }, { - "x": 183.23699951171875, - "y": -80.14900207519531 + "x": 182.27999877929688, + "y": -82.302001953125 + }, + { + "x": 183.5500030517578, + "y": -79.42900085449219 }, { "x": 184.77499389648438, "y": -76.53600311279297 }, { - "x": 186.24200439453125, - "y": -72.89399719238281 + "x": 185.9550018310547, + "y": -73.6240005493164 + }, + { + "x": 187.08799743652344, + "y": -70.69400024414062 }, { - "x": 187.63800048828125, - "y": -69.2229995727539 + "x": 188.17599487304688, + "y": -67.74700164794922 }, { - "x": 188.96099853515625, - "y": -65.5260009765625 + "x": 189.2169952392578, + "y": -64.78299713134766 }, { "x": 190.21099853515625, "y": -61.803001403808594 }, { - "x": 191.38800048828125, - "y": -58.055999755859375 + "x": 191.1580047607422, + "y": -58.80799865722656 + }, + { + "x": 192.05799865722656, + "y": -55.79800033569336 }, { - "x": 192.49099731445312, - "y": -54.28799819946289 + "x": 192.91099548339844, + "y": -52.77399826049805 }, { - "x": 193.5189971923828, - "y": -50.49800109863281 + "x": 193.71600341796875, + "y": -49.73699951171875 }, { "x": 194.47300720214844, "y": -46.68899917602539 }, { - "x": 195.35299682617188, - "y": -42.861000061035156 + "x": 195.18299865722656, + "y": -43.62799835205078 }, { - "x": 196.15699768066406, - "y": -39.018001556396484 + "x": 195.843994140625, + "y": -40.55699920654297 }, { - "x": 196.88499450683594, - "y": -35.159000396728516 + "x": 196.45700073242188, + "y": -37.47600173950195 }, { - "x": 197.24899291992188, + "x": 197.02099609375, + "y": -34.3849983215332 + }, + { + "x": 197.2519989013672, "y": -33 } ], @@ -840,272 +904,336 @@ "link": "", "route": [ { - "x": 197.24899291992188, + "x": 197.2519989013672, "y": 33 }, { - "x": 196.88499450683594, - "y": 35.159000396728516 + "x": 197.02099609375, + "y": 34.3849983215332 + }, + { + "x": 196.45700073242188, + "y": 37.47600173950195 }, { - "x": 196.15699768066406, - "y": 39.018001556396484 + "x": 195.843994140625, + "y": 40.55699920654297 }, { - "x": 195.35299682617188, - "y": 42.861000061035156 + "x": 195.18299865722656, + "y": 43.62799835205078 }, { "x": 194.47300720214844, "y": 46.68899917602539 }, { - "x": 193.5189971923828, - "y": 50.49800109863281 + "x": 193.71600341796875, + "y": 49.73699951171875 }, { - "x": 192.49099731445312, - "y": 54.28799819946289 + "x": 192.91099548339844, + "y": 52.77399826049805 }, { - "x": 191.38800048828125, - "y": 58.055999755859375 + "x": 192.05799865722656, + "y": 55.79800033569336 + }, + { + "x": 191.1580047607422, + "y": 58.80799865722656 }, { "x": 190.21099853515625, "y": 61.803001403808594 }, { - "x": 188.96099853515625, - "y": 65.5260009765625 + "x": 189.2169952392578, + "y": 64.78299713134766 + }, + { + "x": 188.17599487304688, + "y": 67.74700164794922 }, { - "x": 187.63800048828125, - "y": 69.2229995727539 + "x": 187.08799743652344, + "y": 70.69400024414062 }, { - "x": 186.24200439453125, - "y": 72.89399719238281 + "x": 185.9550018310547, + "y": 73.6240005493164 }, { "x": 184.77499389648438, "y": 76.53600311279297 }, { - "x": 183.23699951171875, - "y": 80.14900207519531 + "x": 183.5500030517578, + "y": 79.42900085449219 }, { - "x": 181.6280059814453, - "y": 83.73100280761719 + "x": 182.27999877929688, + "y": 82.302001953125 }, { - "x": 179.94900512695312, - "y": 87.28099822998047 + "x": 180.96499633789062, + "y": 85.15499877929688 + }, + { + "x": 179.60499572753906, + "y": 87.98699951171875 }, { "x": 178.2010040283203, "y": 90.7979965209961 }, { - "x": 176.38400268554688, - "y": 94.27899932861328 + "x": 176.7530059814453, + "y": 93.58499908447266 }, { - "x": 174.49899291992188, - "y": 97.7239990234375 + "x": 175.26100158691406, + "y": 96.3499984741211 }, { - "x": 172.54600524902344, - "y": 101.13099670410156 + "x": 173.7259979248047, + "y": 99.09100341796875 + }, + { + "x": 172.1479949951172, + "y": 101.80799865722656 }, { "x": 170.5279998779297, "y": 104.4990005493164 }, { - "x": 168.4429931640625, - "y": 107.8270034790039 + "x": 168.86500549316406, + "y": 107.16500091552734 + }, + { + "x": 167.16099548339844, + "y": 109.80400085449219 }, { - "x": 166.29299926757812, - "y": 111.11399841308594 + "x": 165.41600036621094, + "y": 112.41600036621094 }, { - "x": 164.0800018310547, - "y": 114.35700225830078 + "x": 163.62899780273438, + "y": 115.0009994506836 }, { "x": 161.80299377441406, "y": 117.55699920654297 }, { - "x": 159.46400451660156, - "y": 120.71099853515625 + "x": 159.93600463867188, + "y": 120.08399963378906 }, { - "x": 157.06300354003906, - "y": 123.81800079345703 + "x": 158.031005859375, + "y": 122.58100128173828 }, { - "x": 154.6020050048828, - "y": 126.87799835205078 + "x": 156.08599853515625, + "y": 125.0479965209961 + }, + { + "x": 154.1020050048828, + "y": 127.48400115966797 }, { "x": 152.08099365234375, "y": 129.88900756835938 }, { - "x": 149.50100708007812, - "y": 132.85000610351562 + "x": 150.02200317382812, + "y": 132.26199340820312 + }, + { + "x": 147.92599487304688, + "y": 134.6020050048828 }, { - "x": 146.86399841308594, - "y": 135.75999450683594 + "x": 145.79299926757812, + "y": 136.90899658203125 }, { - "x": 144.1699981689453, - "y": 138.61700439453125 + "x": 143.625, + "y": 139.1820068359375 }, { "x": 141.42100524902344, "y": 141.42100524902344 }, { - "x": 138.61700439453125, - "y": 144.1699981689453 + "x": 139.1820068359375, + "y": 143.625 }, { - "x": 135.75999450683594, - "y": 146.86399841308594 + "x": 136.90899658203125, + "y": 145.79299926757812 }, { - "x": 132.85000610351562, - "y": 149.50100708007812 + "x": 134.6020050048828, + "y": 147.92599487304688 + }, + { + "x": 132.26199340820312, + "y": 150.02200317382812 }, { "x": 129.88900756835938, "y": 152.08099365234375 }, { - "x": 126.87799835205078, - "y": 154.6020050048828 + "x": 127.48400115966797, + "y": 154.1020050048828 + }, + { + "x": 125.0479965209961, + "y": 156.08599853515625 }, { - "x": 123.81800079345703, - "y": 157.06300354003906 + "x": 122.58100128173828, + "y": 158.031005859375 }, { - "x": 120.71099853515625, - "y": 159.46400451660156 + "x": 120.08399963378906, + "y": 159.93600463867188 }, { "x": 117.55699920654297, "y": 161.80299377441406 }, { - "x": 114.35700225830078, - "y": 164.0800018310547 + "x": 115.0009994506836, + "y": 163.62899780273438 + }, + { + "x": 112.41600036621094, + "y": 165.41600036621094 }, { - "x": 111.11399841308594, - "y": 166.29299926757812 + "x": 109.80400085449219, + "y": 167.16099548339844 }, { - "x": 107.8270034790039, - "y": 168.4429931640625 + "x": 107.16500091552734, + "y": 168.86500549316406 }, { "x": 104.4990005493164, "y": 170.5279998779297 }, { - "x": 101.13099670410156, - "y": 172.54600524902344 + "x": 101.80799865722656, + "y": 172.1479949951172 }, { - "x": 97.7239990234375, - "y": 174.49899291992188 + "x": 99.09100341796875, + "y": 173.7259979248047 }, { - "x": 94.27899932861328, - "y": 176.38400268554688 + "x": 96.3499984741211, + "y": 175.26100158691406 + }, + { + "x": 93.58499908447266, + "y": 176.7530059814453 }, { "x": 90.7979965209961, "y": 178.2010040283203 }, { - "x": 87.28099822998047, - "y": 179.94900512695312 + "x": 87.98699951171875, + "y": 179.60499572753906 + }, + { + "x": 85.15499877929688, + "y": 180.96499633789062 }, { - "x": 83.73100280761719, - "y": 181.6280059814453 + "x": 82.302001953125, + "y": 182.27999877929688 }, { - "x": 80.14900207519531, - "y": 183.23699951171875 + "x": 79.42900085449219, + "y": 183.5500030517578 }, { "x": 76.53600311279297, "y": 184.77499389648438 }, { - "x": 72.89399719238281, - "y": 186.24200439453125 + "x": 73.6240005493164, + "y": 185.9550018310547 }, { - "x": 69.2229995727539, - "y": 187.63800048828125 + "x": 70.69400024414062, + "y": 187.08799743652344 }, { - "x": 65.5260009765625, - "y": 188.96099853515625 + "x": 67.74700164794922, + "y": 188.17599487304688 + }, + { + "x": 64.78299713134766, + "y": 189.2169952392578 }, { "x": 61.803001403808594, "y": 190.21099853515625 }, { - "x": 58.055999755859375, - "y": 191.38800048828125 + "x": 58.80799865722656, + "y": 191.1580047607422 + }, + { + "x": 55.79800033569336, + "y": 192.05799865722656 }, { - "x": 54.28799819946289, - "y": 192.49099731445312 + "x": 52.77399826049805, + "y": 192.91099548339844 }, { - "x": 50.49800109863281, - "y": 193.5189971923828 + "x": 49.73699951171875, + "y": 193.71600341796875 }, { "x": 46.68899917602539, "y": 194.47300720214844 }, { - "x": 42.861000061035156, - "y": 195.35299682617188 + "x": 43.62799835205078, + "y": 195.18299865722656 + }, + { + "x": 40.55699920654297, + "y": 195.843994140625 }, { - "x": 39.018001556396484, - "y": 196.15699768066406 + "x": 37.47600173950195, + "y": 196.45700073242188 }, { - "x": 35.159000396728516, - "y": 196.88499450683594 + "x": 34.3849983215332, + "y": 197.02099609375 }, { "x": 31.285999298095703, "y": 197.53700256347656 }, { - "x": 27.402000427246094, - "y": 198.11300659179688 + "x": 28.18000030517578, + "y": 198.00399780273438 }, { "x": 26.5, - "y": 198.22900390625 + "y": 198.22999572753906 } ], "isCurve": true, @@ -1141,270 +1269,334 @@ "route": [ { "x": -26.499000549316406, - "y": 198.22900390625 + "y": 198.22999572753906 }, { - "x": -27.402000427246094, - "y": 198.11300659179688 + "x": -28.18000030517578, + "y": 198.00399780273438 }, { "x": -31.285999298095703, "y": 197.53700256347656 }, { - "x": -35.159000396728516, - "y": 196.88499450683594 + "x": -34.3849983215332, + "y": 197.02099609375 }, { - "x": -39.018001556396484, - "y": 196.15699768066406 + "x": -37.47600173950195, + "y": 196.45700073242188 }, { - "x": -42.861000061035156, - "y": 195.35299682617188 + "x": -40.55699920654297, + "y": 195.843994140625 + }, + { + "x": -43.62799835205078, + "y": 195.18299865722656 }, { "x": -46.68899917602539, "y": 194.47300720214844 }, { - "x": -50.49800109863281, - "y": 193.5189971923828 + "x": -49.73699951171875, + "y": 193.71600341796875 + }, + { + "x": -52.77399826049805, + "y": 192.91099548339844 }, { - "x": -54.28799819946289, - "y": 192.49099731445312 + "x": -55.79800033569336, + "y": 192.05799865722656 }, { - "x": -58.055999755859375, - "y": 191.38800048828125 + "x": -58.80799865722656, + "y": 191.1580047607422 }, { "x": -61.803001403808594, "y": 190.21099853515625 }, { - "x": -65.5260009765625, - "y": 188.96099853515625 + "x": -64.78299713134766, + "y": 189.2169952392578 }, { - "x": -69.2229995727539, - "y": 187.63800048828125 + "x": -67.74700164794922, + "y": 188.17599487304688 }, { - "x": -72.89399719238281, - "y": 186.24200439453125 + "x": -70.69400024414062, + "y": 187.08799743652344 + }, + { + "x": -73.6240005493164, + "y": 185.9550018310547 }, { "x": -76.53600311279297, "y": 184.77499389648438 }, { - "x": -80.14900207519531, - "y": 183.23699951171875 + "x": -79.42900085449219, + "y": 183.5500030517578 + }, + { + "x": -82.302001953125, + "y": 182.27999877929688 }, { - "x": -83.73100280761719, - "y": 181.6280059814453 + "x": -85.15499877929688, + "y": 180.96499633789062 }, { - "x": -87.28099822998047, - "y": 179.94900512695312 + "x": -87.98699951171875, + "y": 179.60499572753906 }, { "x": -90.7979965209961, "y": 178.2010040283203 }, { - "x": -94.27899932861328, - "y": 176.38400268554688 + "x": -93.58499908447266, + "y": 176.7530059814453 }, { - "x": -97.7239990234375, - "y": 174.49899291992188 + "x": -96.3499984741211, + "y": 175.26100158691406 }, { - "x": -101.13099670410156, - "y": 172.54600524902344 + "x": -99.09100341796875, + "y": 173.7259979248047 + }, + { + "x": -101.80799865722656, + "y": 172.1479949951172 }, { "x": -104.4990005493164, "y": 170.5279998779297 }, { - "x": -107.8270034790039, - "y": 168.4429931640625 + "x": -107.16500091552734, + "y": 168.86500549316406 }, { - "x": -111.11399841308594, - "y": 166.29299926757812 + "x": -109.80400085449219, + "y": 167.16099548339844 }, { - "x": -114.35700225830078, - "y": 164.0800018310547 + "x": -112.41600036621094, + "y": 165.41600036621094 + }, + { + "x": -115.0009994506836, + "y": 163.62899780273438 }, { "x": -117.55699920654297, "y": 161.80299377441406 }, { - "x": -120.71099853515625, - "y": 159.46400451660156 + "x": -120.08399963378906, + "y": 159.93600463867188 + }, + { + "x": -122.58100128173828, + "y": 158.031005859375 }, { - "x": -123.81800079345703, - "y": 157.06300354003906 + "x": -125.0479965209961, + "y": 156.08599853515625 }, { - "x": -126.87799835205078, - "y": 154.6020050048828 + "x": -127.48400115966797, + "y": 154.1020050048828 }, { "x": -129.88900756835938, "y": 152.08099365234375 }, { - "x": -132.85000610351562, - "y": 149.50100708007812 + "x": -132.26199340820312, + "y": 150.02200317382812 }, { - "x": -135.75999450683594, - "y": 146.86399841308594 + "x": -134.6020050048828, + "y": 147.92599487304688 }, { - "x": -138.61700439453125, - "y": 144.1699981689453 + "x": -136.90899658203125, + "y": 145.79299926757812 + }, + { + "x": -139.1820068359375, + "y": 143.625 }, { "x": -141.42100524902344, "y": 141.42100524902344 }, { - "x": -144.1699981689453, - "y": 138.61700439453125 + "x": -143.625, + "y": 139.1820068359375 }, { - "x": -146.86399841308594, - "y": 135.75999450683594 + "x": -145.79299926757812, + "y": 136.90899658203125 }, { - "x": -149.50100708007812, - "y": 132.85000610351562 + "x": -147.92599487304688, + "y": 134.6020050048828 + }, + { + "x": -150.02200317382812, + "y": 132.26199340820312 }, { "x": -152.08099365234375, "y": 129.88900756835938 }, { - "x": -154.6020050048828, - "y": 126.87799835205078 + "x": -154.1020050048828, + "y": 127.48400115966797 + }, + { + "x": -156.08599853515625, + "y": 125.0479965209961 }, { - "x": -157.06300354003906, - "y": 123.81800079345703 + "x": -158.031005859375, + "y": 122.58100128173828 }, { - "x": -159.46400451660156, - "y": 120.71099853515625 + "x": -159.93600463867188, + "y": 120.08399963378906 }, { "x": -161.80299377441406, "y": 117.55699920654297 }, { - "x": -164.0800018310547, - "y": 114.35700225830078 + "x": -163.62899780273438, + "y": 115.0009994506836 }, { - "x": -166.29299926757812, - "y": 111.11399841308594 + "x": -165.41600036621094, + "y": 112.41600036621094 }, { - "x": -168.4429931640625, - "y": 107.8270034790039 + "x": -167.16099548339844, + "y": 109.80400085449219 + }, + { + "x": -168.86500549316406, + "y": 107.16500091552734 }, { "x": -170.5279998779297, "y": 104.4990005493164 }, { - "x": -172.54600524902344, - "y": 101.13099670410156 + "x": -172.1479949951172, + "y": 101.80799865722656 + }, + { + "x": -173.7259979248047, + "y": 99.09100341796875 }, { - "x": -174.49899291992188, - "y": 97.7239990234375 + "x": -175.26100158691406, + "y": 96.3499984741211 }, { - "x": -176.38400268554688, - "y": 94.27899932861328 + "x": -176.7530059814453, + "y": 93.58499908447266 }, { "x": -178.2010040283203, "y": 90.7979965209961 }, { - "x": -179.94900512695312, - "y": 87.28099822998047 + "x": -179.60499572753906, + "y": 87.98699951171875 }, { - "x": -181.6280059814453, - "y": 83.73100280761719 + "x": -180.96499633789062, + "y": 85.15499877929688 }, { - "x": -183.23699951171875, - "y": 80.14900207519531 + "x": -182.27999877929688, + "y": 82.302001953125 + }, + { + "x": -183.5500030517578, + "y": 79.42900085449219 }, { "x": -184.77499389648438, "y": 76.53600311279297 }, { - "x": -186.24200439453125, - "y": 72.89399719238281 + "x": -185.9550018310547, + "y": 73.6240005493164 + }, + { + "x": -187.08799743652344, + "y": 70.69400024414062 }, { - "x": -187.63800048828125, - "y": 69.2229995727539 + "x": -188.17599487304688, + "y": 67.74700164794922 }, { - "x": -188.96099853515625, - "y": 65.5260009765625 + "x": -189.2169952392578, + "y": 64.78299713134766 }, { "x": -190.21099853515625, "y": 61.803001403808594 }, { - "x": -191.38800048828125, - "y": 58.055999755859375 + "x": -191.1580047607422, + "y": 58.80799865722656 + }, + { + "x": -192.05799865722656, + "y": 55.79800033569336 }, { - "x": -192.49099731445312, - "y": 54.28799819946289 + "x": -192.91099548339844, + "y": 52.77399826049805 }, { - "x": -193.5189971923828, - "y": 50.49800109863281 + "x": -193.71600341796875, + "y": 49.73699951171875 }, { "x": -194.47300720214844, "y": 46.68899917602539 }, { - "x": -195.35299682617188, - "y": 42.861000061035156 + "x": -195.18299865722656, + "y": 43.62799835205078 }, { - "x": -196.15699768066406, - "y": 39.018001556396484 + "x": -195.843994140625, + "y": 40.55699920654297 }, { - "x": -196.88499450683594, - "y": 35.159000396728516 + "x": -196.45700073242188, + "y": 37.47600173950195 }, { - "x": -197.24899291992188, + "x": -197.02099609375, + "y": 34.3849983215332 + }, + { + "x": -197.2519989013672, "y": 33 } ], @@ -1441,282 +1633,350 @@ "route": [ { "x": 539.5, - "y": -148.2310028076172 + "y": -148.2259979248047 + }, + { + "x": 542.2160034179688, + "y": -147.85400390625 }, { - "x": 544.2860107421875, - "y": -147.53700256347656 + "x": 546.35302734375, + "y": -147.19900512695312 }, { - "x": 549.447021484375, - "y": -146.64999389648438 + "x": 550.4760131835938, + "y": -146.45700073242188 }, { "x": 554.5819702148438, "y": -145.62899780273438 }, { - "x": 559.6890258789062, - "y": -144.47300720214844 + "x": 558.6699829101562, + "y": -144.71499633789062 }, { - "x": 564.7630004882812, - "y": -143.18499755859375 + "x": 562.7369995117188, + "y": -143.71600341796875 }, { - "x": 569.802978515625, - "y": -141.76300048828125 + "x": 566.7830200195312, + "y": -142.6320037841797 + }, + { + "x": 570.8060302734375, + "y": -141.46299743652344 }, { "x": 574.802978515625, "y": -140.21099853515625 }, { - "x": 579.760986328125, - "y": -138.5279998779297 + "x": 578.7730102539062, + "y": -138.875 }, { - "x": 584.6729736328125, - "y": -136.71600341796875 + "x": 582.7139892578125, + "y": -137.45599365234375 }, { - "x": 589.5360107421875, - "y": -134.77499389648438 + "x": 586.6240234375, + "y": -135.9550018310547 + }, + { + "x": 590.5029907226562, + "y": -134.3719940185547 }, { "x": 594.3469848632812, "y": -132.70899963378906 }, { - "x": 599.1019897460938, - "y": -130.51699829101562 + "x": 598.155029296875, + "y": -130.96499633789062 + }, + { + "x": 601.927001953125, + "y": -129.14199829101562 }, { - "x": 603.7979736328125, - "y": -128.2010040283203 + "x": 605.6589965820312, + "y": -127.23999786376953 }, { - "x": 608.4310302734375, - "y": -125.76300048828125 + "x": 609.3499755859375, + "y": -125.26100158691406 }, { "x": 613, "y": -123.20500183105469 }, { - "x": 617.4990234375, - "y": -120.52799987792969 + "x": 616.60498046875, + "y": -121.0719985961914 }, { - "x": 621.927001953125, - "y": -117.73400115966797 + "x": 620.1649780273438, + "y": -118.86499786376953 }, { - "x": 626.281005859375, - "y": -114.82499694824219 + "x": 623.677978515625, + "y": -116.58399963378906 + }, + { + "x": 627.1420288085938, + "y": -114.22899627685547 }, { "x": 630.5570068359375, "y": -111.8030014038086 }, { - "x": 634.7520141601562, - "y": -108.66999816894531 + "x": 633.9190063476562, + "y": -109.30500030517578 + }, + { + "x": 637.22900390625, + "y": -106.73799896240234 }, { - "x": 638.864013671875, - "y": -105.42900085449219 + "x": 640.4840087890625, + "y": -104.10199737548828 }, { - "x": 642.8889770507812, - "y": -102.08100128173828 + "x": 643.6840209960938, + "y": -101.39900207519531 }, { "x": 646.8259887695312, "y": -98.62799835205078 }, { - "x": 650.6699829101562, - "y": -95.0739974975586 + "x": 649.9089965820312, + "y": -95.79299926757812 + }, + { + "x": 652.9320068359375, + "y": -92.89399719238281 }, { - "x": 654.4210205078125, - "y": -91.4209976196289 + "x": 655.8939819335938, + "y": -89.93199920654297 }, { - "x": 658.073974609375, - "y": -87.66999816894531 + "x": 658.7930297851562, + "y": -86.90899658203125 }, { "x": 661.6279907226562, "y": -83.82599639892578 }, { - "x": 665.0809936523438, - "y": -79.88899993896484 + "x": 664.3989868164062, + "y": -80.68399810791016 }, { - "x": 668.4290161132812, - "y": -75.86399841308594 + "x": 667.1019897460938, + "y": -77.48400115966797 }, { - "x": 671.6699829101562, - "y": -71.75199890136719 + "x": 669.7379760742188, + "y": -74.22899627685547 + }, + { + "x": 672.3049926757812, + "y": -70.91899871826172 }, { "x": 674.802978515625, "y": -67.55699920654297 }, { - "x": 677.8250122070312, - "y": -63.28099822998047 + "x": 677.22900390625, + "y": -64.14199829101562 + }, + { + "x": 679.583984375, + "y": -60.678001403808594 }, { - "x": 680.7340087890625, - "y": -58.926998138427734 + "x": 681.864990234375, + "y": -57.165000915527344 }, { - "x": 683.5280151367188, - "y": -54.499000549316406 + "x": 684.072021484375, + "y": -53.60499954223633 }, { "x": 686.2050170898438, "y": -50 }, { - "x": 688.7630004882812, - "y": -45.430999755859375 + "x": 688.260986328125, + "y": -46.349998474121094 }, { - "x": 691.2009887695312, - "y": -40.79800033569336 + "x": 690.239990234375, + "y": -42.659000396728516 }, { - "x": 693.5170288085938, - "y": -36.10200119018555 + "x": 692.1420288085938, + "y": -38.926998138427734 + }, + { + "x": 693.9650268554688, + "y": -35.154998779296875 }, { "x": 695.708984375, "y": -31.347000122070312 }, { - "x": 697.7750244140625, - "y": -26.535999298095703 + "x": 697.3720092773438, + "y": -27.503000259399414 + }, + { + "x": 698.9550170898438, + "y": -23.624000549316406 }, { - "x": 699.7160034179688, - "y": -21.67300033569336 + "x": 700.4559936523438, + "y": -19.714000701904297 }, { - "x": 701.5280151367188, - "y": -16.76099967956543 + "x": 701.875, + "y": -15.77299976348877 }, { "x": 703.2109985351562, "y": -11.803000450134277 }, { - "x": 704.7630004882812, - "y": -6.802999973297119 + "x": 704.4630126953125, + "y": -7.806000232696533 }, { - "x": 706.1849975585938, - "y": -1.7630000114440918 + "x": 705.6320190429688, + "y": -3.7829999923706055 }, { - "x": 707.4730224609375, - "y": 3.309999942779541 + "x": 706.7160034179688, + "y": 0.2619999945163727 + }, + { + "x": 707.7150268554688, + "y": 4.328999996185303 }, { "x": 708.6290283203125, "y": 8.416999816894531 }, { - "x": 709.6500244140625, - "y": 13.552000045776367 + "x": 709.4569702148438, + "y": 12.52299976348877 }, { - "x": 710.5369873046875, - "y": 18.71299934387207 + "x": 710.198974609375, + "y": 16.645999908447266 }, { - "x": 711.2880249023438, - "y": 23.893999099731445 + "x": 710.85400390625, + "y": 20.783000946044922 + }, + { + "x": 711.4219970703125, + "y": 24.933000564575195 }, { "x": 711.9039916992188, "y": 29.0939998626709 }, { - "x": 712.3829956054688, - "y": 34.30799865722656 + "x": 712.2979736328125, + "y": 33.263999938964844 + }, + { + "x": 712.60498046875, + "y": 37.441001892089844 }, { - "x": 712.7249755859375, - "y": 39.53200149536133 + "x": 712.823974609375, + "y": 41.624000549316406 }, { - "x": 712.9310302734375, - "y": 44.763999938964844 + "x": 712.9559936523438, + "y": 45.81100082397461 }, { "x": 713, "y": 50 }, { - "x": 712.9310302734375, - "y": 55.23500061035156 + "x": 712.9559936523438, + "y": 54.1879997253418 }, { - "x": 712.7249755859375, - "y": 60.46699905395508 + "x": 712.823974609375, + "y": 58.375 }, { - "x": 712.3829956054688, - "y": 65.69100189208984 + "x": 712.60498046875, + "y": 62.55799865722656 + }, + { + "x": 712.2979736328125, + "y": 66.73500061035156 }, { "x": 711.9039916992188, "y": 70.90499877929688 }, { - "x": 711.2880249023438, - "y": 76.1050033569336 + "x": 711.4219970703125, + "y": 75.06600189208984 + }, + { + "x": 710.85400390625, + "y": 79.21600341796875 }, { - "x": 710.5369873046875, - "y": 81.28600311279297 + "x": 710.198974609375, + "y": 83.35299682617188 }, { - "x": 709.6500244140625, - "y": 86.4469985961914 + "x": 709.4569702148438, + "y": 87.47599792480469 }, { "x": 708.6290283203125, "y": 91.58200073242188 }, { - "x": 707.4730224609375, - "y": 96.68900299072266 + "x": 707.7150268554688, + "y": 95.66999816894531 }, { - "x": 706.1849975585938, - "y": 101.76300048828125 + "x": 706.7160034179688, + "y": 99.73699951171875 }, { - "x": 704.7630004882812, - "y": 106.8030014038086 + "x": 705.6320190429688, + "y": 103.78299713134766 + }, + { + "x": 704.4630126953125, + "y": 107.80599975585938 }, { "x": 703.2109985351562, "y": 111.8030014038086 }, { - "x": 701.5280151367188, - "y": 116.76100158691406 + "x": 701.875, + "y": 115.77300262451172 }, { - "x": 701.4400024414062, + "x": 701.4329833984375, "y": 116.9990005493164 } ], @@ -1752,7 +2012,7 @@ "link": "", "route": [ { - "x": 662.35302734375, + "x": 662.3569946289062, "y": 182.99899291992188 }, { @@ -1760,263 +2020,327 @@ "y": 183.8260040283203 }, { - "x": 658.073974609375, - "y": 187.6699981689453 + "x": 658.7930297851562, + "y": 186.90899658203125 + }, + { + "x": 655.8939819335938, + "y": 189.9320068359375 }, { - "x": 654.4210205078125, - "y": 191.42100524902344 + "x": 652.9320068359375, + "y": 192.8939971923828 }, { - "x": 650.6699829101562, - "y": 195.07400512695312 + "x": 649.9089965820312, + "y": 195.79299926757812 }, { "x": 646.8259887695312, "y": 198.6280059814453 }, { - "x": 642.8889770507812, - "y": 202.08099365234375 + "x": 643.6840209960938, + "y": 201.3990020751953 + }, + { + "x": 640.4840087890625, + "y": 204.1020050048828 }, { - "x": 638.864013671875, - "y": 205.4290008544922 + "x": 637.22900390625, + "y": 206.73800659179688 }, { - "x": 634.7520141601562, - "y": 208.6699981689453 + "x": 633.9190063476562, + "y": 209.30499267578125 }, { "x": 630.5570068359375, "y": 211.80299377441406 }, { - "x": 626.281005859375, - "y": 214.8249969482422 + "x": 627.1420288085938, + "y": 214.22900390625 }, { - "x": 621.927001953125, - "y": 217.73399353027344 + "x": 623.677978515625, + "y": 216.58399963378906 }, { - "x": 617.4990234375, - "y": 220.5279998779297 + "x": 620.1649780273438, + "y": 218.86500549316406 + }, + { + "x": 616.60498046875, + "y": 221.07200622558594 }, { "x": 613, "y": 223.2050018310547 }, { - "x": 608.4310302734375, - "y": 225.76300048828125 + "x": 609.3499755859375, + "y": 225.26100158691406 + }, + { + "x": 605.6589965820312, + "y": 227.24000549316406 }, { - "x": 603.7979736328125, - "y": 228.2010040283203 + "x": 601.927001953125, + "y": 229.14199829101562 }, { - "x": 599.1019897460938, - "y": 230.51699829101562 + "x": 598.155029296875, + "y": 230.96499633789062 }, { "x": 594.3469848632812, "y": 232.70899963378906 }, { - "x": 589.5360107421875, - "y": 234.77499389648438 + "x": 590.5029907226562, + "y": 234.3719940185547 }, { - "x": 584.6729736328125, - "y": 236.71600341796875 + "x": 586.6240234375, + "y": 235.9550018310547 }, { - "x": 579.760986328125, - "y": 238.5279998779297 + "x": 582.7139892578125, + "y": 237.45599365234375 + }, + { + "x": 578.7730102539062, + "y": 238.875 }, { "x": 574.802978515625, "y": 240.21099853515625 }, { - "x": 569.802978515625, - "y": 241.76300048828125 + "x": 570.8060302734375, + "y": 241.46299743652344 + }, + { + "x": 566.7830200195312, + "y": 242.6320037841797 }, { - "x": 564.7630004882812, - "y": 243.18499755859375 + "x": 562.7369995117188, + "y": 243.71600341796875 }, { - "x": 559.6890258789062, - "y": 244.47300720214844 + "x": 558.6699829101562, + "y": 244.71499633789062 }, { "x": 554.5819702148438, "y": 245.62899780273438 }, { - "x": 549.447021484375, - "y": 246.64999389648438 + "x": 550.4760131835938, + "y": 246.45700073242188 + }, + { + "x": 546.35302734375, + "y": 247.19900512695312 }, { - "x": 544.2860107421875, - "y": 247.53700256347656 + "x": 542.2160034179688, + "y": 247.85400390625 }, { - "x": 539.10498046875, - "y": 248.28799438476562 + "x": 538.0659790039062, + "y": 248.4219970703125 }, { "x": 533.905029296875, "y": 248.9040069580078 }, { - "x": 528.6909790039062, - "y": 249.38299560546875 + "x": 529.7349853515625, + "y": 249.29800415039062 }, { - "x": 523.4669799804688, - "y": 249.72500610351562 + "x": 525.5579833984375, + "y": 249.60499572753906 }, { - "x": 518.2349853515625, - "y": 249.93099975585938 + "x": 521.375, + "y": 249.82400512695312 + }, + { + "x": 517.18798828125, + "y": 249.95599365234375 }, { "x": 513, "y": 250 }, { - "x": 507.7640075683594, - "y": 249.93099975585938 + "x": 508.8110046386719, + "y": 249.95599365234375 + }, + { + "x": 504.6239929199219, + "y": 249.82400512695312 }, { - "x": 502.5320129394531, - "y": 249.72500610351562 + "x": 500.4410095214844, + "y": 249.60499572753906 }, { - "x": 497.3080139160156, - "y": 249.38299560546875 + "x": 496.2640075683594, + "y": 249.29800415039062 }, { "x": 492.093994140625, "y": 248.9040069580078 }, { - "x": 486.8940124511719, - "y": 248.28799438476562 + "x": 487.9330139160156, + "y": 248.4219970703125 }, { - "x": 481.7130126953125, - "y": 247.53700256347656 + "x": 483.7829895019531, + "y": 247.85400390625 }, { - "x": 476.552001953125, - "y": 246.64999389648438 + "x": 479.64599609375, + "y": 247.19900512695312 + }, + { + "x": 475.52301025390625, + "y": 246.45700073242188 }, { "x": 471.4169921875, "y": 245.62899780273438 }, { - "x": 466.30999755859375, - "y": 244.47300720214844 + "x": 467.3290100097656, + "y": 244.71499633789062 + }, + { + "x": 463.2619934082031, + "y": 243.71600341796875 }, { - "x": 461.2359924316406, - "y": 243.18499755859375 + "x": 459.21600341796875, + "y": 242.6320037841797 }, { - "x": 456.1960144042969, - "y": 241.76300048828125 + "x": 455.1929931640625, + "y": 241.46299743652344 }, { "x": 451.1960144042969, "y": 240.21099853515625 }, { - "x": 446.2380065917969, - "y": 238.5279998779297 + "x": 447.22601318359375, + "y": 238.875 }, { - "x": 441.32598876953125, - "y": 236.71600341796875 + "x": 443.2850036621094, + "y": 237.45599365234375 }, { - "x": 436.4630126953125, - "y": 234.77499389648438 + "x": 439.375, + "y": 235.9550018310547 + }, + { + "x": 435.4960021972656, + "y": 234.3719940185547 }, { "x": 431.6520080566406, "y": 232.70899963378906 }, { - "x": 426.8970031738281, - "y": 230.51699829101562 + "x": 427.843994140625, + "y": 230.96499633789062 }, { - "x": 422.20098876953125, - "y": 228.2010040283203 + "x": 424.0719909667969, + "y": 229.14199829101562 }, { - "x": 417.5679931640625, - "y": 225.76300048828125 + "x": 420.3399963378906, + "y": 227.24000549316406 + }, + { + "x": 416.64898681640625, + "y": 225.26100158691406 }, { "x": 413, "y": 223.2050018310547 }, { - "x": 408.5, - "y": 220.5279998779297 + "x": 409.3940124511719, + "y": 221.07200622558594 + }, + { + "x": 405.8340148925781, + "y": 218.86500549316406 }, { - "x": 404.0719909667969, - "y": 217.73399353027344 + "x": 402.3210144042969, + "y": 216.58399963378906 }, { - "x": 399.7179870605469, - "y": 214.8249969482422 + "x": 398.85699462890625, + "y": 214.22900390625 }, { "x": 395.4419860839844, "y": 211.80299377441406 }, { - "x": 391.24700927734375, - "y": 208.6699981689453 + "x": 392.0799865722656, + "y": 209.30499267578125 }, { - "x": 387.135009765625, - "y": 205.4290008544922 + "x": 388.7699890136719, + "y": 206.73800659179688 }, { - "x": 383.1099853515625, - "y": 202.08099365234375 + "x": 385.5150146484375, + "y": 204.1020050048828 + }, + { + "x": 382.31500244140625, + "y": 201.3990020751953 }, { "x": 379.1730041503906, "y": 198.6280059814453 }, { - "x": 375.3290100097656, - "y": 195.07400512695312 + "x": 376.0899963378906, + "y": 195.79299926757812 }, { - "x": 371.5780029296875, - "y": 191.42100524902344 + "x": 373.0669860839844, + "y": 192.8939971923828 }, { - "x": 367.92498779296875, - "y": 187.6699981689453 + "x": 370.1050109863281, + "y": 189.9320068359375 + }, + { + "x": 367.20599365234375, + "y": 186.90899658203125 }, { "x": 364.3710021972656, "y": 183.8260040283203 }, { - "x": 363.64599609375, + "x": 363.6419982910156, "y": 183 } ], @@ -2053,295 +2377,367 @@ "route": [ { "x": 998.5, - "y": -198.19900512695312 + "y": -198.21800231933594 }, { "x": 1003.2860107421875, "y": -197.53700256347656 }, { - "x": 1011.0180053710938, - "y": -196.15699768066406 + "x": 1009.4760131835938, + "y": -196.45700073242188 }, { - "x": 1018.6890258789062, - "y": -194.47300720214844 + "x": 1015.6279907226562, + "y": -195.18299865722656 + }, + { + "x": 1021.7369995117188, + "y": -193.71600341796875 }, { - "x": 1026.2879638671875, - "y": -192.49099731445312 + "x": 1027.7979736328125, + "y": -192.05799865722656 }, { "x": 1033.802978515625, "y": -190.21099853515625 }, { - "x": 1041.2230224609375, - "y": -187.63800048828125 + "x": 1039.7469482421875, + "y": -188.17599487304688 }, { - "x": 1048.5360107421875, - "y": -184.77499389648438 + "x": 1045.6240234375, + "y": -185.9550018310547 + }, + { + "x": 1051.428955078125, + "y": -183.5500030517578 }, { - "x": 1055.73095703125, - "y": -181.6280059814453 + "x": 1057.155029296875, + "y": -180.96499633789062 }, { "x": 1062.7979736328125, "y": -178.2010040283203 }, { - "x": 1069.7239990234375, - "y": -174.49899291992188 + "x": 1068.3499755859375, + "y": -175.26100158691406 }, { - "x": 1076.4990234375, - "y": -170.5279998779297 + "x": 1073.8079833984375, + "y": -172.1479949951172 + }, + { + "x": 1079.1650390625, + "y": -168.86500549316406 }, { - "x": 1083.114013671875, - "y": -166.29299926757812 + "x": 1084.416015625, + "y": -165.41600036621094 }, { "x": 1089.5570068359375, "y": -161.80299377441406 }, { - "x": 1095.8179931640625, - "y": -157.06300354003906 + "x": 1094.5810546875, + "y": -158.031005859375 }, { - "x": 1101.8890380859375, - "y": -152.08099365234375 + "x": 1099.4840087890625, + "y": -154.1020050048828 }, { - "x": 1107.760009765625, - "y": -146.86399841308594 + "x": 1104.261962890625, + "y": -150.02200317382812 + }, + { + "x": 1108.9090576171875, + "y": -145.79299926757812 }, { "x": 1113.4210205078125, "y": -141.42100524902344 }, { - "x": 1118.864013671875, - "y": -135.75999450683594 + "x": 1117.79296875, + "y": -136.90899658203125 }, { - "x": 1124.0810546875, - "y": -129.88900756835938 + "x": 1122.02197265625, + "y": -132.26199340820312 }, { - "x": 1129.06298828125, - "y": -123.81800079345703 + "x": 1126.10205078125, + "y": -127.48400115966797 + }, + { + "x": 1130.031005859375, + "y": -122.58100128173828 }, { "x": 1133.802978515625, "y": -117.55699920654297 }, { - "x": 1138.29296875, - "y": -111.11399841308594 + "x": 1137.416015625, + "y": -112.41600036621094 }, { - "x": 1142.5279541015625, - "y": -104.4990005493164 + "x": 1140.864990234375, + "y": -107.16500091552734 }, { - "x": 1146.4990234375, - "y": -97.7239990234375 + "x": 1144.14794921875, + "y": -101.80799865722656 + }, + { + "x": 1147.260986328125, + "y": -96.3499984741211 }, { "x": 1150.2010498046875, "y": -90.7979965209961 }, { - "x": 1153.6280517578125, - "y": -83.73100280761719 + "x": 1152.9649658203125, + "y": -85.15499877929688 }, { - "x": 1156.7750244140625, - "y": -76.53600311279297 + "x": 1155.550048828125, + "y": -79.42900085449219 }, { - "x": 1159.637939453125, - "y": -69.2229995727539 + "x": 1157.9549560546875, + "y": -73.6240005493164 + }, + { + "x": 1160.176025390625, + "y": -67.74700164794922 }, { "x": 1162.2110595703125, "y": -61.803001403808594 }, { - "x": 1164.490966796875, - "y": -54.28799819946289 + "x": 1164.0579833984375, + "y": -55.79800033569336 }, { - "x": 1166.4730224609375, - "y": -46.68899917602539 + "x": 1165.7159423828125, + "y": -49.73699951171875 + }, + { + "x": 1167.1829833984375, + "y": -43.62799835205078 }, { - "x": 1168.156982421875, - "y": -39.018001556396484 + "x": 1168.45703125, + "y": -37.47600173950195 }, { "x": 1169.5369873046875, "y": -31.285999298095703 }, { - "x": 1170.613037109375, - "y": -23.506999969482422 + "x": 1170.4219970703125, + "y": -25.06599998474121 + }, + { + "x": 1171.112060546875, + "y": -18.820999145507812 }, { - "x": 1171.383056640625, - "y": -15.690999984741211 + "x": 1171.60498046875, + "y": -12.557999610900879 }, { - "x": 1171.844970703125, - "y": -7.85099983215332 + "x": 1171.9010009765625, + "y": -6.2820000648498535 }, { "x": 1172, "y": 0 }, { - "x": 1171.844970703125, - "y": 7.85099983215332 + "x": 1171.9010009765625, + "y": 6.2820000648498535 }, { - "x": 1171.383056640625, - "y": 15.690999984741211 + "x": 1171.60498046875, + "y": 12.557999610900879 }, { - "x": 1170.613037109375, - "y": 23.506999969482422 + "x": 1171.112060546875, + "y": 18.820999145507812 + }, + { + "x": 1170.4219970703125, + "y": 25.06599998474121 }, { "x": 1169.5369873046875, "y": 31.285999298095703 }, { - "x": 1168.156982421875, - "y": 39.018001556396484 + "x": 1168.45703125, + "y": 37.47600173950195 }, { - "x": 1166.4730224609375, - "y": 46.68899917602539 + "x": 1167.1829833984375, + "y": 43.62799835205078 }, { - "x": 1164.490966796875, - "y": 54.28799819946289 + "x": 1165.7159423828125, + "y": 49.73699951171875 + }, + { + "x": 1164.0579833984375, + "y": 55.79800033569336 }, { "x": 1162.2110595703125, "y": 61.803001403808594 }, { - "x": 1159.637939453125, - "y": 69.2229995727539 + "x": 1160.176025390625, + "y": 67.74700164794922 }, { - "x": 1156.7750244140625, - "y": 76.53600311279297 + "x": 1157.9549560546875, + "y": 73.6240005493164 }, { - "x": 1153.6280517578125, - "y": 83.73100280761719 + "x": 1155.550048828125, + "y": 79.42900085449219 + }, + { + "x": 1152.9649658203125, + "y": 85.15499877929688 }, { "x": 1150.2010498046875, "y": 90.7979965209961 }, { - "x": 1146.4990234375, - "y": 97.7239990234375 + "x": 1147.260986328125, + "y": 96.3499984741211 }, { - "x": 1142.5279541015625, - "y": 104.4990005493164 + "x": 1144.14794921875, + "y": 101.80799865722656 + }, + { + "x": 1140.864990234375, + "y": 107.16500091552734 }, { - "x": 1138.29296875, - "y": 111.11399841308594 + "x": 1137.416015625, + "y": 112.41600036621094 }, { "x": 1133.802978515625, "y": 117.55699920654297 }, { - "x": 1129.06298828125, - "y": 123.81800079345703 + "x": 1130.031005859375, + "y": 122.58100128173828 }, { - "x": 1124.0810546875, - "y": 129.88900756835938 + "x": 1126.10205078125, + "y": 127.48400115966797 + }, + { + "x": 1122.02197265625, + "y": 132.26199340820312 }, { - "x": 1118.864013671875, - "y": 135.75999450683594 + "x": 1117.79296875, + "y": 136.90899658203125 }, { "x": 1113.4210205078125, "y": 141.42100524902344 }, { - "x": 1107.760009765625, - "y": 146.86399841308594 + "x": 1108.9090576171875, + "y": 145.79299926757812 }, { - "x": 1101.8890380859375, - "y": 152.08099365234375 + "x": 1104.261962890625, + "y": 150.02200317382812 + }, + { + "x": 1099.4840087890625, + "y": 154.1020050048828 }, { - "x": 1095.8179931640625, - "y": 157.06300354003906 + "x": 1094.5810546875, + "y": 158.031005859375 }, { "x": 1089.5570068359375, "y": 161.80299377441406 }, { - "x": 1083.114013671875, - "y": 166.29299926757812 + "x": 1084.416015625, + "y": 165.41600036621094 }, { - "x": 1076.4990234375, - "y": 170.5279998779297 + "x": 1079.1650390625, + "y": 168.86500549316406 + }, + { + "x": 1073.8079833984375, + "y": 172.1479949951172 }, { - "x": 1069.7239990234375, - "y": 174.49899291992188 + "x": 1068.3499755859375, + "y": 175.26100158691406 }, { "x": 1062.7979736328125, "y": 178.2010040283203 }, { - "x": 1055.73095703125, - "y": 181.6280059814453 + "x": 1057.155029296875, + "y": 180.96499633789062 }, { - "x": 1048.5360107421875, - "y": 184.77499389648438 + "x": 1051.428955078125, + "y": 183.5500030517578 + }, + { + "x": 1045.6240234375, + "y": 185.9550018310547 }, { - "x": 1041.2230224609375, - "y": 187.63800048828125 + "x": 1039.7469482421875, + "y": 188.17599487304688 }, { "x": 1033.802978515625, "y": 190.21099853515625 }, { - "x": 1026.2879638671875, - "y": 192.49099731445312 + "x": 1027.7979736328125, + "y": 192.05799865722656 }, { - "x": 1018.6890258789062, - "y": 194.47300720214844 + "x": 1021.7369995117188, + "y": 193.71600341796875 + }, + { + "x": 1015.6279907226562, + "y": 195.18299865722656 }, { - "x": 1011.0180053710938, - "y": 196.15699768066406 + "x": 1009.4760131835938, + "y": 196.45700073242188 }, { "x": 1003.2860107421875, @@ -2349,7 +2745,7 @@ }, { "x": 998.5, - "y": 198.19900512695312 + "y": 198.21800231933594 } ], "isCurve": true, diff --git a/e2etests/testdata/txtar/cycle-diagram/dagre/sketch.exp.svg b/e2etests/testdata/txtar/cycle-diagram/dagre/sketch.exp.svg index cbcfebd418..015478d741 100644 --- a/e2etests/testdata/txtar/cycle-diagram/dagre/sketch.exp.svg +++ b/e2etests/testdata/txtar/cycle-diagram/dagre/sketch.exp.svg @@ -1,9 +1,9 @@ -abcdabcab + .d2-153681122 .fill-N1{fill:#0A0F25;} + .d2-153681122 .fill-N2{fill:#676C7E;} + .d2-153681122 .fill-N3{fill:#9499AB;} + .d2-153681122 .fill-N4{fill:#CFD2DD;} + .d2-153681122 .fill-N5{fill:#DEE1EB;} + .d2-153681122 .fill-N6{fill:#EEF1F8;} + .d2-153681122 .fill-N7{fill:#FFFFFF;} + .d2-153681122 .fill-B1{fill:#0D32B2;} + .d2-153681122 .fill-B2{fill:#0D32B2;} + .d2-153681122 .fill-B3{fill:#E3E9FD;} + .d2-153681122 .fill-B4{fill:#E3E9FD;} + .d2-153681122 .fill-B5{fill:#EDF0FD;} + .d2-153681122 .fill-B6{fill:#F7F8FE;} + .d2-153681122 .fill-AA2{fill:#4A6FF3;} + .d2-153681122 .fill-AA4{fill:#EDF0FD;} + .d2-153681122 .fill-AA5{fill:#F7F8FE;} + .d2-153681122 .fill-AB4{fill:#EDF0FD;} + .d2-153681122 .fill-AB5{fill:#F7F8FE;} + .d2-153681122 .stroke-N1{stroke:#0A0F25;} + .d2-153681122 .stroke-N2{stroke:#676C7E;} + .d2-153681122 .stroke-N3{stroke:#9499AB;} + .d2-153681122 .stroke-N4{stroke:#CFD2DD;} + .d2-153681122 .stroke-N5{stroke:#DEE1EB;} + .d2-153681122 .stroke-N6{stroke:#EEF1F8;} + .d2-153681122 .stroke-N7{stroke:#FFFFFF;} + .d2-153681122 .stroke-B1{stroke:#0D32B2;} + .d2-153681122 .stroke-B2{stroke:#0D32B2;} + .d2-153681122 .stroke-B3{stroke:#E3E9FD;} + .d2-153681122 .stroke-B4{stroke:#E3E9FD;} + .d2-153681122 .stroke-B5{stroke:#EDF0FD;} + .d2-153681122 .stroke-B6{stroke:#F7F8FE;} + .d2-153681122 .stroke-AA2{stroke:#4A6FF3;} + .d2-153681122 .stroke-AA4{stroke:#EDF0FD;} + .d2-153681122 .stroke-AA5{stroke:#F7F8FE;} + .d2-153681122 .stroke-AB4{stroke:#EDF0FD;} + .d2-153681122 .stroke-AB5{stroke:#F7F8FE;} + .d2-153681122 .background-color-N1{background-color:#0A0F25;} + .d2-153681122 .background-color-N2{background-color:#676C7E;} + .d2-153681122 .background-color-N3{background-color:#9499AB;} + .d2-153681122 .background-color-N4{background-color:#CFD2DD;} + .d2-153681122 .background-color-N5{background-color:#DEE1EB;} + .d2-153681122 .background-color-N6{background-color:#EEF1F8;} + .d2-153681122 .background-color-N7{background-color:#FFFFFF;} + .d2-153681122 .background-color-B1{background-color:#0D32B2;} + .d2-153681122 .background-color-B2{background-color:#0D32B2;} + .d2-153681122 .background-color-B3{background-color:#E3E9FD;} + .d2-153681122 .background-color-B4{background-color:#E3E9FD;} + .d2-153681122 .background-color-B5{background-color:#EDF0FD;} + .d2-153681122 .background-color-B6{background-color:#F7F8FE;} + .d2-153681122 .background-color-AA2{background-color:#4A6FF3;} + .d2-153681122 .background-color-AA4{background-color:#EDF0FD;} + .d2-153681122 .background-color-AA5{background-color:#F7F8FE;} + .d2-153681122 .background-color-AB4{background-color:#EDF0FD;} + .d2-153681122 .background-color-AB5{background-color:#F7F8FE;} + .d2-153681122 .color-N1{color:#0A0F25;} + .d2-153681122 .color-N2{color:#676C7E;} + .d2-153681122 .color-N3{color:#9499AB;} + .d2-153681122 .color-N4{color:#CFD2DD;} + .d2-153681122 .color-N5{color:#DEE1EB;} + .d2-153681122 .color-N6{color:#EEF1F8;} + .d2-153681122 .color-N7{color:#FFFFFF;} + .d2-153681122 .color-B1{color:#0D32B2;} + .d2-153681122 .color-B2{color:#0D32B2;} + .d2-153681122 .color-B3{color:#E3E9FD;} + .d2-153681122 .color-B4{color:#E3E9FD;} + .d2-153681122 .color-B5{color:#EDF0FD;} + .d2-153681122 .color-B6{color:#F7F8FE;} + .d2-153681122 .color-AA2{color:#4A6FF3;} + .d2-153681122 .color-AA4{color:#EDF0FD;} + .d2-153681122 .color-AA5{color:#F7F8FE;} + .d2-153681122 .color-AB4{color:#EDF0FD;} + .d2-153681122 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker-d2-153681122);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker-d2-153681122);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright-d2-153681122);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright-d2-153681122);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright-d2-153681122);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright-d2-153681122);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark-d2-153681122);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright-d2-153681122);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright-d2-153681122);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright-d2-153681122);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright-d2-153681122);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker-d2-153681122);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark-d2-153681122);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal-d2-153681122);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal-d2-153681122);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright-d2-153681122);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright-d2-153681122);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright-d2-153681122);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>abcdabcab diff --git a/e2etests/testdata/txtar/cycle-diagram/elk/board.exp.json b/e2etests/testdata/txtar/cycle-diagram/elk/board.exp.json index 8f19b558ca..6eb058a841 100644 --- a/e2etests/testdata/txtar/cycle-diagram/elk/board.exp.json +++ b/e2etests/testdata/txtar/cycle-diagram/elk/board.exp.json @@ -541,270 +541,334 @@ "route": [ { "x": 38.5, - "y": -186.22900390625 + "y": -186.22999572753906 }, { - "x": 39.402000427246094, - "y": -186.11300659179688 + "x": 40.18000030517578, + "y": -186.00399780273438 }, { "x": 43.2859992980957, "y": -185.53700256347656 }, { - "x": 47.159000396728516, - "y": -184.88499450683594 + "x": 46.3849983215332, + "y": -185.02099609375 }, { - "x": 51.018001556396484, - "y": -184.15699768066406 + "x": 49.47600173950195, + "y": -184.45700073242188 }, { - "x": 54.861000061035156, - "y": -183.35299682617188 + "x": 52.55699920654297, + "y": -183.843994140625 + }, + { + "x": 55.62799835205078, + "y": -183.18299865722656 }, { "x": 58.68899917602539, "y": -182.47300720214844 }, { - "x": 62.49800109863281, - "y": -181.5189971923828 + "x": 61.73699951171875, + "y": -181.71600341796875 + }, + { + "x": 64.77400207519531, + "y": -180.91099548339844 }, { - "x": 66.28800201416016, - "y": -180.49099731445312 + "x": 67.7979965209961, + "y": -180.05799865722656 }, { - "x": 70.05599975585938, - "y": -179.38800048828125 + "x": 70.80799865722656, + "y": -179.1580047607422 }, { "x": 73.8030014038086, "y": -178.21099853515625 }, { - "x": 77.5260009765625, - "y": -176.96099853515625 + "x": 76.78299713134766, + "y": -177.2169952392578 }, { - "x": 81.2229995727539, - "y": -175.63800048828125 + "x": 79.74700164794922, + "y": -176.17599487304688 }, { - "x": 84.89399719238281, - "y": -174.24200439453125 + "x": 82.69400024414062, + "y": -175.08799743652344 + }, + { + "x": 85.6240005493164, + "y": -173.9550018310547 }, { "x": 88.53600311279297, "y": -172.77499389648438 }, { - "x": 92.14900207519531, - "y": -171.23699951171875 + "x": 91.42900085449219, + "y": -171.5500030517578 + }, + { + "x": 94.302001953125, + "y": -170.27999877929688 }, { - "x": 95.73100280761719, - "y": -169.6280059814453 + "x": 97.15499877929688, + "y": -168.96499633789062 }, { - "x": 99.28099822998047, - "y": -167.94900512695312 + "x": 99.98699951171875, + "y": -167.60499572753906 }, { "x": 102.7979965209961, "y": -166.2010040283203 }, { - "x": 106.27899932861328, - "y": -164.38400268554688 + "x": 105.58499908447266, + "y": -164.7530059814453 + }, + { + "x": 108.3499984741211, + "y": -163.26100158691406 }, { - "x": 109.7239990234375, - "y": -162.49899291992188 + "x": 111.09100341796875, + "y": -161.7259979248047 }, { - "x": 113.13099670410156, - "y": -160.54600524902344 + "x": 113.80799865722656, + "y": -160.1479949951172 }, { "x": 116.4990005493164, "y": -158.5279998779297 }, { - "x": 119.8270034790039, - "y": -156.4429931640625 + "x": 119.16500091552734, + "y": -156.86500549316406 }, { - "x": 123.11399841308594, - "y": -154.29299926757812 + "x": 121.80400085449219, + "y": -155.16099548339844 }, { - "x": 126.35700225830078, - "y": -152.0800018310547 + "x": 124.41600036621094, + "y": -153.41600036621094 + }, + { + "x": 127.0009994506836, + "y": -151.62899780273438 }, { "x": 129.5570068359375, "y": -149.80299377441406 }, { - "x": 132.71099853515625, - "y": -147.46400451660156 + "x": 132.08399963378906, + "y": -147.93600463867188 + }, + { + "x": 134.58099365234375, + "y": -146.031005859375 }, { - "x": 135.8179931640625, - "y": -145.06300354003906 + "x": 137.04800415039062, + "y": -144.08599853515625 }, { - "x": 138.8780059814453, - "y": -142.6020050048828 + "x": 139.48399353027344, + "y": -142.1020050048828 }, { "x": 141.88900756835938, "y": -140.08099365234375 }, { - "x": 144.85000610351562, - "y": -137.50100708007812 + "x": 144.26199340820312, + "y": -138.02200317382812 }, { - "x": 147.75999450683594, - "y": -134.86399841308594 + "x": 146.6020050048828, + "y": -135.92599487304688 }, { - "x": 150.61700439453125, - "y": -132.1699981689453 + "x": 148.90899658203125, + "y": -133.79299926757812 + }, + { + "x": 151.1820068359375, + "y": -131.625 }, { "x": 153.42100524902344, "y": -129.42100524902344 }, { - "x": 156.1699981689453, - "y": -126.61699676513672 + "x": 155.625, + "y": -127.18199920654297 + }, + { + "x": 157.79299926757812, + "y": -124.90899658203125 }, { - "x": 158.86399841308594, - "y": -123.76000213623047 + "x": 159.92599487304688, + "y": -122.60199737548828 }, { - "x": 161.50100708007812, - "y": -120.8499984741211 + "x": 162.02200317382812, + "y": -120.26200103759766 }, { "x": 164.08099365234375, "y": -117.88899993896484 }, { - "x": 166.6020050048828, - "y": -114.87799835205078 + "x": 166.1020050048828, + "y": -115.48400115966797 }, { - "x": 169.06300354003906, - "y": -111.81800079345703 + "x": 168.08599853515625, + "y": -113.0479965209961 }, { - "x": 171.46400451660156, - "y": -108.71099853515625 + "x": 170.031005859375, + "y": -110.58100128173828 + }, + { + "x": 171.93600463867188, + "y": -108.08399963378906 }, { "x": 173.80299377441406, "y": -105.55699920654297 }, { - "x": 176.0800018310547, - "y": -102.35700225830078 + "x": 175.62899780273438, + "y": -103.0009994506836 }, { - "x": 178.29299926757812, - "y": -99.11399841308594 + "x": 177.41600036621094, + "y": -100.41600036621094 }, { - "x": 180.4429931640625, - "y": -95.8270034790039 + "x": 179.16099548339844, + "y": -97.80400085449219 + }, + { + "x": 180.86500549316406, + "y": -95.16500091552734 }, { "x": 182.5279998779297, "y": -92.4990005493164 }, { - "x": 184.54600524902344, - "y": -89.13099670410156 + "x": 184.1479949951172, + "y": -89.80799865722656 + }, + { + "x": 185.7259979248047, + "y": -87.09100341796875 }, { - "x": 186.49899291992188, - "y": -85.7239990234375 + "x": 187.26100158691406, + "y": -84.3499984741211 }, { - "x": 188.38400268554688, - "y": -82.27899932861328 + "x": 188.7530059814453, + "y": -81.58499908447266 }, { "x": 190.2010040283203, "y": -78.7979965209961 }, { - "x": 191.94900512695312, - "y": -75.28099822998047 + "x": 191.60499572753906, + "y": -75.98699951171875 }, { - "x": 193.6280059814453, - "y": -71.73100280761719 + "x": 192.96499633789062, + "y": -73.15499877929688 }, { - "x": 195.23699951171875, - "y": -68.14900207519531 + "x": 194.27999877929688, + "y": -70.302001953125 + }, + { + "x": 195.5500030517578, + "y": -67.42900085449219 }, { "x": 196.77499389648438, "y": -64.53600311279297 }, { - "x": 198.24200439453125, - "y": -60.89400100708008 + "x": 197.9550018310547, + "y": -61.624000549316406 + }, + { + "x": 199.08799743652344, + "y": -58.694000244140625 }, { - "x": 199.63800048828125, - "y": -57.222999572753906 + "x": 200.17599487304688, + "y": -55.74700164794922 }, { - "x": 200.96099853515625, - "y": -53.5260009765625 + "x": 201.2169952392578, + "y": -52.78300094604492 }, { "x": 202.21099853515625, "y": -49.803001403808594 }, { - "x": 203.38800048828125, - "y": -46.055999755859375 + "x": 203.1580047607422, + "y": -46.80799865722656 + }, + { + "x": 204.05799865722656, + "y": -43.79800033569336 }, { - "x": 204.49099731445312, - "y": -42.28799819946289 + "x": 204.91099548339844, + "y": -40.77399826049805 }, { - "x": 205.5189971923828, - "y": -38.49800109863281 + "x": 205.71600341796875, + "y": -37.73699951171875 }, { "x": 206.47300720214844, "y": -34.68899917602539 }, { - "x": 207.35299682617188, - "y": -30.861000061035156 + "x": 207.18299865722656, + "y": -31.628000259399414 }, { - "x": 208.15699768066406, - "y": -27.01799964904785 + "x": 207.843994140625, + "y": -28.55699920654297 }, { - "x": 208.88499450683594, - "y": -23.159000396728516 + "x": 208.45700073242188, + "y": -25.47599983215332 }, { - "x": 209.24899291992188, + "x": 209.02099609375, + "y": -22.385000228881836 + }, + { + "x": 209.2519989013672, "y": -21 } ], @@ -840,272 +904,336 @@ "link": "", "route": [ { - "x": 209.24899291992188, + "x": 209.2519989013672, "y": 45 }, { - "x": 208.88499450683594, - "y": 47.159000396728516 + "x": 209.02099609375, + "y": 46.3849983215332 + }, + { + "x": 208.45700073242188, + "y": 49.47600173950195 }, { - "x": 208.15699768066406, - "y": 51.018001556396484 + "x": 207.843994140625, + "y": 52.55699920654297 }, { - "x": 207.35299682617188, - "y": 54.861000061035156 + "x": 207.18299865722656, + "y": 55.62799835205078 }, { "x": 206.47300720214844, "y": 58.68899917602539 }, { - "x": 205.5189971923828, - "y": 62.49800109863281 + "x": 205.71600341796875, + "y": 61.73699951171875 }, { - "x": 204.49099731445312, - "y": 66.28800201416016 + "x": 204.91099548339844, + "y": 64.77400207519531 }, { - "x": 203.38800048828125, - "y": 70.05599975585938 + "x": 204.05799865722656, + "y": 67.7979965209961 + }, + { + "x": 203.1580047607422, + "y": 70.80799865722656 }, { "x": 202.21099853515625, "y": 73.8030014038086 }, { - "x": 200.96099853515625, - "y": 77.5260009765625 + "x": 201.2169952392578, + "y": 76.78299713134766 + }, + { + "x": 200.17599487304688, + "y": 79.74700164794922 }, { - "x": 199.63800048828125, - "y": 81.2229995727539 + "x": 199.08799743652344, + "y": 82.69400024414062 }, { - "x": 198.24200439453125, - "y": 84.89399719238281 + "x": 197.9550018310547, + "y": 85.6240005493164 }, { "x": 196.77499389648438, "y": 88.53600311279297 }, { - "x": 195.23699951171875, - "y": 92.14900207519531 + "x": 195.5500030517578, + "y": 91.42900085449219 }, { - "x": 193.6280059814453, - "y": 95.73100280761719 + "x": 194.27999877929688, + "y": 94.302001953125 }, { - "x": 191.94900512695312, - "y": 99.28099822998047 + "x": 192.96499633789062, + "y": 97.15499877929688 + }, + { + "x": 191.60499572753906, + "y": 99.98699951171875 }, { "x": 190.2010040283203, "y": 102.7979965209961 }, { - "x": 188.38400268554688, - "y": 106.27899932861328 + "x": 188.7530059814453, + "y": 105.58499908447266 }, { - "x": 186.49899291992188, - "y": 109.7239990234375 + "x": 187.26100158691406, + "y": 108.3499984741211 }, { - "x": 184.54600524902344, - "y": 113.13099670410156 + "x": 185.7259979248047, + "y": 111.09100341796875 + }, + { + "x": 184.1479949951172, + "y": 113.80799865722656 }, { "x": 182.5279998779297, "y": 116.4990005493164 }, { - "x": 180.4429931640625, - "y": 119.8270034790039 + "x": 180.86500549316406, + "y": 119.16500091552734 + }, + { + "x": 179.16099548339844, + "y": 121.80400085449219 }, { - "x": 178.29299926757812, - "y": 123.11399841308594 + "x": 177.41600036621094, + "y": 124.41600036621094 }, { - "x": 176.0800018310547, - "y": 126.35700225830078 + "x": 175.62899780273438, + "y": 127.0009994506836 }, { "x": 173.80299377441406, "y": 129.5570068359375 }, { - "x": 171.46400451660156, - "y": 132.71099853515625 + "x": 171.93600463867188, + "y": 132.08399963378906 }, { - "x": 169.06300354003906, - "y": 135.8179931640625 + "x": 170.031005859375, + "y": 134.58099365234375 }, { - "x": 166.6020050048828, - "y": 138.8780059814453 + "x": 168.08599853515625, + "y": 137.04800415039062 + }, + { + "x": 166.1020050048828, + "y": 139.48399353027344 }, { "x": 164.08099365234375, "y": 141.88900756835938 }, { - "x": 161.50100708007812, - "y": 144.85000610351562 + "x": 162.02200317382812, + "y": 144.26199340820312 + }, + { + "x": 159.92599487304688, + "y": 146.6020050048828 }, { - "x": 158.86399841308594, - "y": 147.75999450683594 + "x": 157.79299926757812, + "y": 148.90899658203125 }, { - "x": 156.1699981689453, - "y": 150.61700439453125 + "x": 155.625, + "y": 151.1820068359375 }, { "x": 153.42100524902344, "y": 153.42100524902344 }, { - "x": 150.61700439453125, - "y": 156.1699981689453 + "x": 151.1820068359375, + "y": 155.625 }, { - "x": 147.75999450683594, - "y": 158.86399841308594 + "x": 148.90899658203125, + "y": 157.79299926757812 }, { - "x": 144.85000610351562, - "y": 161.50100708007812 + "x": 146.6020050048828, + "y": 159.92599487304688 + }, + { + "x": 144.26199340820312, + "y": 162.02200317382812 }, { "x": 141.88900756835938, "y": 164.08099365234375 }, { - "x": 138.8780059814453, - "y": 166.6020050048828 + "x": 139.48399353027344, + "y": 166.1020050048828 + }, + { + "x": 137.04800415039062, + "y": 168.08599853515625 }, { - "x": 135.8179931640625, - "y": 169.06300354003906 + "x": 134.58099365234375, + "y": 170.031005859375 }, { - "x": 132.71099853515625, - "y": 171.46400451660156 + "x": 132.08399963378906, + "y": 171.93600463867188 }, { "x": 129.5570068359375, "y": 173.80299377441406 }, { - "x": 126.35700225830078, - "y": 176.0800018310547 + "x": 127.0009994506836, + "y": 175.62899780273438 + }, + { + "x": 124.41600036621094, + "y": 177.41600036621094 }, { - "x": 123.11399841308594, - "y": 178.29299926757812 + "x": 121.80400085449219, + "y": 179.16099548339844 }, { - "x": 119.8270034790039, - "y": 180.4429931640625 + "x": 119.16500091552734, + "y": 180.86500549316406 }, { "x": 116.4990005493164, "y": 182.5279998779297 }, { - "x": 113.13099670410156, - "y": 184.54600524902344 + "x": 113.80799865722656, + "y": 184.1479949951172 }, { - "x": 109.7239990234375, - "y": 186.49899291992188 + "x": 111.09100341796875, + "y": 185.7259979248047 }, { - "x": 106.27899932861328, - "y": 188.38400268554688 + "x": 108.3499984741211, + "y": 187.26100158691406 + }, + { + "x": 105.58499908447266, + "y": 188.7530059814453 }, { "x": 102.7979965209961, "y": 190.2010040283203 }, { - "x": 99.28099822998047, - "y": 191.94900512695312 + "x": 99.98699951171875, + "y": 191.60499572753906 + }, + { + "x": 97.15499877929688, + "y": 192.96499633789062 }, { - "x": 95.73100280761719, - "y": 193.6280059814453 + "x": 94.302001953125, + "y": 194.27999877929688 }, { - "x": 92.14900207519531, - "y": 195.23699951171875 + "x": 91.42900085449219, + "y": 195.5500030517578 }, { "x": 88.53600311279297, "y": 196.77499389648438 }, { - "x": 84.89399719238281, - "y": 198.24200439453125 + "x": 85.6240005493164, + "y": 197.9550018310547 }, { - "x": 81.2229995727539, - "y": 199.63800048828125 + "x": 82.69400024414062, + "y": 199.08799743652344 }, { - "x": 77.5260009765625, - "y": 200.96099853515625 + "x": 79.74700164794922, + "y": 200.17599487304688 + }, + { + "x": 76.78299713134766, + "y": 201.2169952392578 }, { "x": 73.8030014038086, "y": 202.21099853515625 }, { - "x": 70.05599975585938, - "y": 203.38800048828125 + "x": 70.80799865722656, + "y": 203.1580047607422 + }, + { + "x": 67.7979965209961, + "y": 204.05799865722656 }, { - "x": 66.28800201416016, - "y": 204.49099731445312 + "x": 64.77400207519531, + "y": 204.91099548339844 }, { - "x": 62.49800109863281, - "y": 205.5189971923828 + "x": 61.73699951171875, + "y": 205.71600341796875 }, { "x": 58.68899917602539, "y": 206.47300720214844 }, { - "x": 54.861000061035156, - "y": 207.35299682617188 + "x": 55.62799835205078, + "y": 207.18299865722656 + }, + { + "x": 52.55699920654297, + "y": 207.843994140625 }, { - "x": 51.018001556396484, - "y": 208.15699768066406 + "x": 49.47600173950195, + "y": 208.45700073242188 }, { - "x": 47.159000396728516, - "y": 208.88499450683594 + "x": 46.3849983215332, + "y": 209.02099609375 }, { "x": 43.2859992980957, "y": 209.53700256347656 }, { - "x": 39.402000427246094, - "y": 210.11300659179688 + "x": 40.18000030517578, + "y": 210.00399780273438 }, { "x": 38.5, - "y": 210.22900390625 + "y": 210.22999572753906 } ], "isCurve": true, @@ -1141,270 +1269,334 @@ "route": [ { "x": -14.49899959564209, - "y": 210.22900390625 + "y": 210.22999572753906 }, { - "x": -15.402000427246094, - "y": 210.11300659179688 + "x": -16.18000030517578, + "y": 210.00399780273438 }, { "x": -19.285999298095703, "y": 209.53700256347656 }, { - "x": -23.159000396728516, - "y": 208.88499450683594 + "x": -22.385000228881836, + "y": 209.02099609375 }, { - "x": -27.01799964904785, - "y": 208.15699768066406 + "x": -25.47599983215332, + "y": 208.45700073242188 }, { - "x": -30.861000061035156, - "y": 207.35299682617188 + "x": -28.55699920654297, + "y": 207.843994140625 + }, + { + "x": -31.628000259399414, + "y": 207.18299865722656 }, { "x": -34.68899917602539, "y": 206.47300720214844 }, { - "x": -38.49800109863281, - "y": 205.5189971923828 + "x": -37.73699951171875, + "y": 205.71600341796875 + }, + { + "x": -40.77399826049805, + "y": 204.91099548339844 }, { - "x": -42.28799819946289, - "y": 204.49099731445312 + "x": -43.79800033569336, + "y": 204.05799865722656 }, { - "x": -46.055999755859375, - "y": 203.38800048828125 + "x": -46.80799865722656, + "y": 203.1580047607422 }, { "x": -49.803001403808594, "y": 202.21099853515625 }, { - "x": -53.5260009765625, - "y": 200.96099853515625 + "x": -52.78300094604492, + "y": 201.2169952392578 }, { - "x": -57.222999572753906, - "y": 199.63800048828125 + "x": -55.74700164794922, + "y": 200.17599487304688 }, { - "x": -60.89400100708008, - "y": 198.24200439453125 + "x": -58.694000244140625, + "y": 199.08799743652344 + }, + { + "x": -61.624000549316406, + "y": 197.9550018310547 }, { "x": -64.53600311279297, "y": 196.77499389648438 }, { - "x": -68.14900207519531, - "y": 195.23699951171875 + "x": -67.42900085449219, + "y": 195.5500030517578 + }, + { + "x": -70.302001953125, + "y": 194.27999877929688 }, { - "x": -71.73100280761719, - "y": 193.6280059814453 + "x": -73.15499877929688, + "y": 192.96499633789062 }, { - "x": -75.28099822998047, - "y": 191.94900512695312 + "x": -75.98699951171875, + "y": 191.60499572753906 }, { "x": -78.7979965209961, "y": 190.2010040283203 }, { - "x": -82.27899932861328, - "y": 188.38400268554688 + "x": -81.58499908447266, + "y": 188.7530059814453 }, { - "x": -85.7239990234375, - "y": 186.49899291992188 + "x": -84.3499984741211, + "y": 187.26100158691406 }, { - "x": -89.13099670410156, - "y": 184.54600524902344 + "x": -87.09100341796875, + "y": 185.7259979248047 + }, + { + "x": -89.80799865722656, + "y": 184.1479949951172 }, { "x": -92.4990005493164, "y": 182.5279998779297 }, { - "x": -95.8270034790039, - "y": 180.4429931640625 + "x": -95.16500091552734, + "y": 180.86500549316406 }, { - "x": -99.11399841308594, - "y": 178.29299926757812 + "x": -97.80400085449219, + "y": 179.16099548339844 }, { - "x": -102.35700225830078, - "y": 176.0800018310547 + "x": -100.41600036621094, + "y": 177.41600036621094 + }, + { + "x": -103.0009994506836, + "y": 175.62899780273438 }, { "x": -105.55699920654297, "y": 173.80299377441406 }, { - "x": -108.71099853515625, - "y": 171.46400451660156 + "x": -108.08399963378906, + "y": 171.93600463867188 + }, + { + "x": -110.58100128173828, + "y": 170.031005859375 }, { - "x": -111.81800079345703, - "y": 169.06300354003906 + "x": -113.0479965209961, + "y": 168.08599853515625 }, { - "x": -114.87799835205078, - "y": 166.6020050048828 + "x": -115.48400115966797, + "y": 166.1020050048828 }, { "x": -117.88899993896484, "y": 164.08099365234375 }, { - "x": -120.8499984741211, - "y": 161.50100708007812 + "x": -120.26200103759766, + "y": 162.02200317382812 }, { - "x": -123.76000213623047, - "y": 158.86399841308594 + "x": -122.60199737548828, + "y": 159.92599487304688 }, { - "x": -126.61699676513672, - "y": 156.1699981689453 + "x": -124.90899658203125, + "y": 157.79299926757812 + }, + { + "x": -127.18199920654297, + "y": 155.625 }, { "x": -129.42100524902344, "y": 153.42100524902344 }, { - "x": -132.1699981689453, - "y": 150.61700439453125 + "x": -131.625, + "y": 151.1820068359375 }, { - "x": -134.86399841308594, - "y": 147.75999450683594 + "x": -133.79299926757812, + "y": 148.90899658203125 }, { - "x": -137.50100708007812, - "y": 144.85000610351562 + "x": -135.92599487304688, + "y": 146.6020050048828 + }, + { + "x": -138.02200317382812, + "y": 144.26199340820312 }, { "x": -140.08099365234375, "y": 141.88900756835938 }, { - "x": -142.6020050048828, - "y": 138.8780059814453 + "x": -142.1020050048828, + "y": 139.48399353027344 + }, + { + "x": -144.08599853515625, + "y": 137.04800415039062 }, { - "x": -145.06300354003906, - "y": 135.8179931640625 + "x": -146.031005859375, + "y": 134.58099365234375 }, { - "x": -147.46400451660156, - "y": 132.71099853515625 + "x": -147.93600463867188, + "y": 132.08399963378906 }, { "x": -149.80299377441406, "y": 129.5570068359375 }, { - "x": -152.0800018310547, - "y": 126.35700225830078 + "x": -151.62899780273438, + "y": 127.0009994506836 }, { - "x": -154.29299926757812, - "y": 123.11399841308594 + "x": -153.41600036621094, + "y": 124.41600036621094 }, { - "x": -156.4429931640625, - "y": 119.8270034790039 + "x": -155.16099548339844, + "y": 121.80400085449219 + }, + { + "x": -156.86500549316406, + "y": 119.16500091552734 }, { "x": -158.5279998779297, "y": 116.4990005493164 }, { - "x": -160.54600524902344, - "y": 113.13099670410156 + "x": -160.1479949951172, + "y": 113.80799865722656 + }, + { + "x": -161.7259979248047, + "y": 111.09100341796875 }, { - "x": -162.49899291992188, - "y": 109.7239990234375 + "x": -163.26100158691406, + "y": 108.3499984741211 }, { - "x": -164.38400268554688, - "y": 106.27899932861328 + "x": -164.7530059814453, + "y": 105.58499908447266 }, { "x": -166.2010040283203, "y": 102.7979965209961 }, { - "x": -167.94900512695312, - "y": 99.28099822998047 + "x": -167.60499572753906, + "y": 99.98699951171875 }, { - "x": -169.6280059814453, - "y": 95.73100280761719 + "x": -168.96499633789062, + "y": 97.15499877929688 }, { - "x": -171.23699951171875, - "y": 92.14900207519531 + "x": -170.27999877929688, + "y": 94.302001953125 + }, + { + "x": -171.5500030517578, + "y": 91.42900085449219 }, { "x": -172.77499389648438, "y": 88.53600311279297 }, { - "x": -174.24200439453125, - "y": 84.89399719238281 + "x": -173.9550018310547, + "y": 85.6240005493164 + }, + { + "x": -175.08799743652344, + "y": 82.69400024414062 }, { - "x": -175.63800048828125, - "y": 81.2229995727539 + "x": -176.17599487304688, + "y": 79.74700164794922 }, { - "x": -176.96099853515625, - "y": 77.5260009765625 + "x": -177.2169952392578, + "y": 76.78299713134766 }, { "x": -178.21099853515625, "y": 73.8030014038086 }, { - "x": -179.38800048828125, - "y": 70.05599975585938 + "x": -179.1580047607422, + "y": 70.80799865722656 + }, + { + "x": -180.05799865722656, + "y": 67.7979965209961 }, { - "x": -180.49099731445312, - "y": 66.28800201416016 + "x": -180.91099548339844, + "y": 64.77400207519531 }, { - "x": -181.5189971923828, - "y": 62.49800109863281 + "x": -181.71600341796875, + "y": 61.73699951171875 }, { "x": -182.47300720214844, "y": 58.68899917602539 }, { - "x": -183.35299682617188, - "y": 54.861000061035156 + "x": -183.18299865722656, + "y": 55.62799835205078 }, { - "x": -184.15699768066406, - "y": 51.018001556396484 + "x": -183.843994140625, + "y": 52.55699920654297 }, { - "x": -184.88499450683594, - "y": 47.159000396728516 + "x": -184.45700073242188, + "y": 49.47600173950195 }, { - "x": -185.24899291992188, + "x": -185.02099609375, + "y": 46.3849983215332 + }, + { + "x": -185.2519989013672, "y": 45 } ], @@ -1441,282 +1633,350 @@ "route": [ { "x": 512, - "y": -136.2310028076172 + "y": -136.2259979248047 + }, + { + "x": 514.7160034179688, + "y": -135.85400390625 }, { - "x": 516.7860107421875, - "y": -135.53700256347656 + "x": 518.85302734375, + "y": -135.19900512695312 }, { - "x": 521.947021484375, - "y": -134.64999389648438 + "x": 522.9760131835938, + "y": -134.45700073242188 }, { "x": 527.0819702148438, "y": -133.62899780273438 }, { - "x": 532.1890258789062, - "y": -132.47300720214844 + "x": 531.1699829101562, + "y": -132.71499633789062 }, { - "x": 537.2630004882812, - "y": -131.18499755859375 + "x": 535.2369995117188, + "y": -131.71600341796875 }, { - "x": 542.302978515625, - "y": -129.76300048828125 + "x": 539.2830200195312, + "y": -130.6320037841797 + }, + { + "x": 543.3060302734375, + "y": -129.46299743652344 }, { "x": 547.302978515625, "y": -128.21099853515625 }, { - "x": 552.260986328125, - "y": -126.52799987792969 + "x": 551.2730102539062, + "y": -126.875 }, { - "x": 557.1729736328125, - "y": -124.71600341796875 + "x": 555.2139892578125, + "y": -125.45600128173828 }, { - "x": 562.0360107421875, - "y": -122.7750015258789 + "x": 559.1240234375, + "y": -123.95500183105469 + }, + { + "x": 563.0029907226562, + "y": -122.37200164794922 }, { "x": 566.8469848632812, "y": -120.70899963378906 }, { - "x": 571.6019897460938, - "y": -118.51699829101562 + "x": 570.655029296875, + "y": -118.96499633789062 + }, + { + "x": 574.427001953125, + "y": -117.14199829101562 }, { - "x": 576.2979736328125, - "y": -116.20099639892578 + "x": 578.1589965820312, + "y": -115.23999786376953 }, { - "x": 580.9310302734375, - "y": -113.76300048828125 + "x": 581.8499755859375, + "y": -113.26100158691406 }, { "x": 585.5, "y": -111.20500183105469 }, { - "x": 589.9990234375, - "y": -108.52799987792969 + "x": 589.10498046875, + "y": -109.0719985961914 }, { - "x": 594.427001953125, - "y": -105.73400115966797 + "x": 592.6649780273438, + "y": -106.86499786376953 }, { - "x": 598.781005859375, - "y": -102.82499694824219 + "x": 596.177978515625, + "y": -104.58399963378906 + }, + { + "x": 599.6420288085938, + "y": -102.22899627685547 }, { "x": 603.0570068359375, "y": -99.8030014038086 }, { - "x": 607.2520141601562, - "y": -96.66999816894531 + "x": 606.4190063476562, + "y": -97.30500030517578 + }, + { + "x": 609.72900390625, + "y": -94.73799896240234 }, { - "x": 611.364013671875, - "y": -93.42900085449219 + "x": 612.9840087890625, + "y": -92.10199737548828 }, { - "x": 615.3889770507812, - "y": -90.08100128173828 + "x": 616.1840209960938, + "y": -89.39900207519531 }, { "x": 619.3259887695312, "y": -86.62799835205078 }, { - "x": 623.1699829101562, - "y": -83.0739974975586 + "x": 622.4089965820312, + "y": -83.79299926757812 + }, + { + "x": 625.4320068359375, + "y": -80.89399719238281 }, { - "x": 626.9210205078125, - "y": -79.4209976196289 + "x": 628.3939819335938, + "y": -77.93199920654297 }, { - "x": 630.573974609375, - "y": -75.66999816894531 + "x": 631.2930297851562, + "y": -74.90899658203125 }, { "x": 634.1279907226562, "y": -71.82599639892578 }, { - "x": 637.5809936523438, - "y": -67.88899993896484 + "x": 636.8989868164062, + "y": -68.68399810791016 }, { - "x": 640.9290161132812, - "y": -63.86399841308594 + "x": 639.6019897460938, + "y": -65.48400115966797 }, { - "x": 644.1699829101562, - "y": -59.75199890136719 + "x": 642.2379760742188, + "y": -62.229000091552734 + }, + { + "x": 644.8049926757812, + "y": -58.91899871826172 }, { "x": 647.302978515625, "y": -55.55699920654297 }, { - "x": 650.3250122070312, - "y": -51.28099822998047 + "x": 649.72900390625, + "y": -52.141998291015625 + }, + { + "x": 652.083984375, + "y": -48.678001403808594 }, { - "x": 653.2340087890625, - "y": -46.926998138427734 + "x": 654.364990234375, + "y": -45.165000915527344 }, { - "x": 656.0280151367188, - "y": -42.499000549316406 + "x": 656.572021484375, + "y": -41.60499954223633 }, { "x": 658.7050170898438, "y": -38 }, { - "x": 661.2630004882812, - "y": -33.430999755859375 + "x": 660.760986328125, + "y": -34.349998474121094 }, { - "x": 663.7009887695312, - "y": -28.79800033569336 + "x": 662.739990234375, + "y": -30.659000396728516 }, { - "x": 666.0170288085938, - "y": -24.101999282836914 + "x": 664.6420288085938, + "y": -26.927000045776367 + }, + { + "x": 666.4650268554688, + "y": -23.155000686645508 }, { "x": 668.208984375, "y": -19.347000122070312 }, { - "x": 670.2750244140625, - "y": -14.53600025177002 + "x": 669.8720092773438, + "y": -15.503000259399414 + }, + { + "x": 671.4550170898438, + "y": -11.62399959564209 }, { - "x": 672.2160034179688, - "y": -9.67300033569336 + "x": 672.9559936523438, + "y": -7.714000225067139 }, { - "x": 674.0280151367188, - "y": -4.761000156402588 + "x": 674.375, + "y": -3.7730000019073486 }, { "x": 675.7109985351562, "y": 0.19599999487400055 }, { - "x": 677.2630004882812, - "y": 5.196000099182129 + "x": 676.9630126953125, + "y": 4.192999839782715 }, { - "x": 678.6849975585938, - "y": 10.236000061035156 + "x": 678.1320190429688, + "y": 8.215999603271484 }, { - "x": 679.9730224609375, - "y": 15.3100004196167 + "x": 679.2160034179688, + "y": 12.26200008392334 + }, + { + "x": 680.2150268554688, + "y": 16.32900047302246 }, { "x": 681.1290283203125, "y": 20.41699981689453 }, { - "x": 682.1500244140625, - "y": 25.552000045776367 + "x": 681.9569702148438, + "y": 24.523000717163086 }, { - "x": 683.0369873046875, - "y": 30.71299934387207 + "x": 682.698974609375, + "y": 28.645999908447266 }, { - "x": 683.7880249023438, - "y": 35.89400100708008 + "x": 683.35400390625, + "y": 32.78300094604492 + }, + { + "x": 683.9219970703125, + "y": 36.93299865722656 }, { "x": 684.4039916992188, "y": 41.09400177001953 }, { - "x": 684.8829956054688, - "y": 46.30799865722656 + "x": 684.7979736328125, + "y": 45.263999938964844 + }, + { + "x": 685.10498046875, + "y": 49.441001892089844 }, { - "x": 685.2249755859375, - "y": 51.53200149536133 + "x": 685.323974609375, + "y": 53.624000549316406 }, { - "x": 685.4310302734375, - "y": 56.763999938964844 + "x": 685.4559936523438, + "y": 57.81100082397461 }, { "x": 685.5, "y": 61.999000549316406 }, { - "x": 685.4310302734375, - "y": 67.23500061035156 + "x": 685.4559936523438, + "y": 66.18800354003906 }, { - "x": 685.2249755859375, - "y": 72.46700286865234 + "x": 685.323974609375, + "y": 70.375 }, { - "x": 684.8829956054688, - "y": 77.69100189208984 + "x": 685.10498046875, + "y": 74.55799865722656 + }, + { + "x": 684.7979736328125, + "y": 78.73500061035156 }, { "x": 684.4039916992188, "y": 82.90499877929688 }, { - "x": 683.7880249023438, - "y": 88.1050033569336 + "x": 683.9219970703125, + "y": 87.06600189208984 + }, + { + "x": 683.35400390625, + "y": 91.21600341796875 }, { - "x": 683.0369873046875, - "y": 93.28600311279297 + "x": 682.698974609375, + "y": 95.35299682617188 }, { - "x": 682.1500244140625, - "y": 98.4469985961914 + "x": 681.9569702148438, + "y": 99.47599792480469 }, { "x": 681.1290283203125, "y": 103.58200073242188 }, { - "x": 679.9730224609375, - "y": 108.68900299072266 + "x": 680.2150268554688, + "y": 107.66999816894531 }, { - "x": 678.6849975585938, - "y": 113.76300048828125 + "x": 679.2160034179688, + "y": 111.73699951171875 }, { - "x": 677.2630004882812, - "y": 118.8030014038086 + "x": 678.1320190429688, + "y": 115.78299713134766 + }, + { + "x": 676.9630126953125, + "y": 119.80599975585938 }, { "x": 675.7109985351562, "y": 123.8030014038086 }, { - "x": 674.0280151367188, - "y": 128.76100158691406 + "x": 674.375, + "y": 127.77300262451172 }, { - "x": 673.9400024414062, + "x": 673.9329833984375, "y": 128.99899291992188 } ], @@ -1752,7 +2012,7 @@ "link": "", "route": [ { - "x": 634.85302734375, + "x": 634.8569946289062, "y": 194.99899291992188 }, { @@ -1760,263 +2020,327 @@ "y": 195.8260040283203 }, { - "x": 630.573974609375, - "y": 199.6699981689453 + "x": 631.2930297851562, + "y": 198.90899658203125 + }, + { + "x": 628.3939819335938, + "y": 201.9320068359375 }, { - "x": 626.9210205078125, - "y": 203.42100524902344 + "x": 625.4320068359375, + "y": 204.8939971923828 }, { - "x": 623.1699829101562, - "y": 207.07400512695312 + "x": 622.4089965820312, + "y": 207.79299926757812 }, { "x": 619.3259887695312, "y": 210.6280059814453 }, { - "x": 615.3889770507812, - "y": 214.08099365234375 + "x": 616.1840209960938, + "y": 213.3990020751953 + }, + { + "x": 612.9840087890625, + "y": 216.1020050048828 }, { - "x": 611.364013671875, - "y": 217.4290008544922 + "x": 609.72900390625, + "y": 218.73800659179688 }, { - "x": 607.2520141601562, - "y": 220.6699981689453 + "x": 606.4190063476562, + "y": 221.30499267578125 }, { "x": 603.0570068359375, "y": 223.80299377441406 }, { - "x": 598.781005859375, - "y": 226.8249969482422 + "x": 599.6420288085938, + "y": 226.22900390625 }, { - "x": 594.427001953125, - "y": 229.73399353027344 + "x": 596.177978515625, + "y": 228.58399963378906 }, { - "x": 589.9990234375, - "y": 232.5279998779297 + "x": 592.6649780273438, + "y": 230.86500549316406 + }, + { + "x": 589.10498046875, + "y": 233.07200622558594 }, { "x": 585.5, "y": 235.2050018310547 }, { - "x": 580.9310302734375, - "y": 237.76300048828125 + "x": 581.8499755859375, + "y": 237.26100158691406 + }, + { + "x": 578.1589965820312, + "y": 239.24000549316406 }, { - "x": 576.2979736328125, - "y": 240.2010040283203 + "x": 574.427001953125, + "y": 241.14199829101562 }, { - "x": 571.6019897460938, - "y": 242.51699829101562 + "x": 570.655029296875, + "y": 242.96499633789062 }, { "x": 566.8469848632812, "y": 244.70899963378906 }, { - "x": 562.0360107421875, - "y": 246.77499389648438 + "x": 563.0029907226562, + "y": 246.3719940185547 }, { - "x": 557.1729736328125, - "y": 248.71600341796875 + "x": 559.1240234375, + "y": 247.9550018310547 }, { - "x": 552.260986328125, - "y": 250.5279998779297 + "x": 555.2139892578125, + "y": 249.45599365234375 + }, + { + "x": 551.2730102539062, + "y": 250.875 }, { "x": 547.302978515625, "y": 252.21099853515625 }, { - "x": 542.302978515625, - "y": 253.76300048828125 + "x": 543.3060302734375, + "y": 253.46299743652344 + }, + { + "x": 539.2830200195312, + "y": 254.6320037841797 }, { - "x": 537.2630004882812, - "y": 255.18499755859375 + "x": 535.2369995117188, + "y": 255.71600341796875 }, { - "x": 532.1890258789062, - "y": 256.4729919433594 + "x": 531.1699829101562, + "y": 256.7149963378906 }, { "x": 527.0819702148438, "y": 257.6289978027344 }, { - "x": 521.947021484375, - "y": 258.6499938964844 + "x": 522.9760131835938, + "y": 258.4570007324219 + }, + { + "x": 518.85302734375, + "y": 259.1990051269531 }, { - "x": 516.7860107421875, - "y": 259.5369873046875 + "x": 514.7160034179688, + "y": 259.85400390625 }, { - "x": 511.6050109863281, - "y": 260.2879943847656 + "x": 510.5660095214844, + "y": 260.4219970703125 }, { "x": 506.4049987792969, "y": 260.90399169921875 }, { - "x": 501.1910095214844, - "y": 261.38299560546875 + "x": 502.2349853515625, + "y": 261.2980041503906 }, { - "x": 495.9670104980469, - "y": 261.7250061035156 + "x": 498.0580139160156, + "y": 261.6050109863281 }, { - "x": 490.7349853515625, - "y": 261.9309997558594 + "x": 493.875, + "y": 261.8240051269531 + }, + { + "x": 489.68798828125, + "y": 261.95599365234375 }, { "x": 485.5, "y": 262 }, { - "x": 480.2640075683594, - "y": 261.9309997558594 + "x": 481.3110046386719, + "y": 261.95599365234375 + }, + { + "x": 477.1239929199219, + "y": 261.8240051269531 }, { - "x": 475.0320129394531, - "y": 261.7250061035156 + "x": 472.9410095214844, + "y": 261.6050109863281 }, { - "x": 469.8080139160156, - "y": 261.38299560546875 + "x": 468.7640075683594, + "y": 261.2980041503906 }, { "x": 464.593994140625, "y": 260.90399169921875 }, { - "x": 459.3940124511719, - "y": 260.2879943847656 + "x": 460.4330139160156, + "y": 260.4219970703125 }, { - "x": 454.2130126953125, - "y": 259.5369873046875 + "x": 456.2829895019531, + "y": 259.85400390625 }, { - "x": 449.052001953125, - "y": 258.6499938964844 + "x": 452.14599609375, + "y": 259.1990051269531 + }, + { + "x": 448.02301025390625, + "y": 258.4570007324219 }, { "x": 443.9169921875, "y": 257.6289978027344 }, { - "x": 438.80999755859375, - "y": 256.4729919433594 + "x": 439.8290100097656, + "y": 256.7149963378906 + }, + { + "x": 435.7619934082031, + "y": 255.71600341796875 }, { - "x": 433.7359924316406, - "y": 255.18499755859375 + "x": 431.71600341796875, + "y": 254.6320037841797 }, { - "x": 428.6960144042969, - "y": 253.76300048828125 + "x": 427.6929931640625, + "y": 253.46299743652344 }, { "x": 423.6960144042969, "y": 252.21099853515625 }, { - "x": 418.7380065917969, - "y": 250.5279998779297 + "x": 419.72601318359375, + "y": 250.875 }, { - "x": 413.82598876953125, - "y": 248.71600341796875 + "x": 415.7850036621094, + "y": 249.45599365234375 }, { - "x": 408.9630126953125, - "y": 246.77499389648438 + "x": 411.875, + "y": 247.9550018310547 + }, + { + "x": 407.9960021972656, + "y": 246.3719940185547 }, { "x": 404.1520080566406, "y": 244.70899963378906 }, { - "x": 399.3970031738281, - "y": 242.51699829101562 + "x": 400.343994140625, + "y": 242.96499633789062 }, { - "x": 394.70098876953125, - "y": 240.2010040283203 + "x": 396.5719909667969, + "y": 241.14199829101562 }, { - "x": 390.0679931640625, - "y": 237.76300048828125 + "x": 392.8399963378906, + "y": 239.24000549316406 + }, + { + "x": 389.14898681640625, + "y": 237.26100158691406 }, { "x": 385.5, "y": 235.2050018310547 }, { - "x": 381, - "y": 232.5279998779297 + "x": 381.8940124511719, + "y": 233.07200622558594 + }, + { + "x": 378.3340148925781, + "y": 230.86500549316406 }, { - "x": 376.5719909667969, - "y": 229.73399353027344 + "x": 374.8210144042969, + "y": 228.58399963378906 }, { - "x": 372.2179870605469, - "y": 226.8249969482422 + "x": 371.35699462890625, + "y": 226.22900390625 }, { "x": 367.9419860839844, "y": 223.80299377441406 }, { - "x": 363.74700927734375, - "y": 220.6699981689453 + "x": 364.5799865722656, + "y": 221.30499267578125 }, { - "x": 359.635009765625, - "y": 217.4290008544922 + "x": 361.2699890136719, + "y": 218.73800659179688 }, { - "x": 355.6099853515625, - "y": 214.08099365234375 + "x": 358.0150146484375, + "y": 216.1020050048828 + }, + { + "x": 354.81500244140625, + "y": 213.3990020751953 }, { "x": 351.6730041503906, "y": 210.6280059814453 }, { - "x": 347.8290100097656, - "y": 207.07400512695312 + "x": 348.5899963378906, + "y": 207.79299926757812 }, { - "x": 344.0780029296875, - "y": 203.42100524902344 + "x": 345.5669860839844, + "y": 204.8939971923828 }, { - "x": 340.42498779296875, - "y": 199.6699981689453 + "x": 342.6050109863281, + "y": 201.9320068359375 + }, + { + "x": 339.70599365234375, + "y": 198.90899658203125 }, { "x": 336.8710021972656, "y": 195.8260040283203 }, { - "x": 336.14599609375, + "x": 336.1419982910156, "y": 195 } ], @@ -2053,295 +2377,367 @@ "route": [ { "x": 931.4099731445312, - "y": -186.19900512695312 + "y": -186.21800231933594 }, { "x": 936.197021484375, "y": -185.53700256347656 }, { - "x": 943.927978515625, - "y": -184.15699768066406 + "x": 942.385986328125, + "y": -184.45700073242188 }, { - "x": 951.5989990234375, - "y": -182.47300720214844 + "x": 948.5380249023438, + "y": -183.18299865722656 + }, + { + "x": 954.6480102539062, + "y": -181.71600341796875 }, { - "x": 959.197998046875, - "y": -180.49099731445312 + "x": 960.7080078125, + "y": -180.05799865722656 }, { "x": 966.7130126953125, "y": -178.21099853515625 }, { - "x": 974.1329956054688, - "y": -175.63800048828125 + "x": 972.656982421875, + "y": -176.17599487304688 }, { - "x": 981.4459838867188, - "y": -172.77499389648438 + "x": 978.5349731445312, + "y": -173.9550018310547 + }, + { + "x": 984.3389892578125, + "y": -171.5500030517578 }, { - "x": 988.6420288085938, - "y": -169.6280059814453 + "x": 990.0659790039062, + "y": -168.96499633789062 }, { "x": 995.7080078125, "y": -166.2010040283203 }, { - "x": 1002.6339721679688, - "y": -162.49899291992188 + "x": 1001.260009765625, + "y": -163.26100158691406 }, { - "x": 1009.4089965820312, - "y": -158.5279998779297 + "x": 1006.718017578125, + "y": -160.1479949951172 + }, + { + "x": 1012.0750122070312, + "y": -156.86500549316406 }, { - "x": 1016.0239868164062, - "y": -154.29299926757812 + "x": 1017.3259887695312, + "y": -153.41600036621094 }, { "x": 1022.4669799804688, "y": -149.80299377441406 }, { - "x": 1028.72802734375, - "y": -145.06300354003906 + "x": 1027.490966796875, + "y": -146.031005859375 }, { - "x": 1034.7989501953125, - "y": -140.08099365234375 + "x": 1032.39404296875, + "y": -142.1020050048828 }, { - "x": 1040.6700439453125, - "y": -134.86399841308594 + "x": 1037.1719970703125, + "y": -138.02200317382812 + }, + { + "x": 1041.8189697265625, + "y": -133.79299926757812 }, { "x": 1046.3310546875, "y": -129.42100524902344 }, { - "x": 1051.7740478515625, - "y": -123.76000213623047 + "x": 1050.7030029296875, + "y": -124.90899658203125 }, { - "x": 1056.990966796875, - "y": -117.88899993896484 + "x": 1054.9320068359375, + "y": -120.26200103759766 }, { - "x": 1061.9730224609375, - "y": -111.81800079345703 + "x": 1059.011962890625, + "y": -115.48400115966797 + }, + { + "x": 1062.9410400390625, + "y": -110.58100128173828 }, { "x": 1066.7130126953125, "y": -105.55699920654297 }, { - "x": 1071.2039794921875, - "y": -99.11399841308594 + "x": 1070.3260498046875, + "y": -100.41600036621094 }, { - "x": 1075.43798828125, - "y": -92.4990005493164 + "x": 1073.7750244140625, + "y": -95.16500091552734 }, { - "x": 1079.4090576171875, - "y": -85.7239990234375 + "x": 1077.0579833984375, + "y": -89.80799865722656 + }, + { + "x": 1080.1710205078125, + "y": -84.3499984741211 }, { "x": 1083.1109619140625, "y": -78.7979965209961 }, { - "x": 1086.5379638671875, - "y": -71.73100280761719 + "x": 1085.875, + "y": -73.15499877929688 }, { - "x": 1089.68603515625, - "y": -64.53600311279297 + "x": 1088.4610595703125, + "y": -67.42900085449219 }, { - "x": 1092.5479736328125, - "y": -57.222999572753906 + "x": 1090.864990234375, + "y": -61.624000549316406 + }, + { + "x": 1093.0860595703125, + "y": -55.74700164794922 }, { "x": 1095.1209716796875, "y": -49.803001403808594 }, { - "x": 1097.4010009765625, - "y": -42.28799819946289 + "x": 1096.968017578125, + "y": -43.79800033569336 }, { - "x": 1099.384033203125, - "y": -34.68899917602539 + "x": 1098.6259765625, + "y": -37.73699951171875 + }, + { + "x": 1100.093017578125, + "y": -31.628000259399414 }, { - "x": 1101.0670166015625, - "y": -27.01799964904785 + "x": 1101.366943359375, + "y": -25.47599983215332 }, { "x": 1102.447021484375, "y": -19.285999298095703 }, { - "x": 1103.52294921875, - "y": -11.506999969482422 + "x": 1103.3330078125, + "y": -13.065999984741211 + }, + { + "x": 1104.02197265625, + "y": -6.821000099182129 }, { - "x": 1104.29296875, - "y": -3.690999984741211 + "x": 1104.5150146484375, + "y": -0.5580000281333923 }, { - "x": 1104.7550048828125, - "y": 4.1479997634887695 + "x": 1104.81103515625, + "y": 5.7170000076293945 }, { "x": 1104.9100341796875, "y": 12 }, { - "x": 1104.7550048828125, - "y": 19.85099983215332 + "x": 1104.81103515625, + "y": 18.281999588012695 }, { - "x": 1104.29296875, - "y": 27.69099998474121 + "x": 1104.5150146484375, + "y": 24.558000564575195 }, { - "x": 1103.52294921875, - "y": 35.50699996948242 + "x": 1104.02197265625, + "y": 30.820999145507812 + }, + { + "x": 1103.3330078125, + "y": 37.066001892089844 }, { "x": 1102.447021484375, "y": 43.2859992980957 }, { - "x": 1101.0670166015625, - "y": 51.018001556396484 + "x": 1101.366943359375, + "y": 49.47600173950195 }, { - "x": 1099.384033203125, - "y": 58.68899917602539 + "x": 1100.093017578125, + "y": 55.62799835205078 }, { - "x": 1097.4010009765625, - "y": 66.28800201416016 + "x": 1098.6259765625, + "y": 61.73699951171875 + }, + { + "x": 1096.968017578125, + "y": 67.7979965209961 }, { "x": 1095.1209716796875, "y": 73.8030014038086 }, { - "x": 1092.5479736328125, - "y": 81.2229995727539 + "x": 1093.0860595703125, + "y": 79.74700164794922 }, { - "x": 1089.68603515625, - "y": 88.53600311279297 + "x": 1090.864990234375, + "y": 85.6240005493164 }, { - "x": 1086.5379638671875, - "y": 95.73100280761719 + "x": 1088.4610595703125, + "y": 91.42900085449219 + }, + { + "x": 1085.875, + "y": 97.15499877929688 }, { "x": 1083.1109619140625, "y": 102.7979965209961 }, { - "x": 1079.4090576171875, - "y": 109.7239990234375 + "x": 1080.1710205078125, + "y": 108.3499984741211 }, { - "x": 1075.43798828125, - "y": 116.4990005493164 + "x": 1077.0579833984375, + "y": 113.80799865722656 + }, + { + "x": 1073.7750244140625, + "y": 119.16500091552734 }, { - "x": 1071.2039794921875, - "y": 123.11399841308594 + "x": 1070.3260498046875, + "y": 124.41600036621094 }, { "x": 1066.7130126953125, "y": 129.5570068359375 }, { - "x": 1061.9730224609375, - "y": 135.8179931640625 + "x": 1062.9410400390625, + "y": 134.58099365234375 }, { - "x": 1056.990966796875, - "y": 141.88900756835938 + "x": 1059.011962890625, + "y": 139.48399353027344 + }, + { + "x": 1054.9320068359375, + "y": 144.26199340820312 }, { - "x": 1051.7740478515625, - "y": 147.75999450683594 + "x": 1050.7030029296875, + "y": 148.90899658203125 }, { "x": 1046.3310546875, "y": 153.42100524902344 }, { - "x": 1040.6700439453125, - "y": 158.86399841308594 + "x": 1041.8189697265625, + "y": 157.79299926757812 }, { - "x": 1034.7989501953125, - "y": 164.08099365234375 + "x": 1037.1719970703125, + "y": 162.02200317382812 + }, + { + "x": 1032.39404296875, + "y": 166.1020050048828 }, { - "x": 1028.72802734375, - "y": 169.06300354003906 + "x": 1027.490966796875, + "y": 170.031005859375 }, { "x": 1022.4669799804688, "y": 173.80299377441406 }, { - "x": 1016.0239868164062, - "y": 178.29299926757812 + "x": 1017.3259887695312, + "y": 177.41600036621094 }, { - "x": 1009.4089965820312, - "y": 182.5279998779297 + "x": 1012.0750122070312, + "y": 180.86500549316406 + }, + { + "x": 1006.718017578125, + "y": 184.1479949951172 }, { - "x": 1002.6339721679688, - "y": 186.49899291992188 + "x": 1001.260009765625, + "y": 187.26100158691406 }, { "x": 995.7080078125, "y": 190.2010040283203 }, { - "x": 988.6420288085938, - "y": 193.6280059814453 + "x": 990.0659790039062, + "y": 192.96499633789062 }, { - "x": 981.4459838867188, - "y": 196.77499389648438 + "x": 984.3389892578125, + "y": 195.5500030517578 + }, + { + "x": 978.5349731445312, + "y": 197.9550018310547 }, { - "x": 974.1329956054688, - "y": 199.63800048828125 + "x": 972.656982421875, + "y": 200.17599487304688 }, { "x": 966.7130126953125, "y": 202.21099853515625 }, { - "x": 959.197998046875, - "y": 204.49099731445312 + "x": 960.7080078125, + "y": 204.05799865722656 }, { - "x": 951.5989990234375, - "y": 206.47300720214844 + "x": 954.6480102539062, + "y": 205.71600341796875 + }, + { + "x": 948.5380249023438, + "y": 207.18299865722656 }, { - "x": 943.927978515625, - "y": 208.15699768066406 + "x": 942.385986328125, + "y": 208.45700073242188 }, { "x": 936.197021484375, @@ -2349,7 +2745,7 @@ }, { "x": 931.4099731445312, - "y": 210.19900512695312 + "y": 210.21800231933594 } ], "isCurve": true, diff --git a/e2etests/testdata/txtar/cycle-diagram/elk/sketch.exp.svg b/e2etests/testdata/txtar/cycle-diagram/elk/sketch.exp.svg index f9882c89da..21e65f752a 100644 --- a/e2etests/testdata/txtar/cycle-diagram/elk/sketch.exp.svg +++ b/e2etests/testdata/txtar/cycle-diagram/elk/sketch.exp.svg @@ -1,9 +1,9 @@ -abcdabcab + .d2-2891159010 .fill-N1{fill:#0A0F25;} + .d2-2891159010 .fill-N2{fill:#676C7E;} + .d2-2891159010 .fill-N3{fill:#9499AB;} + .d2-2891159010 .fill-N4{fill:#CFD2DD;} + .d2-2891159010 .fill-N5{fill:#DEE1EB;} + .d2-2891159010 .fill-N6{fill:#EEF1F8;} + .d2-2891159010 .fill-N7{fill:#FFFFFF;} + .d2-2891159010 .fill-B1{fill:#0D32B2;} + .d2-2891159010 .fill-B2{fill:#0D32B2;} + .d2-2891159010 .fill-B3{fill:#E3E9FD;} + .d2-2891159010 .fill-B4{fill:#E3E9FD;} + .d2-2891159010 .fill-B5{fill:#EDF0FD;} + .d2-2891159010 .fill-B6{fill:#F7F8FE;} + .d2-2891159010 .fill-AA2{fill:#4A6FF3;} + .d2-2891159010 .fill-AA4{fill:#EDF0FD;} + .d2-2891159010 .fill-AA5{fill:#F7F8FE;} + .d2-2891159010 .fill-AB4{fill:#EDF0FD;} + .d2-2891159010 .fill-AB5{fill:#F7F8FE;} + .d2-2891159010 .stroke-N1{stroke:#0A0F25;} + .d2-2891159010 .stroke-N2{stroke:#676C7E;} + .d2-2891159010 .stroke-N3{stroke:#9499AB;} + .d2-2891159010 .stroke-N4{stroke:#CFD2DD;} + .d2-2891159010 .stroke-N5{stroke:#DEE1EB;} + .d2-2891159010 .stroke-N6{stroke:#EEF1F8;} + .d2-2891159010 .stroke-N7{stroke:#FFFFFF;} + .d2-2891159010 .stroke-B1{stroke:#0D32B2;} + .d2-2891159010 .stroke-B2{stroke:#0D32B2;} + .d2-2891159010 .stroke-B3{stroke:#E3E9FD;} + .d2-2891159010 .stroke-B4{stroke:#E3E9FD;} + .d2-2891159010 .stroke-B5{stroke:#EDF0FD;} + .d2-2891159010 .stroke-B6{stroke:#F7F8FE;} + .d2-2891159010 .stroke-AA2{stroke:#4A6FF3;} + .d2-2891159010 .stroke-AA4{stroke:#EDF0FD;} + .d2-2891159010 .stroke-AA5{stroke:#F7F8FE;} + .d2-2891159010 .stroke-AB4{stroke:#EDF0FD;} + .d2-2891159010 .stroke-AB5{stroke:#F7F8FE;} + .d2-2891159010 .background-color-N1{background-color:#0A0F25;} + .d2-2891159010 .background-color-N2{background-color:#676C7E;} + .d2-2891159010 .background-color-N3{background-color:#9499AB;} + .d2-2891159010 .background-color-N4{background-color:#CFD2DD;} + .d2-2891159010 .background-color-N5{background-color:#DEE1EB;} + .d2-2891159010 .background-color-N6{background-color:#EEF1F8;} + .d2-2891159010 .background-color-N7{background-color:#FFFFFF;} + .d2-2891159010 .background-color-B1{background-color:#0D32B2;} + .d2-2891159010 .background-color-B2{background-color:#0D32B2;} + .d2-2891159010 .background-color-B3{background-color:#E3E9FD;} + .d2-2891159010 .background-color-B4{background-color:#E3E9FD;} + .d2-2891159010 .background-color-B5{background-color:#EDF0FD;} + .d2-2891159010 .background-color-B6{background-color:#F7F8FE;} + .d2-2891159010 .background-color-AA2{background-color:#4A6FF3;} + .d2-2891159010 .background-color-AA4{background-color:#EDF0FD;} + .d2-2891159010 .background-color-AA5{background-color:#F7F8FE;} + .d2-2891159010 .background-color-AB4{background-color:#EDF0FD;} + .d2-2891159010 .background-color-AB5{background-color:#F7F8FE;} + .d2-2891159010 .color-N1{color:#0A0F25;} + .d2-2891159010 .color-N2{color:#676C7E;} + .d2-2891159010 .color-N3{color:#9499AB;} + .d2-2891159010 .color-N4{color:#CFD2DD;} + .d2-2891159010 .color-N5{color:#DEE1EB;} + .d2-2891159010 .color-N6{color:#EEF1F8;} + .d2-2891159010 .color-N7{color:#FFFFFF;} + .d2-2891159010 .color-B1{color:#0D32B2;} + .d2-2891159010 .color-B2{color:#0D32B2;} + .d2-2891159010 .color-B3{color:#E3E9FD;} + .d2-2891159010 .color-B4{color:#E3E9FD;} + .d2-2891159010 .color-B5{color:#EDF0FD;} + .d2-2891159010 .color-B6{color:#F7F8FE;} + .d2-2891159010 .color-AA2{color:#4A6FF3;} + .d2-2891159010 .color-AA4{color:#EDF0FD;} + .d2-2891159010 .color-AA5{color:#F7F8FE;} + .d2-2891159010 .color-AB4{color:#EDF0FD;} + .d2-2891159010 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker-d2-2891159010);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker-d2-2891159010);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright-d2-2891159010);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright-d2-2891159010);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright-d2-2891159010);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright-d2-2891159010);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark-d2-2891159010);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright-d2-2891159010);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright-d2-2891159010);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright-d2-2891159010);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright-d2-2891159010);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker-d2-2891159010);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark-d2-2891159010);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal-d2-2891159010);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal-d2-2891159010);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright-d2-2891159010);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright-d2-2891159010);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright-d2-2891159010);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>abcdabcab From a9a27821c486410d501a24d985e131dbc7cc68a6 Mon Sep 17 00:00:00 2001 From: Mayank Mohapatra <125661248+Mayank77maruti@users.noreply.github.com> Date: Sat, 22 Feb 2025 13:50:35 +0000 Subject: [PATCH 36/73] try --- d2layouts/d2cycle/layout.go | 47 +++++- .../txtar/cycle-diagram/dagre/board.exp.json | 24 +-- .../txtar/cycle-diagram/dagre/sketch.exp.svg | 152 +++++++++--------- .../txtar/cycle-diagram/elk/board.exp.json | 24 +-- .../txtar/cycle-diagram/elk/sketch.exp.svg | 152 +++++++++--------- 5 files changed, 219 insertions(+), 180 deletions(-) diff --git a/d2layouts/d2cycle/layout.go b/d2layouts/d2cycle/layout.go index c63eb20397..91bab5add4 100644 --- a/d2layouts/d2cycle/layout.go +++ b/d2layouts/d2cycle/layout.go @@ -99,13 +99,52 @@ func createCircularArc(edge *d2graph.Edge) { path[len(path)-1] = newDst // Trim redundant path points that fall inside node boundaries. - path = trimPathPoints(path, edge.Src.Box) - path = trimPathPoints(path, edge.Dst.Box) +// path = trimPathPoints(path, edge.Src.Box) +// path = trimPathPoints(path, edge.Dst.Box) + +// edge.Route = path +// edge.IsCurve = true +// } +path = trimPathPoints(path, edge.Src.Box) +path = trimPathPoints(path, edge.Dst.Box) + +// Adjust the last two points to align the arrow direction with the arc's tangent +if len(path) >= 2 { + dstPoint := path[len(path)-1] + prevPoint := path[len(path)-2] + + // Calculate the vector between the last two points + dx := dstPoint.X - prevPoint.X + dy := dstPoint.Y - prevPoint.Y + + // Calculate the perpendicular vector (rotated 90 degrees counter-clockwise) + // This gives us the center direction of the circular arc + centerDirX := -dy + centerDirY := dx + + // Normalize the center direction vector + centerLength := math.Hypot(centerDirX, centerDirY) + if centerLength > 0 { + centerDirX /= centerLength + centerDirY /= centerLength + } + + // Calculate the tangent direction (perpendicular to center direction) + tangentX := -centerDirY + tangentY := centerDirX - edge.Route = path - edge.IsCurve = true + // Adjust the penultimate point to create proper arrow alignment + step := 10.0 + newPrevX := dstPoint.X - tangentX*step + newPrevY := dstPoint.Y - tangentY*step + + // Update the path with the adjusted point + path[len(path)-2] = geo.NewPoint(newPrevX, newPrevY) } +edge.Route = path +edge.IsCurve = true +} // clampPointOutsideBox walks forward along the path until it finds a point outside the box, // then replaces the point with a precise intersection. diff --git a/e2etests/testdata/txtar/cycle-diagram/dagre/board.exp.json b/e2etests/testdata/txtar/cycle-diagram/dagre/board.exp.json index 78ed2dffeb..3a9f3504b0 100644 --- a/e2etests/testdata/txtar/cycle-diagram/dagre/board.exp.json +++ b/e2etests/testdata/txtar/cycle-diagram/dagre/board.exp.json @@ -864,8 +864,8 @@ "y": -37.47600173950195 }, { - "x": 197.02099609375, - "y": -34.3849983215332 + "x": 198.8939971923828, + "y": -23.135000228881836 }, { "x": 197.2519989013672, @@ -1228,8 +1228,8 @@ "y": 197.53700256347656 }, { - "x": 28.18000030517578, - "y": 198.00399780273438 + "x": 16.589000701904297, + "y": 199.56100463867188 }, { "x": 26.5, @@ -1592,8 +1592,8 @@ "y": 37.47600173950195 }, { - "x": -197.02099609375, - "y": 34.3849983215332 + "x": -198.8939971923828, + "y": 23.135000228881836 }, { "x": -197.2519989013672, @@ -1972,8 +1972,8 @@ "y": 111.8030014038086 }, { - "x": 701.875, - "y": 115.77300262451172 + "x": 698.0460205078125, + "y": 126.40799713134766 }, { "x": 701.4329833984375, @@ -2336,8 +2336,8 @@ "y": 186.90899658203125 }, { - "x": 364.3710021972656, - "y": 183.8260040283203 + "x": 357.02899169921875, + "y": 175.4980010986328 }, { "x": 363.6419982910156, @@ -2740,8 +2740,8 @@ "y": 196.45700073242188 }, { - "x": 1003.2860107421875, - "y": 197.53700256347656 + "x": 988.5989990234375, + "y": 199.6269989013672 }, { "x": 998.5, diff --git a/e2etests/testdata/txtar/cycle-diagram/dagre/sketch.exp.svg b/e2etests/testdata/txtar/cycle-diagram/dagre/sketch.exp.svg index 015478d741..408ede6d2e 100644 --- a/e2etests/testdata/txtar/cycle-diagram/dagre/sketch.exp.svg +++ b/e2etests/testdata/txtar/cycle-diagram/dagre/sketch.exp.svg @@ -1,9 +1,9 @@ -abcdabcab + .d2-809410311 .fill-N1{fill:#0A0F25;} + .d2-809410311 .fill-N2{fill:#676C7E;} + .d2-809410311 .fill-N3{fill:#9499AB;} + .d2-809410311 .fill-N4{fill:#CFD2DD;} + .d2-809410311 .fill-N5{fill:#DEE1EB;} + .d2-809410311 .fill-N6{fill:#EEF1F8;} + .d2-809410311 .fill-N7{fill:#FFFFFF;} + .d2-809410311 .fill-B1{fill:#0D32B2;} + .d2-809410311 .fill-B2{fill:#0D32B2;} + .d2-809410311 .fill-B3{fill:#E3E9FD;} + .d2-809410311 .fill-B4{fill:#E3E9FD;} + .d2-809410311 .fill-B5{fill:#EDF0FD;} + .d2-809410311 .fill-B6{fill:#F7F8FE;} + .d2-809410311 .fill-AA2{fill:#4A6FF3;} + .d2-809410311 .fill-AA4{fill:#EDF0FD;} + .d2-809410311 .fill-AA5{fill:#F7F8FE;} + .d2-809410311 .fill-AB4{fill:#EDF0FD;} + .d2-809410311 .fill-AB5{fill:#F7F8FE;} + .d2-809410311 .stroke-N1{stroke:#0A0F25;} + .d2-809410311 .stroke-N2{stroke:#676C7E;} + .d2-809410311 .stroke-N3{stroke:#9499AB;} + .d2-809410311 .stroke-N4{stroke:#CFD2DD;} + .d2-809410311 .stroke-N5{stroke:#DEE1EB;} + .d2-809410311 .stroke-N6{stroke:#EEF1F8;} + .d2-809410311 .stroke-N7{stroke:#FFFFFF;} + .d2-809410311 .stroke-B1{stroke:#0D32B2;} + .d2-809410311 .stroke-B2{stroke:#0D32B2;} + .d2-809410311 .stroke-B3{stroke:#E3E9FD;} + .d2-809410311 .stroke-B4{stroke:#E3E9FD;} + .d2-809410311 .stroke-B5{stroke:#EDF0FD;} + .d2-809410311 .stroke-B6{stroke:#F7F8FE;} + .d2-809410311 .stroke-AA2{stroke:#4A6FF3;} + .d2-809410311 .stroke-AA4{stroke:#EDF0FD;} + .d2-809410311 .stroke-AA5{stroke:#F7F8FE;} + .d2-809410311 .stroke-AB4{stroke:#EDF0FD;} + .d2-809410311 .stroke-AB5{stroke:#F7F8FE;} + .d2-809410311 .background-color-N1{background-color:#0A0F25;} + .d2-809410311 .background-color-N2{background-color:#676C7E;} + .d2-809410311 .background-color-N3{background-color:#9499AB;} + .d2-809410311 .background-color-N4{background-color:#CFD2DD;} + .d2-809410311 .background-color-N5{background-color:#DEE1EB;} + .d2-809410311 .background-color-N6{background-color:#EEF1F8;} + .d2-809410311 .background-color-N7{background-color:#FFFFFF;} + .d2-809410311 .background-color-B1{background-color:#0D32B2;} + .d2-809410311 .background-color-B2{background-color:#0D32B2;} + .d2-809410311 .background-color-B3{background-color:#E3E9FD;} + .d2-809410311 .background-color-B4{background-color:#E3E9FD;} + .d2-809410311 .background-color-B5{background-color:#EDF0FD;} + .d2-809410311 .background-color-B6{background-color:#F7F8FE;} + .d2-809410311 .background-color-AA2{background-color:#4A6FF3;} + .d2-809410311 .background-color-AA4{background-color:#EDF0FD;} + .d2-809410311 .background-color-AA5{background-color:#F7F8FE;} + .d2-809410311 .background-color-AB4{background-color:#EDF0FD;} + .d2-809410311 .background-color-AB5{background-color:#F7F8FE;} + .d2-809410311 .color-N1{color:#0A0F25;} + .d2-809410311 .color-N2{color:#676C7E;} + .d2-809410311 .color-N3{color:#9499AB;} + .d2-809410311 .color-N4{color:#CFD2DD;} + .d2-809410311 .color-N5{color:#DEE1EB;} + .d2-809410311 .color-N6{color:#EEF1F8;} + .d2-809410311 .color-N7{color:#FFFFFF;} + .d2-809410311 .color-B1{color:#0D32B2;} + .d2-809410311 .color-B2{color:#0D32B2;} + .d2-809410311 .color-B3{color:#E3E9FD;} + .d2-809410311 .color-B4{color:#E3E9FD;} + .d2-809410311 .color-B5{color:#EDF0FD;} + .d2-809410311 .color-B6{color:#F7F8FE;} + .d2-809410311 .color-AA2{color:#4A6FF3;} + .d2-809410311 .color-AA4{color:#EDF0FD;} + .d2-809410311 .color-AA5{color:#F7F8FE;} + .d2-809410311 .color-AB4{color:#EDF0FD;} + .d2-809410311 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker-d2-809410311);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker-d2-809410311);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright-d2-809410311);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright-d2-809410311);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright-d2-809410311);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright-d2-809410311);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark-d2-809410311);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright-d2-809410311);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright-d2-809410311);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright-d2-809410311);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright-d2-809410311);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker-d2-809410311);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark-d2-809410311);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal-d2-809410311);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal-d2-809410311);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright-d2-809410311);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright-d2-809410311);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright-d2-809410311);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>abcdabcab diff --git a/e2etests/testdata/txtar/cycle-diagram/elk/board.exp.json b/e2etests/testdata/txtar/cycle-diagram/elk/board.exp.json index 6eb058a841..3c71bae17f 100644 --- a/e2etests/testdata/txtar/cycle-diagram/elk/board.exp.json +++ b/e2etests/testdata/txtar/cycle-diagram/elk/board.exp.json @@ -864,8 +864,8 @@ "y": -25.47599983215332 }, { - "x": 209.02099609375, - "y": -22.385000228881836 + "x": 210.8939971923828, + "y": -11.135000228881836 }, { "x": 209.2519989013672, @@ -1228,8 +1228,8 @@ "y": 209.53700256347656 }, { - "x": 40.18000030517578, - "y": 210.00399780273438 + "x": 28.589000701904297, + "y": 211.56100463867188 }, { "x": 38.5, @@ -1592,8 +1592,8 @@ "y": 49.47600173950195 }, { - "x": -185.02099609375, - "y": 46.3849983215332 + "x": -186.8939971923828, + "y": 35.1349983215332 }, { "x": -185.2519989013672, @@ -1972,8 +1972,8 @@ "y": 123.8030014038086 }, { - "x": 674.375, - "y": 127.77300262451172 + "x": 670.5460205078125, + "y": 138.4080047607422 }, { "x": 673.9329833984375, @@ -2336,8 +2336,8 @@ "y": 198.90899658203125 }, { - "x": 336.8710021972656, - "y": 195.8260040283203 + "x": 329.52899169921875, + "y": 187.4980010986328 }, { "x": 336.1419982910156, @@ -2740,8 +2740,8 @@ "y": 208.45700073242188 }, { - "x": 936.197021484375, - "y": 209.53700256347656 + "x": 921.5089721679688, + "y": 211.6269989013672 }, { "x": 931.4099731445312, diff --git a/e2etests/testdata/txtar/cycle-diagram/elk/sketch.exp.svg b/e2etests/testdata/txtar/cycle-diagram/elk/sketch.exp.svg index 21e65f752a..ebcfc05cf2 100644 --- a/e2etests/testdata/txtar/cycle-diagram/elk/sketch.exp.svg +++ b/e2etests/testdata/txtar/cycle-diagram/elk/sketch.exp.svg @@ -1,9 +1,9 @@ -abcdabcab + .d2-301116794 .fill-N1{fill:#0A0F25;} + .d2-301116794 .fill-N2{fill:#676C7E;} + .d2-301116794 .fill-N3{fill:#9499AB;} + .d2-301116794 .fill-N4{fill:#CFD2DD;} + .d2-301116794 .fill-N5{fill:#DEE1EB;} + .d2-301116794 .fill-N6{fill:#EEF1F8;} + .d2-301116794 .fill-N7{fill:#FFFFFF;} + .d2-301116794 .fill-B1{fill:#0D32B2;} + .d2-301116794 .fill-B2{fill:#0D32B2;} + .d2-301116794 .fill-B3{fill:#E3E9FD;} + .d2-301116794 .fill-B4{fill:#E3E9FD;} + .d2-301116794 .fill-B5{fill:#EDF0FD;} + .d2-301116794 .fill-B6{fill:#F7F8FE;} + .d2-301116794 .fill-AA2{fill:#4A6FF3;} + .d2-301116794 .fill-AA4{fill:#EDF0FD;} + .d2-301116794 .fill-AA5{fill:#F7F8FE;} + .d2-301116794 .fill-AB4{fill:#EDF0FD;} + .d2-301116794 .fill-AB5{fill:#F7F8FE;} + .d2-301116794 .stroke-N1{stroke:#0A0F25;} + .d2-301116794 .stroke-N2{stroke:#676C7E;} + .d2-301116794 .stroke-N3{stroke:#9499AB;} + .d2-301116794 .stroke-N4{stroke:#CFD2DD;} + .d2-301116794 .stroke-N5{stroke:#DEE1EB;} + .d2-301116794 .stroke-N6{stroke:#EEF1F8;} + .d2-301116794 .stroke-N7{stroke:#FFFFFF;} + .d2-301116794 .stroke-B1{stroke:#0D32B2;} + .d2-301116794 .stroke-B2{stroke:#0D32B2;} + .d2-301116794 .stroke-B3{stroke:#E3E9FD;} + .d2-301116794 .stroke-B4{stroke:#E3E9FD;} + .d2-301116794 .stroke-B5{stroke:#EDF0FD;} + .d2-301116794 .stroke-B6{stroke:#F7F8FE;} + .d2-301116794 .stroke-AA2{stroke:#4A6FF3;} + .d2-301116794 .stroke-AA4{stroke:#EDF0FD;} + .d2-301116794 .stroke-AA5{stroke:#F7F8FE;} + .d2-301116794 .stroke-AB4{stroke:#EDF0FD;} + .d2-301116794 .stroke-AB5{stroke:#F7F8FE;} + .d2-301116794 .background-color-N1{background-color:#0A0F25;} + .d2-301116794 .background-color-N2{background-color:#676C7E;} + .d2-301116794 .background-color-N3{background-color:#9499AB;} + .d2-301116794 .background-color-N4{background-color:#CFD2DD;} + .d2-301116794 .background-color-N5{background-color:#DEE1EB;} + .d2-301116794 .background-color-N6{background-color:#EEF1F8;} + .d2-301116794 .background-color-N7{background-color:#FFFFFF;} + .d2-301116794 .background-color-B1{background-color:#0D32B2;} + .d2-301116794 .background-color-B2{background-color:#0D32B2;} + .d2-301116794 .background-color-B3{background-color:#E3E9FD;} + .d2-301116794 .background-color-B4{background-color:#E3E9FD;} + .d2-301116794 .background-color-B5{background-color:#EDF0FD;} + .d2-301116794 .background-color-B6{background-color:#F7F8FE;} + .d2-301116794 .background-color-AA2{background-color:#4A6FF3;} + .d2-301116794 .background-color-AA4{background-color:#EDF0FD;} + .d2-301116794 .background-color-AA5{background-color:#F7F8FE;} + .d2-301116794 .background-color-AB4{background-color:#EDF0FD;} + .d2-301116794 .background-color-AB5{background-color:#F7F8FE;} + .d2-301116794 .color-N1{color:#0A0F25;} + .d2-301116794 .color-N2{color:#676C7E;} + .d2-301116794 .color-N3{color:#9499AB;} + .d2-301116794 .color-N4{color:#CFD2DD;} + .d2-301116794 .color-N5{color:#DEE1EB;} + .d2-301116794 .color-N6{color:#EEF1F8;} + .d2-301116794 .color-N7{color:#FFFFFF;} + .d2-301116794 .color-B1{color:#0D32B2;} + .d2-301116794 .color-B2{color:#0D32B2;} + .d2-301116794 .color-B3{color:#E3E9FD;} + .d2-301116794 .color-B4{color:#E3E9FD;} + .d2-301116794 .color-B5{color:#EDF0FD;} + .d2-301116794 .color-B6{color:#F7F8FE;} + .d2-301116794 .color-AA2{color:#4A6FF3;} + .d2-301116794 .color-AA4{color:#EDF0FD;} + .d2-301116794 .color-AA5{color:#F7F8FE;} + .d2-301116794 .color-AB4{color:#EDF0FD;} + .d2-301116794 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker-d2-301116794);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker-d2-301116794);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright-d2-301116794);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright-d2-301116794);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright-d2-301116794);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright-d2-301116794);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark-d2-301116794);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright-d2-301116794);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright-d2-301116794);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright-d2-301116794);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright-d2-301116794);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker-d2-301116794);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark-d2-301116794);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal-d2-301116794);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal-d2-301116794);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright-d2-301116794);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright-d2-301116794);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright-d2-301116794);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>abcdabcab From 8135688757443ca1874a1ffdcdedc7d41389772a Mon Sep 17 00:00:00 2001 From: Mayank Mohapatra <125661248+Mayank77maruti@users.noreply.github.com> Date: Sat, 22 Feb 2025 13:51:14 +0000 Subject: [PATCH 37/73] try --- d2layouts/d2cycle/layout.go | 47 +----- .../txtar/cycle-diagram/dagre/board.exp.json | 24 +-- .../txtar/cycle-diagram/dagre/sketch.exp.svg | 152 +++++++++--------- .../txtar/cycle-diagram/elk/board.exp.json | 24 +-- .../txtar/cycle-diagram/elk/sketch.exp.svg | 152 +++++++++--------- 5 files changed, 180 insertions(+), 219 deletions(-) diff --git a/d2layouts/d2cycle/layout.go b/d2layouts/d2cycle/layout.go index 91bab5add4..c63eb20397 100644 --- a/d2layouts/d2cycle/layout.go +++ b/d2layouts/d2cycle/layout.go @@ -99,52 +99,13 @@ func createCircularArc(edge *d2graph.Edge) { path[len(path)-1] = newDst // Trim redundant path points that fall inside node boundaries. -// path = trimPathPoints(path, edge.Src.Box) -// path = trimPathPoints(path, edge.Dst.Box) - -// edge.Route = path -// edge.IsCurve = true -// } -path = trimPathPoints(path, edge.Src.Box) -path = trimPathPoints(path, edge.Dst.Box) - -// Adjust the last two points to align the arrow direction with the arc's tangent -if len(path) >= 2 { - dstPoint := path[len(path)-1] - prevPoint := path[len(path)-2] - - // Calculate the vector between the last two points - dx := dstPoint.X - prevPoint.X - dy := dstPoint.Y - prevPoint.Y - - // Calculate the perpendicular vector (rotated 90 degrees counter-clockwise) - // This gives us the center direction of the circular arc - centerDirX := -dy - centerDirY := dx - - // Normalize the center direction vector - centerLength := math.Hypot(centerDirX, centerDirY) - if centerLength > 0 { - centerDirX /= centerLength - centerDirY /= centerLength - } - - // Calculate the tangent direction (perpendicular to center direction) - tangentX := -centerDirY - tangentY := centerDirX + path = trimPathPoints(path, edge.Src.Box) + path = trimPathPoints(path, edge.Dst.Box) - // Adjust the penultimate point to create proper arrow alignment - step := 10.0 - newPrevX := dstPoint.X - tangentX*step - newPrevY := dstPoint.Y - tangentY*step - - // Update the path with the adjusted point - path[len(path)-2] = geo.NewPoint(newPrevX, newPrevY) + edge.Route = path + edge.IsCurve = true } -edge.Route = path -edge.IsCurve = true -} // clampPointOutsideBox walks forward along the path until it finds a point outside the box, // then replaces the point with a precise intersection. diff --git a/e2etests/testdata/txtar/cycle-diagram/dagre/board.exp.json b/e2etests/testdata/txtar/cycle-diagram/dagre/board.exp.json index 3a9f3504b0..78ed2dffeb 100644 --- a/e2etests/testdata/txtar/cycle-diagram/dagre/board.exp.json +++ b/e2etests/testdata/txtar/cycle-diagram/dagre/board.exp.json @@ -864,8 +864,8 @@ "y": -37.47600173950195 }, { - "x": 198.8939971923828, - "y": -23.135000228881836 + "x": 197.02099609375, + "y": -34.3849983215332 }, { "x": 197.2519989013672, @@ -1228,8 +1228,8 @@ "y": 197.53700256347656 }, { - "x": 16.589000701904297, - "y": 199.56100463867188 + "x": 28.18000030517578, + "y": 198.00399780273438 }, { "x": 26.5, @@ -1592,8 +1592,8 @@ "y": 37.47600173950195 }, { - "x": -198.8939971923828, - "y": 23.135000228881836 + "x": -197.02099609375, + "y": 34.3849983215332 }, { "x": -197.2519989013672, @@ -1972,8 +1972,8 @@ "y": 111.8030014038086 }, { - "x": 698.0460205078125, - "y": 126.40799713134766 + "x": 701.875, + "y": 115.77300262451172 }, { "x": 701.4329833984375, @@ -2336,8 +2336,8 @@ "y": 186.90899658203125 }, { - "x": 357.02899169921875, - "y": 175.4980010986328 + "x": 364.3710021972656, + "y": 183.8260040283203 }, { "x": 363.6419982910156, @@ -2740,8 +2740,8 @@ "y": 196.45700073242188 }, { - "x": 988.5989990234375, - "y": 199.6269989013672 + "x": 1003.2860107421875, + "y": 197.53700256347656 }, { "x": 998.5, diff --git a/e2etests/testdata/txtar/cycle-diagram/dagre/sketch.exp.svg b/e2etests/testdata/txtar/cycle-diagram/dagre/sketch.exp.svg index 408ede6d2e..015478d741 100644 --- a/e2etests/testdata/txtar/cycle-diagram/dagre/sketch.exp.svg +++ b/e2etests/testdata/txtar/cycle-diagram/dagre/sketch.exp.svg @@ -1,9 +1,9 @@ -abcdabcab + .d2-153681122 .fill-N1{fill:#0A0F25;} + .d2-153681122 .fill-N2{fill:#676C7E;} + .d2-153681122 .fill-N3{fill:#9499AB;} + .d2-153681122 .fill-N4{fill:#CFD2DD;} + .d2-153681122 .fill-N5{fill:#DEE1EB;} + .d2-153681122 .fill-N6{fill:#EEF1F8;} + .d2-153681122 .fill-N7{fill:#FFFFFF;} + .d2-153681122 .fill-B1{fill:#0D32B2;} + .d2-153681122 .fill-B2{fill:#0D32B2;} + .d2-153681122 .fill-B3{fill:#E3E9FD;} + .d2-153681122 .fill-B4{fill:#E3E9FD;} + .d2-153681122 .fill-B5{fill:#EDF0FD;} + .d2-153681122 .fill-B6{fill:#F7F8FE;} + .d2-153681122 .fill-AA2{fill:#4A6FF3;} + .d2-153681122 .fill-AA4{fill:#EDF0FD;} + .d2-153681122 .fill-AA5{fill:#F7F8FE;} + .d2-153681122 .fill-AB4{fill:#EDF0FD;} + .d2-153681122 .fill-AB5{fill:#F7F8FE;} + .d2-153681122 .stroke-N1{stroke:#0A0F25;} + .d2-153681122 .stroke-N2{stroke:#676C7E;} + .d2-153681122 .stroke-N3{stroke:#9499AB;} + .d2-153681122 .stroke-N4{stroke:#CFD2DD;} + .d2-153681122 .stroke-N5{stroke:#DEE1EB;} + .d2-153681122 .stroke-N6{stroke:#EEF1F8;} + .d2-153681122 .stroke-N7{stroke:#FFFFFF;} + .d2-153681122 .stroke-B1{stroke:#0D32B2;} + .d2-153681122 .stroke-B2{stroke:#0D32B2;} + .d2-153681122 .stroke-B3{stroke:#E3E9FD;} + .d2-153681122 .stroke-B4{stroke:#E3E9FD;} + .d2-153681122 .stroke-B5{stroke:#EDF0FD;} + .d2-153681122 .stroke-B6{stroke:#F7F8FE;} + .d2-153681122 .stroke-AA2{stroke:#4A6FF3;} + .d2-153681122 .stroke-AA4{stroke:#EDF0FD;} + .d2-153681122 .stroke-AA5{stroke:#F7F8FE;} + .d2-153681122 .stroke-AB4{stroke:#EDF0FD;} + .d2-153681122 .stroke-AB5{stroke:#F7F8FE;} + .d2-153681122 .background-color-N1{background-color:#0A0F25;} + .d2-153681122 .background-color-N2{background-color:#676C7E;} + .d2-153681122 .background-color-N3{background-color:#9499AB;} + .d2-153681122 .background-color-N4{background-color:#CFD2DD;} + .d2-153681122 .background-color-N5{background-color:#DEE1EB;} + .d2-153681122 .background-color-N6{background-color:#EEF1F8;} + .d2-153681122 .background-color-N7{background-color:#FFFFFF;} + .d2-153681122 .background-color-B1{background-color:#0D32B2;} + .d2-153681122 .background-color-B2{background-color:#0D32B2;} + .d2-153681122 .background-color-B3{background-color:#E3E9FD;} + .d2-153681122 .background-color-B4{background-color:#E3E9FD;} + .d2-153681122 .background-color-B5{background-color:#EDF0FD;} + .d2-153681122 .background-color-B6{background-color:#F7F8FE;} + .d2-153681122 .background-color-AA2{background-color:#4A6FF3;} + .d2-153681122 .background-color-AA4{background-color:#EDF0FD;} + .d2-153681122 .background-color-AA5{background-color:#F7F8FE;} + .d2-153681122 .background-color-AB4{background-color:#EDF0FD;} + .d2-153681122 .background-color-AB5{background-color:#F7F8FE;} + .d2-153681122 .color-N1{color:#0A0F25;} + .d2-153681122 .color-N2{color:#676C7E;} + .d2-153681122 .color-N3{color:#9499AB;} + .d2-153681122 .color-N4{color:#CFD2DD;} + .d2-153681122 .color-N5{color:#DEE1EB;} + .d2-153681122 .color-N6{color:#EEF1F8;} + .d2-153681122 .color-N7{color:#FFFFFF;} + .d2-153681122 .color-B1{color:#0D32B2;} + .d2-153681122 .color-B2{color:#0D32B2;} + .d2-153681122 .color-B3{color:#E3E9FD;} + .d2-153681122 .color-B4{color:#E3E9FD;} + .d2-153681122 .color-B5{color:#EDF0FD;} + .d2-153681122 .color-B6{color:#F7F8FE;} + .d2-153681122 .color-AA2{color:#4A6FF3;} + .d2-153681122 .color-AA4{color:#EDF0FD;} + .d2-153681122 .color-AA5{color:#F7F8FE;} + .d2-153681122 .color-AB4{color:#EDF0FD;} + .d2-153681122 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker-d2-153681122);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker-d2-153681122);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright-d2-153681122);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright-d2-153681122);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright-d2-153681122);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright-d2-153681122);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark-d2-153681122);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright-d2-153681122);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright-d2-153681122);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright-d2-153681122);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright-d2-153681122);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker-d2-153681122);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark-d2-153681122);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal-d2-153681122);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal-d2-153681122);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright-d2-153681122);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright-d2-153681122);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright-d2-153681122);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>abcdabcab diff --git a/e2etests/testdata/txtar/cycle-diagram/elk/board.exp.json b/e2etests/testdata/txtar/cycle-diagram/elk/board.exp.json index 3c71bae17f..6eb058a841 100644 --- a/e2etests/testdata/txtar/cycle-diagram/elk/board.exp.json +++ b/e2etests/testdata/txtar/cycle-diagram/elk/board.exp.json @@ -864,8 +864,8 @@ "y": -25.47599983215332 }, { - "x": 210.8939971923828, - "y": -11.135000228881836 + "x": 209.02099609375, + "y": -22.385000228881836 }, { "x": 209.2519989013672, @@ -1228,8 +1228,8 @@ "y": 209.53700256347656 }, { - "x": 28.589000701904297, - "y": 211.56100463867188 + "x": 40.18000030517578, + "y": 210.00399780273438 }, { "x": 38.5, @@ -1592,8 +1592,8 @@ "y": 49.47600173950195 }, { - "x": -186.8939971923828, - "y": 35.1349983215332 + "x": -185.02099609375, + "y": 46.3849983215332 }, { "x": -185.2519989013672, @@ -1972,8 +1972,8 @@ "y": 123.8030014038086 }, { - "x": 670.5460205078125, - "y": 138.4080047607422 + "x": 674.375, + "y": 127.77300262451172 }, { "x": 673.9329833984375, @@ -2336,8 +2336,8 @@ "y": 198.90899658203125 }, { - "x": 329.52899169921875, - "y": 187.4980010986328 + "x": 336.8710021972656, + "y": 195.8260040283203 }, { "x": 336.1419982910156, @@ -2740,8 +2740,8 @@ "y": 208.45700073242188 }, { - "x": 921.5089721679688, - "y": 211.6269989013672 + "x": 936.197021484375, + "y": 209.53700256347656 }, { "x": 931.4099731445312, diff --git a/e2etests/testdata/txtar/cycle-diagram/elk/sketch.exp.svg b/e2etests/testdata/txtar/cycle-diagram/elk/sketch.exp.svg index ebcfc05cf2..21e65f752a 100644 --- a/e2etests/testdata/txtar/cycle-diagram/elk/sketch.exp.svg +++ b/e2etests/testdata/txtar/cycle-diagram/elk/sketch.exp.svg @@ -1,9 +1,9 @@ -abcdabcab + .d2-2891159010 .fill-N1{fill:#0A0F25;} + .d2-2891159010 .fill-N2{fill:#676C7E;} + .d2-2891159010 .fill-N3{fill:#9499AB;} + .d2-2891159010 .fill-N4{fill:#CFD2DD;} + .d2-2891159010 .fill-N5{fill:#DEE1EB;} + .d2-2891159010 .fill-N6{fill:#EEF1F8;} + .d2-2891159010 .fill-N7{fill:#FFFFFF;} + .d2-2891159010 .fill-B1{fill:#0D32B2;} + .d2-2891159010 .fill-B2{fill:#0D32B2;} + .d2-2891159010 .fill-B3{fill:#E3E9FD;} + .d2-2891159010 .fill-B4{fill:#E3E9FD;} + .d2-2891159010 .fill-B5{fill:#EDF0FD;} + .d2-2891159010 .fill-B6{fill:#F7F8FE;} + .d2-2891159010 .fill-AA2{fill:#4A6FF3;} + .d2-2891159010 .fill-AA4{fill:#EDF0FD;} + .d2-2891159010 .fill-AA5{fill:#F7F8FE;} + .d2-2891159010 .fill-AB4{fill:#EDF0FD;} + .d2-2891159010 .fill-AB5{fill:#F7F8FE;} + .d2-2891159010 .stroke-N1{stroke:#0A0F25;} + .d2-2891159010 .stroke-N2{stroke:#676C7E;} + .d2-2891159010 .stroke-N3{stroke:#9499AB;} + .d2-2891159010 .stroke-N4{stroke:#CFD2DD;} + .d2-2891159010 .stroke-N5{stroke:#DEE1EB;} + .d2-2891159010 .stroke-N6{stroke:#EEF1F8;} + .d2-2891159010 .stroke-N7{stroke:#FFFFFF;} + .d2-2891159010 .stroke-B1{stroke:#0D32B2;} + .d2-2891159010 .stroke-B2{stroke:#0D32B2;} + .d2-2891159010 .stroke-B3{stroke:#E3E9FD;} + .d2-2891159010 .stroke-B4{stroke:#E3E9FD;} + .d2-2891159010 .stroke-B5{stroke:#EDF0FD;} + .d2-2891159010 .stroke-B6{stroke:#F7F8FE;} + .d2-2891159010 .stroke-AA2{stroke:#4A6FF3;} + .d2-2891159010 .stroke-AA4{stroke:#EDF0FD;} + .d2-2891159010 .stroke-AA5{stroke:#F7F8FE;} + .d2-2891159010 .stroke-AB4{stroke:#EDF0FD;} + .d2-2891159010 .stroke-AB5{stroke:#F7F8FE;} + .d2-2891159010 .background-color-N1{background-color:#0A0F25;} + .d2-2891159010 .background-color-N2{background-color:#676C7E;} + .d2-2891159010 .background-color-N3{background-color:#9499AB;} + .d2-2891159010 .background-color-N4{background-color:#CFD2DD;} + .d2-2891159010 .background-color-N5{background-color:#DEE1EB;} + .d2-2891159010 .background-color-N6{background-color:#EEF1F8;} + .d2-2891159010 .background-color-N7{background-color:#FFFFFF;} + .d2-2891159010 .background-color-B1{background-color:#0D32B2;} + .d2-2891159010 .background-color-B2{background-color:#0D32B2;} + .d2-2891159010 .background-color-B3{background-color:#E3E9FD;} + .d2-2891159010 .background-color-B4{background-color:#E3E9FD;} + .d2-2891159010 .background-color-B5{background-color:#EDF0FD;} + .d2-2891159010 .background-color-B6{background-color:#F7F8FE;} + .d2-2891159010 .background-color-AA2{background-color:#4A6FF3;} + .d2-2891159010 .background-color-AA4{background-color:#EDF0FD;} + .d2-2891159010 .background-color-AA5{background-color:#F7F8FE;} + .d2-2891159010 .background-color-AB4{background-color:#EDF0FD;} + .d2-2891159010 .background-color-AB5{background-color:#F7F8FE;} + .d2-2891159010 .color-N1{color:#0A0F25;} + .d2-2891159010 .color-N2{color:#676C7E;} + .d2-2891159010 .color-N3{color:#9499AB;} + .d2-2891159010 .color-N4{color:#CFD2DD;} + .d2-2891159010 .color-N5{color:#DEE1EB;} + .d2-2891159010 .color-N6{color:#EEF1F8;} + .d2-2891159010 .color-N7{color:#FFFFFF;} + .d2-2891159010 .color-B1{color:#0D32B2;} + .d2-2891159010 .color-B2{color:#0D32B2;} + .d2-2891159010 .color-B3{color:#E3E9FD;} + .d2-2891159010 .color-B4{color:#E3E9FD;} + .d2-2891159010 .color-B5{color:#EDF0FD;} + .d2-2891159010 .color-B6{color:#F7F8FE;} + .d2-2891159010 .color-AA2{color:#4A6FF3;} + .d2-2891159010 .color-AA4{color:#EDF0FD;} + .d2-2891159010 .color-AA5{color:#F7F8FE;} + .d2-2891159010 .color-AB4{color:#EDF0FD;} + .d2-2891159010 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker-d2-2891159010);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker-d2-2891159010);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright-d2-2891159010);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright-d2-2891159010);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright-d2-2891159010);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright-d2-2891159010);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark-d2-2891159010);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright-d2-2891159010);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright-d2-2891159010);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright-d2-2891159010);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright-d2-2891159010);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker-d2-2891159010);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark-d2-2891159010);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal-d2-2891159010);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal-d2-2891159010);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright-d2-2891159010);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright-d2-2891159010);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright-d2-2891159010);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>abcdabcab From a5ed6aacd061068e05f9fda8ec8feda1af0d9590 Mon Sep 17 00:00:00 2001 From: Mayank Mohapatra <125661248+Mayank77maruti@users.noreply.github.com> Date: Sat, 22 Feb 2025 15:56:41 +0000 Subject: [PATCH 38/73] try --- d2layouts/d2cycle/layout.go | 12 +- .../txtar/cycle-diagram/dagre/board.exp.json | 24 +++ .../txtar/cycle-diagram/dagre/sketch.exp.svg | 152 +++++++++--------- .../txtar/cycle-diagram/elk/board.exp.json | 24 +++ .../txtar/cycle-diagram/elk/sketch.exp.svg | 152 +++++++++--------- 5 files changed, 210 insertions(+), 154 deletions(-) diff --git a/d2layouts/d2cycle/layout.go b/d2layouts/d2cycle/layout.go index c63eb20397..4e553977c8 100644 --- a/d2layouts/d2cycle/layout.go +++ b/d2layouts/d2cycle/layout.go @@ -92,13 +92,21 @@ func createCircularArc(edge *d2graph.Edge) { path[0] = srcCenter path[len(path)-1] = dstCenter - // Clamp endpoints to the boundaries of the source and destination 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. + // Add a point before newDst along the tangent direction + if len(path) >= 2 { + dstAngle := math.Atan2(newDst.Y, newDst.X) + tangent := geo.NewPoint(-math.Sin(dstAngle), math.Cos(dstAngle)) + ε := 0.01 * arcRadius // Small offset, e.g., 1% of radius + preDst := geo.NewPoint(newDst.X - ε*tangent.X, newDst.Y - ε*tangent.Y) + // Insert preDst before newDst + path = append(path[:len(path)-1], preDst, newDst) + } + path = trimPathPoints(path, edge.Src.Box) path = trimPathPoints(path, edge.Dst.Box) diff --git a/e2etests/testdata/txtar/cycle-diagram/dagre/board.exp.json b/e2etests/testdata/txtar/cycle-diagram/dagre/board.exp.json index 78ed2dffeb..1453daf862 100644 --- a/e2etests/testdata/txtar/cycle-diagram/dagre/board.exp.json +++ b/e2etests/testdata/txtar/cycle-diagram/dagre/board.exp.json @@ -867,6 +867,10 @@ "x": 197.02099609375, "y": -34.3849983215332 }, + { + "x": 196.9219970703125, + "y": -34.97200012207031 + }, { "x": 197.2519989013672, "y": -33 @@ -1231,6 +1235,10 @@ "x": 28.18000030517578, "y": 198.00399780273438 }, + { + "x": 28.48200035095215, + "y": 197.96499633789062 + }, { "x": 26.5, "y": 198.22999572753906 @@ -1595,6 +1603,10 @@ "x": -197.02099609375, "y": 34.3849983215332 }, + { + "x": -196.9219970703125, + "y": 34.97200012207031 + }, { "x": -197.2519989013672, "y": 33 @@ -1975,6 +1987,10 @@ "x": 701.875, "y": 115.77300262451172 }, + { + "x": 702.10302734375, + "y": 115.11499786376953 + }, { "x": 701.4329833984375, "y": 116.9990005493164 @@ -2339,6 +2355,10 @@ "x": 364.3710021972656, "y": 183.8260040283203 }, + { + "x": 364.97198486328125, + "y": 184.4929962158203 + }, { "x": 363.6419982910156, "y": 183 @@ -2743,6 +2763,10 @@ "x": 1003.2860107421875, "y": 197.53700256347656 }, + { + "x": 1000.4819946289062, + "y": 197.9530029296875 + }, { "x": 998.5, "y": 198.21800231933594 diff --git a/e2etests/testdata/txtar/cycle-diagram/dagre/sketch.exp.svg b/e2etests/testdata/txtar/cycle-diagram/dagre/sketch.exp.svg index 015478d741..be500c9520 100644 --- a/e2etests/testdata/txtar/cycle-diagram/dagre/sketch.exp.svg +++ b/e2etests/testdata/txtar/cycle-diagram/dagre/sketch.exp.svg @@ -1,9 +1,9 @@ -abcdabcab + .d2-1694830323 .fill-N1{fill:#0A0F25;} + .d2-1694830323 .fill-N2{fill:#676C7E;} + .d2-1694830323 .fill-N3{fill:#9499AB;} + .d2-1694830323 .fill-N4{fill:#CFD2DD;} + .d2-1694830323 .fill-N5{fill:#DEE1EB;} + .d2-1694830323 .fill-N6{fill:#EEF1F8;} + .d2-1694830323 .fill-N7{fill:#FFFFFF;} + .d2-1694830323 .fill-B1{fill:#0D32B2;} + .d2-1694830323 .fill-B2{fill:#0D32B2;} + .d2-1694830323 .fill-B3{fill:#E3E9FD;} + .d2-1694830323 .fill-B4{fill:#E3E9FD;} + .d2-1694830323 .fill-B5{fill:#EDF0FD;} + .d2-1694830323 .fill-B6{fill:#F7F8FE;} + .d2-1694830323 .fill-AA2{fill:#4A6FF3;} + .d2-1694830323 .fill-AA4{fill:#EDF0FD;} + .d2-1694830323 .fill-AA5{fill:#F7F8FE;} + .d2-1694830323 .fill-AB4{fill:#EDF0FD;} + .d2-1694830323 .fill-AB5{fill:#F7F8FE;} + .d2-1694830323 .stroke-N1{stroke:#0A0F25;} + .d2-1694830323 .stroke-N2{stroke:#676C7E;} + .d2-1694830323 .stroke-N3{stroke:#9499AB;} + .d2-1694830323 .stroke-N4{stroke:#CFD2DD;} + .d2-1694830323 .stroke-N5{stroke:#DEE1EB;} + .d2-1694830323 .stroke-N6{stroke:#EEF1F8;} + .d2-1694830323 .stroke-N7{stroke:#FFFFFF;} + .d2-1694830323 .stroke-B1{stroke:#0D32B2;} + .d2-1694830323 .stroke-B2{stroke:#0D32B2;} + .d2-1694830323 .stroke-B3{stroke:#E3E9FD;} + .d2-1694830323 .stroke-B4{stroke:#E3E9FD;} + .d2-1694830323 .stroke-B5{stroke:#EDF0FD;} + .d2-1694830323 .stroke-B6{stroke:#F7F8FE;} + .d2-1694830323 .stroke-AA2{stroke:#4A6FF3;} + .d2-1694830323 .stroke-AA4{stroke:#EDF0FD;} + .d2-1694830323 .stroke-AA5{stroke:#F7F8FE;} + .d2-1694830323 .stroke-AB4{stroke:#EDF0FD;} + .d2-1694830323 .stroke-AB5{stroke:#F7F8FE;} + .d2-1694830323 .background-color-N1{background-color:#0A0F25;} + .d2-1694830323 .background-color-N2{background-color:#676C7E;} + .d2-1694830323 .background-color-N3{background-color:#9499AB;} + .d2-1694830323 .background-color-N4{background-color:#CFD2DD;} + .d2-1694830323 .background-color-N5{background-color:#DEE1EB;} + .d2-1694830323 .background-color-N6{background-color:#EEF1F8;} + .d2-1694830323 .background-color-N7{background-color:#FFFFFF;} + .d2-1694830323 .background-color-B1{background-color:#0D32B2;} + .d2-1694830323 .background-color-B2{background-color:#0D32B2;} + .d2-1694830323 .background-color-B3{background-color:#E3E9FD;} + .d2-1694830323 .background-color-B4{background-color:#E3E9FD;} + .d2-1694830323 .background-color-B5{background-color:#EDF0FD;} + .d2-1694830323 .background-color-B6{background-color:#F7F8FE;} + .d2-1694830323 .background-color-AA2{background-color:#4A6FF3;} + .d2-1694830323 .background-color-AA4{background-color:#EDF0FD;} + .d2-1694830323 .background-color-AA5{background-color:#F7F8FE;} + .d2-1694830323 .background-color-AB4{background-color:#EDF0FD;} + .d2-1694830323 .background-color-AB5{background-color:#F7F8FE;} + .d2-1694830323 .color-N1{color:#0A0F25;} + .d2-1694830323 .color-N2{color:#676C7E;} + .d2-1694830323 .color-N3{color:#9499AB;} + .d2-1694830323 .color-N4{color:#CFD2DD;} + .d2-1694830323 .color-N5{color:#DEE1EB;} + .d2-1694830323 .color-N6{color:#EEF1F8;} + .d2-1694830323 .color-N7{color:#FFFFFF;} + .d2-1694830323 .color-B1{color:#0D32B2;} + .d2-1694830323 .color-B2{color:#0D32B2;} + .d2-1694830323 .color-B3{color:#E3E9FD;} + .d2-1694830323 .color-B4{color:#E3E9FD;} + .d2-1694830323 .color-B5{color:#EDF0FD;} + .d2-1694830323 .color-B6{color:#F7F8FE;} + .d2-1694830323 .color-AA2{color:#4A6FF3;} + .d2-1694830323 .color-AA4{color:#EDF0FD;} + .d2-1694830323 .color-AA5{color:#F7F8FE;} + .d2-1694830323 .color-AB4{color:#EDF0FD;} + .d2-1694830323 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker-d2-1694830323);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker-d2-1694830323);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright-d2-1694830323);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright-d2-1694830323);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright-d2-1694830323);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright-d2-1694830323);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark-d2-1694830323);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright-d2-1694830323);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright-d2-1694830323);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright-d2-1694830323);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright-d2-1694830323);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker-d2-1694830323);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark-d2-1694830323);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal-d2-1694830323);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal-d2-1694830323);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright-d2-1694830323);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright-d2-1694830323);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright-d2-1694830323);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>abcdabcab diff --git a/e2etests/testdata/txtar/cycle-diagram/elk/board.exp.json b/e2etests/testdata/txtar/cycle-diagram/elk/board.exp.json index 6eb058a841..d03145822d 100644 --- a/e2etests/testdata/txtar/cycle-diagram/elk/board.exp.json +++ b/e2etests/testdata/txtar/cycle-diagram/elk/board.exp.json @@ -867,6 +867,10 @@ "x": 209.02099609375, "y": -22.385000228881836 }, + { + "x": 208.9219970703125, + "y": -22.972000122070312 + }, { "x": 209.2519989013672, "y": -21 @@ -1231,6 +1235,10 @@ "x": 40.18000030517578, "y": 210.00399780273438 }, + { + "x": 40.481998443603516, + "y": 209.96499633789062 + }, { "x": 38.5, "y": 210.22999572753906 @@ -1595,6 +1603,10 @@ "x": -185.02099609375, "y": 46.3849983215332 }, + { + "x": -184.9219970703125, + "y": 46.97200012207031 + }, { "x": -185.2519989013672, "y": 45 @@ -1975,6 +1987,10 @@ "x": 674.375, "y": 127.77300262451172 }, + { + "x": 674.60302734375, + "y": 127.11499786376953 + }, { "x": 673.9329833984375, "y": 128.99899291992188 @@ -2339,6 +2355,10 @@ "x": 336.8710021972656, "y": 195.8260040283203 }, + { + "x": 337.47198486328125, + "y": 196.4929962158203 + }, { "x": 336.1419982910156, "y": 195 @@ -2743,6 +2763,10 @@ "x": 936.197021484375, "y": 209.53700256347656 }, + { + "x": 933.3920288085938, + "y": 209.9530029296875 + }, { "x": 931.4099731445312, "y": 210.21800231933594 diff --git a/e2etests/testdata/txtar/cycle-diagram/elk/sketch.exp.svg b/e2etests/testdata/txtar/cycle-diagram/elk/sketch.exp.svg index 21e65f752a..a167e907ca 100644 --- a/e2etests/testdata/txtar/cycle-diagram/elk/sketch.exp.svg +++ b/e2etests/testdata/txtar/cycle-diagram/elk/sketch.exp.svg @@ -1,9 +1,9 @@ -abcdabcab + .d2-2388635244 .fill-N1{fill:#0A0F25;} + .d2-2388635244 .fill-N2{fill:#676C7E;} + .d2-2388635244 .fill-N3{fill:#9499AB;} + .d2-2388635244 .fill-N4{fill:#CFD2DD;} + .d2-2388635244 .fill-N5{fill:#DEE1EB;} + .d2-2388635244 .fill-N6{fill:#EEF1F8;} + .d2-2388635244 .fill-N7{fill:#FFFFFF;} + .d2-2388635244 .fill-B1{fill:#0D32B2;} + .d2-2388635244 .fill-B2{fill:#0D32B2;} + .d2-2388635244 .fill-B3{fill:#E3E9FD;} + .d2-2388635244 .fill-B4{fill:#E3E9FD;} + .d2-2388635244 .fill-B5{fill:#EDF0FD;} + .d2-2388635244 .fill-B6{fill:#F7F8FE;} + .d2-2388635244 .fill-AA2{fill:#4A6FF3;} + .d2-2388635244 .fill-AA4{fill:#EDF0FD;} + .d2-2388635244 .fill-AA5{fill:#F7F8FE;} + .d2-2388635244 .fill-AB4{fill:#EDF0FD;} + .d2-2388635244 .fill-AB5{fill:#F7F8FE;} + .d2-2388635244 .stroke-N1{stroke:#0A0F25;} + .d2-2388635244 .stroke-N2{stroke:#676C7E;} + .d2-2388635244 .stroke-N3{stroke:#9499AB;} + .d2-2388635244 .stroke-N4{stroke:#CFD2DD;} + .d2-2388635244 .stroke-N5{stroke:#DEE1EB;} + .d2-2388635244 .stroke-N6{stroke:#EEF1F8;} + .d2-2388635244 .stroke-N7{stroke:#FFFFFF;} + .d2-2388635244 .stroke-B1{stroke:#0D32B2;} + .d2-2388635244 .stroke-B2{stroke:#0D32B2;} + .d2-2388635244 .stroke-B3{stroke:#E3E9FD;} + .d2-2388635244 .stroke-B4{stroke:#E3E9FD;} + .d2-2388635244 .stroke-B5{stroke:#EDF0FD;} + .d2-2388635244 .stroke-B6{stroke:#F7F8FE;} + .d2-2388635244 .stroke-AA2{stroke:#4A6FF3;} + .d2-2388635244 .stroke-AA4{stroke:#EDF0FD;} + .d2-2388635244 .stroke-AA5{stroke:#F7F8FE;} + .d2-2388635244 .stroke-AB4{stroke:#EDF0FD;} + .d2-2388635244 .stroke-AB5{stroke:#F7F8FE;} + .d2-2388635244 .background-color-N1{background-color:#0A0F25;} + .d2-2388635244 .background-color-N2{background-color:#676C7E;} + .d2-2388635244 .background-color-N3{background-color:#9499AB;} + .d2-2388635244 .background-color-N4{background-color:#CFD2DD;} + .d2-2388635244 .background-color-N5{background-color:#DEE1EB;} + .d2-2388635244 .background-color-N6{background-color:#EEF1F8;} + .d2-2388635244 .background-color-N7{background-color:#FFFFFF;} + .d2-2388635244 .background-color-B1{background-color:#0D32B2;} + .d2-2388635244 .background-color-B2{background-color:#0D32B2;} + .d2-2388635244 .background-color-B3{background-color:#E3E9FD;} + .d2-2388635244 .background-color-B4{background-color:#E3E9FD;} + .d2-2388635244 .background-color-B5{background-color:#EDF0FD;} + .d2-2388635244 .background-color-B6{background-color:#F7F8FE;} + .d2-2388635244 .background-color-AA2{background-color:#4A6FF3;} + .d2-2388635244 .background-color-AA4{background-color:#EDF0FD;} + .d2-2388635244 .background-color-AA5{background-color:#F7F8FE;} + .d2-2388635244 .background-color-AB4{background-color:#EDF0FD;} + .d2-2388635244 .background-color-AB5{background-color:#F7F8FE;} + .d2-2388635244 .color-N1{color:#0A0F25;} + .d2-2388635244 .color-N2{color:#676C7E;} + .d2-2388635244 .color-N3{color:#9499AB;} + .d2-2388635244 .color-N4{color:#CFD2DD;} + .d2-2388635244 .color-N5{color:#DEE1EB;} + .d2-2388635244 .color-N6{color:#EEF1F8;} + .d2-2388635244 .color-N7{color:#FFFFFF;} + .d2-2388635244 .color-B1{color:#0D32B2;} + .d2-2388635244 .color-B2{color:#0D32B2;} + .d2-2388635244 .color-B3{color:#E3E9FD;} + .d2-2388635244 .color-B4{color:#E3E9FD;} + .d2-2388635244 .color-B5{color:#EDF0FD;} + .d2-2388635244 .color-B6{color:#F7F8FE;} + .d2-2388635244 .color-AA2{color:#4A6FF3;} + .d2-2388635244 .color-AA4{color:#EDF0FD;} + .d2-2388635244 .color-AA5{color:#F7F8FE;} + .d2-2388635244 .color-AB4{color:#EDF0FD;} + .d2-2388635244 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker-d2-2388635244);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker-d2-2388635244);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright-d2-2388635244);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright-d2-2388635244);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright-d2-2388635244);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright-d2-2388635244);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark-d2-2388635244);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright-d2-2388635244);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright-d2-2388635244);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright-d2-2388635244);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright-d2-2388635244);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker-d2-2388635244);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark-d2-2388635244);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal-d2-2388635244);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal-d2-2388635244);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright-d2-2388635244);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright-d2-2388635244);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright-d2-2388635244);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>abcdabcab From 738af0eff02678a11876fcdbe41ae8b4cca0d40f Mon Sep 17 00:00:00 2001 From: Mayank Mohapatra <125661248+Mayank77maruti@users.noreply.github.com> Date: Sat, 22 Feb 2025 16:07:45 +0000 Subject: [PATCH 39/73] try --- d2layouts/d2cycle/layout.go | 12 +- .../txtar/cycle-diagram/dagre/board.exp.json | 24 --- .../txtar/cycle-diagram/dagre/sketch.exp.svg | 152 +++++++++--------- .../txtar/cycle-diagram/elk/board.exp.json | 24 --- .../txtar/cycle-diagram/elk/sketch.exp.svg | 152 +++++++++--------- 5 files changed, 154 insertions(+), 210 deletions(-) diff --git a/d2layouts/d2cycle/layout.go b/d2layouts/d2cycle/layout.go index 4e553977c8..c63eb20397 100644 --- a/d2layouts/d2cycle/layout.go +++ b/d2layouts/d2cycle/layout.go @@ -92,21 +92,13 @@ func createCircularArc(edge *d2graph.Edge) { path[0] = srcCenter path[len(path)-1] = dstCenter + // Clamp endpoints to the boundaries of the source and destination 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 - // Add a point before newDst along the tangent direction - if len(path) >= 2 { - dstAngle := math.Atan2(newDst.Y, newDst.X) - tangent := geo.NewPoint(-math.Sin(dstAngle), math.Cos(dstAngle)) - ε := 0.01 * arcRadius // Small offset, e.g., 1% of radius - preDst := geo.NewPoint(newDst.X - ε*tangent.X, newDst.Y - ε*tangent.Y) - // Insert preDst before newDst - path = append(path[:len(path)-1], preDst, newDst) - } - + // Trim redundant path points that fall inside node boundaries. path = trimPathPoints(path, edge.Src.Box) path = trimPathPoints(path, edge.Dst.Box) diff --git a/e2etests/testdata/txtar/cycle-diagram/dagre/board.exp.json b/e2etests/testdata/txtar/cycle-diagram/dagre/board.exp.json index 1453daf862..78ed2dffeb 100644 --- a/e2etests/testdata/txtar/cycle-diagram/dagre/board.exp.json +++ b/e2etests/testdata/txtar/cycle-diagram/dagre/board.exp.json @@ -867,10 +867,6 @@ "x": 197.02099609375, "y": -34.3849983215332 }, - { - "x": 196.9219970703125, - "y": -34.97200012207031 - }, { "x": 197.2519989013672, "y": -33 @@ -1235,10 +1231,6 @@ "x": 28.18000030517578, "y": 198.00399780273438 }, - { - "x": 28.48200035095215, - "y": 197.96499633789062 - }, { "x": 26.5, "y": 198.22999572753906 @@ -1603,10 +1595,6 @@ "x": -197.02099609375, "y": 34.3849983215332 }, - { - "x": -196.9219970703125, - "y": 34.97200012207031 - }, { "x": -197.2519989013672, "y": 33 @@ -1987,10 +1975,6 @@ "x": 701.875, "y": 115.77300262451172 }, - { - "x": 702.10302734375, - "y": 115.11499786376953 - }, { "x": 701.4329833984375, "y": 116.9990005493164 @@ -2355,10 +2339,6 @@ "x": 364.3710021972656, "y": 183.8260040283203 }, - { - "x": 364.97198486328125, - "y": 184.4929962158203 - }, { "x": 363.6419982910156, "y": 183 @@ -2763,10 +2743,6 @@ "x": 1003.2860107421875, "y": 197.53700256347656 }, - { - "x": 1000.4819946289062, - "y": 197.9530029296875 - }, { "x": 998.5, "y": 198.21800231933594 diff --git a/e2etests/testdata/txtar/cycle-diagram/dagre/sketch.exp.svg b/e2etests/testdata/txtar/cycle-diagram/dagre/sketch.exp.svg index be500c9520..015478d741 100644 --- a/e2etests/testdata/txtar/cycle-diagram/dagre/sketch.exp.svg +++ b/e2etests/testdata/txtar/cycle-diagram/dagre/sketch.exp.svg @@ -1,9 +1,9 @@ -abcdabcab + .d2-153681122 .fill-N1{fill:#0A0F25;} + .d2-153681122 .fill-N2{fill:#676C7E;} + .d2-153681122 .fill-N3{fill:#9499AB;} + .d2-153681122 .fill-N4{fill:#CFD2DD;} + .d2-153681122 .fill-N5{fill:#DEE1EB;} + .d2-153681122 .fill-N6{fill:#EEF1F8;} + .d2-153681122 .fill-N7{fill:#FFFFFF;} + .d2-153681122 .fill-B1{fill:#0D32B2;} + .d2-153681122 .fill-B2{fill:#0D32B2;} + .d2-153681122 .fill-B3{fill:#E3E9FD;} + .d2-153681122 .fill-B4{fill:#E3E9FD;} + .d2-153681122 .fill-B5{fill:#EDF0FD;} + .d2-153681122 .fill-B6{fill:#F7F8FE;} + .d2-153681122 .fill-AA2{fill:#4A6FF3;} + .d2-153681122 .fill-AA4{fill:#EDF0FD;} + .d2-153681122 .fill-AA5{fill:#F7F8FE;} + .d2-153681122 .fill-AB4{fill:#EDF0FD;} + .d2-153681122 .fill-AB5{fill:#F7F8FE;} + .d2-153681122 .stroke-N1{stroke:#0A0F25;} + .d2-153681122 .stroke-N2{stroke:#676C7E;} + .d2-153681122 .stroke-N3{stroke:#9499AB;} + .d2-153681122 .stroke-N4{stroke:#CFD2DD;} + .d2-153681122 .stroke-N5{stroke:#DEE1EB;} + .d2-153681122 .stroke-N6{stroke:#EEF1F8;} + .d2-153681122 .stroke-N7{stroke:#FFFFFF;} + .d2-153681122 .stroke-B1{stroke:#0D32B2;} + .d2-153681122 .stroke-B2{stroke:#0D32B2;} + .d2-153681122 .stroke-B3{stroke:#E3E9FD;} + .d2-153681122 .stroke-B4{stroke:#E3E9FD;} + .d2-153681122 .stroke-B5{stroke:#EDF0FD;} + .d2-153681122 .stroke-B6{stroke:#F7F8FE;} + .d2-153681122 .stroke-AA2{stroke:#4A6FF3;} + .d2-153681122 .stroke-AA4{stroke:#EDF0FD;} + .d2-153681122 .stroke-AA5{stroke:#F7F8FE;} + .d2-153681122 .stroke-AB4{stroke:#EDF0FD;} + .d2-153681122 .stroke-AB5{stroke:#F7F8FE;} + .d2-153681122 .background-color-N1{background-color:#0A0F25;} + .d2-153681122 .background-color-N2{background-color:#676C7E;} + .d2-153681122 .background-color-N3{background-color:#9499AB;} + .d2-153681122 .background-color-N4{background-color:#CFD2DD;} + .d2-153681122 .background-color-N5{background-color:#DEE1EB;} + .d2-153681122 .background-color-N6{background-color:#EEF1F8;} + .d2-153681122 .background-color-N7{background-color:#FFFFFF;} + .d2-153681122 .background-color-B1{background-color:#0D32B2;} + .d2-153681122 .background-color-B2{background-color:#0D32B2;} + .d2-153681122 .background-color-B3{background-color:#E3E9FD;} + .d2-153681122 .background-color-B4{background-color:#E3E9FD;} + .d2-153681122 .background-color-B5{background-color:#EDF0FD;} + .d2-153681122 .background-color-B6{background-color:#F7F8FE;} + .d2-153681122 .background-color-AA2{background-color:#4A6FF3;} + .d2-153681122 .background-color-AA4{background-color:#EDF0FD;} + .d2-153681122 .background-color-AA5{background-color:#F7F8FE;} + .d2-153681122 .background-color-AB4{background-color:#EDF0FD;} + .d2-153681122 .background-color-AB5{background-color:#F7F8FE;} + .d2-153681122 .color-N1{color:#0A0F25;} + .d2-153681122 .color-N2{color:#676C7E;} + .d2-153681122 .color-N3{color:#9499AB;} + .d2-153681122 .color-N4{color:#CFD2DD;} + .d2-153681122 .color-N5{color:#DEE1EB;} + .d2-153681122 .color-N6{color:#EEF1F8;} + .d2-153681122 .color-N7{color:#FFFFFF;} + .d2-153681122 .color-B1{color:#0D32B2;} + .d2-153681122 .color-B2{color:#0D32B2;} + .d2-153681122 .color-B3{color:#E3E9FD;} + .d2-153681122 .color-B4{color:#E3E9FD;} + .d2-153681122 .color-B5{color:#EDF0FD;} + .d2-153681122 .color-B6{color:#F7F8FE;} + .d2-153681122 .color-AA2{color:#4A6FF3;} + .d2-153681122 .color-AA4{color:#EDF0FD;} + .d2-153681122 .color-AA5{color:#F7F8FE;} + .d2-153681122 .color-AB4{color:#EDF0FD;} + .d2-153681122 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker-d2-153681122);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker-d2-153681122);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright-d2-153681122);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright-d2-153681122);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright-d2-153681122);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright-d2-153681122);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark-d2-153681122);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright-d2-153681122);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright-d2-153681122);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright-d2-153681122);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright-d2-153681122);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker-d2-153681122);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark-d2-153681122);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal-d2-153681122);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal-d2-153681122);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright-d2-153681122);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright-d2-153681122);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright-d2-153681122);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>abcdabcab diff --git a/e2etests/testdata/txtar/cycle-diagram/elk/board.exp.json b/e2etests/testdata/txtar/cycle-diagram/elk/board.exp.json index d03145822d..6eb058a841 100644 --- a/e2etests/testdata/txtar/cycle-diagram/elk/board.exp.json +++ b/e2etests/testdata/txtar/cycle-diagram/elk/board.exp.json @@ -867,10 +867,6 @@ "x": 209.02099609375, "y": -22.385000228881836 }, - { - "x": 208.9219970703125, - "y": -22.972000122070312 - }, { "x": 209.2519989013672, "y": -21 @@ -1235,10 +1231,6 @@ "x": 40.18000030517578, "y": 210.00399780273438 }, - { - "x": 40.481998443603516, - "y": 209.96499633789062 - }, { "x": 38.5, "y": 210.22999572753906 @@ -1603,10 +1595,6 @@ "x": -185.02099609375, "y": 46.3849983215332 }, - { - "x": -184.9219970703125, - "y": 46.97200012207031 - }, { "x": -185.2519989013672, "y": 45 @@ -1987,10 +1975,6 @@ "x": 674.375, "y": 127.77300262451172 }, - { - "x": 674.60302734375, - "y": 127.11499786376953 - }, { "x": 673.9329833984375, "y": 128.99899291992188 @@ -2355,10 +2339,6 @@ "x": 336.8710021972656, "y": 195.8260040283203 }, - { - "x": 337.47198486328125, - "y": 196.4929962158203 - }, { "x": 336.1419982910156, "y": 195 @@ -2763,10 +2743,6 @@ "x": 936.197021484375, "y": 209.53700256347656 }, - { - "x": 933.3920288085938, - "y": 209.9530029296875 - }, { "x": 931.4099731445312, "y": 210.21800231933594 diff --git a/e2etests/testdata/txtar/cycle-diagram/elk/sketch.exp.svg b/e2etests/testdata/txtar/cycle-diagram/elk/sketch.exp.svg index a167e907ca..21e65f752a 100644 --- a/e2etests/testdata/txtar/cycle-diagram/elk/sketch.exp.svg +++ b/e2etests/testdata/txtar/cycle-diagram/elk/sketch.exp.svg @@ -1,9 +1,9 @@ -abcdabcab + .d2-2891159010 .fill-N1{fill:#0A0F25;} + .d2-2891159010 .fill-N2{fill:#676C7E;} + .d2-2891159010 .fill-N3{fill:#9499AB;} + .d2-2891159010 .fill-N4{fill:#CFD2DD;} + .d2-2891159010 .fill-N5{fill:#DEE1EB;} + .d2-2891159010 .fill-N6{fill:#EEF1F8;} + .d2-2891159010 .fill-N7{fill:#FFFFFF;} + .d2-2891159010 .fill-B1{fill:#0D32B2;} + .d2-2891159010 .fill-B2{fill:#0D32B2;} + .d2-2891159010 .fill-B3{fill:#E3E9FD;} + .d2-2891159010 .fill-B4{fill:#E3E9FD;} + .d2-2891159010 .fill-B5{fill:#EDF0FD;} + .d2-2891159010 .fill-B6{fill:#F7F8FE;} + .d2-2891159010 .fill-AA2{fill:#4A6FF3;} + .d2-2891159010 .fill-AA4{fill:#EDF0FD;} + .d2-2891159010 .fill-AA5{fill:#F7F8FE;} + .d2-2891159010 .fill-AB4{fill:#EDF0FD;} + .d2-2891159010 .fill-AB5{fill:#F7F8FE;} + .d2-2891159010 .stroke-N1{stroke:#0A0F25;} + .d2-2891159010 .stroke-N2{stroke:#676C7E;} + .d2-2891159010 .stroke-N3{stroke:#9499AB;} + .d2-2891159010 .stroke-N4{stroke:#CFD2DD;} + .d2-2891159010 .stroke-N5{stroke:#DEE1EB;} + .d2-2891159010 .stroke-N6{stroke:#EEF1F8;} + .d2-2891159010 .stroke-N7{stroke:#FFFFFF;} + .d2-2891159010 .stroke-B1{stroke:#0D32B2;} + .d2-2891159010 .stroke-B2{stroke:#0D32B2;} + .d2-2891159010 .stroke-B3{stroke:#E3E9FD;} + .d2-2891159010 .stroke-B4{stroke:#E3E9FD;} + .d2-2891159010 .stroke-B5{stroke:#EDF0FD;} + .d2-2891159010 .stroke-B6{stroke:#F7F8FE;} + .d2-2891159010 .stroke-AA2{stroke:#4A6FF3;} + .d2-2891159010 .stroke-AA4{stroke:#EDF0FD;} + .d2-2891159010 .stroke-AA5{stroke:#F7F8FE;} + .d2-2891159010 .stroke-AB4{stroke:#EDF0FD;} + .d2-2891159010 .stroke-AB5{stroke:#F7F8FE;} + .d2-2891159010 .background-color-N1{background-color:#0A0F25;} + .d2-2891159010 .background-color-N2{background-color:#676C7E;} + .d2-2891159010 .background-color-N3{background-color:#9499AB;} + .d2-2891159010 .background-color-N4{background-color:#CFD2DD;} + .d2-2891159010 .background-color-N5{background-color:#DEE1EB;} + .d2-2891159010 .background-color-N6{background-color:#EEF1F8;} + .d2-2891159010 .background-color-N7{background-color:#FFFFFF;} + .d2-2891159010 .background-color-B1{background-color:#0D32B2;} + .d2-2891159010 .background-color-B2{background-color:#0D32B2;} + .d2-2891159010 .background-color-B3{background-color:#E3E9FD;} + .d2-2891159010 .background-color-B4{background-color:#E3E9FD;} + .d2-2891159010 .background-color-B5{background-color:#EDF0FD;} + .d2-2891159010 .background-color-B6{background-color:#F7F8FE;} + .d2-2891159010 .background-color-AA2{background-color:#4A6FF3;} + .d2-2891159010 .background-color-AA4{background-color:#EDF0FD;} + .d2-2891159010 .background-color-AA5{background-color:#F7F8FE;} + .d2-2891159010 .background-color-AB4{background-color:#EDF0FD;} + .d2-2891159010 .background-color-AB5{background-color:#F7F8FE;} + .d2-2891159010 .color-N1{color:#0A0F25;} + .d2-2891159010 .color-N2{color:#676C7E;} + .d2-2891159010 .color-N3{color:#9499AB;} + .d2-2891159010 .color-N4{color:#CFD2DD;} + .d2-2891159010 .color-N5{color:#DEE1EB;} + .d2-2891159010 .color-N6{color:#EEF1F8;} + .d2-2891159010 .color-N7{color:#FFFFFF;} + .d2-2891159010 .color-B1{color:#0D32B2;} + .d2-2891159010 .color-B2{color:#0D32B2;} + .d2-2891159010 .color-B3{color:#E3E9FD;} + .d2-2891159010 .color-B4{color:#E3E9FD;} + .d2-2891159010 .color-B5{color:#EDF0FD;} + .d2-2891159010 .color-B6{color:#F7F8FE;} + .d2-2891159010 .color-AA2{color:#4A6FF3;} + .d2-2891159010 .color-AA4{color:#EDF0FD;} + .d2-2891159010 .color-AA5{color:#F7F8FE;} + .d2-2891159010 .color-AB4{color:#EDF0FD;} + .d2-2891159010 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker-d2-2891159010);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker-d2-2891159010);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright-d2-2891159010);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright-d2-2891159010);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright-d2-2891159010);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright-d2-2891159010);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark-d2-2891159010);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright-d2-2891159010);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright-d2-2891159010);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright-d2-2891159010);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright-d2-2891159010);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker-d2-2891159010);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark-d2-2891159010);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal-d2-2891159010);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal-d2-2891159010);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright-d2-2891159010);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright-d2-2891159010);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright-d2-2891159010);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>abcdabcab From 59f4a1bb9006df19efbce36e48fac949a287c1ed Mon Sep 17 00:00:00 2001 From: Mayank Mohapatra <125661248+Mayank77maruti@users.noreply.github.com> Date: Sat, 22 Feb 2025 16:09:02 +0000 Subject: [PATCH 40/73] try --- d2layouts/d2cycle/layout.go | 96 ++++++----- .../txtar/cycle-diagram/dagre/board.exp.json | 24 +++ .../txtar/cycle-diagram/dagre/sketch.exp.svg | 152 +++++++++--------- .../txtar/cycle-diagram/elk/board.exp.json | 24 +++ .../txtar/cycle-diagram/elk/sketch.exp.svg | 152 +++++++++--------- 5 files changed, 259 insertions(+), 189 deletions(-) diff --git a/d2layouts/d2cycle/layout.go b/d2layouts/d2cycle/layout.go index c63eb20397..531464f0ba 100644 --- a/d2layouts/d2cycle/layout.go +++ b/d2layouts/d2cycle/layout.go @@ -33,12 +33,13 @@ func Layout(ctx context.Context, g *d2graph.Graph, layout d2graph.LayoutGraph) e positionObjects(objects, radius) for _, edge := range g.Edges { - createCircularArc(edge) + createCircularArc(edge, radius) } return nil } +// calculateRadius determines the radius of the circular layout based on the number and size of objects. func calculateRadius(objects []*d2graph.Object) float64 { numObjects := float64(len(objects)) maxSize := 0.0 @@ -50,9 +51,10 @@ func calculateRadius(objects []*d2graph.Object) float64 { return math.Max(minRadius, MIN_RADIUS) } +// positionObjects arranges objects in a circular pattern around the origin. func positionObjects(objects []*d2graph.Object, radius float64) { numObjects := float64(len(objects)) - angleOffset := -math.Pi / 2 + angleOffset := -math.Pi / 2 // Start at the top of the circle for i, obj := range objects { angle := angleOffset + (2*math.Pi*float64(i)/numObjects) @@ -65,7 +67,8 @@ func positionObjects(objects []*d2graph.Object, radius float64) { } } -func createCircularArc(edge *d2graph.Edge) { +// createCircularArc generates a curved edge route with corrected arrow orientation. +func createCircularArc(edge *d2graph.Edge, radius float64) { if edge.Src == nil || edge.Dst == nil { return } @@ -73,32 +76,26 @@ func createCircularArc(edge *d2graph.Edge) { srcCenter := edge.Src.Center() dstCenter := edge.Dst.Center() - srcAngle := math.Atan2(srcCenter.Y, srcCenter.X) - dstAngle := math.Atan2(dstCenter.Y, dstCenter.X) - if dstAngle < srcAngle { - dstAngle += 2 * math.Pi - } + // Generate initial arc path from source center to destination center + path := generateArcPoints(srcCenter, dstCenter, radius, ARC_STEPS) - arcRadius := math.Hypot(srcCenter.X, srcCenter.Y) - - path := make([]*geo.Point, 0, ARC_STEPS+1) - 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) - path = append(path, geo.NewPoint(x, y)) - } - 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 source and destination 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. + // Add a point before newDst along the tangent direction to correct arrow orientation + if len(path) >= 2 { + dstAngle := math.Atan2(newDst.Y, newDst.X) + tangent := geo.NewPoint(-math.Sin(dstAngle), math.Cos(dstAngle)) + ε := 0.01 * radius // Small offset, e.g., 1% of radius + preDst := geo.NewPoint(newDst.X-ε*tangent.X, newDst.Y-ε*tangent.Y) + // Insert preDst before newDst + path = append(path[:len(path)-1], preDst, newDst) + } + + // Trim redundant path points that fall inside node boundaries path = trimPathPoints(path, edge.Src.Box) path = trimPathPoints(path, edge.Dst.Box) @@ -106,9 +103,34 @@ func createCircularArc(edge *d2graph.Edge) { edge.IsCurve = true } +// generateArcPoints creates points along a circular arc from src to dst. +func generateArcPoints(src, dst *geo.Point, radius float64, steps int) []*geo.Point { + // Calculate angles relative to the center (0,0) + srcAngle := math.Atan2(src.Y, src.X) + dstAngle := math.Atan2(dst.Y, dst.X) + + // Ensure the arc goes the shorter way + if dstAngle < srcAngle { + dstAngle += 2 * math.Pi + } + angleDiff := dstAngle - srcAngle + if angleDiff > math.Pi { + dstAngle -= 2 * math.Pi + } + + // Generate points along the arc + path := make([]*geo.Point, 0, steps+1) + for i := 0; i <= steps; i++ { + t := float64(i) / float64(steps) + angle := srcAngle + t*(dstAngle-srcAngle) + x := radius * math.Cos(angle) + y := radius * math.Sin(angle) + path = append(path, geo.NewPoint(x, y)) + } + return path +} -// clampPointOutsideBox walks forward along the path until it finds a point outside the box, -// then replaces the point with a precise intersection. +// clampPointOutsideBox finds the first point outside the box and computes the precise intersection. func clampPointOutsideBox(box *geo.Box, path []*geo.Point, startIdx int) (int, *geo.Point) { if startIdx >= len(path)-1 { return startIdx, path[startIdx] @@ -131,7 +153,7 @@ func clampPointOutsideBox(box *geo.Box, path []*geo.Point, startIdx int) (int, * return len(path)-1, path[len(path)-1] } -// clampPointOutsideBoxReverse works similarly but in reverse order. +// clampPointOutsideBoxReverse works similarly but traverses the path in reverse. func clampPointOutsideBoxReverse(box *geo.Box, path []*geo.Point, endIdx int) (int, *geo.Point) { if endIdx <= 0 { return endIdx, path[endIdx] @@ -154,8 +176,7 @@ func clampPointOutsideBoxReverse(box *geo.Box, path []*geo.Point, endIdx int) (i return 0, path[0] } -// findPreciseIntersection calculates intersection points between seg and all four sides of the box, -// then returns the intersection closest to seg.Start. +// findPreciseIntersection calculates the closest intersection between a segment and box boundaries. func findPreciseIntersection(box *geo.Box, seg geo.Segment) *geo.Point { intersections := []struct { point *geo.Point @@ -170,9 +191,9 @@ func findPreciseIntersection(box *geo.Box, seg geo.Segment) *geo.Point { dx := seg.End.X - seg.Start.X dy := seg.End.Y - seg.Start.Y - // Check vertical boundaries. + // Check vertical boundaries if dx != 0 { - // Left boundary. + // Left boundary t := (left - seg.Start.X) / dx if t >= 0 && t <= 1 { y := seg.Start.Y + t*dy @@ -183,7 +204,7 @@ func findPreciseIntersection(box *geo.Box, seg geo.Segment) *geo.Point { }{geo.NewPoint(left, y), t}) } } - // Right boundary. + // Right boundary t = (right - seg.Start.X) / dx if t >= 0 && t <= 1 { y := seg.Start.Y + t*dy @@ -196,9 +217,9 @@ func findPreciseIntersection(box *geo.Box, seg geo.Segment) *geo.Point { } } - // Check horizontal boundaries. + // Check horizontal boundaries if dy != 0 { - // Top boundary. + // Top boundary t := (top - seg.Start.Y) / dy if t >= 0 && t <= 1 { x := seg.Start.X + t*dx @@ -209,7 +230,7 @@ func findPreciseIntersection(box *geo.Box, seg geo.Segment) *geo.Point { }{geo.NewPoint(x, top), t}) } } - // Bottom boundary. + // Bottom boundary t = (bottom - seg.Start.Y) / dy if t >= 0 && t <= 1 { x := seg.Start.X + t*dx @@ -226,14 +247,14 @@ func findPreciseIntersection(box *geo.Box, seg geo.Segment) *geo.Point { return nil } - // Sort intersections by t (distance from seg.Start) and return the closest. + // Sort intersections by t (distance from seg.Start) and return the closest sort.Slice(intersections, func(i, j int) bool { return intersections[i].t < intersections[j].t }) return intersections[0].point } -// trimPathPoints removes intermediate points that fall inside the given box while preserving endpoints. +// trimPathPoints removes intermediate points inside the box while retaining endpoints. func trimPathPoints(path []*geo.Point, box *geo.Box) []*geo.Point { if len(path) <= 2 { return path @@ -248,7 +269,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 strictly inside the box (boundary points are outside). func boxContains(b *geo.Box, p *geo.Point) bool { return p.X > b.TopLeft.X && p.X < b.TopLeft.X+b.Width && @@ -256,6 +277,7 @@ func boxContains(b *geo.Box, p *geo.Point) bool { p.Y < b.TopLeft.Y+b.Height } +// positionLabelsIcons sets default positions for labels and icons on objects. func positionLabelsIcons(obj *d2graph.Object) { if obj.Icon != nil && obj.IconPosition == nil { if len(obj.ChildrenArray) > 0 { diff --git a/e2etests/testdata/txtar/cycle-diagram/dagre/board.exp.json b/e2etests/testdata/txtar/cycle-diagram/dagre/board.exp.json index 78ed2dffeb..1453daf862 100644 --- a/e2etests/testdata/txtar/cycle-diagram/dagre/board.exp.json +++ b/e2etests/testdata/txtar/cycle-diagram/dagre/board.exp.json @@ -867,6 +867,10 @@ "x": 197.02099609375, "y": -34.3849983215332 }, + { + "x": 196.9219970703125, + "y": -34.97200012207031 + }, { "x": 197.2519989013672, "y": -33 @@ -1231,6 +1235,10 @@ "x": 28.18000030517578, "y": 198.00399780273438 }, + { + "x": 28.48200035095215, + "y": 197.96499633789062 + }, { "x": 26.5, "y": 198.22999572753906 @@ -1595,6 +1603,10 @@ "x": -197.02099609375, "y": 34.3849983215332 }, + { + "x": -196.9219970703125, + "y": 34.97200012207031 + }, { "x": -197.2519989013672, "y": 33 @@ -1975,6 +1987,10 @@ "x": 701.875, "y": 115.77300262451172 }, + { + "x": 702.10302734375, + "y": 115.11499786376953 + }, { "x": 701.4329833984375, "y": 116.9990005493164 @@ -2339,6 +2355,10 @@ "x": 364.3710021972656, "y": 183.8260040283203 }, + { + "x": 364.97198486328125, + "y": 184.4929962158203 + }, { "x": 363.6419982910156, "y": 183 @@ -2743,6 +2763,10 @@ "x": 1003.2860107421875, "y": 197.53700256347656 }, + { + "x": 1000.4819946289062, + "y": 197.9530029296875 + }, { "x": 998.5, "y": 198.21800231933594 diff --git a/e2etests/testdata/txtar/cycle-diagram/dagre/sketch.exp.svg b/e2etests/testdata/txtar/cycle-diagram/dagre/sketch.exp.svg index 015478d741..be500c9520 100644 --- a/e2etests/testdata/txtar/cycle-diagram/dagre/sketch.exp.svg +++ b/e2etests/testdata/txtar/cycle-diagram/dagre/sketch.exp.svg @@ -1,9 +1,9 @@ -abcdabcab + .d2-1694830323 .fill-N1{fill:#0A0F25;} + .d2-1694830323 .fill-N2{fill:#676C7E;} + .d2-1694830323 .fill-N3{fill:#9499AB;} + .d2-1694830323 .fill-N4{fill:#CFD2DD;} + .d2-1694830323 .fill-N5{fill:#DEE1EB;} + .d2-1694830323 .fill-N6{fill:#EEF1F8;} + .d2-1694830323 .fill-N7{fill:#FFFFFF;} + .d2-1694830323 .fill-B1{fill:#0D32B2;} + .d2-1694830323 .fill-B2{fill:#0D32B2;} + .d2-1694830323 .fill-B3{fill:#E3E9FD;} + .d2-1694830323 .fill-B4{fill:#E3E9FD;} + .d2-1694830323 .fill-B5{fill:#EDF0FD;} + .d2-1694830323 .fill-B6{fill:#F7F8FE;} + .d2-1694830323 .fill-AA2{fill:#4A6FF3;} + .d2-1694830323 .fill-AA4{fill:#EDF0FD;} + .d2-1694830323 .fill-AA5{fill:#F7F8FE;} + .d2-1694830323 .fill-AB4{fill:#EDF0FD;} + .d2-1694830323 .fill-AB5{fill:#F7F8FE;} + .d2-1694830323 .stroke-N1{stroke:#0A0F25;} + .d2-1694830323 .stroke-N2{stroke:#676C7E;} + .d2-1694830323 .stroke-N3{stroke:#9499AB;} + .d2-1694830323 .stroke-N4{stroke:#CFD2DD;} + .d2-1694830323 .stroke-N5{stroke:#DEE1EB;} + .d2-1694830323 .stroke-N6{stroke:#EEF1F8;} + .d2-1694830323 .stroke-N7{stroke:#FFFFFF;} + .d2-1694830323 .stroke-B1{stroke:#0D32B2;} + .d2-1694830323 .stroke-B2{stroke:#0D32B2;} + .d2-1694830323 .stroke-B3{stroke:#E3E9FD;} + .d2-1694830323 .stroke-B4{stroke:#E3E9FD;} + .d2-1694830323 .stroke-B5{stroke:#EDF0FD;} + .d2-1694830323 .stroke-B6{stroke:#F7F8FE;} + .d2-1694830323 .stroke-AA2{stroke:#4A6FF3;} + .d2-1694830323 .stroke-AA4{stroke:#EDF0FD;} + .d2-1694830323 .stroke-AA5{stroke:#F7F8FE;} + .d2-1694830323 .stroke-AB4{stroke:#EDF0FD;} + .d2-1694830323 .stroke-AB5{stroke:#F7F8FE;} + .d2-1694830323 .background-color-N1{background-color:#0A0F25;} + .d2-1694830323 .background-color-N2{background-color:#676C7E;} + .d2-1694830323 .background-color-N3{background-color:#9499AB;} + .d2-1694830323 .background-color-N4{background-color:#CFD2DD;} + .d2-1694830323 .background-color-N5{background-color:#DEE1EB;} + .d2-1694830323 .background-color-N6{background-color:#EEF1F8;} + .d2-1694830323 .background-color-N7{background-color:#FFFFFF;} + .d2-1694830323 .background-color-B1{background-color:#0D32B2;} + .d2-1694830323 .background-color-B2{background-color:#0D32B2;} + .d2-1694830323 .background-color-B3{background-color:#E3E9FD;} + .d2-1694830323 .background-color-B4{background-color:#E3E9FD;} + .d2-1694830323 .background-color-B5{background-color:#EDF0FD;} + .d2-1694830323 .background-color-B6{background-color:#F7F8FE;} + .d2-1694830323 .background-color-AA2{background-color:#4A6FF3;} + .d2-1694830323 .background-color-AA4{background-color:#EDF0FD;} + .d2-1694830323 .background-color-AA5{background-color:#F7F8FE;} + .d2-1694830323 .background-color-AB4{background-color:#EDF0FD;} + .d2-1694830323 .background-color-AB5{background-color:#F7F8FE;} + .d2-1694830323 .color-N1{color:#0A0F25;} + .d2-1694830323 .color-N2{color:#676C7E;} + .d2-1694830323 .color-N3{color:#9499AB;} + .d2-1694830323 .color-N4{color:#CFD2DD;} + .d2-1694830323 .color-N5{color:#DEE1EB;} + .d2-1694830323 .color-N6{color:#EEF1F8;} + .d2-1694830323 .color-N7{color:#FFFFFF;} + .d2-1694830323 .color-B1{color:#0D32B2;} + .d2-1694830323 .color-B2{color:#0D32B2;} + .d2-1694830323 .color-B3{color:#E3E9FD;} + .d2-1694830323 .color-B4{color:#E3E9FD;} + .d2-1694830323 .color-B5{color:#EDF0FD;} + .d2-1694830323 .color-B6{color:#F7F8FE;} + .d2-1694830323 .color-AA2{color:#4A6FF3;} + .d2-1694830323 .color-AA4{color:#EDF0FD;} + .d2-1694830323 .color-AA5{color:#F7F8FE;} + .d2-1694830323 .color-AB4{color:#EDF0FD;} + .d2-1694830323 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker-d2-1694830323);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker-d2-1694830323);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright-d2-1694830323);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright-d2-1694830323);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright-d2-1694830323);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright-d2-1694830323);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark-d2-1694830323);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright-d2-1694830323);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright-d2-1694830323);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright-d2-1694830323);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright-d2-1694830323);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker-d2-1694830323);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark-d2-1694830323);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal-d2-1694830323);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal-d2-1694830323);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright-d2-1694830323);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright-d2-1694830323);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright-d2-1694830323);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>abcdabcab diff --git a/e2etests/testdata/txtar/cycle-diagram/elk/board.exp.json b/e2etests/testdata/txtar/cycle-diagram/elk/board.exp.json index 6eb058a841..d03145822d 100644 --- a/e2etests/testdata/txtar/cycle-diagram/elk/board.exp.json +++ b/e2etests/testdata/txtar/cycle-diagram/elk/board.exp.json @@ -867,6 +867,10 @@ "x": 209.02099609375, "y": -22.385000228881836 }, + { + "x": 208.9219970703125, + "y": -22.972000122070312 + }, { "x": 209.2519989013672, "y": -21 @@ -1231,6 +1235,10 @@ "x": 40.18000030517578, "y": 210.00399780273438 }, + { + "x": 40.481998443603516, + "y": 209.96499633789062 + }, { "x": 38.5, "y": 210.22999572753906 @@ -1595,6 +1603,10 @@ "x": -185.02099609375, "y": 46.3849983215332 }, + { + "x": -184.9219970703125, + "y": 46.97200012207031 + }, { "x": -185.2519989013672, "y": 45 @@ -1975,6 +1987,10 @@ "x": 674.375, "y": 127.77300262451172 }, + { + "x": 674.60302734375, + "y": 127.11499786376953 + }, { "x": 673.9329833984375, "y": 128.99899291992188 @@ -2339,6 +2355,10 @@ "x": 336.8710021972656, "y": 195.8260040283203 }, + { + "x": 337.47198486328125, + "y": 196.4929962158203 + }, { "x": 336.1419982910156, "y": 195 @@ -2743,6 +2763,10 @@ "x": 936.197021484375, "y": 209.53700256347656 }, + { + "x": 933.3920288085938, + "y": 209.9530029296875 + }, { "x": 931.4099731445312, "y": 210.21800231933594 diff --git a/e2etests/testdata/txtar/cycle-diagram/elk/sketch.exp.svg b/e2etests/testdata/txtar/cycle-diagram/elk/sketch.exp.svg index 21e65f752a..a167e907ca 100644 --- a/e2etests/testdata/txtar/cycle-diagram/elk/sketch.exp.svg +++ b/e2etests/testdata/txtar/cycle-diagram/elk/sketch.exp.svg @@ -1,9 +1,9 @@ -abcdabcab + .d2-2388635244 .fill-N1{fill:#0A0F25;} + .d2-2388635244 .fill-N2{fill:#676C7E;} + .d2-2388635244 .fill-N3{fill:#9499AB;} + .d2-2388635244 .fill-N4{fill:#CFD2DD;} + .d2-2388635244 .fill-N5{fill:#DEE1EB;} + .d2-2388635244 .fill-N6{fill:#EEF1F8;} + .d2-2388635244 .fill-N7{fill:#FFFFFF;} + .d2-2388635244 .fill-B1{fill:#0D32B2;} + .d2-2388635244 .fill-B2{fill:#0D32B2;} + .d2-2388635244 .fill-B3{fill:#E3E9FD;} + .d2-2388635244 .fill-B4{fill:#E3E9FD;} + .d2-2388635244 .fill-B5{fill:#EDF0FD;} + .d2-2388635244 .fill-B6{fill:#F7F8FE;} + .d2-2388635244 .fill-AA2{fill:#4A6FF3;} + .d2-2388635244 .fill-AA4{fill:#EDF0FD;} + .d2-2388635244 .fill-AA5{fill:#F7F8FE;} + .d2-2388635244 .fill-AB4{fill:#EDF0FD;} + .d2-2388635244 .fill-AB5{fill:#F7F8FE;} + .d2-2388635244 .stroke-N1{stroke:#0A0F25;} + .d2-2388635244 .stroke-N2{stroke:#676C7E;} + .d2-2388635244 .stroke-N3{stroke:#9499AB;} + .d2-2388635244 .stroke-N4{stroke:#CFD2DD;} + .d2-2388635244 .stroke-N5{stroke:#DEE1EB;} + .d2-2388635244 .stroke-N6{stroke:#EEF1F8;} + .d2-2388635244 .stroke-N7{stroke:#FFFFFF;} + .d2-2388635244 .stroke-B1{stroke:#0D32B2;} + .d2-2388635244 .stroke-B2{stroke:#0D32B2;} + .d2-2388635244 .stroke-B3{stroke:#E3E9FD;} + .d2-2388635244 .stroke-B4{stroke:#E3E9FD;} + .d2-2388635244 .stroke-B5{stroke:#EDF0FD;} + .d2-2388635244 .stroke-B6{stroke:#F7F8FE;} + .d2-2388635244 .stroke-AA2{stroke:#4A6FF3;} + .d2-2388635244 .stroke-AA4{stroke:#EDF0FD;} + .d2-2388635244 .stroke-AA5{stroke:#F7F8FE;} + .d2-2388635244 .stroke-AB4{stroke:#EDF0FD;} + .d2-2388635244 .stroke-AB5{stroke:#F7F8FE;} + .d2-2388635244 .background-color-N1{background-color:#0A0F25;} + .d2-2388635244 .background-color-N2{background-color:#676C7E;} + .d2-2388635244 .background-color-N3{background-color:#9499AB;} + .d2-2388635244 .background-color-N4{background-color:#CFD2DD;} + .d2-2388635244 .background-color-N5{background-color:#DEE1EB;} + .d2-2388635244 .background-color-N6{background-color:#EEF1F8;} + .d2-2388635244 .background-color-N7{background-color:#FFFFFF;} + .d2-2388635244 .background-color-B1{background-color:#0D32B2;} + .d2-2388635244 .background-color-B2{background-color:#0D32B2;} + .d2-2388635244 .background-color-B3{background-color:#E3E9FD;} + .d2-2388635244 .background-color-B4{background-color:#E3E9FD;} + .d2-2388635244 .background-color-B5{background-color:#EDF0FD;} + .d2-2388635244 .background-color-B6{background-color:#F7F8FE;} + .d2-2388635244 .background-color-AA2{background-color:#4A6FF3;} + .d2-2388635244 .background-color-AA4{background-color:#EDF0FD;} + .d2-2388635244 .background-color-AA5{background-color:#F7F8FE;} + .d2-2388635244 .background-color-AB4{background-color:#EDF0FD;} + .d2-2388635244 .background-color-AB5{background-color:#F7F8FE;} + .d2-2388635244 .color-N1{color:#0A0F25;} + .d2-2388635244 .color-N2{color:#676C7E;} + .d2-2388635244 .color-N3{color:#9499AB;} + .d2-2388635244 .color-N4{color:#CFD2DD;} + .d2-2388635244 .color-N5{color:#DEE1EB;} + .d2-2388635244 .color-N6{color:#EEF1F8;} + .d2-2388635244 .color-N7{color:#FFFFFF;} + .d2-2388635244 .color-B1{color:#0D32B2;} + .d2-2388635244 .color-B2{color:#0D32B2;} + .d2-2388635244 .color-B3{color:#E3E9FD;} + .d2-2388635244 .color-B4{color:#E3E9FD;} + .d2-2388635244 .color-B5{color:#EDF0FD;} + .d2-2388635244 .color-B6{color:#F7F8FE;} + .d2-2388635244 .color-AA2{color:#4A6FF3;} + .d2-2388635244 .color-AA4{color:#EDF0FD;} + .d2-2388635244 .color-AA5{color:#F7F8FE;} + .d2-2388635244 .color-AB4{color:#EDF0FD;} + .d2-2388635244 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker-d2-2388635244);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker-d2-2388635244);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright-d2-2388635244);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright-d2-2388635244);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright-d2-2388635244);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright-d2-2388635244);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark-d2-2388635244);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright-d2-2388635244);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright-d2-2388635244);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright-d2-2388635244);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright-d2-2388635244);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker-d2-2388635244);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark-d2-2388635244);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal-d2-2388635244);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal-d2-2388635244);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright-d2-2388635244);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright-d2-2388635244);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright-d2-2388635244);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>abcdabcab From 53423dbabca1c08e1c265f99c2c3a2df0d032e55 Mon Sep 17 00:00:00 2001 From: Mayank Mohapatra <125661248+Mayank77maruti@users.noreply.github.com> Date: Sat, 22 Feb 2025 16:19:48 +0000 Subject: [PATCH 41/73] try --- d2layouts/d2cycle/layout.go | 2 +- .../txtar/cycle-diagram/dagre/board.exp.json | 24 --- .../txtar/cycle-diagram/dagre/sketch.exp.svg | 152 +++++++++--------- .../txtar/cycle-diagram/elk/board.exp.json | 24 --- .../txtar/cycle-diagram/elk/sketch.exp.svg | 152 +++++++++--------- 5 files changed, 153 insertions(+), 201 deletions(-) diff --git a/d2layouts/d2cycle/layout.go b/d2layouts/d2cycle/layout.go index 531464f0ba..81f94c1534 100644 --- a/d2layouts/d2cycle/layout.go +++ b/d2layouts/d2cycle/layout.go @@ -90,7 +90,7 @@ func createCircularArc(edge *d2graph.Edge, radius float64) { dstAngle := math.Atan2(newDst.Y, newDst.X) tangent := geo.NewPoint(-math.Sin(dstAngle), math.Cos(dstAngle)) ε := 0.01 * radius // Small offset, e.g., 1% of radius - preDst := geo.NewPoint(newDst.X-ε*tangent.X, newDst.Y-ε*tangent.Y) + preDst := geo.NewPoint(newDst.X+ε*tangent.X, newDst.Y+ε*tangent.Y) // Insert preDst before newDst path = append(path[:len(path)-1], preDst, newDst) } diff --git a/e2etests/testdata/txtar/cycle-diagram/dagre/board.exp.json b/e2etests/testdata/txtar/cycle-diagram/dagre/board.exp.json index 1453daf862..78ed2dffeb 100644 --- a/e2etests/testdata/txtar/cycle-diagram/dagre/board.exp.json +++ b/e2etests/testdata/txtar/cycle-diagram/dagre/board.exp.json @@ -867,10 +867,6 @@ "x": 197.02099609375, "y": -34.3849983215332 }, - { - "x": 196.9219970703125, - "y": -34.97200012207031 - }, { "x": 197.2519989013672, "y": -33 @@ -1235,10 +1231,6 @@ "x": 28.18000030517578, "y": 198.00399780273438 }, - { - "x": 28.48200035095215, - "y": 197.96499633789062 - }, { "x": 26.5, "y": 198.22999572753906 @@ -1603,10 +1595,6 @@ "x": -197.02099609375, "y": 34.3849983215332 }, - { - "x": -196.9219970703125, - "y": 34.97200012207031 - }, { "x": -197.2519989013672, "y": 33 @@ -1987,10 +1975,6 @@ "x": 701.875, "y": 115.77300262451172 }, - { - "x": 702.10302734375, - "y": 115.11499786376953 - }, { "x": 701.4329833984375, "y": 116.9990005493164 @@ -2355,10 +2339,6 @@ "x": 364.3710021972656, "y": 183.8260040283203 }, - { - "x": 364.97198486328125, - "y": 184.4929962158203 - }, { "x": 363.6419982910156, "y": 183 @@ -2763,10 +2743,6 @@ "x": 1003.2860107421875, "y": 197.53700256347656 }, - { - "x": 1000.4819946289062, - "y": 197.9530029296875 - }, { "x": 998.5, "y": 198.21800231933594 diff --git a/e2etests/testdata/txtar/cycle-diagram/dagre/sketch.exp.svg b/e2etests/testdata/txtar/cycle-diagram/dagre/sketch.exp.svg index be500c9520..015478d741 100644 --- a/e2etests/testdata/txtar/cycle-diagram/dagre/sketch.exp.svg +++ b/e2etests/testdata/txtar/cycle-diagram/dagre/sketch.exp.svg @@ -1,9 +1,9 @@ -abcdabcab + .d2-153681122 .fill-N1{fill:#0A0F25;} + .d2-153681122 .fill-N2{fill:#676C7E;} + .d2-153681122 .fill-N3{fill:#9499AB;} + .d2-153681122 .fill-N4{fill:#CFD2DD;} + .d2-153681122 .fill-N5{fill:#DEE1EB;} + .d2-153681122 .fill-N6{fill:#EEF1F8;} + .d2-153681122 .fill-N7{fill:#FFFFFF;} + .d2-153681122 .fill-B1{fill:#0D32B2;} + .d2-153681122 .fill-B2{fill:#0D32B2;} + .d2-153681122 .fill-B3{fill:#E3E9FD;} + .d2-153681122 .fill-B4{fill:#E3E9FD;} + .d2-153681122 .fill-B5{fill:#EDF0FD;} + .d2-153681122 .fill-B6{fill:#F7F8FE;} + .d2-153681122 .fill-AA2{fill:#4A6FF3;} + .d2-153681122 .fill-AA4{fill:#EDF0FD;} + .d2-153681122 .fill-AA5{fill:#F7F8FE;} + .d2-153681122 .fill-AB4{fill:#EDF0FD;} + .d2-153681122 .fill-AB5{fill:#F7F8FE;} + .d2-153681122 .stroke-N1{stroke:#0A0F25;} + .d2-153681122 .stroke-N2{stroke:#676C7E;} + .d2-153681122 .stroke-N3{stroke:#9499AB;} + .d2-153681122 .stroke-N4{stroke:#CFD2DD;} + .d2-153681122 .stroke-N5{stroke:#DEE1EB;} + .d2-153681122 .stroke-N6{stroke:#EEF1F8;} + .d2-153681122 .stroke-N7{stroke:#FFFFFF;} + .d2-153681122 .stroke-B1{stroke:#0D32B2;} + .d2-153681122 .stroke-B2{stroke:#0D32B2;} + .d2-153681122 .stroke-B3{stroke:#E3E9FD;} + .d2-153681122 .stroke-B4{stroke:#E3E9FD;} + .d2-153681122 .stroke-B5{stroke:#EDF0FD;} + .d2-153681122 .stroke-B6{stroke:#F7F8FE;} + .d2-153681122 .stroke-AA2{stroke:#4A6FF3;} + .d2-153681122 .stroke-AA4{stroke:#EDF0FD;} + .d2-153681122 .stroke-AA5{stroke:#F7F8FE;} + .d2-153681122 .stroke-AB4{stroke:#EDF0FD;} + .d2-153681122 .stroke-AB5{stroke:#F7F8FE;} + .d2-153681122 .background-color-N1{background-color:#0A0F25;} + .d2-153681122 .background-color-N2{background-color:#676C7E;} + .d2-153681122 .background-color-N3{background-color:#9499AB;} + .d2-153681122 .background-color-N4{background-color:#CFD2DD;} + .d2-153681122 .background-color-N5{background-color:#DEE1EB;} + .d2-153681122 .background-color-N6{background-color:#EEF1F8;} + .d2-153681122 .background-color-N7{background-color:#FFFFFF;} + .d2-153681122 .background-color-B1{background-color:#0D32B2;} + .d2-153681122 .background-color-B2{background-color:#0D32B2;} + .d2-153681122 .background-color-B3{background-color:#E3E9FD;} + .d2-153681122 .background-color-B4{background-color:#E3E9FD;} + .d2-153681122 .background-color-B5{background-color:#EDF0FD;} + .d2-153681122 .background-color-B6{background-color:#F7F8FE;} + .d2-153681122 .background-color-AA2{background-color:#4A6FF3;} + .d2-153681122 .background-color-AA4{background-color:#EDF0FD;} + .d2-153681122 .background-color-AA5{background-color:#F7F8FE;} + .d2-153681122 .background-color-AB4{background-color:#EDF0FD;} + .d2-153681122 .background-color-AB5{background-color:#F7F8FE;} + .d2-153681122 .color-N1{color:#0A0F25;} + .d2-153681122 .color-N2{color:#676C7E;} + .d2-153681122 .color-N3{color:#9499AB;} + .d2-153681122 .color-N4{color:#CFD2DD;} + .d2-153681122 .color-N5{color:#DEE1EB;} + .d2-153681122 .color-N6{color:#EEF1F8;} + .d2-153681122 .color-N7{color:#FFFFFF;} + .d2-153681122 .color-B1{color:#0D32B2;} + .d2-153681122 .color-B2{color:#0D32B2;} + .d2-153681122 .color-B3{color:#E3E9FD;} + .d2-153681122 .color-B4{color:#E3E9FD;} + .d2-153681122 .color-B5{color:#EDF0FD;} + .d2-153681122 .color-B6{color:#F7F8FE;} + .d2-153681122 .color-AA2{color:#4A6FF3;} + .d2-153681122 .color-AA4{color:#EDF0FD;} + .d2-153681122 .color-AA5{color:#F7F8FE;} + .d2-153681122 .color-AB4{color:#EDF0FD;} + .d2-153681122 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker-d2-153681122);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker-d2-153681122);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright-d2-153681122);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright-d2-153681122);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright-d2-153681122);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright-d2-153681122);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark-d2-153681122);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright-d2-153681122);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright-d2-153681122);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright-d2-153681122);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright-d2-153681122);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker-d2-153681122);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark-d2-153681122);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal-d2-153681122);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal-d2-153681122);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright-d2-153681122);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright-d2-153681122);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright-d2-153681122);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>abcdabcab diff --git a/e2etests/testdata/txtar/cycle-diagram/elk/board.exp.json b/e2etests/testdata/txtar/cycle-diagram/elk/board.exp.json index d03145822d..6eb058a841 100644 --- a/e2etests/testdata/txtar/cycle-diagram/elk/board.exp.json +++ b/e2etests/testdata/txtar/cycle-diagram/elk/board.exp.json @@ -867,10 +867,6 @@ "x": 209.02099609375, "y": -22.385000228881836 }, - { - "x": 208.9219970703125, - "y": -22.972000122070312 - }, { "x": 209.2519989013672, "y": -21 @@ -1235,10 +1231,6 @@ "x": 40.18000030517578, "y": 210.00399780273438 }, - { - "x": 40.481998443603516, - "y": 209.96499633789062 - }, { "x": 38.5, "y": 210.22999572753906 @@ -1603,10 +1595,6 @@ "x": -185.02099609375, "y": 46.3849983215332 }, - { - "x": -184.9219970703125, - "y": 46.97200012207031 - }, { "x": -185.2519989013672, "y": 45 @@ -1987,10 +1975,6 @@ "x": 674.375, "y": 127.77300262451172 }, - { - "x": 674.60302734375, - "y": 127.11499786376953 - }, { "x": 673.9329833984375, "y": 128.99899291992188 @@ -2355,10 +2339,6 @@ "x": 336.8710021972656, "y": 195.8260040283203 }, - { - "x": 337.47198486328125, - "y": 196.4929962158203 - }, { "x": 336.1419982910156, "y": 195 @@ -2763,10 +2743,6 @@ "x": 936.197021484375, "y": 209.53700256347656 }, - { - "x": 933.3920288085938, - "y": 209.9530029296875 - }, { "x": 931.4099731445312, "y": 210.21800231933594 diff --git a/e2etests/testdata/txtar/cycle-diagram/elk/sketch.exp.svg b/e2etests/testdata/txtar/cycle-diagram/elk/sketch.exp.svg index a167e907ca..21e65f752a 100644 --- a/e2etests/testdata/txtar/cycle-diagram/elk/sketch.exp.svg +++ b/e2etests/testdata/txtar/cycle-diagram/elk/sketch.exp.svg @@ -1,9 +1,9 @@ -abcdabcab + .d2-2891159010 .fill-N1{fill:#0A0F25;} + .d2-2891159010 .fill-N2{fill:#676C7E;} + .d2-2891159010 .fill-N3{fill:#9499AB;} + .d2-2891159010 .fill-N4{fill:#CFD2DD;} + .d2-2891159010 .fill-N5{fill:#DEE1EB;} + .d2-2891159010 .fill-N6{fill:#EEF1F8;} + .d2-2891159010 .fill-N7{fill:#FFFFFF;} + .d2-2891159010 .fill-B1{fill:#0D32B2;} + .d2-2891159010 .fill-B2{fill:#0D32B2;} + .d2-2891159010 .fill-B3{fill:#E3E9FD;} + .d2-2891159010 .fill-B4{fill:#E3E9FD;} + .d2-2891159010 .fill-B5{fill:#EDF0FD;} + .d2-2891159010 .fill-B6{fill:#F7F8FE;} + .d2-2891159010 .fill-AA2{fill:#4A6FF3;} + .d2-2891159010 .fill-AA4{fill:#EDF0FD;} + .d2-2891159010 .fill-AA5{fill:#F7F8FE;} + .d2-2891159010 .fill-AB4{fill:#EDF0FD;} + .d2-2891159010 .fill-AB5{fill:#F7F8FE;} + .d2-2891159010 .stroke-N1{stroke:#0A0F25;} + .d2-2891159010 .stroke-N2{stroke:#676C7E;} + .d2-2891159010 .stroke-N3{stroke:#9499AB;} + .d2-2891159010 .stroke-N4{stroke:#CFD2DD;} + .d2-2891159010 .stroke-N5{stroke:#DEE1EB;} + .d2-2891159010 .stroke-N6{stroke:#EEF1F8;} + .d2-2891159010 .stroke-N7{stroke:#FFFFFF;} + .d2-2891159010 .stroke-B1{stroke:#0D32B2;} + .d2-2891159010 .stroke-B2{stroke:#0D32B2;} + .d2-2891159010 .stroke-B3{stroke:#E3E9FD;} + .d2-2891159010 .stroke-B4{stroke:#E3E9FD;} + .d2-2891159010 .stroke-B5{stroke:#EDF0FD;} + .d2-2891159010 .stroke-B6{stroke:#F7F8FE;} + .d2-2891159010 .stroke-AA2{stroke:#4A6FF3;} + .d2-2891159010 .stroke-AA4{stroke:#EDF0FD;} + .d2-2891159010 .stroke-AA5{stroke:#F7F8FE;} + .d2-2891159010 .stroke-AB4{stroke:#EDF0FD;} + .d2-2891159010 .stroke-AB5{stroke:#F7F8FE;} + .d2-2891159010 .background-color-N1{background-color:#0A0F25;} + .d2-2891159010 .background-color-N2{background-color:#676C7E;} + .d2-2891159010 .background-color-N3{background-color:#9499AB;} + .d2-2891159010 .background-color-N4{background-color:#CFD2DD;} + .d2-2891159010 .background-color-N5{background-color:#DEE1EB;} + .d2-2891159010 .background-color-N6{background-color:#EEF1F8;} + .d2-2891159010 .background-color-N7{background-color:#FFFFFF;} + .d2-2891159010 .background-color-B1{background-color:#0D32B2;} + .d2-2891159010 .background-color-B2{background-color:#0D32B2;} + .d2-2891159010 .background-color-B3{background-color:#E3E9FD;} + .d2-2891159010 .background-color-B4{background-color:#E3E9FD;} + .d2-2891159010 .background-color-B5{background-color:#EDF0FD;} + .d2-2891159010 .background-color-B6{background-color:#F7F8FE;} + .d2-2891159010 .background-color-AA2{background-color:#4A6FF3;} + .d2-2891159010 .background-color-AA4{background-color:#EDF0FD;} + .d2-2891159010 .background-color-AA5{background-color:#F7F8FE;} + .d2-2891159010 .background-color-AB4{background-color:#EDF0FD;} + .d2-2891159010 .background-color-AB5{background-color:#F7F8FE;} + .d2-2891159010 .color-N1{color:#0A0F25;} + .d2-2891159010 .color-N2{color:#676C7E;} + .d2-2891159010 .color-N3{color:#9499AB;} + .d2-2891159010 .color-N4{color:#CFD2DD;} + .d2-2891159010 .color-N5{color:#DEE1EB;} + .d2-2891159010 .color-N6{color:#EEF1F8;} + .d2-2891159010 .color-N7{color:#FFFFFF;} + .d2-2891159010 .color-B1{color:#0D32B2;} + .d2-2891159010 .color-B2{color:#0D32B2;} + .d2-2891159010 .color-B3{color:#E3E9FD;} + .d2-2891159010 .color-B4{color:#E3E9FD;} + .d2-2891159010 .color-B5{color:#EDF0FD;} + .d2-2891159010 .color-B6{color:#F7F8FE;} + .d2-2891159010 .color-AA2{color:#4A6FF3;} + .d2-2891159010 .color-AA4{color:#EDF0FD;} + .d2-2891159010 .color-AA5{color:#F7F8FE;} + .d2-2891159010 .color-AB4{color:#EDF0FD;} + .d2-2891159010 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker-d2-2891159010);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker-d2-2891159010);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright-d2-2891159010);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright-d2-2891159010);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright-d2-2891159010);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright-d2-2891159010);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark-d2-2891159010);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright-d2-2891159010);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright-d2-2891159010);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright-d2-2891159010);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright-d2-2891159010);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker-d2-2891159010);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark-d2-2891159010);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal-d2-2891159010);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal-d2-2891159010);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright-d2-2891159010);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright-d2-2891159010);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright-d2-2891159010);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>abcdabcab From b31f8720c7d9f6ddecfab46a86aed58287ba71d8 Mon Sep 17 00:00:00 2001 From: Mayank Mohapatra <125661248+Mayank77maruti@users.noreply.github.com> Date: Sat, 22 Feb 2025 16:20:41 +0000 Subject: [PATCH 42/73] try --- d2layouts/d2cycle/layout.go | 2 +- .../txtar/cycle-diagram/dagre/board.exp.json | 2078 +++++++---------- .../txtar/cycle-diagram/dagre/sketch.exp.svg | 172 +- .../txtar/cycle-diagram/elk/board.exp.json | 2078 +++++++---------- .../txtar/cycle-diagram/elk/sketch.exp.svg | 172 +- 5 files changed, 1843 insertions(+), 2659 deletions(-) diff --git a/d2layouts/d2cycle/layout.go b/d2layouts/d2cycle/layout.go index 81f94c1534..b0692943f4 100644 --- a/d2layouts/d2cycle/layout.go +++ b/d2layouts/d2cycle/layout.go @@ -12,7 +12,7 @@ import ( ) const ( - MIN_RADIUS = 200 + MIN_RADIUS = 100 PADDING = 20 MIN_SEGMENT_LEN = 10 ARC_STEPS = 100 diff --git a/e2etests/testdata/txtar/cycle-diagram/dagre/board.exp.json b/e2etests/testdata/txtar/cycle-diagram/dagre/board.exp.json index 78ed2dffeb..b5f4f083ef 100644 --- a/e2etests/testdata/txtar/cycle-diagram/dagre/board.exp.json +++ b/e2etests/testdata/txtar/cycle-diagram/dagre/board.exp.json @@ -18,8 +18,8 @@ "x": 0, "y": 0 }, - "width": 453, - "height": 466, + "width": 253, + "height": 266, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -57,7 +57,7 @@ "type": "rectangle", "pos": { "x": -26, - "y": -233 + "y": -133 }, "width": 53, "height": 66, @@ -98,7 +98,7 @@ "id": "1.b", "type": "rectangle", "pos": { - "x": 173, + "x": 73, "y": -33 }, "width": 53, @@ -141,7 +141,7 @@ "type": "rectangle", "pos": { "x": -26, - "y": 167 + "y": 67 }, "width": 53, "height": 66, @@ -182,7 +182,7 @@ "id": "1.d", "type": "rectangle", "pos": { - "x": -227, + "x": -127, "y": -32 }, "width": 54, @@ -224,11 +224,11 @@ "id": "2", "type": "cycle", "pos": { - "x": 513, - "y": 50 + "x": 313, + "y": 25 }, - "width": 399, - "height": 366, + "width": 226, + "height": 216, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -265,8 +265,8 @@ "id": "2.a", "type": "rectangle", "pos": { - "x": 486, - "y": -183 + "x": 286, + "y": -108 }, "width": 53, "height": 66, @@ -307,8 +307,8 @@ "id": "2.b", "type": "rectangle", "pos": { - "x": 659, - "y": 116 + "x": 373, + "y": 41 }, "width": 53, "height": 66, @@ -349,8 +349,8 @@ "id": "2.c", "type": "rectangle", "pos": { - "x": 313, - "y": 117 + "x": 199, + "y": 42 }, "width": 53, "height": 66, @@ -391,11 +391,11 @@ "id": "3", "type": "cycle", "pos": { - "x": 972, + "x": 599, "y": 0 }, "width": 53, - "height": 466, + "height": 266, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -432,8 +432,8 @@ "id": "3.a", "type": "rectangle", "pos": { - "x": 945, - "y": -233 + "x": 572, + "y": -133 }, "width": 53, "height": 66, @@ -474,8 +474,8 @@ "id": "3.b", "type": "rectangle", "pos": { - "x": 945, - "y": 167 + "x": 572, + "y": 67 }, "width": 53, "height": 66, @@ -541,334 +541,254 @@ "route": [ { "x": 26.5, - "y": -198.22999572753906 - }, - { - "x": 28.18000030517578, - "y": -198.00399780273438 - }, - { - "x": 31.285999298095703, - "y": -197.53700256347656 - }, - { - "x": 34.3849983215332, - "y": -197.02099609375 - }, - { - "x": 37.47600173950195, - "y": -196.45700073242188 - }, - { - "x": 40.55699920654297, - "y": -195.843994140625 - }, - { - "x": 43.62799835205078, - "y": -195.18299865722656 - }, - { - "x": 46.68899917602539, - "y": -194.47300720214844 - }, - { - "x": 49.73699951171875, - "y": -193.71600341796875 - }, - { - "x": 52.77399826049805, - "y": -192.91099548339844 - }, - { - "x": 55.79800033569336, - "y": -192.05799865722656 - }, - { - "x": 58.80799865722656, - "y": -191.1580047607422 - }, - { - "x": 61.803001403808594, - "y": -190.21099853515625 + "y": -96.4229965209961 }, { - "x": 64.78299713134766, - "y": -189.2169952392578 + "x": 27.89900016784668, + "y": -96.02899932861328 }, { - "x": 67.74700164794922, - "y": -188.17599487304688 + "x": 29.40399932861328, + "y": -95.5790023803711 }, { - "x": 70.69400024414062, - "y": -187.08799743652344 + "x": 30.900999069213867, + "y": -95.1050033569336 }, { - "x": 73.6240005493164, - "y": -185.9550018310547 + "x": 32.39099884033203, + "y": -94.60800170898438 }, { - "x": 76.53600311279297, - "y": -184.77499389648438 + "x": 33.87300109863281, + "y": -94.08799743652344 }, { - "x": 79.42900085449219, - "y": -183.5500030517578 + "x": 35.34700012207031, + "y": -93.54399871826172 }, { - "x": 82.302001953125, - "y": -182.27999877929688 + "x": 36.8120002746582, + "y": -92.97699737548828 }, { - "x": 85.15499877929688, - "y": -180.96499633789062 + "x": 38.268001556396484, + "y": -92.38700103759766 }, { - "x": 87.98699951171875, - "y": -179.60499572753906 + "x": 39.7140007019043, + "y": -91.7750015258789 }, { - "x": 90.7979965209961, - "y": -178.2010040283203 + "x": 41.1510009765625, + "y": -91.13999938964844 }, { - "x": 93.58499908447266, - "y": -176.7530059814453 + "x": 42.57699966430664, + "y": -90.48200225830078 }, { - "x": 96.3499984741211, - "y": -175.26100158691406 + "x": 43.99300003051758, + "y": -89.802001953125 }, { - "x": 99.09100341796875, - "y": -173.7259979248047 + "x": 45.39899826049805, + "y": -89.0999984741211 }, { - "x": 101.80799865722656, - "y": -172.1479949951172 + "x": 46.79199981689453, + "y": -88.3759994506836 }, { - "x": 104.4990005493164, - "y": -170.5279998779297 + "x": 48.17499923706055, + "y": -87.62999725341797 }, { - "x": 107.16500091552734, - "y": -168.86500549316406 + "x": 49.54499816894531, + "y": -86.86299896240234 }, { - "x": 109.80400085449219, - "y": -167.16099548339844 + "x": 50.90399932861328, + "y": -86.0739974975586 }, { - "x": 112.41600036621094, - "y": -165.41600036621094 + "x": 52.249000549316406, + "y": -85.26399993896484 }, { - "x": 115.0009994506836, - "y": -163.62899780273438 + "x": 53.582000732421875, + "y": -84.43199920654297 }, { - "x": 117.55699920654297, - "y": -161.80299377441406 + "x": 54.902000427246094, + "y": -83.58000183105469 }, { - "x": 120.08399963378906, - "y": -159.93600463867188 + "x": 56.20800018310547, + "y": -82.70800018310547 }, { - "x": 122.58100128173828, - "y": -158.031005859375 + "x": 57.5, + "y": -81.81400299072266 }, { - "x": 125.0479965209961, - "y": -156.08599853515625 + "x": 58.77799987792969, + "y": -80.9010009765625 }, { - "x": 127.48400115966797, - "y": -154.1020050048828 + "x": 60.04199981689453, + "y": -79.96800231933594 }, { - "x": 129.88900756835938, - "y": -152.08099365234375 + "x": 61.290000915527344, + "y": -79.01499938964844 }, { - "x": 132.26199340820312, - "y": -150.02200317382812 + "x": 62.52399826049805, + "y": -78.04299926757812 }, { - "x": 134.6020050048828, - "y": -147.92599487304688 + "x": 63.742000579833984, + "y": -77.0510025024414 }, { - "x": 136.90899658203125, - "y": -145.79299926757812 + "x": 64.94400024414062, + "y": -76.04000091552734 }, { - "x": 139.1820068359375, - "y": -143.625 + "x": 66.13099670410156, + "y": -75.01100158691406 }, { - "x": 141.42100524902344, - "y": -141.42100524902344 + "x": 67.3010025024414, + "y": -73.96299743652344 }, { - "x": 143.625, - "y": -139.1820068359375 + "x": 68.4540023803711, + "y": -72.89600372314453 }, { - "x": 145.79299926757812, - "y": -136.90899658203125 + "x": 69.59100341796875, + "y": -71.81199645996094 }, { - "x": 147.92599487304688, - "y": -134.6020050048828 + "x": 70.70999908447266, + "y": -70.70999908447266 }, { - "x": 150.02200317382812, - "y": -132.26199340820312 + "x": 71.81199645996094, + "y": -69.59100341796875 }, { - "x": 152.08099365234375, - "y": -129.88900756835938 + "x": 72.89600372314453, + "y": -68.4540023803711 }, { - "x": 154.1020050048828, - "y": -127.48400115966797 + "x": 73.96299743652344, + "y": -67.3010025024414 }, { - "x": 156.08599853515625, - "y": -125.0479965209961 + "x": 75.01100158691406, + "y": -66.13099670410156 }, { - "x": 158.031005859375, - "y": -122.58100128173828 + "x": 76.04000091552734, + "y": -64.94400024414062 }, { - "x": 159.93600463867188, - "y": -120.08399963378906 + "x": 77.0510025024414, + "y": -63.742000579833984 }, { - "x": 161.80299377441406, - "y": -117.55699920654297 + "x": 78.04299926757812, + "y": -62.52399826049805 }, { - "x": 163.62899780273438, - "y": -115.0009994506836 + "x": 79.01499938964844, + "y": -61.290000915527344 }, { - "x": 165.41600036621094, - "y": -112.41600036621094 + "x": 79.96800231933594, + "y": -60.04199981689453 }, { - "x": 167.16099548339844, - "y": -109.80400085449219 + "x": 80.9010009765625, + "y": -58.77799987792969 }, { - "x": 168.86500549316406, - "y": -107.16500091552734 + "x": 81.81400299072266, + "y": -57.5 }, { - "x": 170.5279998779297, - "y": -104.4990005493164 + "x": 82.70800018310547, + "y": -56.20800018310547 }, { - "x": 172.1479949951172, - "y": -101.80799865722656 + "x": 83.58000183105469, + "y": -54.902000427246094 }, { - "x": 173.7259979248047, - "y": -99.09100341796875 + "x": 84.43199920654297, + "y": -53.582000732421875 }, { - "x": 175.26100158691406, - "y": -96.3499984741211 + "x": 85.26399993896484, + "y": -52.249000549316406 }, { - "x": 176.7530059814453, - "y": -93.58499908447266 + "x": 86.0739974975586, + "y": -50.90399932861328 }, { - "x": 178.2010040283203, - "y": -90.7979965209961 + "x": 86.86299896240234, + "y": -49.54499816894531 }, { - "x": 179.60499572753906, - "y": -87.98699951171875 + "x": 87.62999725341797, + "y": -48.17499923706055 }, { - "x": 180.96499633789062, - "y": -85.15499877929688 + "x": 88.3759994506836, + "y": -46.79199981689453 }, { - "x": 182.27999877929688, - "y": -82.302001953125 + "x": 89.0999984741211, + "y": -45.39899826049805 }, { - "x": 183.5500030517578, - "y": -79.42900085449219 + "x": 89.802001953125, + "y": -43.99300003051758 }, { - "x": 184.77499389648438, - "y": -76.53600311279297 + "x": 90.48200225830078, + "y": -42.57699966430664 }, { - "x": 185.9550018310547, - "y": -73.6240005493164 + "x": 91.13999938964844, + "y": -41.1510009765625 }, { - "x": 187.08799743652344, - "y": -70.69400024414062 + "x": 91.7750015258789, + "y": -39.7140007019043 }, { - "x": 188.17599487304688, - "y": -67.74700164794922 + "x": 92.38700103759766, + "y": -38.268001556396484 }, { - "x": 189.2169952392578, - "y": -64.78299713134766 + "x": 92.97699737548828, + "y": -36.8120002746582 }, { - "x": 190.21099853515625, - "y": -61.803001403808594 + "x": 93.54399871826172, + "y": -35.34700012207031 }, { - "x": 191.1580047607422, - "y": -58.80799865722656 + "x": 94.08799743652344, + "y": -33.87300109863281 }, { - "x": 192.05799865722656, - "y": -55.79800033569336 - }, - { - "x": 192.91099548339844, - "y": -52.77399826049805 - }, - { - "x": 193.71600341796875, - "y": -49.73699951171875 - }, - { - "x": 194.47300720214844, - "y": -46.68899917602539 - }, - { - "x": 195.18299865722656, - "y": -43.62799835205078 - }, - { - "x": 195.843994140625, - "y": -40.55699920654297 - }, - { - "x": 196.45700073242188, - "y": -37.47600173950195 - }, - { - "x": 197.02099609375, - "y": -34.3849983215332 - }, - { - "x": 197.2519989013672, + "x": 94.39399719238281, "y": -33 } ], @@ -904,336 +824,256 @@ "link": "", "route": [ { - "x": 197.2519989013672, + "x": 94.39399719238281, "y": 33 }, { - "x": 197.02099609375, - "y": 34.3849983215332 - }, - { - "x": 196.45700073242188, - "y": 37.47600173950195 - }, - { - "x": 195.843994140625, - "y": 40.55699920654297 - }, - { - "x": 195.18299865722656, - "y": 43.62799835205078 - }, - { - "x": 194.47300720214844, - "y": 46.68899917602539 - }, - { - "x": 193.71600341796875, - "y": 49.73699951171875 + "x": 94.08799743652344, + "y": 33.87300109863281 }, { - "x": 192.91099548339844, - "y": 52.77399826049805 + "x": 93.54399871826172, + "y": 35.34700012207031 }, { - "x": 192.05799865722656, - "y": 55.79800033569336 + "x": 92.97699737548828, + "y": 36.8120002746582 }, { - "x": 191.1580047607422, - "y": 58.80799865722656 + "x": 92.38700103759766, + "y": 38.268001556396484 }, { - "x": 190.21099853515625, - "y": 61.803001403808594 + "x": 91.7750015258789, + "y": 39.7140007019043 }, { - "x": 189.2169952392578, - "y": 64.78299713134766 + "x": 91.13999938964844, + "y": 41.1510009765625 }, { - "x": 188.17599487304688, - "y": 67.74700164794922 + "x": 90.48200225830078, + "y": 42.57699966430664 }, { - "x": 187.08799743652344, - "y": 70.69400024414062 + "x": 89.802001953125, + "y": 43.99300003051758 }, { - "x": 185.9550018310547, - "y": 73.6240005493164 + "x": 89.0999984741211, + "y": 45.39899826049805 }, { - "x": 184.77499389648438, - "y": 76.53600311279297 + "x": 88.3759994506836, + "y": 46.79199981689453 }, { - "x": 183.5500030517578, - "y": 79.42900085449219 + "x": 87.62999725341797, + "y": 48.17499923706055 }, { - "x": 182.27999877929688, - "y": 82.302001953125 + "x": 86.86299896240234, + "y": 49.54499816894531 }, { - "x": 180.96499633789062, - "y": 85.15499877929688 + "x": 86.0739974975586, + "y": 50.90399932861328 }, { - "x": 179.60499572753906, - "y": 87.98699951171875 + "x": 85.26399993896484, + "y": 52.249000549316406 }, { - "x": 178.2010040283203, - "y": 90.7979965209961 + "x": 84.43199920654297, + "y": 53.582000732421875 }, { - "x": 176.7530059814453, - "y": 93.58499908447266 + "x": 83.58000183105469, + "y": 54.902000427246094 }, { - "x": 175.26100158691406, - "y": 96.3499984741211 + "x": 82.70800018310547, + "y": 56.20800018310547 }, { - "x": 173.7259979248047, - "y": 99.09100341796875 + "x": 81.81400299072266, + "y": 57.5 }, { - "x": 172.1479949951172, - "y": 101.80799865722656 + "x": 80.9010009765625, + "y": 58.77799987792969 }, { - "x": 170.5279998779297, - "y": 104.4990005493164 + "x": 79.96800231933594, + "y": 60.04199981689453 }, { - "x": 168.86500549316406, - "y": 107.16500091552734 + "x": 79.01499938964844, + "y": 61.290000915527344 }, { - "x": 167.16099548339844, - "y": 109.80400085449219 + "x": 78.04299926757812, + "y": 62.52399826049805 }, { - "x": 165.41600036621094, - "y": 112.41600036621094 + "x": 77.0510025024414, + "y": 63.742000579833984 }, { - "x": 163.62899780273438, - "y": 115.0009994506836 + "x": 76.04000091552734, + "y": 64.94400024414062 }, { - "x": 161.80299377441406, - "y": 117.55699920654297 + "x": 75.01100158691406, + "y": 66.13099670410156 }, { - "x": 159.93600463867188, - "y": 120.08399963378906 + "x": 73.96299743652344, + "y": 67.3010025024414 }, { - "x": 158.031005859375, - "y": 122.58100128173828 + "x": 72.89600372314453, + "y": 68.4540023803711 }, { - "x": 156.08599853515625, - "y": 125.0479965209961 + "x": 71.81199645996094, + "y": 69.59100341796875 }, { - "x": 154.1020050048828, - "y": 127.48400115966797 + "x": 70.70999908447266, + "y": 70.70999908447266 }, { - "x": 152.08099365234375, - "y": 129.88900756835938 + "x": 69.59100341796875, + "y": 71.81199645996094 }, { - "x": 150.02200317382812, - "y": 132.26199340820312 + "x": 68.4540023803711, + "y": 72.89600372314453 }, { - "x": 147.92599487304688, - "y": 134.6020050048828 + "x": 67.3010025024414, + "y": 73.96299743652344 }, { - "x": 145.79299926757812, - "y": 136.90899658203125 + "x": 66.13099670410156, + "y": 75.01100158691406 }, { - "x": 143.625, - "y": 139.1820068359375 + "x": 64.94400024414062, + "y": 76.04000091552734 }, { - "x": 141.42100524902344, - "y": 141.42100524902344 + "x": 63.742000579833984, + "y": 77.0510025024414 }, { - "x": 139.1820068359375, - "y": 143.625 + "x": 62.52399826049805, + "y": 78.04299926757812 }, { - "x": 136.90899658203125, - "y": 145.79299926757812 + "x": 61.290000915527344, + "y": 79.01499938964844 }, { - "x": 134.6020050048828, - "y": 147.92599487304688 + "x": 60.04199981689453, + "y": 79.96800231933594 }, { - "x": 132.26199340820312, - "y": 150.02200317382812 + "x": 58.77799987792969, + "y": 80.9010009765625 }, { - "x": 129.88900756835938, - "y": 152.08099365234375 + "x": 57.5, + "y": 81.81400299072266 }, { - "x": 127.48400115966797, - "y": 154.1020050048828 + "x": 56.20800018310547, + "y": 82.70800018310547 }, { - "x": 125.0479965209961, - "y": 156.08599853515625 + "x": 54.902000427246094, + "y": 83.58000183105469 }, { - "x": 122.58100128173828, - "y": 158.031005859375 + "x": 53.582000732421875, + "y": 84.43199920654297 }, { - "x": 120.08399963378906, - "y": 159.93600463867188 + "x": 52.249000549316406, + "y": 85.26399993896484 }, { - "x": 117.55699920654297, - "y": 161.80299377441406 + "x": 50.90399932861328, + "y": 86.0739974975586 }, { - "x": 115.0009994506836, - "y": 163.62899780273438 + "x": 49.54499816894531, + "y": 86.86299896240234 }, { - "x": 112.41600036621094, - "y": 165.41600036621094 + "x": 48.17499923706055, + "y": 87.62999725341797 }, { - "x": 109.80400085449219, - "y": 167.16099548339844 + "x": 46.79199981689453, + "y": 88.3759994506836 }, { - "x": 107.16500091552734, - "y": 168.86500549316406 + "x": 45.39899826049805, + "y": 89.0999984741211 }, { - "x": 104.4990005493164, - "y": 170.5279998779297 + "x": 43.99300003051758, + "y": 89.802001953125 }, { - "x": 101.80799865722656, - "y": 172.1479949951172 + "x": 42.57699966430664, + "y": 90.48200225830078 }, { - "x": 99.09100341796875, - "y": 173.7259979248047 + "x": 41.1510009765625, + "y": 91.13999938964844 }, { - "x": 96.3499984741211, - "y": 175.26100158691406 + "x": 39.7140007019043, + "y": 91.7750015258789 }, { - "x": 93.58499908447266, - "y": 176.7530059814453 + "x": 38.268001556396484, + "y": 92.38700103759766 }, { - "x": 90.7979965209961, - "y": 178.2010040283203 + "x": 36.8120002746582, + "y": 92.97699737548828 }, { - "x": 87.98699951171875, - "y": 179.60499572753906 + "x": 35.34700012207031, + "y": 93.54399871826172 }, { - "x": 85.15499877929688, - "y": 180.96499633789062 + "x": 33.87300109863281, + "y": 94.08799743652344 }, { - "x": 82.302001953125, - "y": 182.27999877929688 + "x": 32.39099884033203, + "y": 94.60800170898438 }, { - "x": 79.42900085449219, - "y": 183.5500030517578 + "x": 30.900999069213867, + "y": 95.1050033569336 }, { - "x": 76.53600311279297, - "y": 184.77499389648438 + "x": 29.40399932861328, + "y": 95.5790023803711 }, { - "x": 73.6240005493164, - "y": 185.9550018310547 - }, - { - "x": 70.69400024414062, - "y": 187.08799743652344 - }, - { - "x": 67.74700164794922, - "y": 188.17599487304688 - }, - { - "x": 64.78299713134766, - "y": 189.2169952392578 - }, - { - "x": 61.803001403808594, - "y": 190.21099853515625 - }, - { - "x": 58.80799865722656, - "y": 191.1580047607422 - }, - { - "x": 55.79800033569336, - "y": 192.05799865722656 - }, - { - "x": 52.77399826049805, - "y": 192.91099548339844 - }, - { - "x": 49.73699951171875, - "y": 193.71600341796875 - }, - { - "x": 46.68899917602539, - "y": 194.47300720214844 - }, - { - "x": 43.62799835205078, - "y": 195.18299865722656 - }, - { - "x": 40.55699920654297, - "y": 195.843994140625 - }, - { - "x": 37.47600173950195, - "y": 196.45700073242188 - }, - { - "x": 34.3849983215332, - "y": 197.02099609375 - }, - { - "x": 31.285999298095703, - "y": 197.53700256347656 - }, - { - "x": 28.18000030517578, - "y": 198.00399780273438 + "x": 27.89900016784668, + "y": 96.02899932861328 }, { "x": 26.5, - "y": 198.22999572753906 + "y": 96.4229965209961 } ], "isCurve": true, @@ -1269,334 +1109,254 @@ "route": [ { "x": -26.499000549316406, - "y": 198.22999572753906 - }, - { - "x": -28.18000030517578, - "y": 198.00399780273438 - }, - { - "x": -31.285999298095703, - "y": 197.53700256347656 - }, - { - "x": -34.3849983215332, - "y": 197.02099609375 - }, - { - "x": -37.47600173950195, - "y": 196.45700073242188 - }, - { - "x": -40.55699920654297, - "y": 195.843994140625 - }, - { - "x": -43.62799835205078, - "y": 195.18299865722656 - }, - { - "x": -46.68899917602539, - "y": 194.47300720214844 - }, - { - "x": -49.73699951171875, - "y": 193.71600341796875 - }, - { - "x": -52.77399826049805, - "y": 192.91099548339844 - }, - { - "x": -55.79800033569336, - "y": 192.05799865722656 - }, - { - "x": -58.80799865722656, - "y": 191.1580047607422 + "y": 96.4229965209961 }, { - "x": -61.803001403808594, - "y": 190.21099853515625 + "x": -27.89900016784668, + "y": 96.02899932861328 }, { - "x": -64.78299713134766, - "y": 189.2169952392578 + "x": -29.40399932861328, + "y": 95.5790023803711 }, { - "x": -67.74700164794922, - "y": 188.17599487304688 + "x": -30.900999069213867, + "y": 95.1050033569336 }, { - "x": -70.69400024414062, - "y": 187.08799743652344 + "x": -32.39099884033203, + "y": 94.60800170898438 }, { - "x": -73.6240005493164, - "y": 185.9550018310547 + "x": -33.87300109863281, + "y": 94.08799743652344 }, { - "x": -76.53600311279297, - "y": 184.77499389648438 + "x": -35.34700012207031, + "y": 93.54399871826172 }, { - "x": -79.42900085449219, - "y": 183.5500030517578 + "x": -36.8120002746582, + "y": 92.97699737548828 }, { - "x": -82.302001953125, - "y": 182.27999877929688 + "x": -38.268001556396484, + "y": 92.38700103759766 }, { - "x": -85.15499877929688, - "y": 180.96499633789062 + "x": -39.7140007019043, + "y": 91.7750015258789 }, { - "x": -87.98699951171875, - "y": 179.60499572753906 + "x": -41.1510009765625, + "y": 91.13999938964844 }, { - "x": -90.7979965209961, - "y": 178.2010040283203 + "x": -42.57699966430664, + "y": 90.48200225830078 }, { - "x": -93.58499908447266, - "y": 176.7530059814453 + "x": -43.99300003051758, + "y": 89.802001953125 }, { - "x": -96.3499984741211, - "y": 175.26100158691406 + "x": -45.39899826049805, + "y": 89.0999984741211 }, { - "x": -99.09100341796875, - "y": 173.7259979248047 + "x": -46.79199981689453, + "y": 88.3759994506836 }, { - "x": -101.80799865722656, - "y": 172.1479949951172 + "x": -48.17499923706055, + "y": 87.62999725341797 }, { - "x": -104.4990005493164, - "y": 170.5279998779297 + "x": -49.54499816894531, + "y": 86.86299896240234 }, { - "x": -107.16500091552734, - "y": 168.86500549316406 + "x": -50.90399932861328, + "y": 86.0739974975586 }, { - "x": -109.80400085449219, - "y": 167.16099548339844 + "x": -52.249000549316406, + "y": 85.26399993896484 }, { - "x": -112.41600036621094, - "y": 165.41600036621094 + "x": -53.582000732421875, + "y": 84.43199920654297 }, { - "x": -115.0009994506836, - "y": 163.62899780273438 + "x": -54.902000427246094, + "y": 83.58000183105469 }, { - "x": -117.55699920654297, - "y": 161.80299377441406 + "x": -56.20800018310547, + "y": 82.70800018310547 }, { - "x": -120.08399963378906, - "y": 159.93600463867188 + "x": -57.5, + "y": 81.81400299072266 }, { - "x": -122.58100128173828, - "y": 158.031005859375 + "x": -58.77799987792969, + "y": 80.9010009765625 }, { - "x": -125.0479965209961, - "y": 156.08599853515625 + "x": -60.04199981689453, + "y": 79.96800231933594 }, { - "x": -127.48400115966797, - "y": 154.1020050048828 + "x": -61.290000915527344, + "y": 79.01499938964844 }, { - "x": -129.88900756835938, - "y": 152.08099365234375 + "x": -62.52399826049805, + "y": 78.04299926757812 }, { - "x": -132.26199340820312, - "y": 150.02200317382812 + "x": -63.742000579833984, + "y": 77.0510025024414 }, { - "x": -134.6020050048828, - "y": 147.92599487304688 + "x": -64.94400024414062, + "y": 76.04000091552734 }, { - "x": -136.90899658203125, - "y": 145.79299926757812 + "x": -66.13099670410156, + "y": 75.01100158691406 }, { - "x": -139.1820068359375, - "y": 143.625 + "x": -67.3010025024414, + "y": 73.96299743652344 }, { - "x": -141.42100524902344, - "y": 141.42100524902344 + "x": -68.4540023803711, + "y": 72.89600372314453 }, { - "x": -143.625, - "y": 139.1820068359375 + "x": -69.59100341796875, + "y": 71.81199645996094 }, { - "x": -145.79299926757812, - "y": 136.90899658203125 + "x": -70.70999908447266, + "y": 70.70999908447266 }, { - "x": -147.92599487304688, - "y": 134.6020050048828 + "x": -71.81199645996094, + "y": 69.59100341796875 }, { - "x": -150.02200317382812, - "y": 132.26199340820312 + "x": -72.89600372314453, + "y": 68.4540023803711 }, { - "x": -152.08099365234375, - "y": 129.88900756835938 + "x": -73.96299743652344, + "y": 67.3010025024414 }, { - "x": -154.1020050048828, - "y": 127.48400115966797 + "x": -75.01100158691406, + "y": 66.13099670410156 }, { - "x": -156.08599853515625, - "y": 125.0479965209961 + "x": -76.04000091552734, + "y": 64.94400024414062 }, { - "x": -158.031005859375, - "y": 122.58100128173828 + "x": -77.0510025024414, + "y": 63.742000579833984 }, { - "x": -159.93600463867188, - "y": 120.08399963378906 + "x": -78.04299926757812, + "y": 62.52399826049805 }, { - "x": -161.80299377441406, - "y": 117.55699920654297 + "x": -79.01499938964844, + "y": 61.290000915527344 }, { - "x": -163.62899780273438, - "y": 115.0009994506836 + "x": -79.96800231933594, + "y": 60.04199981689453 }, { - "x": -165.41600036621094, - "y": 112.41600036621094 + "x": -80.9010009765625, + "y": 58.77799987792969 }, { - "x": -167.16099548339844, - "y": 109.80400085449219 + "x": -81.81400299072266, + "y": 57.5 }, { - "x": -168.86500549316406, - "y": 107.16500091552734 + "x": -82.70800018310547, + "y": 56.20800018310547 }, { - "x": -170.5279998779297, - "y": 104.4990005493164 + "x": -83.58000183105469, + "y": 54.902000427246094 }, { - "x": -172.1479949951172, - "y": 101.80799865722656 + "x": -84.43199920654297, + "y": 53.582000732421875 }, { - "x": -173.7259979248047, - "y": 99.09100341796875 + "x": -85.26399993896484, + "y": 52.249000549316406 }, { - "x": -175.26100158691406, - "y": 96.3499984741211 + "x": -86.0739974975586, + "y": 50.90399932861328 }, { - "x": -176.7530059814453, - "y": 93.58499908447266 + "x": -86.86299896240234, + "y": 49.54499816894531 }, { - "x": -178.2010040283203, - "y": 90.7979965209961 + "x": -87.62999725341797, + "y": 48.17499923706055 }, { - "x": -179.60499572753906, - "y": 87.98699951171875 + "x": -88.3759994506836, + "y": 46.79199981689453 }, { - "x": -180.96499633789062, - "y": 85.15499877929688 + "x": -89.0999984741211, + "y": 45.39899826049805 }, { - "x": -182.27999877929688, - "y": 82.302001953125 + "x": -89.802001953125, + "y": 43.99300003051758 }, { - "x": -183.5500030517578, - "y": 79.42900085449219 + "x": -90.48200225830078, + "y": 42.57699966430664 }, { - "x": -184.77499389648438, - "y": 76.53600311279297 + "x": -91.13999938964844, + "y": 41.1510009765625 }, { - "x": -185.9550018310547, - "y": 73.6240005493164 + "x": -91.7750015258789, + "y": 39.7140007019043 }, { - "x": -187.08799743652344, - "y": 70.69400024414062 + "x": -92.38700103759766, + "y": 38.268001556396484 }, { - "x": -188.17599487304688, - "y": 67.74700164794922 + "x": -92.97699737548828, + "y": 36.8120002746582 }, { - "x": -189.2169952392578, - "y": 64.78299713134766 + "x": -93.54399871826172, + "y": 35.34700012207031 }, { - "x": -190.21099853515625, - "y": 61.803001403808594 + "x": -94.08799743652344, + "y": 33.87300109863281 }, { - "x": -191.1580047607422, - "y": 58.80799865722656 - }, - { - "x": -192.05799865722656, - "y": 55.79800033569336 - }, - { - "x": -192.91099548339844, - "y": 52.77399826049805 - }, - { - "x": -193.71600341796875, - "y": 49.73699951171875 - }, - { - "x": -194.47300720214844, - "y": 46.68899917602539 - }, - { - "x": -195.18299865722656, - "y": 43.62799835205078 - }, - { - "x": -195.843994140625, - "y": 40.55699920654297 - }, - { - "x": -196.45700073242188, - "y": 37.47600173950195 - }, - { - "x": -197.02099609375, - "y": 34.3849983215332 - }, - { - "x": -197.2519989013672, + "x": -94.39399719238281, "y": 33 } ], @@ -1632,352 +1392,296 @@ "link": "", "route": [ { - "x": 539.5, - "y": -148.2259979248047 - }, - { - "x": 542.2160034179688, - "y": -147.85400390625 - }, - { - "x": 546.35302734375, - "y": -147.19900512695312 - }, - { - "x": 550.4760131835938, - "y": -146.45700073242188 - }, - { - "x": 554.5819702148438, - "y": -145.62899780273438 + "x": 339.5, + "y": -71.4209976196289 }, { - "x": 558.6699829101562, - "y": -144.71499633789062 + "x": 339.8909912109375, + "y": -71.31600189208984 }, { - "x": 562.7369995117188, - "y": -143.71600341796875 + "x": 341.90301513671875, + "y": -70.73100280761719 }, { - "x": 566.7830200195312, - "y": -142.6320037841797 + "x": 343.9010009765625, + "y": -70.1050033569336 }, { - "x": 570.8060302734375, - "y": -141.46299743652344 + "x": 345.885986328125, + "y": -69.43699645996094 }, { - "x": 574.802978515625, - "y": -140.21099853515625 + "x": 347.85699462890625, + "y": -68.72799682617188 }, { - "x": 578.7730102539062, - "y": -138.875 + "x": 349.81201171875, + "y": -67.97699737548828 }, { - "x": 582.7139892578125, - "y": -137.45599365234375 + "x": 351.7510070800781, + "y": -67.18599700927734 }, { - "x": 586.6240234375, - "y": -135.9550018310547 + "x": 353.6730041503906, + "y": -66.35399627685547 }, { - "x": 590.5029907226562, - "y": -134.3719940185547 + "x": 355.5769958496094, + "y": -65.48200225830078 }, { - "x": 594.3469848632812, - "y": -132.70899963378906 + "x": 357.4630126953125, + "y": -64.57099914550781 }, { - "x": 598.155029296875, - "y": -130.96499633789062 + "x": 359.3290100097656, + "y": -63.619998931884766 }, { - "x": 601.927001953125, - "y": -129.14199829101562 + "x": 361.17498779296875, + "y": -62.630001068115234 }, { - "x": 605.6589965820312, - "y": -127.23999786376953 + "x": 363, + "y": -61.60200119018555 }, { - "x": 609.3499755859375, - "y": -125.26100158691406 + "x": 364.802001953125, + "y": -60.5359992980957 }, { - "x": 613, - "y": -123.20500183105469 + "x": 366.5820007324219, + "y": -59.43199920654297 }, { - "x": 616.60498046875, - "y": -121.0719985961914 + "x": 368.3389892578125, + "y": -58.29199981689453 }, { - "x": 620.1649780273438, - "y": -118.86499786376953 + "x": 370.0710144042969, + "y": -57.11399841308594 }, { - "x": 623.677978515625, - "y": -116.58399963378906 + "x": 371.77801513671875, + "y": -55.9010009765625 }, { - "x": 627.1420288085938, - "y": -114.22899627685547 + "x": 373.4590148925781, + "y": -54.652000427246094 }, { - "x": 630.5570068359375, - "y": -111.8030014038086 + "x": 375.114013671875, + "y": -53.36899948120117 }, { - "x": 633.9190063476562, - "y": -109.30500030517578 + "x": 376.74200439453125, + "y": -52.05099868774414 }, { - "x": 637.22900390625, - "y": -106.73799896240234 + "x": 378.3420104980469, + "y": -50.69900131225586 }, { - "x": 640.4840087890625, - "y": -104.10199737548828 + "x": 379.9129943847656, + "y": -49.31399917602539 }, { - "x": 643.6840209960938, - "y": -101.39900207519531 + "x": 381.4540100097656, + "y": -47.895999908447266 }, { - "x": 646.8259887695312, - "y": -98.62799835205078 + "x": 382.96600341796875, + "y": -46.446998596191406 }, { - "x": 649.9089965820312, - "y": -95.79299926757812 + "x": 384.4469909667969, + "y": -44.965999603271484 }, { - "x": 652.9320068359375, - "y": -92.89399719238281 + "x": 385.89599609375, + "y": -43.45399856567383 }, { - "x": 655.8939819335938, - "y": -89.93199920654297 + "x": 387.3139953613281, + "y": -41.91299819946289 }, { - "x": 658.7930297851562, - "y": -86.90899658203125 + "x": 388.6990051269531, + "y": -40.34199905395508 }, { - "x": 661.6279907226562, - "y": -83.82599639892578 + "x": 390.0509948730469, + "y": -38.742000579833984 }, { - "x": 664.3989868164062, - "y": -80.68399810791016 + "x": 391.3689880371094, + "y": -37.11399841308594 }, { - "x": 667.1019897460938, - "y": -77.48400115966797 + "x": 392.6520080566406, + "y": -35.45899963378906 }, { - "x": 669.7379760742188, - "y": -74.22899627685547 + "x": 393.9010009765625, + "y": -33.77799987792969 }, { - "x": 672.3049926757812, - "y": -70.91899871826172 + "x": 395.114013671875, + "y": -32.07099914550781 }, { - "x": 674.802978515625, - "y": -67.55699920654297 + "x": 396.2919921875, + "y": -30.339000701904297 }, { - "x": 677.22900390625, - "y": -64.14199829101562 + "x": 397.4320068359375, + "y": -28.582000732421875 }, { - "x": 679.583984375, - "y": -60.678001403808594 + "x": 398.5360107421875, + "y": -26.802000045776367 }, { - "x": 681.864990234375, - "y": -57.165000915527344 + "x": 399.60198974609375, + "y": -25 }, { - "x": 684.072021484375, - "y": -53.60499954223633 + "x": 400.6300048828125, + "y": -23.174999237060547 }, { - "x": 686.2050170898438, - "y": -50 + "x": 401.6199951171875, + "y": -21.32900047302246 }, { - "x": 688.260986328125, - "y": -46.349998474121094 + "x": 402.5710144042969, + "y": -19.46299934387207 }, { - "x": 690.239990234375, - "y": -42.659000396728516 + "x": 403.48199462890625, + "y": -17.57699966430664 }, { - "x": 692.1420288085938, - "y": -38.926998138427734 + "x": 404.35400390625, + "y": -15.67300033569336 }, { - "x": 693.9650268554688, - "y": -35.154998779296875 + "x": 405.1860046386719, + "y": -13.75100040435791 }, { - "x": 695.708984375, - "y": -31.347000122070312 + "x": 405.97698974609375, + "y": -11.812000274658203 }, { - "x": 697.3720092773438, - "y": -27.503000259399414 + "x": 406.7279968261719, + "y": -9.857000350952148 }, { - "x": 698.9550170898438, - "y": -23.624000549316406 + "x": 407.43701171875, + "y": -7.886000156402588 }, { - "x": 700.4559936523438, - "y": -19.714000701904297 + "x": 408.1050109863281, + "y": -5.901000022888184 }, { - "x": 701.875, - "y": -15.77299976348877 + "x": 408.7309875488281, + "y": -3.9030001163482666 }, { - "x": 703.2109985351562, - "y": -11.803000450134277 + "x": 409.3160095214844, + "y": -1.8910000324249268 }, { - "x": 704.4630126953125, - "y": -7.806000232696533 + "x": 409.8580017089844, + "y": 0.13099999725818634 }, { - "x": 705.6320190429688, - "y": -3.7829999923706055 + "x": 410.35699462890625, + "y": 2.1640000343322754 }, { - "x": 706.7160034179688, - "y": 0.2619999945163727 + "x": 410.8139953613281, + "y": 4.208000183105469 }, { - "x": 707.7150268554688, - "y": 4.328999996185303 + "x": 411.2279968261719, + "y": 6.261000156402588 }, { - "x": 708.6290283203125, - "y": 8.416999816894531 + "x": 411.5989990234375, + "y": 8.322999954223633 }, { - "x": 709.4569702148438, - "y": 12.52299976348877 + "x": 411.927001953125, + "y": 10.390999794006348 }, { - "x": 710.198974609375, - "y": 16.645999908447266 + "x": 412.21099853515625, + "y": 12.465999603271484 }, { - "x": 710.85400390625, - "y": 20.783000946044922 + "x": 412.4519958496094, + "y": 14.54699993133545 }, { - "x": 711.4219970703125, - "y": 24.933000564575195 + "x": 412.64898681640625, + "y": 16.631999969482422 }, { - "x": 711.9039916992188, - "y": 29.0939998626709 + "x": 412.802001953125, + "y": 18.719999313354492 }, { - "x": 712.2979736328125, - "y": 33.263999938964844 + "x": 412.9119873046875, + "y": 20.812000274658203 }, { - "x": 712.60498046875, - "y": 37.441001892089844 + "x": 412.9779968261719, + "y": 22.905000686645508 }, { - "x": 712.823974609375, - "y": 41.624000549316406 - }, - { - "x": 712.9559936523438, - "y": 45.81100082397461 - }, - { - "x": 713, - "y": 50 - }, - { - "x": 712.9559936523438, - "y": 54.1879997253418 - }, - { - "x": 712.823974609375, - "y": 58.375 - }, - { - "x": 712.60498046875, - "y": 62.55799865722656 - }, - { - "x": 712.2979736328125, - "y": 66.73500061035156 - }, - { - "x": 711.9039916992188, - "y": 70.90499877929688 - }, - { - "x": 711.4219970703125, - "y": 75.06600189208984 - }, - { - "x": 710.85400390625, - "y": 79.21600341796875 - }, - { - "x": 710.198974609375, - "y": 83.35299682617188 + "x": 413, + "y": 25 }, { - "x": 709.4569702148438, - "y": 87.47599792480469 + "x": 412.9779968261719, + "y": 27.0939998626709 }, { - "x": 708.6290283203125, - "y": 91.58200073242188 + "x": 412.9119873046875, + "y": 29.187000274658203 }, { - "x": 707.7150268554688, - "y": 95.66999816894531 + "x": 412.802001953125, + "y": 31.27899932861328 }, { - "x": 706.7160034179688, - "y": 99.73699951171875 + "x": 412.64898681640625, + "y": 33.367000579833984 }, { - "x": 705.6320190429688, - "y": 103.78299713134766 + "x": 412.4519958496094, + "y": 35.45199966430664 }, { - "x": 704.4630126953125, - "y": 107.80599975585938 + "x": 412.21099853515625, + "y": 37.53300094604492 }, { - "x": 703.2109985351562, - "y": 111.8030014038086 + "x": 411.927001953125, + "y": 39.608001708984375 }, { - "x": 701.875, - "y": 115.77300262451172 + "x": 411.5989990234375, + "y": 41.67599868774414 }, { - "x": 701.4329833984375, - "y": 116.9990005493164 + "x": 411.5409851074219, + "y": 41.999000549316406 } ], "isCurve": true, @@ -2012,336 +1716,256 @@ "link": "", "route": [ { - "x": 662.3569946289062, - "y": 182.99899291992188 - }, - { - "x": 661.6279907226562, - "y": 183.8260040283203 - }, - { - "x": 658.7930297851562, - "y": 186.90899658203125 - }, - { - "x": 655.8939819335938, - "y": 189.9320068359375 - }, - { - "x": 652.9320068359375, - "y": 192.8939971923828 - }, - { - "x": 649.9089965820312, - "y": 195.79299926757812 - }, - { - "x": 646.8259887695312, - "y": 198.6280059814453 - }, - { - "x": 643.6840209960938, - "y": 201.3990020751953 - }, - { - "x": 640.4840087890625, - "y": 204.1020050048828 - }, - { - "x": 637.22900390625, - "y": 206.73800659179688 - }, - { - "x": 633.9190063476562, - "y": 209.30499267578125 - }, - { - "x": 630.5570068359375, - "y": 211.80299377441406 - }, - { - "x": 627.1420288085938, - "y": 214.22900390625 - }, - { - "x": 623.677978515625, - "y": 216.58399963378906 - }, - { - "x": 620.1649780273438, - "y": 218.86500549316406 - }, - { - "x": 616.60498046875, - "y": 221.07200622558594 - }, - { - "x": 613, - "y": 223.2050018310547 - }, - { - "x": 609.3499755859375, - "y": 225.26100158691406 + "x": 373.10198974609375, + "y": 104.91799926757812 }, { - "x": 605.6589965820312, - "y": 227.24000549316406 + "x": 371.77801513671875, + "y": 105.9010009765625 }, { - "x": 601.927001953125, - "y": 229.14199829101562 + "x": 370.0710144042969, + "y": 107.11399841308594 }, { - "x": 598.155029296875, - "y": 230.96499633789062 + "x": 368.3389892578125, + "y": 108.29199981689453 }, { - "x": 594.3469848632812, - "y": 232.70899963378906 + "x": 366.5820007324219, + "y": 109.43199920654297 }, { - "x": 590.5029907226562, - "y": 234.3719940185547 + "x": 364.802001953125, + "y": 110.53600311279297 }, { - "x": 586.6240234375, - "y": 235.9550018310547 + "x": 363, + "y": 111.60199737548828 }, { - "x": 582.7139892578125, - "y": 237.45599365234375 + "x": 361.17498779296875, + "y": 112.62999725341797 }, { - "x": 578.7730102539062, - "y": 238.875 + "x": 359.3290100097656, + "y": 113.62000274658203 }, { - "x": 574.802978515625, - "y": 240.21099853515625 + "x": 357.4630126953125, + "y": 114.57099914550781 }, { - "x": 570.8060302734375, - "y": 241.46299743652344 + "x": 355.5769958496094, + "y": 115.48200225830078 }, { - "x": 566.7830200195312, - "y": 242.6320037841797 + "x": 353.6730041503906, + "y": 116.35399627685547 }, { - "x": 562.7369995117188, - "y": 243.71600341796875 + "x": 351.7510070800781, + "y": 117.18599700927734 }, { - "x": 558.6699829101562, - "y": 244.71499633789062 + "x": 349.81201171875, + "y": 117.97699737548828 }, { - "x": 554.5819702148438, - "y": 245.62899780273438 + "x": 347.85699462890625, + "y": 118.72799682617188 }, { - "x": 550.4760131835938, - "y": 246.45700073242188 + "x": 345.885986328125, + "y": 119.43699645996094 }, { - "x": 546.35302734375, - "y": 247.19900512695312 + "x": 343.9010009765625, + "y": 120.1050033569336 }, { - "x": 542.2160034179688, - "y": 247.85400390625 + "x": 341.90301513671875, + "y": 120.73100280761719 }, { - "x": 538.0659790039062, - "y": 248.4219970703125 + "x": 339.8909912109375, + "y": 121.31600189208984 }, { - "x": 533.905029296875, - "y": 248.9040069580078 + "x": 337.8680114746094, + "y": 121.85800170898438 }, { - "x": 529.7349853515625, - "y": 249.29800415039062 + "x": 335.8349914550781, + "y": 122.35700225830078 }, { - "x": 525.5579833984375, - "y": 249.60499572753906 + "x": 333.7909851074219, + "y": 122.81400299072266 }, { - "x": 521.375, - "y": 249.82400512695312 + "x": 331.7380065917969, + "y": 123.22799682617188 }, { - "x": 517.18798828125, - "y": 249.95599365234375 + "x": 329.6759948730469, + "y": 123.5989990234375 }, { - "x": 513, - "y": 250 + "x": 327.6080017089844, + "y": 123.927001953125 }, { - "x": 508.8110046386719, - "y": 249.95599365234375 + "x": 325.5329895019531, + "y": 124.21099853515625 }, { - "x": 504.6239929199219, - "y": 249.82400512695312 + "x": 323.4519958496094, + "y": 124.4520034790039 }, { - "x": 500.4410095214844, - "y": 249.60499572753906 + "x": 321.36700439453125, + "y": 124.64900207519531 }, { - "x": 496.2640075683594, - "y": 249.29800415039062 + "x": 319.27899169921875, + "y": 124.802001953125 }, { - "x": 492.093994140625, - "y": 248.9040069580078 + "x": 317.18701171875, + "y": 124.91200256347656 }, { - "x": 487.9330139160156, - "y": 248.4219970703125 + "x": 315.093994140625, + "y": 124.97799682617188 }, { - "x": 483.7829895019531, - "y": 247.85400390625 + "x": 313, + "y": 125 }, { - "x": 479.64599609375, - "y": 247.19900512695312 + "x": 310.9049987792969, + "y": 124.97799682617188 }, { - "x": 475.52301025390625, - "y": 246.45700073242188 + "x": 308.81201171875, + "y": 124.91200256347656 }, { - "x": 471.4169921875, - "y": 245.62899780273438 + "x": 306.7200012207031, + "y": 124.802001953125 }, { - "x": 467.3290100097656, - "y": 244.71499633789062 + "x": 304.6319885253906, + "y": 124.64900207519531 }, { - "x": 463.2619934082031, - "y": 243.71600341796875 + "x": 302.5469970703125, + "y": 124.4520034790039 }, { - "x": 459.21600341796875, - "y": 242.6320037841797 + "x": 300.46600341796875, + "y": 124.21099853515625 }, { - "x": 455.1929931640625, - "y": 241.46299743652344 + "x": 298.3909912109375, + "y": 123.927001953125 }, { - "x": 451.1960144042969, - "y": 240.21099853515625 + "x": 296.322998046875, + "y": 123.5989990234375 }, { - "x": 447.22601318359375, - "y": 238.875 + "x": 294.260986328125, + "y": 123.22799682617188 }, { - "x": 443.2850036621094, - "y": 237.45599365234375 + "x": 292.2080078125, + "y": 122.81400299072266 }, { - "x": 439.375, - "y": 235.9550018310547 + "x": 290.16400146484375, + "y": 122.35700225830078 }, { - "x": 435.4960021972656, - "y": 234.3719940185547 + "x": 288.1310119628906, + "y": 121.85800170898438 }, { - "x": 431.6520080566406, - "y": 232.70899963378906 + "x": 286.1080017089844, + "y": 121.31600189208984 }, { - "x": 427.843994140625, - "y": 230.96499633789062 + "x": 284.09600830078125, + "y": 120.73100280761719 }, { - "x": 424.0719909667969, - "y": 229.14199829101562 + "x": 282.0979919433594, + "y": 120.1050033569336 }, { - "x": 420.3399963378906, - "y": 227.24000549316406 + "x": 280.1130065917969, + "y": 119.43699645996094 }, { - "x": 416.64898681640625, - "y": 225.26100158691406 + "x": 278.1419982910156, + "y": 118.72799682617188 }, { - "x": 413, - "y": 223.2050018310547 + "x": 276.18701171875, + "y": 117.97699737548828 }, { - "x": 409.3940124511719, - "y": 221.07200622558594 + "x": 274.24798583984375, + "y": 117.18599700927734 }, { - "x": 405.8340148925781, - "y": 218.86500549316406 + "x": 272.32598876953125, + "y": 116.35399627685547 }, { - "x": 402.3210144042969, - "y": 216.58399963378906 + "x": 270.4219970703125, + "y": 115.48200225830078 }, { - "x": 398.85699462890625, - "y": 214.22900390625 + "x": 268.5360107421875, + "y": 114.57099914550781 }, { - "x": 395.4419860839844, - "y": 211.80299377441406 + "x": 266.6700134277344, + "y": 113.62000274658203 }, { - "x": 392.0799865722656, - "y": 209.30499267578125 + "x": 264.8240051269531, + "y": 112.62999725341797 }, { - "x": 388.7699890136719, - "y": 206.73800659179688 + "x": 263, + "y": 111.60199737548828 }, { - "x": 385.5150146484375, - "y": 204.1020050048828 + "x": 261.1969909667969, + "y": 110.53600311279297 }, { - "x": 382.31500244140625, - "y": 201.3990020751953 + "x": 259.4169921875, + "y": 109.43199920654297 }, { - "x": 379.1730041503906, - "y": 198.6280059814453 + "x": 257.6600036621094, + "y": 108.29199981689453 }, { - "x": 376.0899963378906, - "y": 195.79299926757812 + "x": 255.92799377441406, + "y": 107.11399841308594 }, { - "x": 373.0669860839844, - "y": 192.8939971923828 + "x": 254.2209930419922, + "y": 105.9010009765625 }, { - "x": 370.1050109863281, - "y": 189.9320068359375 - }, - { - "x": 367.20599365234375, - "y": 186.90899658203125 - }, - { - "x": 364.3710021972656, - "y": 183.8260040283203 - }, - { - "x": 363.6419982910156, - "y": 183 + "x": 252.89700317382812, + "y": 104.91799926757812 } ], "isCurve": true, @@ -2376,376 +2000,344 @@ "link": "", "route": [ { - "x": 998.5, - "y": -198.21800231933594 - }, - { - "x": 1003.2860107421875, - "y": -197.53700256347656 - }, - { - "x": 1009.4760131835938, - "y": -196.45700073242188 - }, - { - "x": 1015.6279907226562, - "y": -195.18299865722656 + "x": 625.5, + "y": -96.41200256347656 }, { - "x": 1021.7369995117188, - "y": -193.71600341796875 + "x": 626.8989868164062, + "y": -96.02899932861328 }, { - "x": 1027.7979736328125, - "y": -192.05799865722656 + "x": 629.9010009765625, + "y": -95.1050033569336 }, { - "x": 1033.802978515625, - "y": -190.21099853515625 + "x": 632.8729858398438, + "y": -94.08799743652344 }, { - "x": 1039.7469482421875, - "y": -188.17599487304688 + "x": 635.81201171875, + "y": -92.97699737548828 }, { - "x": 1045.6240234375, - "y": -185.9550018310547 + "x": 638.7139892578125, + "y": -91.7750015258789 }, { - "x": 1051.428955078125, - "y": -183.5500030517578 + "x": 641.5770263671875, + "y": -90.48200225830078 }, { - "x": 1057.155029296875, - "y": -180.96499633789062 + "x": 644.3989868164062, + "y": -89.0999984741211 }, { - "x": 1062.7979736328125, - "y": -178.2010040283203 + "x": 647.1749877929688, + "y": -87.62999725341797 }, { - "x": 1068.3499755859375, - "y": -175.26100158691406 + "x": 649.9039916992188, + "y": -86.0739974975586 }, { - "x": 1073.8079833984375, - "y": -172.1479949951172 + "x": 652.5819702148438, + "y": -84.43199920654297 }, { - "x": 1079.1650390625, - "y": -168.86500549316406 + "x": 655.2080078125, + "y": -82.70800018310547 }, { - "x": 1084.416015625, - "y": -165.41600036621094 + "x": 657.7780151367188, + "y": -80.9010009765625 }, { - "x": 1089.5570068359375, - "y": -161.80299377441406 + "x": 660.2899780273438, + "y": -79.01499938964844 }, { - "x": 1094.5810546875, - "y": -158.031005859375 + "x": 662.7420043945312, + "y": -77.0510025024414 }, { - "x": 1099.4840087890625, - "y": -154.1020050048828 + "x": 665.1309814453125, + "y": -75.01100158691406 }, { - "x": 1104.261962890625, - "y": -150.02200317382812 + "x": 667.4539794921875, + "y": -72.89600372314453 }, { - "x": 1108.9090576171875, - "y": -145.79299926757812 + "x": 669.7100219726562, + "y": -70.70999908447266 }, { - "x": 1113.4210205078125, - "y": -141.42100524902344 + "x": 671.89599609375, + "y": -68.4540023803711 }, { - "x": 1117.79296875, - "y": -136.90899658203125 + "x": 674.010986328125, + "y": -66.13099670410156 }, { - "x": 1122.02197265625, - "y": -132.26199340820312 + "x": 676.051025390625, + "y": -63.742000579833984 }, { - "x": 1126.10205078125, - "y": -127.48400115966797 + "x": 678.0150146484375, + "y": -61.290000915527344 }, { - "x": 1130.031005859375, - "y": -122.58100128173828 + "x": 679.9010009765625, + "y": -58.77799987792969 }, { - "x": 1133.802978515625, - "y": -117.55699920654297 + "x": 681.7080078125, + "y": -56.20800018310547 }, { - "x": 1137.416015625, - "y": -112.41600036621094 + "x": 683.4320068359375, + "y": -53.582000732421875 }, { - "x": 1140.864990234375, - "y": -107.16500091552734 + "x": 685.073974609375, + "y": -50.90399932861328 }, { - "x": 1144.14794921875, - "y": -101.80799865722656 + "x": 686.6300048828125, + "y": -48.17499923706055 }, { - "x": 1147.260986328125, - "y": -96.3499984741211 + "x": 688.0999755859375, + "y": -45.39899826049805 }, { - "x": 1150.2010498046875, - "y": -90.7979965209961 + "x": 689.4819946289062, + "y": -42.57699966430664 }, { - "x": 1152.9649658203125, - "y": -85.15499877929688 + "x": 690.7750244140625, + "y": -39.7140007019043 }, { - "x": 1155.550048828125, - "y": -79.42900085449219 + "x": 691.9769897460938, + "y": -36.8120002746582 }, { - "x": 1157.9549560546875, - "y": -73.6240005493164 + "x": 693.0880126953125, + "y": -33.87300109863281 }, { - "x": 1160.176025390625, - "y": -67.74700164794922 + "x": 694.10498046875, + "y": -30.900999069213867 }, { - "x": 1162.2110595703125, - "y": -61.803001403808594 + "x": 695.0289916992188, + "y": -27.89900016784668 }, { - "x": 1164.0579833984375, - "y": -55.79800033569336 + "x": 695.8579711914062, + "y": -24.868000030517578 }, { - "x": 1165.7159423828125, - "y": -49.73699951171875 + "x": 696.5910034179688, + "y": -21.81399917602539 }, { - "x": 1167.1829833984375, - "y": -43.62799835205078 + "x": 697.22802734375, + "y": -18.738000869750977 }, { - "x": 1168.45703125, - "y": -37.47600173950195 + "x": 697.7680053710938, + "y": -15.642999649047852 }, { - "x": 1169.5369873046875, - "y": -31.285999298095703 + "x": 698.2109985351562, + "y": -12.532999992370605 }, { - "x": 1170.4219970703125, - "y": -25.06599998474121 + "x": 698.5560302734375, + "y": -9.40999984741211 }, { - "x": 1171.112060546875, - "y": -18.820999145507812 + "x": 698.802001953125, + "y": -6.2789998054504395 }, { - "x": 1171.60498046875, - "y": -12.557999610900879 + "x": 698.9500122070312, + "y": -3.1410000324249268 }, { - "x": 1171.9010009765625, - "y": -6.2820000648498535 - }, - { - "x": 1172, + "x": 699, "y": 0 }, { - "x": 1171.9010009765625, - "y": 6.2820000648498535 - }, - { - "x": 1171.60498046875, - "y": 12.557999610900879 - }, - { - "x": 1171.112060546875, - "y": 18.820999145507812 - }, - { - "x": 1170.4219970703125, - "y": 25.06599998474121 - }, - { - "x": 1169.5369873046875, - "y": 31.285999298095703 + "x": 698.9500122070312, + "y": 3.1410000324249268 }, { - "x": 1168.45703125, - "y": 37.47600173950195 + "x": 698.802001953125, + "y": 6.2789998054504395 }, { - "x": 1167.1829833984375, - "y": 43.62799835205078 + "x": 698.5560302734375, + "y": 9.40999984741211 }, { - "x": 1165.7159423828125, - "y": 49.73699951171875 + "x": 698.2109985351562, + "y": 12.532999992370605 }, { - "x": 1164.0579833984375, - "y": 55.79800033569336 + "x": 697.7680053710938, + "y": 15.642999649047852 }, { - "x": 1162.2110595703125, - "y": 61.803001403808594 + "x": 697.22802734375, + "y": 18.738000869750977 }, { - "x": 1160.176025390625, - "y": 67.74700164794922 + "x": 696.5910034179688, + "y": 21.81399917602539 }, { - "x": 1157.9549560546875, - "y": 73.6240005493164 + "x": 695.8579711914062, + "y": 24.868000030517578 }, { - "x": 1155.550048828125, - "y": 79.42900085449219 + "x": 695.0289916992188, + "y": 27.89900016784668 }, { - "x": 1152.9649658203125, - "y": 85.15499877929688 + "x": 694.10498046875, + "y": 30.900999069213867 }, { - "x": 1150.2010498046875, - "y": 90.7979965209961 + "x": 693.0880126953125, + "y": 33.87300109863281 }, { - "x": 1147.260986328125, - "y": 96.3499984741211 + "x": 691.9769897460938, + "y": 36.8120002746582 }, { - "x": 1144.14794921875, - "y": 101.80799865722656 + "x": 690.7750244140625, + "y": 39.7140007019043 }, { - "x": 1140.864990234375, - "y": 107.16500091552734 + "x": 689.4819946289062, + "y": 42.57699966430664 }, { - "x": 1137.416015625, - "y": 112.41600036621094 + "x": 688.0999755859375, + "y": 45.39899826049805 }, { - "x": 1133.802978515625, - "y": 117.55699920654297 + "x": 686.6300048828125, + "y": 48.17499923706055 }, { - "x": 1130.031005859375, - "y": 122.58100128173828 + "x": 685.073974609375, + "y": 50.90399932861328 }, { - "x": 1126.10205078125, - "y": 127.48400115966797 + "x": 683.4320068359375, + "y": 53.582000732421875 }, { - "x": 1122.02197265625, - "y": 132.26199340820312 + "x": 681.7080078125, + "y": 56.20800018310547 }, { - "x": 1117.79296875, - "y": 136.90899658203125 + "x": 679.9010009765625, + "y": 58.77799987792969 }, { - "x": 1113.4210205078125, - "y": 141.42100524902344 + "x": 678.0150146484375, + "y": 61.290000915527344 }, { - "x": 1108.9090576171875, - "y": 145.79299926757812 + "x": 676.051025390625, + "y": 63.742000579833984 }, { - "x": 1104.261962890625, - "y": 150.02200317382812 + "x": 674.010986328125, + "y": 66.13099670410156 }, { - "x": 1099.4840087890625, - "y": 154.1020050048828 + "x": 671.89599609375, + "y": 68.4540023803711 }, { - "x": 1094.5810546875, - "y": 158.031005859375 + "x": 669.7100219726562, + "y": 70.70999908447266 }, { - "x": 1089.5570068359375, - "y": 161.80299377441406 + "x": 667.4539794921875, + "y": 72.89600372314453 }, { - "x": 1084.416015625, - "y": 165.41600036621094 + "x": 665.1309814453125, + "y": 75.01100158691406 }, { - "x": 1079.1650390625, - "y": 168.86500549316406 + "x": 662.7420043945312, + "y": 77.0510025024414 }, { - "x": 1073.8079833984375, - "y": 172.1479949951172 + "x": 660.2899780273438, + "y": 79.01499938964844 }, { - "x": 1068.3499755859375, - "y": 175.26100158691406 + "x": 657.7780151367188, + "y": 80.9010009765625 }, { - "x": 1062.7979736328125, - "y": 178.2010040283203 + "x": 655.2080078125, + "y": 82.70800018310547 }, { - "x": 1057.155029296875, - "y": 180.96499633789062 + "x": 652.5819702148438, + "y": 84.43199920654297 }, { - "x": 1051.428955078125, - "y": 183.5500030517578 + "x": 649.9039916992188, + "y": 86.0739974975586 }, { - "x": 1045.6240234375, - "y": 185.9550018310547 + "x": 647.1749877929688, + "y": 87.62999725341797 }, { - "x": 1039.7469482421875, - "y": 188.17599487304688 + "x": 644.3989868164062, + "y": 89.0999984741211 }, { - "x": 1033.802978515625, - "y": 190.21099853515625 + "x": 641.5770263671875, + "y": 90.48200225830078 }, { - "x": 1027.7979736328125, - "y": 192.05799865722656 + "x": 638.7139892578125, + "y": 91.7750015258789 }, { - "x": 1021.7369995117188, - "y": 193.71600341796875 + "x": 635.81201171875, + "y": 92.97699737548828 }, { - "x": 1015.6279907226562, - "y": 195.18299865722656 + "x": 632.8729858398438, + "y": 94.08799743652344 }, { - "x": 1009.4760131835938, - "y": 196.45700073242188 + "x": 629.9010009765625, + "y": 95.1050033569336 }, { - "x": 1003.2860107421875, - "y": 197.53700256347656 + "x": 626.8989868164062, + "y": 96.02899932861328 }, { - "x": 998.5, - "y": 198.21800231933594 + "x": 625.5, + "y": 96.41200256347656 } ], "isCurve": true, diff --git a/e2etests/testdata/txtar/cycle-diagram/dagre/sketch.exp.svg b/e2etests/testdata/txtar/cycle-diagram/dagre/sketch.exp.svg index 015478d741..beb13e80bd 100644 --- a/e2etests/testdata/txtar/cycle-diagram/dagre/sketch.exp.svg +++ b/e2etests/testdata/txtar/cycle-diagram/dagre/sketch.exp.svg @@ -1,9 +1,9 @@ -abcdabcab - - - - - - - - - - + .d2-910961565 .fill-N1{fill:#0A0F25;} + .d2-910961565 .fill-N2{fill:#676C7E;} + .d2-910961565 .fill-N3{fill:#9499AB;} + .d2-910961565 .fill-N4{fill:#CFD2DD;} + .d2-910961565 .fill-N5{fill:#DEE1EB;} + .d2-910961565 .fill-N6{fill:#EEF1F8;} + .d2-910961565 .fill-N7{fill:#FFFFFF;} + .d2-910961565 .fill-B1{fill:#0D32B2;} + .d2-910961565 .fill-B2{fill:#0D32B2;} + .d2-910961565 .fill-B3{fill:#E3E9FD;} + .d2-910961565 .fill-B4{fill:#E3E9FD;} + .d2-910961565 .fill-B5{fill:#EDF0FD;} + .d2-910961565 .fill-B6{fill:#F7F8FE;} + .d2-910961565 .fill-AA2{fill:#4A6FF3;} + .d2-910961565 .fill-AA4{fill:#EDF0FD;} + .d2-910961565 .fill-AA5{fill:#F7F8FE;} + .d2-910961565 .fill-AB4{fill:#EDF0FD;} + .d2-910961565 .fill-AB5{fill:#F7F8FE;} + .d2-910961565 .stroke-N1{stroke:#0A0F25;} + .d2-910961565 .stroke-N2{stroke:#676C7E;} + .d2-910961565 .stroke-N3{stroke:#9499AB;} + .d2-910961565 .stroke-N4{stroke:#CFD2DD;} + .d2-910961565 .stroke-N5{stroke:#DEE1EB;} + .d2-910961565 .stroke-N6{stroke:#EEF1F8;} + .d2-910961565 .stroke-N7{stroke:#FFFFFF;} + .d2-910961565 .stroke-B1{stroke:#0D32B2;} + .d2-910961565 .stroke-B2{stroke:#0D32B2;} + .d2-910961565 .stroke-B3{stroke:#E3E9FD;} + .d2-910961565 .stroke-B4{stroke:#E3E9FD;} + .d2-910961565 .stroke-B5{stroke:#EDF0FD;} + .d2-910961565 .stroke-B6{stroke:#F7F8FE;} + .d2-910961565 .stroke-AA2{stroke:#4A6FF3;} + .d2-910961565 .stroke-AA4{stroke:#EDF0FD;} + .d2-910961565 .stroke-AA5{stroke:#F7F8FE;} + .d2-910961565 .stroke-AB4{stroke:#EDF0FD;} + .d2-910961565 .stroke-AB5{stroke:#F7F8FE;} + .d2-910961565 .background-color-N1{background-color:#0A0F25;} + .d2-910961565 .background-color-N2{background-color:#676C7E;} + .d2-910961565 .background-color-N3{background-color:#9499AB;} + .d2-910961565 .background-color-N4{background-color:#CFD2DD;} + .d2-910961565 .background-color-N5{background-color:#DEE1EB;} + .d2-910961565 .background-color-N6{background-color:#EEF1F8;} + .d2-910961565 .background-color-N7{background-color:#FFFFFF;} + .d2-910961565 .background-color-B1{background-color:#0D32B2;} + .d2-910961565 .background-color-B2{background-color:#0D32B2;} + .d2-910961565 .background-color-B3{background-color:#E3E9FD;} + .d2-910961565 .background-color-B4{background-color:#E3E9FD;} + .d2-910961565 .background-color-B5{background-color:#EDF0FD;} + .d2-910961565 .background-color-B6{background-color:#F7F8FE;} + .d2-910961565 .background-color-AA2{background-color:#4A6FF3;} + .d2-910961565 .background-color-AA4{background-color:#EDF0FD;} + .d2-910961565 .background-color-AA5{background-color:#F7F8FE;} + .d2-910961565 .background-color-AB4{background-color:#EDF0FD;} + .d2-910961565 .background-color-AB5{background-color:#F7F8FE;} + .d2-910961565 .color-N1{color:#0A0F25;} + .d2-910961565 .color-N2{color:#676C7E;} + .d2-910961565 .color-N3{color:#9499AB;} + .d2-910961565 .color-N4{color:#CFD2DD;} + .d2-910961565 .color-N5{color:#DEE1EB;} + .d2-910961565 .color-N6{color:#EEF1F8;} + .d2-910961565 .color-N7{color:#FFFFFF;} + .d2-910961565 .color-B1{color:#0D32B2;} + .d2-910961565 .color-B2{color:#0D32B2;} + .d2-910961565 .color-B3{color:#E3E9FD;} + .d2-910961565 .color-B4{color:#E3E9FD;} + .d2-910961565 .color-B5{color:#EDF0FD;} + .d2-910961565 .color-B6{color:#F7F8FE;} + .d2-910961565 .color-AA2{color:#4A6FF3;} + .d2-910961565 .color-AA4{color:#EDF0FD;} + .d2-910961565 .color-AA5{color:#F7F8FE;} + .d2-910961565 .color-AB4{color:#EDF0FD;} + .d2-910961565 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker-d2-910961565);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker-d2-910961565);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright-d2-910961565);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright-d2-910961565);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright-d2-910961565);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright-d2-910961565);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark-d2-910961565);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright-d2-910961565);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright-d2-910961565);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright-d2-910961565);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright-d2-910961565);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker-d2-910961565);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark-d2-910961565);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal-d2-910961565);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal-d2-910961565);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright-d2-910961565);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright-d2-910961565);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright-d2-910961565);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>abcdabcab + + + + + + + + + + \ No newline at end of file diff --git a/e2etests/testdata/txtar/cycle-diagram/elk/board.exp.json b/e2etests/testdata/txtar/cycle-diagram/elk/board.exp.json index 6eb058a841..d78744f1e4 100644 --- a/e2etests/testdata/txtar/cycle-diagram/elk/board.exp.json +++ b/e2etests/testdata/txtar/cycle-diagram/elk/board.exp.json @@ -18,8 +18,8 @@ "x": 12, "y": 12 }, - "width": 454, - "height": 466, + "width": 254, + "height": 266, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -57,7 +57,7 @@ "type": "rectangle", "pos": { "x": -14, - "y": -221 + "y": -121 }, "width": 53, "height": 66, @@ -98,7 +98,7 @@ "id": "1.b", "type": "rectangle", "pos": { - "x": 185, + "x": 85, "y": -21 }, "width": 53, @@ -141,7 +141,7 @@ "type": "rectangle", "pos": { "x": -14, - "y": 179 + "y": 79 }, "width": 53, "height": 66, @@ -182,7 +182,7 @@ "id": "1.d", "type": "rectangle", "pos": { - "x": -215, + "x": -115, "y": -20 }, "width": 54, @@ -224,11 +224,11 @@ "id": "2", "type": "cycle", "pos": { - "x": 485, - "y": 61 + "x": 285, + "y": 36 }, - "width": 400, - "height": 367, + "width": 227, + "height": 217, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -265,8 +265,8 @@ "id": "2.a", "type": "rectangle", "pos": { - "x": 459, - "y": -171 + "x": 259, + "y": -96 }, "width": 53, "height": 66, @@ -307,8 +307,8 @@ "id": "2.b", "type": "rectangle", "pos": { - "x": 632, - "y": 128 + "x": 345, + "y": 53 }, "width": 53, "height": 66, @@ -349,8 +349,8 @@ "id": "2.c", "type": "rectangle", "pos": { - "x": 285, - "y": 129 + "x": 172, + "y": 54 }, "width": 53, "height": 66, @@ -391,11 +391,11 @@ "id": "3", "type": "cycle", "pos": { - "x": 904, + "x": 531, "y": 12 }, "width": 53, - "height": 466, + "height": 266, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -432,8 +432,8 @@ "id": "3.a", "type": "rectangle", "pos": { - "x": 878, - "y": -221 + "x": 505, + "y": -121 }, "width": 53, "height": 66, @@ -474,8 +474,8 @@ "id": "3.b", "type": "rectangle", "pos": { - "x": 878, - "y": 179 + "x": 505, + "y": 79 }, "width": 53, "height": 66, @@ -541,334 +541,254 @@ "route": [ { "x": 38.5, - "y": -186.22999572753906 - }, - { - "x": 40.18000030517578, - "y": -186.00399780273438 - }, - { - "x": 43.2859992980957, - "y": -185.53700256347656 - }, - { - "x": 46.3849983215332, - "y": -185.02099609375 - }, - { - "x": 49.47600173950195, - "y": -184.45700073242188 - }, - { - "x": 52.55699920654297, - "y": -183.843994140625 - }, - { - "x": 55.62799835205078, - "y": -183.18299865722656 - }, - { - "x": 58.68899917602539, - "y": -182.47300720214844 - }, - { - "x": 61.73699951171875, - "y": -181.71600341796875 - }, - { - "x": 64.77400207519531, - "y": -180.91099548339844 - }, - { - "x": 67.7979965209961, - "y": -180.05799865722656 - }, - { - "x": 70.80799865722656, - "y": -179.1580047607422 - }, - { - "x": 73.8030014038086, - "y": -178.21099853515625 + "y": -84.4229965209961 }, { - "x": 76.78299713134766, - "y": -177.2169952392578 + "x": 39.89899826049805, + "y": -84.02899932861328 }, { - "x": 79.74700164794922, - "y": -176.17599487304688 + "x": 41.40399932861328, + "y": -83.5790023803711 }, { - "x": 82.69400024414062, - "y": -175.08799743652344 + "x": 42.9010009765625, + "y": -83.1050033569336 }, { - "x": 85.6240005493164, - "y": -173.9550018310547 + "x": 44.39099884033203, + "y": -82.60800170898438 }, { - "x": 88.53600311279297, - "y": -172.77499389648438 + "x": 45.87300109863281, + "y": -82.08799743652344 }, { - "x": 91.42900085449219, - "y": -171.5500030517578 + "x": 47.34700012207031, + "y": -81.54399871826172 }, { - "x": 94.302001953125, - "y": -170.27999877929688 + "x": 48.8120002746582, + "y": -80.97699737548828 }, { - "x": 97.15499877929688, - "y": -168.96499633789062 + "x": 50.268001556396484, + "y": -80.38700103759766 }, { - "x": 99.98699951171875, - "y": -167.60499572753906 + "x": 51.7140007019043, + "y": -79.7750015258789 }, { - "x": 102.7979965209961, - "y": -166.2010040283203 + "x": 53.1510009765625, + "y": -79.13999938964844 }, { - "x": 105.58499908447266, - "y": -164.7530059814453 + "x": 54.57699966430664, + "y": -78.48200225830078 }, { - "x": 108.3499984741211, - "y": -163.26100158691406 + "x": 55.99300003051758, + "y": -77.802001953125 }, { - "x": 111.09100341796875, - "y": -161.7259979248047 + "x": 57.39899826049805, + "y": -77.0999984741211 }, { - "x": 113.80799865722656, - "y": -160.1479949951172 + "x": 58.79199981689453, + "y": -76.3759994506836 }, { - "x": 116.4990005493164, - "y": -158.5279998779297 + "x": 60.17499923706055, + "y": -75.62999725341797 }, { - "x": 119.16500091552734, - "y": -156.86500549316406 + "x": 61.54499816894531, + "y": -74.86299896240234 }, { - "x": 121.80400085449219, - "y": -155.16099548339844 + "x": 62.90399932861328, + "y": -74.0739974975586 }, { - "x": 124.41600036621094, - "y": -153.41600036621094 + "x": 64.2490005493164, + "y": -73.26399993896484 }, { - "x": 127.0009994506836, - "y": -151.62899780273438 + "x": 65.58200073242188, + "y": -72.43199920654297 }, { - "x": 129.5570068359375, - "y": -149.80299377441406 + "x": 66.9020004272461, + "y": -71.58000183105469 }, { - "x": 132.08399963378906, - "y": -147.93600463867188 + "x": 68.20800018310547, + "y": -70.70800018310547 }, { - "x": 134.58099365234375, - "y": -146.031005859375 + "x": 69.5, + "y": -69.81400299072266 }, { - "x": 137.04800415039062, - "y": -144.08599853515625 + "x": 70.77799987792969, + "y": -68.9010009765625 }, { - "x": 139.48399353027344, - "y": -142.1020050048828 + "x": 72.04199981689453, + "y": -67.96800231933594 }, { - "x": 141.88900756835938, - "y": -140.08099365234375 + "x": 73.29000091552734, + "y": -67.01499938964844 }, { - "x": 144.26199340820312, - "y": -138.02200317382812 + "x": 74.52400207519531, + "y": -66.04299926757812 }, { - "x": 146.6020050048828, - "y": -135.92599487304688 + "x": 75.74199676513672, + "y": -65.0510025024414 }, { - "x": 148.90899658203125, - "y": -133.79299926757812 + "x": 76.94400024414062, + "y": -64.04000091552734 }, { - "x": 151.1820068359375, - "y": -131.625 + "x": 78.13099670410156, + "y": -63.01100158691406 }, { - "x": 153.42100524902344, - "y": -129.42100524902344 + "x": 79.3010025024414, + "y": -61.9630012512207 }, { - "x": 155.625, - "y": -127.18199920654297 + "x": 80.4540023803711, + "y": -60.895999908447266 }, { - "x": 157.79299926757812, - "y": -124.90899658203125 + "x": 81.59100341796875, + "y": -59.8120002746582 }, { - "x": 159.92599487304688, - "y": -122.60199737548828 + "x": 82.70999908447266, + "y": -58.709999084472656 }, { - "x": 162.02200317382812, - "y": -120.26200103759766 + "x": 83.81199645996094, + "y": -57.590999603271484 }, { - "x": 164.08099365234375, - "y": -117.88899993896484 + "x": 84.89600372314453, + "y": -56.45399856567383 }, { - "x": 166.1020050048828, - "y": -115.48400115966797 + "x": 85.96299743652344, + "y": -55.30099868774414 }, { - "x": 168.08599853515625, - "y": -113.0479965209961 + "x": 87.01100158691406, + "y": -54.13100051879883 }, { - "x": 170.031005859375, - "y": -110.58100128173828 + "x": 88.04000091552734, + "y": -52.944000244140625 }, { - "x": 171.93600463867188, - "y": -108.08399963378906 + "x": 89.0510025024414, + "y": -51.742000579833984 }, { - "x": 173.80299377441406, - "y": -105.55699920654297 + "x": 90.04299926757812, + "y": -50.52399826049805 }, { - "x": 175.62899780273438, - "y": -103.0009994506836 + "x": 91.01499938964844, + "y": -49.290000915527344 }, { - "x": 177.41600036621094, - "y": -100.41600036621094 + "x": 91.96800231933594, + "y": -48.04199981689453 }, { - "x": 179.16099548339844, - "y": -97.80400085449219 + "x": 92.9010009765625, + "y": -46.77799987792969 }, { - "x": 180.86500549316406, - "y": -95.16500091552734 + "x": 93.81400299072266, + "y": -45.5 }, { - "x": 182.5279998779297, - "y": -92.4990005493164 + "x": 94.70800018310547, + "y": -44.20800018310547 }, { - "x": 184.1479949951172, - "y": -89.80799865722656 + "x": 95.58000183105469, + "y": -42.902000427246094 }, { - "x": 185.7259979248047, - "y": -87.09100341796875 + "x": 96.43199920654297, + "y": -41.582000732421875 }, { - "x": 187.26100158691406, - "y": -84.3499984741211 + "x": 97.26399993896484, + "y": -40.249000549316406 }, { - "x": 188.7530059814453, - "y": -81.58499908447266 + "x": 98.0739974975586, + "y": -38.90399932861328 }, { - "x": 190.2010040283203, - "y": -78.7979965209961 + "x": 98.86299896240234, + "y": -37.54499816894531 }, { - "x": 191.60499572753906, - "y": -75.98699951171875 + "x": 99.62999725341797, + "y": -36.17499923706055 }, { - "x": 192.96499633789062, - "y": -73.15499877929688 + "x": 100.3759994506836, + "y": -34.79199981689453 }, { - "x": 194.27999877929688, - "y": -70.302001953125 + "x": 101.0999984741211, + "y": -33.39899826049805 }, { - "x": 195.5500030517578, - "y": -67.42900085449219 + "x": 101.802001953125, + "y": -31.993000030517578 }, { - "x": 196.77499389648438, - "y": -64.53600311279297 + "x": 102.48200225830078, + "y": -30.57699966430664 }, { - "x": 197.9550018310547, - "y": -61.624000549316406 + "x": 103.13999938964844, + "y": -29.150999069213867 }, { - "x": 199.08799743652344, - "y": -58.694000244140625 + "x": 103.7750015258789, + "y": -27.714000701904297 }, { - "x": 200.17599487304688, - "y": -55.74700164794922 + "x": 104.38700103759766, + "y": -26.26799964904785 }, { - "x": 201.2169952392578, - "y": -52.78300094604492 + "x": 104.97699737548828, + "y": -24.812000274658203 }, { - "x": 202.21099853515625, - "y": -49.803001403808594 + "x": 105.54399871826172, + "y": -23.347000122070312 }, { - "x": 203.1580047607422, - "y": -46.80799865722656 + "x": 106.08799743652344, + "y": -21.87299919128418 }, { - "x": 204.05799865722656, - "y": -43.79800033569336 - }, - { - "x": 204.91099548339844, - "y": -40.77399826049805 - }, - { - "x": 205.71600341796875, - "y": -37.73699951171875 - }, - { - "x": 206.47300720214844, - "y": -34.68899917602539 - }, - { - "x": 207.18299865722656, - "y": -31.628000259399414 - }, - { - "x": 207.843994140625, - "y": -28.55699920654297 - }, - { - "x": 208.45700073242188, - "y": -25.47599983215332 - }, - { - "x": 209.02099609375, - "y": -22.385000228881836 - }, - { - "x": 209.2519989013672, + "x": 106.39399719238281, "y": -21 } ], @@ -904,336 +824,256 @@ "link": "", "route": [ { - "x": 209.2519989013672, + "x": 106.39399719238281, "y": 45 }, { - "x": 209.02099609375, - "y": 46.3849983215332 - }, - { - "x": 208.45700073242188, - "y": 49.47600173950195 - }, - { - "x": 207.843994140625, - "y": 52.55699920654297 - }, - { - "x": 207.18299865722656, - "y": 55.62799835205078 - }, - { - "x": 206.47300720214844, - "y": 58.68899917602539 - }, - { - "x": 205.71600341796875, - "y": 61.73699951171875 + "x": 106.08799743652344, + "y": 45.87300109863281 }, { - "x": 204.91099548339844, - "y": 64.77400207519531 + "x": 105.54399871826172, + "y": 47.34700012207031 }, { - "x": 204.05799865722656, - "y": 67.7979965209961 + "x": 104.97699737548828, + "y": 48.8120002746582 }, { - "x": 203.1580047607422, - "y": 70.80799865722656 + "x": 104.38700103759766, + "y": 50.268001556396484 }, { - "x": 202.21099853515625, - "y": 73.8030014038086 + "x": 103.7750015258789, + "y": 51.7140007019043 }, { - "x": 201.2169952392578, - "y": 76.78299713134766 + "x": 103.13999938964844, + "y": 53.1510009765625 }, { - "x": 200.17599487304688, - "y": 79.74700164794922 + "x": 102.48200225830078, + "y": 54.57699966430664 }, { - "x": 199.08799743652344, - "y": 82.69400024414062 + "x": 101.802001953125, + "y": 55.99300003051758 }, { - "x": 197.9550018310547, - "y": 85.6240005493164 + "x": 101.0999984741211, + "y": 57.39899826049805 }, { - "x": 196.77499389648438, - "y": 88.53600311279297 + "x": 100.3759994506836, + "y": 58.79199981689453 }, { - "x": 195.5500030517578, - "y": 91.42900085449219 + "x": 99.62999725341797, + "y": 60.17499923706055 }, { - "x": 194.27999877929688, - "y": 94.302001953125 + "x": 98.86299896240234, + "y": 61.54499816894531 }, { - "x": 192.96499633789062, - "y": 97.15499877929688 + "x": 98.0739974975586, + "y": 62.90399932861328 }, { - "x": 191.60499572753906, - "y": 99.98699951171875 + "x": 97.26399993896484, + "y": 64.2490005493164 }, { - "x": 190.2010040283203, - "y": 102.7979965209961 + "x": 96.43199920654297, + "y": 65.58200073242188 }, { - "x": 188.7530059814453, - "y": 105.58499908447266 + "x": 95.58000183105469, + "y": 66.9020004272461 }, { - "x": 187.26100158691406, - "y": 108.3499984741211 + "x": 94.70800018310547, + "y": 68.20800018310547 }, { - "x": 185.7259979248047, - "y": 111.09100341796875 + "x": 93.81400299072266, + "y": 69.5 }, { - "x": 184.1479949951172, - "y": 113.80799865722656 + "x": 92.9010009765625, + "y": 70.77799987792969 }, { - "x": 182.5279998779297, - "y": 116.4990005493164 + "x": 91.96800231933594, + "y": 72.04199981689453 }, { - "x": 180.86500549316406, - "y": 119.16500091552734 + "x": 91.01499938964844, + "y": 73.29000091552734 }, { - "x": 179.16099548339844, - "y": 121.80400085449219 + "x": 90.04299926757812, + "y": 74.52400207519531 }, { - "x": 177.41600036621094, - "y": 124.41600036621094 + "x": 89.0510025024414, + "y": 75.74199676513672 }, { - "x": 175.62899780273438, - "y": 127.0009994506836 + "x": 88.04000091552734, + "y": 76.94400024414062 }, { - "x": 173.80299377441406, - "y": 129.5570068359375 + "x": 87.01100158691406, + "y": 78.13099670410156 }, { - "x": 171.93600463867188, - "y": 132.08399963378906 + "x": 85.96299743652344, + "y": 79.3010025024414 }, { - "x": 170.031005859375, - "y": 134.58099365234375 + "x": 84.89600372314453, + "y": 80.4540023803711 }, { - "x": 168.08599853515625, - "y": 137.04800415039062 + "x": 83.81199645996094, + "y": 81.59100341796875 }, { - "x": 166.1020050048828, - "y": 139.48399353027344 + "x": 82.70999908447266, + "y": 82.70999908447266 }, { - "x": 164.08099365234375, - "y": 141.88900756835938 + "x": 81.59100341796875, + "y": 83.81199645996094 }, { - "x": 162.02200317382812, - "y": 144.26199340820312 + "x": 80.4540023803711, + "y": 84.89600372314453 }, { - "x": 159.92599487304688, - "y": 146.6020050048828 + "x": 79.3010025024414, + "y": 85.96299743652344 }, { - "x": 157.79299926757812, - "y": 148.90899658203125 + "x": 78.13099670410156, + "y": 87.01100158691406 }, { - "x": 155.625, - "y": 151.1820068359375 + "x": 76.94400024414062, + "y": 88.04000091552734 }, { - "x": 153.42100524902344, - "y": 153.42100524902344 + "x": 75.74199676513672, + "y": 89.0510025024414 }, { - "x": 151.1820068359375, - "y": 155.625 + "x": 74.52400207519531, + "y": 90.04299926757812 }, { - "x": 148.90899658203125, - "y": 157.79299926757812 + "x": 73.29000091552734, + "y": 91.01499938964844 }, { - "x": 146.6020050048828, - "y": 159.92599487304688 + "x": 72.04199981689453, + "y": 91.96800231933594 }, { - "x": 144.26199340820312, - "y": 162.02200317382812 + "x": 70.77799987792969, + "y": 92.9010009765625 }, { - "x": 141.88900756835938, - "y": 164.08099365234375 + "x": 69.5, + "y": 93.81400299072266 }, { - "x": 139.48399353027344, - "y": 166.1020050048828 + "x": 68.20800018310547, + "y": 94.70800018310547 }, { - "x": 137.04800415039062, - "y": 168.08599853515625 + "x": 66.9020004272461, + "y": 95.58000183105469 }, { - "x": 134.58099365234375, - "y": 170.031005859375 + "x": 65.58200073242188, + "y": 96.43199920654297 }, { - "x": 132.08399963378906, - "y": 171.93600463867188 + "x": 64.2490005493164, + "y": 97.26399993896484 }, { - "x": 129.5570068359375, - "y": 173.80299377441406 + "x": 62.90399932861328, + "y": 98.0739974975586 }, { - "x": 127.0009994506836, - "y": 175.62899780273438 + "x": 61.54499816894531, + "y": 98.86299896240234 }, { - "x": 124.41600036621094, - "y": 177.41600036621094 + "x": 60.17499923706055, + "y": 99.62999725341797 }, { - "x": 121.80400085449219, - "y": 179.16099548339844 + "x": 58.79199981689453, + "y": 100.3759994506836 }, { - "x": 119.16500091552734, - "y": 180.86500549316406 + "x": 57.39899826049805, + "y": 101.0999984741211 }, { - "x": 116.4990005493164, - "y": 182.5279998779297 + "x": 55.99300003051758, + "y": 101.802001953125 }, { - "x": 113.80799865722656, - "y": 184.1479949951172 + "x": 54.57699966430664, + "y": 102.48200225830078 }, { - "x": 111.09100341796875, - "y": 185.7259979248047 + "x": 53.1510009765625, + "y": 103.13999938964844 }, { - "x": 108.3499984741211, - "y": 187.26100158691406 + "x": 51.7140007019043, + "y": 103.7750015258789 }, { - "x": 105.58499908447266, - "y": 188.7530059814453 + "x": 50.268001556396484, + "y": 104.38700103759766 }, { - "x": 102.7979965209961, - "y": 190.2010040283203 + "x": 48.8120002746582, + "y": 104.97699737548828 }, { - "x": 99.98699951171875, - "y": 191.60499572753906 + "x": 47.34700012207031, + "y": 105.54399871826172 }, { - "x": 97.15499877929688, - "y": 192.96499633789062 + "x": 45.87300109863281, + "y": 106.08799743652344 }, { - "x": 94.302001953125, - "y": 194.27999877929688 + "x": 44.39099884033203, + "y": 106.60800170898438 }, { - "x": 91.42900085449219, - "y": 195.5500030517578 + "x": 42.9010009765625, + "y": 107.1050033569336 }, { - "x": 88.53600311279297, - "y": 196.77499389648438 + "x": 41.40399932861328, + "y": 107.5790023803711 }, { - "x": 85.6240005493164, - "y": 197.9550018310547 - }, - { - "x": 82.69400024414062, - "y": 199.08799743652344 - }, - { - "x": 79.74700164794922, - "y": 200.17599487304688 - }, - { - "x": 76.78299713134766, - "y": 201.2169952392578 - }, - { - "x": 73.8030014038086, - "y": 202.21099853515625 - }, - { - "x": 70.80799865722656, - "y": 203.1580047607422 - }, - { - "x": 67.7979965209961, - "y": 204.05799865722656 - }, - { - "x": 64.77400207519531, - "y": 204.91099548339844 - }, - { - "x": 61.73699951171875, - "y": 205.71600341796875 - }, - { - "x": 58.68899917602539, - "y": 206.47300720214844 - }, - { - "x": 55.62799835205078, - "y": 207.18299865722656 - }, - { - "x": 52.55699920654297, - "y": 207.843994140625 - }, - { - "x": 49.47600173950195, - "y": 208.45700073242188 - }, - { - "x": 46.3849983215332, - "y": 209.02099609375 - }, - { - "x": 43.2859992980957, - "y": 209.53700256347656 - }, - { - "x": 40.18000030517578, - "y": 210.00399780273438 + "x": 39.89899826049805, + "y": 108.02899932861328 }, { "x": 38.5, - "y": 210.22999572753906 + "y": 108.4229965209961 } ], "isCurve": true, @@ -1269,334 +1109,254 @@ "route": [ { "x": -14.49899959564209, - "y": 210.22999572753906 - }, - { - "x": -16.18000030517578, - "y": 210.00399780273438 - }, - { - "x": -19.285999298095703, - "y": 209.53700256347656 - }, - { - "x": -22.385000228881836, - "y": 209.02099609375 - }, - { - "x": -25.47599983215332, - "y": 208.45700073242188 - }, - { - "x": -28.55699920654297, - "y": 207.843994140625 - }, - { - "x": -31.628000259399414, - "y": 207.18299865722656 - }, - { - "x": -34.68899917602539, - "y": 206.47300720214844 - }, - { - "x": -37.73699951171875, - "y": 205.71600341796875 - }, - { - "x": -40.77399826049805, - "y": 204.91099548339844 - }, - { - "x": -43.79800033569336, - "y": 204.05799865722656 - }, - { - "x": -46.80799865722656, - "y": 203.1580047607422 + "y": 108.4229965209961 }, { - "x": -49.803001403808594, - "y": 202.21099853515625 + "x": -15.89900016784668, + "y": 108.02899932861328 }, { - "x": -52.78300094604492, - "y": 201.2169952392578 + "x": -17.40399932861328, + "y": 107.5790023803711 }, { - "x": -55.74700164794922, - "y": 200.17599487304688 + "x": -18.900999069213867, + "y": 107.1050033569336 }, { - "x": -58.694000244140625, - "y": 199.08799743652344 + "x": -20.391000747680664, + "y": 106.60800170898438 }, { - "x": -61.624000549316406, - "y": 197.9550018310547 + "x": -21.87299919128418, + "y": 106.08799743652344 }, { - "x": -64.53600311279297, - "y": 196.77499389648438 + "x": -23.347000122070312, + "y": 105.54399871826172 }, { - "x": -67.42900085449219, - "y": 195.5500030517578 + "x": -24.812000274658203, + "y": 104.97699737548828 }, { - "x": -70.302001953125, - "y": 194.27999877929688 + "x": -26.26799964904785, + "y": 104.38700103759766 }, { - "x": -73.15499877929688, - "y": 192.96499633789062 + "x": -27.714000701904297, + "y": 103.7750015258789 }, { - "x": -75.98699951171875, - "y": 191.60499572753906 + "x": -29.150999069213867, + "y": 103.13999938964844 }, { - "x": -78.7979965209961, - "y": 190.2010040283203 + "x": -30.57699966430664, + "y": 102.48200225830078 }, { - "x": -81.58499908447266, - "y": 188.7530059814453 + "x": -31.993000030517578, + "y": 101.802001953125 }, { - "x": -84.3499984741211, - "y": 187.26100158691406 + "x": -33.39899826049805, + "y": 101.0999984741211 }, { - "x": -87.09100341796875, - "y": 185.7259979248047 + "x": -34.79199981689453, + "y": 100.3759994506836 }, { - "x": -89.80799865722656, - "y": 184.1479949951172 + "x": -36.17499923706055, + "y": 99.62999725341797 }, { - "x": -92.4990005493164, - "y": 182.5279998779297 + "x": -37.54499816894531, + "y": 98.86299896240234 }, { - "x": -95.16500091552734, - "y": 180.86500549316406 + "x": -38.90399932861328, + "y": 98.0739974975586 }, { - "x": -97.80400085449219, - "y": 179.16099548339844 + "x": -40.249000549316406, + "y": 97.26399993896484 }, { - "x": -100.41600036621094, - "y": 177.41600036621094 + "x": -41.582000732421875, + "y": 96.43199920654297 }, { - "x": -103.0009994506836, - "y": 175.62899780273438 + "x": -42.902000427246094, + "y": 95.58000183105469 }, { - "x": -105.55699920654297, - "y": 173.80299377441406 + "x": -44.20800018310547, + "y": 94.70800018310547 }, { - "x": -108.08399963378906, - "y": 171.93600463867188 + "x": -45.5, + "y": 93.81400299072266 }, { - "x": -110.58100128173828, - "y": 170.031005859375 + "x": -46.77799987792969, + "y": 92.9010009765625 }, { - "x": -113.0479965209961, - "y": 168.08599853515625 + "x": -48.04199981689453, + "y": 91.96800231933594 }, { - "x": -115.48400115966797, - "y": 166.1020050048828 + "x": -49.290000915527344, + "y": 91.01499938964844 }, { - "x": -117.88899993896484, - "y": 164.08099365234375 + "x": -50.52399826049805, + "y": 90.04299926757812 }, { - "x": -120.26200103759766, - "y": 162.02200317382812 + "x": -51.742000579833984, + "y": 89.0510025024414 }, { - "x": -122.60199737548828, - "y": 159.92599487304688 + "x": -52.944000244140625, + "y": 88.04000091552734 }, { - "x": -124.90899658203125, - "y": 157.79299926757812 + "x": -54.13100051879883, + "y": 87.01100158691406 }, { - "x": -127.18199920654297, - "y": 155.625 + "x": -55.30099868774414, + "y": 85.96299743652344 }, { - "x": -129.42100524902344, - "y": 153.42100524902344 + "x": -56.45399856567383, + "y": 84.89600372314453 }, { - "x": -131.625, - "y": 151.1820068359375 + "x": -57.590999603271484, + "y": 83.81199645996094 }, { - "x": -133.79299926757812, - "y": 148.90899658203125 + "x": -58.709999084472656, + "y": 82.70999908447266 }, { - "x": -135.92599487304688, - "y": 146.6020050048828 + "x": -59.8120002746582, + "y": 81.59100341796875 }, { - "x": -138.02200317382812, - "y": 144.26199340820312 + "x": -60.895999908447266, + "y": 80.4540023803711 }, { - "x": -140.08099365234375, - "y": 141.88900756835938 + "x": -61.9630012512207, + "y": 79.3010025024414 }, { - "x": -142.1020050048828, - "y": 139.48399353027344 + "x": -63.01100158691406, + "y": 78.13099670410156 }, { - "x": -144.08599853515625, - "y": 137.04800415039062 + "x": -64.04000091552734, + "y": 76.94400024414062 }, { - "x": -146.031005859375, - "y": 134.58099365234375 + "x": -65.0510025024414, + "y": 75.74199676513672 }, { - "x": -147.93600463867188, - "y": 132.08399963378906 + "x": -66.04299926757812, + "y": 74.52400207519531 }, { - "x": -149.80299377441406, - "y": 129.5570068359375 + "x": -67.01499938964844, + "y": 73.29000091552734 }, { - "x": -151.62899780273438, - "y": 127.0009994506836 + "x": -67.96800231933594, + "y": 72.04199981689453 }, { - "x": -153.41600036621094, - "y": 124.41600036621094 + "x": -68.9010009765625, + "y": 70.77799987792969 }, { - "x": -155.16099548339844, - "y": 121.80400085449219 + "x": -69.81400299072266, + "y": 69.5 }, { - "x": -156.86500549316406, - "y": 119.16500091552734 + "x": -70.70800018310547, + "y": 68.20800018310547 }, { - "x": -158.5279998779297, - "y": 116.4990005493164 + "x": -71.58000183105469, + "y": 66.9020004272461 }, { - "x": -160.1479949951172, - "y": 113.80799865722656 + "x": -72.43199920654297, + "y": 65.58200073242188 }, { - "x": -161.7259979248047, - "y": 111.09100341796875 + "x": -73.26399993896484, + "y": 64.2490005493164 }, { - "x": -163.26100158691406, - "y": 108.3499984741211 + "x": -74.0739974975586, + "y": 62.90399932861328 }, { - "x": -164.7530059814453, - "y": 105.58499908447266 + "x": -74.86299896240234, + "y": 61.54499816894531 }, { - "x": -166.2010040283203, - "y": 102.7979965209961 + "x": -75.62999725341797, + "y": 60.17499923706055 }, { - "x": -167.60499572753906, - "y": 99.98699951171875 + "x": -76.3759994506836, + "y": 58.79199981689453 }, { - "x": -168.96499633789062, - "y": 97.15499877929688 + "x": -77.0999984741211, + "y": 57.39899826049805 }, { - "x": -170.27999877929688, - "y": 94.302001953125 + "x": -77.802001953125, + "y": 55.99300003051758 }, { - "x": -171.5500030517578, - "y": 91.42900085449219 + "x": -78.48200225830078, + "y": 54.57699966430664 }, { - "x": -172.77499389648438, - "y": 88.53600311279297 + "x": -79.13999938964844, + "y": 53.1510009765625 }, { - "x": -173.9550018310547, - "y": 85.6240005493164 + "x": -79.7750015258789, + "y": 51.7140007019043 }, { - "x": -175.08799743652344, - "y": 82.69400024414062 + "x": -80.38700103759766, + "y": 50.268001556396484 }, { - "x": -176.17599487304688, - "y": 79.74700164794922 + "x": -80.97699737548828, + "y": 48.8120002746582 }, { - "x": -177.2169952392578, - "y": 76.78299713134766 + "x": -81.54399871826172, + "y": 47.34700012207031 }, { - "x": -178.21099853515625, - "y": 73.8030014038086 + "x": -82.08799743652344, + "y": 45.87300109863281 }, { - "x": -179.1580047607422, - "y": 70.80799865722656 - }, - { - "x": -180.05799865722656, - "y": 67.7979965209961 - }, - { - "x": -180.91099548339844, - "y": 64.77400207519531 - }, - { - "x": -181.71600341796875, - "y": 61.73699951171875 - }, - { - "x": -182.47300720214844, - "y": 58.68899917602539 - }, - { - "x": -183.18299865722656, - "y": 55.62799835205078 - }, - { - "x": -183.843994140625, - "y": 52.55699920654297 - }, - { - "x": -184.45700073242188, - "y": 49.47600173950195 - }, - { - "x": -185.02099609375, - "y": 46.3849983215332 - }, - { - "x": -185.2519989013672, + "x": -82.39399719238281, "y": 45 } ], @@ -1632,352 +1392,296 @@ "link": "", "route": [ { - "x": 512, - "y": -136.2259979248047 - }, - { - "x": 514.7160034179688, - "y": -135.85400390625 - }, - { - "x": 518.85302734375, - "y": -135.19900512695312 - }, - { - "x": 522.9760131835938, - "y": -134.45700073242188 - }, - { - "x": 527.0819702148438, - "y": -133.62899780273438 + "x": 312, + "y": -59.42100143432617 }, { - "x": 531.1699829101562, - "y": -132.71499633789062 + "x": 312.3909912109375, + "y": -59.316001892089844 }, { - "x": 535.2369995117188, - "y": -131.71600341796875 + "x": 314.40301513671875, + "y": -58.73099899291992 }, { - "x": 539.2830200195312, - "y": -130.6320037841797 + "x": 316.4010009765625, + "y": -58.10499954223633 }, { - "x": 543.3060302734375, - "y": -129.46299743652344 + "x": 318.385986328125, + "y": -57.4370002746582 }, { - "x": 547.302978515625, - "y": -128.21099853515625 + "x": 320.35699462890625, + "y": -56.72800064086914 }, { - "x": 551.2730102539062, - "y": -126.875 + "x": 322.31201171875, + "y": -55.97700119018555 }, { - "x": 555.2139892578125, - "y": -125.45600128173828 + "x": 324.2510070800781, + "y": -55.18600082397461 }, { - "x": 559.1240234375, - "y": -123.95500183105469 + "x": 326.1730041503906, + "y": -54.354000091552734 }, { - "x": 563.0029907226562, - "y": -122.37200164794922 + "x": 328.0769958496094, + "y": -53.481998443603516 }, { - "x": 566.8469848632812, - "y": -120.70899963378906 + "x": 329.9630126953125, + "y": -52.57099914550781 }, { - "x": 570.655029296875, - "y": -118.96499633789062 + "x": 331.8290100097656, + "y": -51.619998931884766 }, { - "x": 574.427001953125, - "y": -117.14199829101562 + "x": 333.67498779296875, + "y": -50.630001068115234 }, { - "x": 578.1589965820312, - "y": -115.23999786376953 + "x": 335.5, + "y": -49.60200119018555 }, { - "x": 581.8499755859375, - "y": -113.26100158691406 + "x": 337.302001953125, + "y": -48.5359992980957 }, { - "x": 585.5, - "y": -111.20500183105469 + "x": 339.0820007324219, + "y": -47.43199920654297 }, { - "x": 589.10498046875, - "y": -109.0719985961914 + "x": 340.8389892578125, + "y": -46.29199981689453 }, { - "x": 592.6649780273438, - "y": -106.86499786376953 + "x": 342.5710144042969, + "y": -45.11399841308594 }, { - "x": 596.177978515625, - "y": -104.58399963378906 + "x": 344.27801513671875, + "y": -43.9010009765625 }, { - "x": 599.6420288085938, - "y": -102.22899627685547 + "x": 345.9590148925781, + "y": -42.652000427246094 }, { - "x": 603.0570068359375, - "y": -99.8030014038086 + "x": 347.614013671875, + "y": -41.36899948120117 }, { - "x": 606.4190063476562, - "y": -97.30500030517578 + "x": 349.24200439453125, + "y": -40.05099868774414 }, { - "x": 609.72900390625, - "y": -94.73799896240234 + "x": 350.8420104980469, + "y": -38.69900131225586 }, { - "x": 612.9840087890625, - "y": -92.10199737548828 + "x": 352.4129943847656, + "y": -37.31399917602539 }, { - "x": 616.1840209960938, - "y": -89.39900207519531 + "x": 353.9540100097656, + "y": -35.895999908447266 }, { - "x": 619.3259887695312, - "y": -86.62799835205078 + "x": 355.46600341796875, + "y": -34.446998596191406 }, { - "x": 622.4089965820312, - "y": -83.79299926757812 + "x": 356.9469909667969, + "y": -32.965999603271484 }, { - "x": 625.4320068359375, - "y": -80.89399719238281 + "x": 358.39599609375, + "y": -31.45400047302246 }, { - "x": 628.3939819335938, - "y": -77.93199920654297 + "x": 359.8139953613281, + "y": -29.913000106811523 }, { - "x": 631.2930297851562, - "y": -74.90899658203125 + "x": 361.1990051269531, + "y": -28.341999053955078 }, { - "x": 634.1279907226562, - "y": -71.82599639892578 + "x": 362.5509948730469, + "y": -26.742000579833984 }, { - "x": 636.8989868164062, - "y": -68.68399810791016 + "x": 363.8689880371094, + "y": -25.11400032043457 }, { - "x": 639.6019897460938, - "y": -65.48400115966797 + "x": 365.1520080566406, + "y": -23.458999633789062 }, { - "x": 642.2379760742188, - "y": -62.229000091552734 + "x": 366.4010009765625, + "y": -21.777999877929688 }, { - "x": 644.8049926757812, - "y": -58.91899871826172 + "x": 367.614013671875, + "y": -20.070999145507812 }, { - "x": 647.302978515625, - "y": -55.55699920654297 + "x": 368.7919921875, + "y": -18.339000701904297 }, { - "x": 649.72900390625, - "y": -52.141998291015625 + "x": 369.9320068359375, + "y": -16.582000732421875 }, { - "x": 652.083984375, - "y": -48.678001403808594 + "x": 371.0360107421875, + "y": -14.802000045776367 }, { - "x": 654.364990234375, - "y": -45.165000915527344 + "x": 372.10198974609375, + "y": -13 }, { - "x": 656.572021484375, - "y": -41.60499954223633 + "x": 373.1300048828125, + "y": -11.175000190734863 }, { - "x": 658.7050170898438, - "y": -38 + "x": 374.1199951171875, + "y": -9.329000473022461 }, { - "x": 660.760986328125, - "y": -34.349998474121094 + "x": 375.0710144042969, + "y": -7.4629998207092285 }, { - "x": 662.739990234375, - "y": -30.659000396728516 + "x": 375.98199462890625, + "y": -5.577000141143799 }, { - "x": 664.6420288085938, - "y": -26.927000045776367 + "x": 376.85400390625, + "y": -3.6730000972747803 }, { - "x": 666.4650268554688, - "y": -23.155000686645508 + "x": 377.6860046386719, + "y": -1.7510000467300415 }, { - "x": 668.208984375, - "y": -19.347000122070312 + "x": 378.47698974609375, + "y": 0.18700000643730164 }, { - "x": 669.8720092773438, - "y": -15.503000259399414 + "x": 379.2279968261719, + "y": 2.1419999599456787 }, { - "x": 671.4550170898438, - "y": -11.62399959564209 + "x": 379.93701171875, + "y": 4.11299991607666 }, { - "x": 672.9559936523438, - "y": -7.714000225067139 + "x": 380.6050109863281, + "y": 6.0980000495910645 }, { - "x": 674.375, - "y": -3.7730000019073486 + "x": 381.2309875488281, + "y": 8.095999717712402 }, { - "x": 675.7109985351562, - "y": 0.19599999487400055 + "x": 381.8160095214844, + "y": 10.107999801635742 }, { - "x": 676.9630126953125, - "y": 4.192999839782715 + "x": 382.3580017089844, + "y": 12.130999565124512 }, { - "x": 678.1320190429688, - "y": 8.215999603271484 + "x": 382.85699462890625, + "y": 14.163999557495117 }, { - "x": 679.2160034179688, - "y": 12.26200008392334 + "x": 383.3139953613281, + "y": 16.20800018310547 }, { - "x": 680.2150268554688, - "y": 16.32900047302246 + "x": 383.7279968261719, + "y": 18.26099967956543 }, { - "x": 681.1290283203125, - "y": 20.41699981689453 + "x": 384.0989990234375, + "y": 20.322999954223633 }, { - "x": 681.9569702148438, - "y": 24.523000717163086 + "x": 384.427001953125, + "y": 22.391000747680664 }, { - "x": 682.698974609375, - "y": 28.645999908447266 + "x": 384.71099853515625, + "y": 24.465999603271484 }, { - "x": 683.35400390625, - "y": 32.78300094604492 + "x": 384.9519958496094, + "y": 26.547000885009766 }, { - "x": 683.9219970703125, - "y": 36.93299865722656 + "x": 385.14898681640625, + "y": 28.631999969482422 }, { - "x": 684.4039916992188, - "y": 41.09400177001953 + "x": 385.302001953125, + "y": 30.719999313354492 }, { - "x": 684.7979736328125, - "y": 45.263999938964844 + "x": 385.4119873046875, + "y": 32.8120002746582 }, { - "x": 685.10498046875, - "y": 49.441001892089844 + "x": 385.4779968261719, + "y": 34.904998779296875 }, { - "x": 685.323974609375, - "y": 53.624000549316406 - }, - { - "x": 685.4559936523438, - "y": 57.81100082397461 - }, - { - "x": 685.5, - "y": 61.999000549316406 - }, - { - "x": 685.4559936523438, - "y": 66.18800354003906 - }, - { - "x": 685.323974609375, - "y": 70.375 - }, - { - "x": 685.10498046875, - "y": 74.55799865722656 - }, - { - "x": 684.7979736328125, - "y": 78.73500061035156 - }, - { - "x": 684.4039916992188, - "y": 82.90499877929688 - }, - { - "x": 683.9219970703125, - "y": 87.06600189208984 - }, - { - "x": 683.35400390625, - "y": 91.21600341796875 - }, - { - "x": 682.698974609375, - "y": 95.35299682617188 + "x": 385.5, + "y": 36.999000549316406 }, { - "x": 681.9569702148438, - "y": 99.47599792480469 + "x": 385.4779968261719, + "y": 39.09400177001953 }, { - "x": 681.1290283203125, - "y": 103.58200073242188 + "x": 385.4119873046875, + "y": 41.1870002746582 }, { - "x": 680.2150268554688, - "y": 107.66999816894531 + "x": 385.302001953125, + "y": 43.27899932861328 }, { - "x": 679.2160034179688, - "y": 111.73699951171875 + "x": 385.14898681640625, + "y": 45.367000579833984 }, { - "x": 678.1320190429688, - "y": 115.78299713134766 + "x": 384.9519958496094, + "y": 47.45199966430664 }, { - "x": 676.9630126953125, - "y": 119.80599975585938 + "x": 384.71099853515625, + "y": 49.53300094604492 }, { - "x": 675.7109985351562, - "y": 123.8030014038086 + "x": 384.427001953125, + "y": 51.608001708984375 }, { - "x": 674.375, - "y": 127.77300262451172 + "x": 384.0989990234375, + "y": 53.67599868774414 }, { - "x": 673.9329833984375, - "y": 128.99899291992188 + "x": 384.0409851074219, + "y": 53.999000549316406 } ], "isCurve": true, @@ -2012,336 +1716,256 @@ "link": "", "route": [ { - "x": 634.8569946289062, - "y": 194.99899291992188 - }, - { - "x": 634.1279907226562, - "y": 195.8260040283203 - }, - { - "x": 631.2930297851562, - "y": 198.90899658203125 - }, - { - "x": 628.3939819335938, - "y": 201.9320068359375 - }, - { - "x": 625.4320068359375, - "y": 204.8939971923828 - }, - { - "x": 622.4089965820312, - "y": 207.79299926757812 - }, - { - "x": 619.3259887695312, - "y": 210.6280059814453 - }, - { - "x": 616.1840209960938, - "y": 213.3990020751953 - }, - { - "x": 612.9840087890625, - "y": 216.1020050048828 - }, - { - "x": 609.72900390625, - "y": 218.73800659179688 - }, - { - "x": 606.4190063476562, - "y": 221.30499267578125 - }, - { - "x": 603.0570068359375, - "y": 223.80299377441406 - }, - { - "x": 599.6420288085938, - "y": 226.22900390625 - }, - { - "x": 596.177978515625, - "y": 228.58399963378906 - }, - { - "x": 592.6649780273438, - "y": 230.86500549316406 - }, - { - "x": 589.10498046875, - "y": 233.07200622558594 - }, - { - "x": 585.5, - "y": 235.2050018310547 - }, - { - "x": 581.8499755859375, - "y": 237.26100158691406 + "x": 345.60198974609375, + "y": 116.91799926757812 }, { - "x": 578.1589965820312, - "y": 239.24000549316406 + "x": 344.27801513671875, + "y": 117.9010009765625 }, { - "x": 574.427001953125, - "y": 241.14199829101562 + "x": 342.5710144042969, + "y": 119.11399841308594 }, { - "x": 570.655029296875, - "y": 242.96499633789062 + "x": 340.8389892578125, + "y": 120.29199981689453 }, { - "x": 566.8469848632812, - "y": 244.70899963378906 + "x": 339.0820007324219, + "y": 121.43199920654297 }, { - "x": 563.0029907226562, - "y": 246.3719940185547 + "x": 337.302001953125, + "y": 122.53600311279297 }, { - "x": 559.1240234375, - "y": 247.9550018310547 + "x": 335.5, + "y": 123.60199737548828 }, { - "x": 555.2139892578125, - "y": 249.45599365234375 + "x": 333.67498779296875, + "y": 124.62999725341797 }, { - "x": 551.2730102539062, - "y": 250.875 + "x": 331.8290100097656, + "y": 125.62000274658203 }, { - "x": 547.302978515625, - "y": 252.21099853515625 + "x": 329.9630126953125, + "y": 126.57099914550781 }, { - "x": 543.3060302734375, - "y": 253.46299743652344 + "x": 328.0769958496094, + "y": 127.48200225830078 }, { - "x": 539.2830200195312, - "y": 254.6320037841797 + "x": 326.1730041503906, + "y": 128.35400390625 }, { - "x": 535.2369995117188, - "y": 255.71600341796875 + "x": 324.2510070800781, + "y": 129.18600463867188 }, { - "x": 531.1699829101562, - "y": 256.7149963378906 + "x": 322.31201171875, + "y": 129.9770050048828 }, { - "x": 527.0819702148438, - "y": 257.6289978027344 + "x": 320.35699462890625, + "y": 130.72799682617188 }, { - "x": 522.9760131835938, - "y": 258.4570007324219 + "x": 318.385986328125, + "y": 131.43699645996094 }, { - "x": 518.85302734375, - "y": 259.1990051269531 + "x": 316.4010009765625, + "y": 132.10499572753906 }, { - "x": 514.7160034179688, - "y": 259.85400390625 + "x": 314.40301513671875, + "y": 132.7310028076172 }, { - "x": 510.5660095214844, - "y": 260.4219970703125 + "x": 312.3909912109375, + "y": 133.3159942626953 }, { - "x": 506.4049987792969, - "y": 260.90399169921875 + "x": 310.3680114746094, + "y": 133.85800170898438 }, { - "x": 502.2349853515625, - "y": 261.2980041503906 + "x": 308.3349914550781, + "y": 134.35699462890625 }, { - "x": 498.0580139160156, - "y": 261.6050109863281 + "x": 306.2909851074219, + "y": 134.81399536132812 }, { - "x": 493.875, - "y": 261.8240051269531 + "x": 304.2380065917969, + "y": 135.22799682617188 }, { - "x": 489.68798828125, - "y": 261.95599365234375 + "x": 302.1759948730469, + "y": 135.5989990234375 }, { - "x": 485.5, - "y": 262 + "x": 300.1080017089844, + "y": 135.927001953125 }, { - "x": 481.3110046386719, - "y": 261.95599365234375 + "x": 298.0329895019531, + "y": 136.21099853515625 }, { - "x": 477.1239929199219, - "y": 261.8240051269531 + "x": 295.9519958496094, + "y": 136.45199584960938 }, { - "x": 472.9410095214844, - "y": 261.6050109863281 + "x": 293.86700439453125, + "y": 136.6490020751953 }, { - "x": 468.7640075683594, - "y": 261.2980041503906 + "x": 291.77899169921875, + "y": 136.802001953125 }, { - "x": 464.593994140625, - "y": 260.90399169921875 + "x": 289.68701171875, + "y": 136.91200256347656 }, { - "x": 460.4330139160156, - "y": 260.4219970703125 + "x": 287.593994140625, + "y": 136.97799682617188 }, { - "x": 456.2829895019531, - "y": 259.85400390625 + "x": 285.5, + "y": 137 }, { - "x": 452.14599609375, - "y": 259.1990051269531 + "x": 283.4049987792969, + "y": 136.97799682617188 }, { - "x": 448.02301025390625, - "y": 258.4570007324219 + "x": 281.31201171875, + "y": 136.91200256347656 }, { - "x": 443.9169921875, - "y": 257.6289978027344 + "x": 279.2200012207031, + "y": 136.802001953125 }, { - "x": 439.8290100097656, - "y": 256.7149963378906 + "x": 277.1319885253906, + "y": 136.6490020751953 }, { - "x": 435.7619934082031, - "y": 255.71600341796875 + "x": 275.0469970703125, + "y": 136.45199584960938 }, { - "x": 431.71600341796875, - "y": 254.6320037841797 + "x": 272.96600341796875, + "y": 136.21099853515625 }, { - "x": 427.6929931640625, - "y": 253.46299743652344 + "x": 270.8909912109375, + "y": 135.927001953125 }, { - "x": 423.6960144042969, - "y": 252.21099853515625 + "x": 268.822998046875, + "y": 135.5989990234375 }, { - "x": 419.72601318359375, - "y": 250.875 + "x": 266.760986328125, + "y": 135.22799682617188 }, { - "x": 415.7850036621094, - "y": 249.45599365234375 + "x": 264.7080078125, + "y": 134.81399536132812 }, { - "x": 411.875, - "y": 247.9550018310547 + "x": 262.66400146484375, + "y": 134.35699462890625 }, { - "x": 407.9960021972656, - "y": 246.3719940185547 + "x": 260.6310119628906, + "y": 133.85800170898438 }, { - "x": 404.1520080566406, - "y": 244.70899963378906 + "x": 258.6080017089844, + "y": 133.3159942626953 }, { - "x": 400.343994140625, - "y": 242.96499633789062 + "x": 256.59600830078125, + "y": 132.7310028076172 }, { - "x": 396.5719909667969, - "y": 241.14199829101562 + "x": 254.59800720214844, + "y": 132.10499572753906 }, { - "x": 392.8399963378906, - "y": 239.24000549316406 + "x": 252.61300659179688, + "y": 131.43699645996094 }, { - "x": 389.14898681640625, - "y": 237.26100158691406 + "x": 250.64199829101562, + "y": 130.72799682617188 }, { - "x": 385.5, - "y": 235.2050018310547 + "x": 248.68699645996094, + "y": 129.9770050048828 }, { - "x": 381.8940124511719, - "y": 233.07200622558594 + "x": 246.7480010986328, + "y": 129.18600463867188 }, { - "x": 378.3340148925781, - "y": 230.86500549316406 + "x": 244.8260040283203, + "y": 128.35400390625 }, { - "x": 374.8210144042969, - "y": 228.58399963378906 + "x": 242.9219970703125, + "y": 127.48200225830078 }, { - "x": 371.35699462890625, - "y": 226.22900390625 + "x": 241.03599548339844, + "y": 126.57099914550781 }, { - "x": 367.9419860839844, - "y": 223.80299377441406 + "x": 239.1699981689453, + "y": 125.62000274658203 }, { - "x": 364.5799865722656, - "y": 221.30499267578125 + "x": 237.32400512695312, + "y": 124.62999725341797 }, { - "x": 361.2699890136719, - "y": 218.73800659179688 + "x": 235.5, + "y": 123.60199737548828 }, { - "x": 358.0150146484375, - "y": 216.1020050048828 + "x": 233.69700622558594, + "y": 122.53600311279297 }, { - "x": 354.81500244140625, - "y": 213.3990020751953 + "x": 231.91700744628906, + "y": 121.43199920654297 }, { - "x": 351.6730041503906, - "y": 210.6280059814453 + "x": 230.16000366210938, + "y": 120.29199981689453 }, { - "x": 348.5899963378906, - "y": 207.79299926757812 + "x": 228.42799377441406, + "y": 119.11399841308594 }, { - "x": 345.5669860839844, - "y": 204.8939971923828 + "x": 226.7209930419922, + "y": 117.9010009765625 }, { - "x": 342.6050109863281, - "y": 201.9320068359375 - }, - { - "x": 339.70599365234375, - "y": 198.90899658203125 - }, - { - "x": 336.8710021972656, - "y": 195.8260040283203 - }, - { - "x": 336.1419982910156, - "y": 195 + "x": 225.39700317382812, + "y": 116.91799926757812 } ], "isCurve": true, @@ -2376,376 +2000,344 @@ "link": "", "route": [ { - "x": 931.4099731445312, - "y": -186.21800231933594 - }, - { - "x": 936.197021484375, - "y": -185.53700256347656 - }, - { - "x": 942.385986328125, - "y": -184.45700073242188 - }, - { - "x": 948.5380249023438, - "y": -183.18299865722656 + "x": 558.2050170898438, + "y": -84.41200256347656 }, { - "x": 954.6480102539062, - "y": -181.71600341796875 + "x": 559.60400390625, + "y": -84.02899932861328 }, { - "x": 960.7080078125, - "y": -180.05799865722656 + "x": 562.6060180664062, + "y": -83.1050033569336 }, { - "x": 966.7130126953125, - "y": -178.21099853515625 + "x": 565.5780029296875, + "y": -82.08799743652344 }, { - "x": 972.656982421875, - "y": -176.17599487304688 + "x": 568.5170288085938, + "y": -80.97699737548828 }, { - "x": 978.5349731445312, - "y": -173.9550018310547 + "x": 571.4190063476562, + "y": -79.7750015258789 }, { - "x": 984.3389892578125, - "y": -171.5500030517578 + "x": 574.2830200195312, + "y": -78.48200225830078 }, { - "x": 990.0659790039062, - "y": -168.96499633789062 + "x": 577.10400390625, + "y": -77.0999984741211 }, { - "x": 995.7080078125, - "y": -166.2010040283203 + "x": 579.8800048828125, + "y": -75.62999725341797 }, { - "x": 1001.260009765625, - "y": -163.26100158691406 + "x": 582.6090087890625, + "y": -74.0739974975586 }, { - "x": 1006.718017578125, - "y": -160.1479949951172 + "x": 585.2869873046875, + "y": -72.43199920654297 }, { - "x": 1012.0750122070312, - "y": -156.86500549316406 + "x": 587.9130249023438, + "y": -70.70800018310547 }, { - "x": 1017.3259887695312, - "y": -153.41600036621094 + "x": 590.4829711914062, + "y": -68.9010009765625 }, { - "x": 1022.4669799804688, - "y": -149.80299377441406 + "x": 592.9949951171875, + "y": -67.01499938964844 }, { - "x": 1027.490966796875, - "y": -146.031005859375 + "x": 595.447021484375, + "y": -65.0510025024414 }, { - "x": 1032.39404296875, - "y": -142.1020050048828 + "x": 597.8359985351562, + "y": -63.01100158691406 }, { - "x": 1037.1719970703125, - "y": -138.02200317382812 + "x": 600.1589965820312, + "y": -60.895999908447266 }, { - "x": 1041.8189697265625, - "y": -133.79299926757812 + "x": 602.4149780273438, + "y": -58.709999084472656 }, { - "x": 1046.3310546875, - "y": -129.42100524902344 + "x": 604.6010131835938, + "y": -56.45399856567383 }, { - "x": 1050.7030029296875, - "y": -124.90899658203125 + "x": 606.7160034179688, + "y": -54.13100051879883 }, { - "x": 1054.9320068359375, - "y": -120.26200103759766 + "x": 608.7559814453125, + "y": -51.742000579833984 }, { - "x": 1059.011962890625, - "y": -115.48400115966797 + "x": 610.719970703125, + "y": -49.290000915527344 }, { - "x": 1062.9410400390625, - "y": -110.58100128173828 + "x": 612.6060180664062, + "y": -46.77799987792969 }, { - "x": 1066.7130126953125, - "y": -105.55699920654297 + "x": 614.4130249023438, + "y": -44.20800018310547 }, { - "x": 1070.3260498046875, - "y": -100.41600036621094 + "x": 616.1370239257812, + "y": -41.582000732421875 }, { - "x": 1073.7750244140625, - "y": -95.16500091552734 + "x": 617.7789916992188, + "y": -38.90399932861328 }, { - "x": 1077.0579833984375, - "y": -89.80799865722656 + "x": 619.3350219726562, + "y": -36.17499923706055 }, { - "x": 1080.1710205078125, - "y": -84.3499984741211 + "x": 620.8049926757812, + "y": -33.39899826049805 }, { - "x": 1083.1109619140625, - "y": -78.7979965209961 + "x": 622.18701171875, + "y": -30.57699966430664 }, { - "x": 1085.875, - "y": -73.15499877929688 + "x": 623.47998046875, + "y": -27.714000701904297 }, { - "x": 1088.4610595703125, - "y": -67.42900085449219 + "x": 624.6820068359375, + "y": -24.812000274658203 }, { - "x": 1090.864990234375, - "y": -61.624000549316406 + "x": 625.7930297851562, + "y": -21.87299919128418 }, { - "x": 1093.0860595703125, - "y": -55.74700164794922 + "x": 626.8099975585938, + "y": -18.900999069213867 }, { - "x": 1095.1209716796875, - "y": -49.803001403808594 + "x": 627.7340087890625, + "y": -15.89900016784668 }, { - "x": 1096.968017578125, - "y": -43.79800033569336 + "x": 628.56298828125, + "y": -12.868000030517578 }, { - "x": 1098.6259765625, - "y": -37.73699951171875 + "x": 629.2960205078125, + "y": -9.814000129699707 }, { - "x": 1100.093017578125, - "y": -31.628000259399414 + "x": 629.9329833984375, + "y": -6.73799991607666 }, { - "x": 1101.366943359375, - "y": -25.47599983215332 + "x": 630.4730224609375, + "y": -3.6429998874664307 }, { - "x": 1102.447021484375, - "y": -19.285999298095703 + "x": 630.916015625, + "y": -0.5329999923706055 }, { - "x": 1103.3330078125, - "y": -13.065999984741211 + "x": 631.260986328125, + "y": 2.5889999866485596 }, { - "x": 1104.02197265625, - "y": -6.821000099182129 + "x": 631.5070190429688, + "y": 5.71999979019165 }, { - "x": 1104.5150146484375, - "y": -0.5580000281333923 + "x": 631.655029296875, + "y": 8.857999801635742 }, { - "x": 1104.81103515625, - "y": 5.7170000076293945 - }, - { - "x": 1104.9100341796875, + "x": 631.7050170898438, "y": 12 }, { - "x": 1104.81103515625, - "y": 18.281999588012695 - }, - { - "x": 1104.5150146484375, - "y": 24.558000564575195 - }, - { - "x": 1104.02197265625, - "y": 30.820999145507812 - }, - { - "x": 1103.3330078125, - "y": 37.066001892089844 - }, - { - "x": 1102.447021484375, - "y": 43.2859992980957 + "x": 631.655029296875, + "y": 15.140999794006348 }, { - "x": 1101.366943359375, - "y": 49.47600173950195 + "x": 631.5070190429688, + "y": 18.27899932861328 }, { - "x": 1100.093017578125, - "y": 55.62799835205078 + "x": 631.260986328125, + "y": 21.40999984741211 }, { - "x": 1098.6259765625, - "y": 61.73699951171875 + "x": 630.916015625, + "y": 24.533000946044922 }, { - "x": 1096.968017578125, - "y": 67.7979965209961 + "x": 630.4730224609375, + "y": 27.64299964904785 }, { - "x": 1095.1209716796875, - "y": 73.8030014038086 + "x": 629.9329833984375, + "y": 30.738000869750977 }, { - "x": 1093.0860595703125, - "y": 79.74700164794922 + "x": 629.2960205078125, + "y": 33.81399917602539 }, { - "x": 1090.864990234375, - "y": 85.6240005493164 + "x": 628.56298828125, + "y": 36.86800003051758 }, { - "x": 1088.4610595703125, - "y": 91.42900085449219 + "x": 627.7340087890625, + "y": 39.89899826049805 }, { - "x": 1085.875, - "y": 97.15499877929688 + "x": 626.8099975585938, + "y": 42.9010009765625 }, { - "x": 1083.1109619140625, - "y": 102.7979965209961 + "x": 625.7930297851562, + "y": 45.87300109863281 }, { - "x": 1080.1710205078125, - "y": 108.3499984741211 + "x": 624.6820068359375, + "y": 48.8120002746582 }, { - "x": 1077.0579833984375, - "y": 113.80799865722656 + "x": 623.47998046875, + "y": 51.7140007019043 }, { - "x": 1073.7750244140625, - "y": 119.16500091552734 + "x": 622.18701171875, + "y": 54.57699966430664 }, { - "x": 1070.3260498046875, - "y": 124.41600036621094 + "x": 620.8049926757812, + "y": 57.39899826049805 }, { - "x": 1066.7130126953125, - "y": 129.5570068359375 + "x": 619.3350219726562, + "y": 60.17499923706055 }, { - "x": 1062.9410400390625, - "y": 134.58099365234375 + "x": 617.7789916992188, + "y": 62.90399932861328 }, { - "x": 1059.011962890625, - "y": 139.48399353027344 + "x": 616.1370239257812, + "y": 65.58200073242188 }, { - "x": 1054.9320068359375, - "y": 144.26199340820312 + "x": 614.4130249023438, + "y": 68.20800018310547 }, { - "x": 1050.7030029296875, - "y": 148.90899658203125 + "x": 612.6060180664062, + "y": 70.77799987792969 }, { - "x": 1046.3310546875, - "y": 153.42100524902344 + "x": 610.719970703125, + "y": 73.29000091552734 }, { - "x": 1041.8189697265625, - "y": 157.79299926757812 + "x": 608.7559814453125, + "y": 75.74199676513672 }, { - "x": 1037.1719970703125, - "y": 162.02200317382812 + "x": 606.7160034179688, + "y": 78.13099670410156 }, { - "x": 1032.39404296875, - "y": 166.1020050048828 + "x": 604.6010131835938, + "y": 80.4540023803711 }, { - "x": 1027.490966796875, - "y": 170.031005859375 + "x": 602.4149780273438, + "y": 82.70999908447266 }, { - "x": 1022.4669799804688, - "y": 173.80299377441406 + "x": 600.1589965820312, + "y": 84.89600372314453 }, { - "x": 1017.3259887695312, - "y": 177.41600036621094 + "x": 597.8359985351562, + "y": 87.01100158691406 }, { - "x": 1012.0750122070312, - "y": 180.86500549316406 + "x": 595.447021484375, + "y": 89.0510025024414 }, { - "x": 1006.718017578125, - "y": 184.1479949951172 + "x": 592.9949951171875, + "y": 91.01499938964844 }, { - "x": 1001.260009765625, - "y": 187.26100158691406 + "x": 590.4829711914062, + "y": 92.9010009765625 }, { - "x": 995.7080078125, - "y": 190.2010040283203 + "x": 587.9130249023438, + "y": 94.70800018310547 }, { - "x": 990.0659790039062, - "y": 192.96499633789062 + "x": 585.2869873046875, + "y": 96.43199920654297 }, { - "x": 984.3389892578125, - "y": 195.5500030517578 + "x": 582.6090087890625, + "y": 98.0739974975586 }, { - "x": 978.5349731445312, - "y": 197.9550018310547 + "x": 579.8800048828125, + "y": 99.62999725341797 }, { - "x": 972.656982421875, - "y": 200.17599487304688 + "x": 577.10400390625, + "y": 101.0999984741211 }, { - "x": 966.7130126953125, - "y": 202.21099853515625 + "x": 574.2830200195312, + "y": 102.48200225830078 }, { - "x": 960.7080078125, - "y": 204.05799865722656 + "x": 571.4190063476562, + "y": 103.7750015258789 }, { - "x": 954.6480102539062, - "y": 205.71600341796875 + "x": 568.5170288085938, + "y": 104.97699737548828 }, { - "x": 948.5380249023438, - "y": 207.18299865722656 + "x": 565.5780029296875, + "y": 106.08799743652344 }, { - "x": 942.385986328125, - "y": 208.45700073242188 + "x": 562.6060180664062, + "y": 107.1050033569336 }, { - "x": 936.197021484375, - "y": 209.53700256347656 + "x": 559.60400390625, + "y": 108.02899932861328 }, { - "x": 931.4099731445312, - "y": 210.21800231933594 + "x": 558.2050170898438, + "y": 108.41200256347656 } ], "isCurve": true, diff --git a/e2etests/testdata/txtar/cycle-diagram/elk/sketch.exp.svg b/e2etests/testdata/txtar/cycle-diagram/elk/sketch.exp.svg index 21e65f752a..58c7ca7a87 100644 --- a/e2etests/testdata/txtar/cycle-diagram/elk/sketch.exp.svg +++ b/e2etests/testdata/txtar/cycle-diagram/elk/sketch.exp.svg @@ -1,9 +1,9 @@ -abcdabcab - - - - - - - - - - + .d2-1783955894 .fill-N1{fill:#0A0F25;} + .d2-1783955894 .fill-N2{fill:#676C7E;} + .d2-1783955894 .fill-N3{fill:#9499AB;} + .d2-1783955894 .fill-N4{fill:#CFD2DD;} + .d2-1783955894 .fill-N5{fill:#DEE1EB;} + .d2-1783955894 .fill-N6{fill:#EEF1F8;} + .d2-1783955894 .fill-N7{fill:#FFFFFF;} + .d2-1783955894 .fill-B1{fill:#0D32B2;} + .d2-1783955894 .fill-B2{fill:#0D32B2;} + .d2-1783955894 .fill-B3{fill:#E3E9FD;} + .d2-1783955894 .fill-B4{fill:#E3E9FD;} + .d2-1783955894 .fill-B5{fill:#EDF0FD;} + .d2-1783955894 .fill-B6{fill:#F7F8FE;} + .d2-1783955894 .fill-AA2{fill:#4A6FF3;} + .d2-1783955894 .fill-AA4{fill:#EDF0FD;} + .d2-1783955894 .fill-AA5{fill:#F7F8FE;} + .d2-1783955894 .fill-AB4{fill:#EDF0FD;} + .d2-1783955894 .fill-AB5{fill:#F7F8FE;} + .d2-1783955894 .stroke-N1{stroke:#0A0F25;} + .d2-1783955894 .stroke-N2{stroke:#676C7E;} + .d2-1783955894 .stroke-N3{stroke:#9499AB;} + .d2-1783955894 .stroke-N4{stroke:#CFD2DD;} + .d2-1783955894 .stroke-N5{stroke:#DEE1EB;} + .d2-1783955894 .stroke-N6{stroke:#EEF1F8;} + .d2-1783955894 .stroke-N7{stroke:#FFFFFF;} + .d2-1783955894 .stroke-B1{stroke:#0D32B2;} + .d2-1783955894 .stroke-B2{stroke:#0D32B2;} + .d2-1783955894 .stroke-B3{stroke:#E3E9FD;} + .d2-1783955894 .stroke-B4{stroke:#E3E9FD;} + .d2-1783955894 .stroke-B5{stroke:#EDF0FD;} + .d2-1783955894 .stroke-B6{stroke:#F7F8FE;} + .d2-1783955894 .stroke-AA2{stroke:#4A6FF3;} + .d2-1783955894 .stroke-AA4{stroke:#EDF0FD;} + .d2-1783955894 .stroke-AA5{stroke:#F7F8FE;} + .d2-1783955894 .stroke-AB4{stroke:#EDF0FD;} + .d2-1783955894 .stroke-AB5{stroke:#F7F8FE;} + .d2-1783955894 .background-color-N1{background-color:#0A0F25;} + .d2-1783955894 .background-color-N2{background-color:#676C7E;} + .d2-1783955894 .background-color-N3{background-color:#9499AB;} + .d2-1783955894 .background-color-N4{background-color:#CFD2DD;} + .d2-1783955894 .background-color-N5{background-color:#DEE1EB;} + .d2-1783955894 .background-color-N6{background-color:#EEF1F8;} + .d2-1783955894 .background-color-N7{background-color:#FFFFFF;} + .d2-1783955894 .background-color-B1{background-color:#0D32B2;} + .d2-1783955894 .background-color-B2{background-color:#0D32B2;} + .d2-1783955894 .background-color-B3{background-color:#E3E9FD;} + .d2-1783955894 .background-color-B4{background-color:#E3E9FD;} + .d2-1783955894 .background-color-B5{background-color:#EDF0FD;} + .d2-1783955894 .background-color-B6{background-color:#F7F8FE;} + .d2-1783955894 .background-color-AA2{background-color:#4A6FF3;} + .d2-1783955894 .background-color-AA4{background-color:#EDF0FD;} + .d2-1783955894 .background-color-AA5{background-color:#F7F8FE;} + .d2-1783955894 .background-color-AB4{background-color:#EDF0FD;} + .d2-1783955894 .background-color-AB5{background-color:#F7F8FE;} + .d2-1783955894 .color-N1{color:#0A0F25;} + .d2-1783955894 .color-N2{color:#676C7E;} + .d2-1783955894 .color-N3{color:#9499AB;} + .d2-1783955894 .color-N4{color:#CFD2DD;} + .d2-1783955894 .color-N5{color:#DEE1EB;} + .d2-1783955894 .color-N6{color:#EEF1F8;} + .d2-1783955894 .color-N7{color:#FFFFFF;} + .d2-1783955894 .color-B1{color:#0D32B2;} + .d2-1783955894 .color-B2{color:#0D32B2;} + .d2-1783955894 .color-B3{color:#E3E9FD;} + .d2-1783955894 .color-B4{color:#E3E9FD;} + .d2-1783955894 .color-B5{color:#EDF0FD;} + .d2-1783955894 .color-B6{color:#F7F8FE;} + .d2-1783955894 .color-AA2{color:#4A6FF3;} + .d2-1783955894 .color-AA4{color:#EDF0FD;} + .d2-1783955894 .color-AA5{color:#F7F8FE;} + .d2-1783955894 .color-AB4{color:#EDF0FD;} + .d2-1783955894 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker-d2-1783955894);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker-d2-1783955894);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright-d2-1783955894);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright-d2-1783955894);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright-d2-1783955894);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright-d2-1783955894);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark-d2-1783955894);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright-d2-1783955894);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright-d2-1783955894);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright-d2-1783955894);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright-d2-1783955894);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker-d2-1783955894);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark-d2-1783955894);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal-d2-1783955894);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal-d2-1783955894);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright-d2-1783955894);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright-d2-1783955894);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright-d2-1783955894);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>abcdabcab + + + + + + + + + + \ No newline at end of file From 04eb007225324db7813806325395ecd899eebd13 Mon Sep 17 00:00:00 2001 From: Mayank Mohapatra <125661248+Mayank77maruti@users.noreply.github.com> Date: Sat, 22 Feb 2025 16:21:30 +0000 Subject: [PATCH 43/73] try --- d2layouts/d2cycle/layout.go | 2 +- .../txtar/cycle-diagram/dagre/board.exp.json | 2078 ++++++++++------- .../txtar/cycle-diagram/dagre/sketch.exp.svg | 172 +- .../txtar/cycle-diagram/elk/board.exp.json | 2078 ++++++++++------- .../txtar/cycle-diagram/elk/sketch.exp.svg | 172 +- 5 files changed, 2659 insertions(+), 1843 deletions(-) diff --git a/d2layouts/d2cycle/layout.go b/d2layouts/d2cycle/layout.go index b0692943f4..81f94c1534 100644 --- a/d2layouts/d2cycle/layout.go +++ b/d2layouts/d2cycle/layout.go @@ -12,7 +12,7 @@ import ( ) const ( - MIN_RADIUS = 100 + MIN_RADIUS = 200 PADDING = 20 MIN_SEGMENT_LEN = 10 ARC_STEPS = 100 diff --git a/e2etests/testdata/txtar/cycle-diagram/dagre/board.exp.json b/e2etests/testdata/txtar/cycle-diagram/dagre/board.exp.json index b5f4f083ef..78ed2dffeb 100644 --- a/e2etests/testdata/txtar/cycle-diagram/dagre/board.exp.json +++ b/e2etests/testdata/txtar/cycle-diagram/dagre/board.exp.json @@ -18,8 +18,8 @@ "x": 0, "y": 0 }, - "width": 253, - "height": 266, + "width": 453, + "height": 466, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -57,7 +57,7 @@ "type": "rectangle", "pos": { "x": -26, - "y": -133 + "y": -233 }, "width": 53, "height": 66, @@ -98,7 +98,7 @@ "id": "1.b", "type": "rectangle", "pos": { - "x": 73, + "x": 173, "y": -33 }, "width": 53, @@ -141,7 +141,7 @@ "type": "rectangle", "pos": { "x": -26, - "y": 67 + "y": 167 }, "width": 53, "height": 66, @@ -182,7 +182,7 @@ "id": "1.d", "type": "rectangle", "pos": { - "x": -127, + "x": -227, "y": -32 }, "width": 54, @@ -224,11 +224,11 @@ "id": "2", "type": "cycle", "pos": { - "x": 313, - "y": 25 + "x": 513, + "y": 50 }, - "width": 226, - "height": 216, + "width": 399, + "height": 366, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -265,8 +265,8 @@ "id": "2.a", "type": "rectangle", "pos": { - "x": 286, - "y": -108 + "x": 486, + "y": -183 }, "width": 53, "height": 66, @@ -307,8 +307,8 @@ "id": "2.b", "type": "rectangle", "pos": { - "x": 373, - "y": 41 + "x": 659, + "y": 116 }, "width": 53, "height": 66, @@ -349,8 +349,8 @@ "id": "2.c", "type": "rectangle", "pos": { - "x": 199, - "y": 42 + "x": 313, + "y": 117 }, "width": 53, "height": 66, @@ -391,11 +391,11 @@ "id": "3", "type": "cycle", "pos": { - "x": 599, + "x": 972, "y": 0 }, "width": 53, - "height": 266, + "height": 466, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -432,8 +432,8 @@ "id": "3.a", "type": "rectangle", "pos": { - "x": 572, - "y": -133 + "x": 945, + "y": -233 }, "width": 53, "height": 66, @@ -474,8 +474,8 @@ "id": "3.b", "type": "rectangle", "pos": { - "x": 572, - "y": 67 + "x": 945, + "y": 167 }, "width": 53, "height": 66, @@ -541,254 +541,334 @@ "route": [ { "x": 26.5, - "y": -96.4229965209961 + "y": -198.22999572753906 + }, + { + "x": 28.18000030517578, + "y": -198.00399780273438 + }, + { + "x": 31.285999298095703, + "y": -197.53700256347656 + }, + { + "x": 34.3849983215332, + "y": -197.02099609375 + }, + { + "x": 37.47600173950195, + "y": -196.45700073242188 + }, + { + "x": 40.55699920654297, + "y": -195.843994140625 + }, + { + "x": 43.62799835205078, + "y": -195.18299865722656 + }, + { + "x": 46.68899917602539, + "y": -194.47300720214844 + }, + { + "x": 49.73699951171875, + "y": -193.71600341796875 + }, + { + "x": 52.77399826049805, + "y": -192.91099548339844 + }, + { + "x": 55.79800033569336, + "y": -192.05799865722656 + }, + { + "x": 58.80799865722656, + "y": -191.1580047607422 + }, + { + "x": 61.803001403808594, + "y": -190.21099853515625 }, { - "x": 27.89900016784668, - "y": -96.02899932861328 + "x": 64.78299713134766, + "y": -189.2169952392578 }, { - "x": 29.40399932861328, - "y": -95.5790023803711 + "x": 67.74700164794922, + "y": -188.17599487304688 }, { - "x": 30.900999069213867, - "y": -95.1050033569336 + "x": 70.69400024414062, + "y": -187.08799743652344 }, { - "x": 32.39099884033203, - "y": -94.60800170898438 + "x": 73.6240005493164, + "y": -185.9550018310547 }, { - "x": 33.87300109863281, - "y": -94.08799743652344 + "x": 76.53600311279297, + "y": -184.77499389648438 }, { - "x": 35.34700012207031, - "y": -93.54399871826172 + "x": 79.42900085449219, + "y": -183.5500030517578 }, { - "x": 36.8120002746582, - "y": -92.97699737548828 + "x": 82.302001953125, + "y": -182.27999877929688 }, { - "x": 38.268001556396484, - "y": -92.38700103759766 + "x": 85.15499877929688, + "y": -180.96499633789062 }, { - "x": 39.7140007019043, - "y": -91.7750015258789 + "x": 87.98699951171875, + "y": -179.60499572753906 }, { - "x": 41.1510009765625, - "y": -91.13999938964844 + "x": 90.7979965209961, + "y": -178.2010040283203 }, { - "x": 42.57699966430664, - "y": -90.48200225830078 + "x": 93.58499908447266, + "y": -176.7530059814453 }, { - "x": 43.99300003051758, - "y": -89.802001953125 + "x": 96.3499984741211, + "y": -175.26100158691406 }, { - "x": 45.39899826049805, - "y": -89.0999984741211 + "x": 99.09100341796875, + "y": -173.7259979248047 }, { - "x": 46.79199981689453, - "y": -88.3759994506836 + "x": 101.80799865722656, + "y": -172.1479949951172 }, { - "x": 48.17499923706055, - "y": -87.62999725341797 + "x": 104.4990005493164, + "y": -170.5279998779297 }, { - "x": 49.54499816894531, - "y": -86.86299896240234 + "x": 107.16500091552734, + "y": -168.86500549316406 }, { - "x": 50.90399932861328, - "y": -86.0739974975586 + "x": 109.80400085449219, + "y": -167.16099548339844 }, { - "x": 52.249000549316406, - "y": -85.26399993896484 + "x": 112.41600036621094, + "y": -165.41600036621094 }, { - "x": 53.582000732421875, - "y": -84.43199920654297 + "x": 115.0009994506836, + "y": -163.62899780273438 }, { - "x": 54.902000427246094, - "y": -83.58000183105469 + "x": 117.55699920654297, + "y": -161.80299377441406 }, { - "x": 56.20800018310547, - "y": -82.70800018310547 + "x": 120.08399963378906, + "y": -159.93600463867188 }, { - "x": 57.5, - "y": -81.81400299072266 + "x": 122.58100128173828, + "y": -158.031005859375 }, { - "x": 58.77799987792969, - "y": -80.9010009765625 + "x": 125.0479965209961, + "y": -156.08599853515625 }, { - "x": 60.04199981689453, - "y": -79.96800231933594 + "x": 127.48400115966797, + "y": -154.1020050048828 }, { - "x": 61.290000915527344, - "y": -79.01499938964844 + "x": 129.88900756835938, + "y": -152.08099365234375 }, { - "x": 62.52399826049805, - "y": -78.04299926757812 + "x": 132.26199340820312, + "y": -150.02200317382812 }, { - "x": 63.742000579833984, - "y": -77.0510025024414 + "x": 134.6020050048828, + "y": -147.92599487304688 }, { - "x": 64.94400024414062, - "y": -76.04000091552734 + "x": 136.90899658203125, + "y": -145.79299926757812 }, { - "x": 66.13099670410156, - "y": -75.01100158691406 + "x": 139.1820068359375, + "y": -143.625 }, { - "x": 67.3010025024414, - "y": -73.96299743652344 + "x": 141.42100524902344, + "y": -141.42100524902344 }, { - "x": 68.4540023803711, - "y": -72.89600372314453 + "x": 143.625, + "y": -139.1820068359375 }, { - "x": 69.59100341796875, - "y": -71.81199645996094 + "x": 145.79299926757812, + "y": -136.90899658203125 }, { - "x": 70.70999908447266, - "y": -70.70999908447266 + "x": 147.92599487304688, + "y": -134.6020050048828 }, { - "x": 71.81199645996094, - "y": -69.59100341796875 + "x": 150.02200317382812, + "y": -132.26199340820312 }, { - "x": 72.89600372314453, - "y": -68.4540023803711 + "x": 152.08099365234375, + "y": -129.88900756835938 }, { - "x": 73.96299743652344, - "y": -67.3010025024414 + "x": 154.1020050048828, + "y": -127.48400115966797 }, { - "x": 75.01100158691406, - "y": -66.13099670410156 + "x": 156.08599853515625, + "y": -125.0479965209961 }, { - "x": 76.04000091552734, - "y": -64.94400024414062 + "x": 158.031005859375, + "y": -122.58100128173828 }, { - "x": 77.0510025024414, - "y": -63.742000579833984 + "x": 159.93600463867188, + "y": -120.08399963378906 }, { - "x": 78.04299926757812, - "y": -62.52399826049805 + "x": 161.80299377441406, + "y": -117.55699920654297 }, { - "x": 79.01499938964844, - "y": -61.290000915527344 + "x": 163.62899780273438, + "y": -115.0009994506836 }, { - "x": 79.96800231933594, - "y": -60.04199981689453 + "x": 165.41600036621094, + "y": -112.41600036621094 }, { - "x": 80.9010009765625, - "y": -58.77799987792969 + "x": 167.16099548339844, + "y": -109.80400085449219 }, { - "x": 81.81400299072266, - "y": -57.5 + "x": 168.86500549316406, + "y": -107.16500091552734 }, { - "x": 82.70800018310547, - "y": -56.20800018310547 + "x": 170.5279998779297, + "y": -104.4990005493164 }, { - "x": 83.58000183105469, - "y": -54.902000427246094 + "x": 172.1479949951172, + "y": -101.80799865722656 }, { - "x": 84.43199920654297, - "y": -53.582000732421875 + "x": 173.7259979248047, + "y": -99.09100341796875 }, { - "x": 85.26399993896484, - "y": -52.249000549316406 + "x": 175.26100158691406, + "y": -96.3499984741211 }, { - "x": 86.0739974975586, - "y": -50.90399932861328 + "x": 176.7530059814453, + "y": -93.58499908447266 }, { - "x": 86.86299896240234, - "y": -49.54499816894531 + "x": 178.2010040283203, + "y": -90.7979965209961 }, { - "x": 87.62999725341797, - "y": -48.17499923706055 + "x": 179.60499572753906, + "y": -87.98699951171875 }, { - "x": 88.3759994506836, - "y": -46.79199981689453 + "x": 180.96499633789062, + "y": -85.15499877929688 }, { - "x": 89.0999984741211, - "y": -45.39899826049805 + "x": 182.27999877929688, + "y": -82.302001953125 }, { - "x": 89.802001953125, - "y": -43.99300003051758 + "x": 183.5500030517578, + "y": -79.42900085449219 }, { - "x": 90.48200225830078, - "y": -42.57699966430664 + "x": 184.77499389648438, + "y": -76.53600311279297 }, { - "x": 91.13999938964844, - "y": -41.1510009765625 + "x": 185.9550018310547, + "y": -73.6240005493164 }, { - "x": 91.7750015258789, - "y": -39.7140007019043 + "x": 187.08799743652344, + "y": -70.69400024414062 }, { - "x": 92.38700103759766, - "y": -38.268001556396484 + "x": 188.17599487304688, + "y": -67.74700164794922 }, { - "x": 92.97699737548828, - "y": -36.8120002746582 + "x": 189.2169952392578, + "y": -64.78299713134766 }, { - "x": 93.54399871826172, - "y": -35.34700012207031 + "x": 190.21099853515625, + "y": -61.803001403808594 }, { - "x": 94.08799743652344, - "y": -33.87300109863281 + "x": 191.1580047607422, + "y": -58.80799865722656 }, { - "x": 94.39399719238281, + "x": 192.05799865722656, + "y": -55.79800033569336 + }, + { + "x": 192.91099548339844, + "y": -52.77399826049805 + }, + { + "x": 193.71600341796875, + "y": -49.73699951171875 + }, + { + "x": 194.47300720214844, + "y": -46.68899917602539 + }, + { + "x": 195.18299865722656, + "y": -43.62799835205078 + }, + { + "x": 195.843994140625, + "y": -40.55699920654297 + }, + { + "x": 196.45700073242188, + "y": -37.47600173950195 + }, + { + "x": 197.02099609375, + "y": -34.3849983215332 + }, + { + "x": 197.2519989013672, "y": -33 } ], @@ -824,256 +904,336 @@ "link": "", "route": [ { - "x": 94.39399719238281, + "x": 197.2519989013672, "y": 33 }, { - "x": 94.08799743652344, - "y": 33.87300109863281 + "x": 197.02099609375, + "y": 34.3849983215332 + }, + { + "x": 196.45700073242188, + "y": 37.47600173950195 + }, + { + "x": 195.843994140625, + "y": 40.55699920654297 + }, + { + "x": 195.18299865722656, + "y": 43.62799835205078 + }, + { + "x": 194.47300720214844, + "y": 46.68899917602539 + }, + { + "x": 193.71600341796875, + "y": 49.73699951171875 }, { - "x": 93.54399871826172, - "y": 35.34700012207031 + "x": 192.91099548339844, + "y": 52.77399826049805 }, { - "x": 92.97699737548828, - "y": 36.8120002746582 + "x": 192.05799865722656, + "y": 55.79800033569336 }, { - "x": 92.38700103759766, - "y": 38.268001556396484 + "x": 191.1580047607422, + "y": 58.80799865722656 }, { - "x": 91.7750015258789, - "y": 39.7140007019043 + "x": 190.21099853515625, + "y": 61.803001403808594 }, { - "x": 91.13999938964844, - "y": 41.1510009765625 + "x": 189.2169952392578, + "y": 64.78299713134766 }, { - "x": 90.48200225830078, - "y": 42.57699966430664 + "x": 188.17599487304688, + "y": 67.74700164794922 }, { - "x": 89.802001953125, - "y": 43.99300003051758 + "x": 187.08799743652344, + "y": 70.69400024414062 }, { - "x": 89.0999984741211, - "y": 45.39899826049805 + "x": 185.9550018310547, + "y": 73.6240005493164 }, { - "x": 88.3759994506836, - "y": 46.79199981689453 + "x": 184.77499389648438, + "y": 76.53600311279297 }, { - "x": 87.62999725341797, - "y": 48.17499923706055 + "x": 183.5500030517578, + "y": 79.42900085449219 }, { - "x": 86.86299896240234, - "y": 49.54499816894531 + "x": 182.27999877929688, + "y": 82.302001953125 }, { - "x": 86.0739974975586, - "y": 50.90399932861328 + "x": 180.96499633789062, + "y": 85.15499877929688 }, { - "x": 85.26399993896484, - "y": 52.249000549316406 + "x": 179.60499572753906, + "y": 87.98699951171875 }, { - "x": 84.43199920654297, - "y": 53.582000732421875 + "x": 178.2010040283203, + "y": 90.7979965209961 }, { - "x": 83.58000183105469, - "y": 54.902000427246094 + "x": 176.7530059814453, + "y": 93.58499908447266 }, { - "x": 82.70800018310547, - "y": 56.20800018310547 + "x": 175.26100158691406, + "y": 96.3499984741211 }, { - "x": 81.81400299072266, - "y": 57.5 + "x": 173.7259979248047, + "y": 99.09100341796875 }, { - "x": 80.9010009765625, - "y": 58.77799987792969 + "x": 172.1479949951172, + "y": 101.80799865722656 }, { - "x": 79.96800231933594, - "y": 60.04199981689453 + "x": 170.5279998779297, + "y": 104.4990005493164 }, { - "x": 79.01499938964844, - "y": 61.290000915527344 + "x": 168.86500549316406, + "y": 107.16500091552734 }, { - "x": 78.04299926757812, - "y": 62.52399826049805 + "x": 167.16099548339844, + "y": 109.80400085449219 }, { - "x": 77.0510025024414, - "y": 63.742000579833984 + "x": 165.41600036621094, + "y": 112.41600036621094 }, { - "x": 76.04000091552734, - "y": 64.94400024414062 + "x": 163.62899780273438, + "y": 115.0009994506836 }, { - "x": 75.01100158691406, - "y": 66.13099670410156 + "x": 161.80299377441406, + "y": 117.55699920654297 }, { - "x": 73.96299743652344, - "y": 67.3010025024414 + "x": 159.93600463867188, + "y": 120.08399963378906 }, { - "x": 72.89600372314453, - "y": 68.4540023803711 + "x": 158.031005859375, + "y": 122.58100128173828 }, { - "x": 71.81199645996094, - "y": 69.59100341796875 + "x": 156.08599853515625, + "y": 125.0479965209961 }, { - "x": 70.70999908447266, - "y": 70.70999908447266 + "x": 154.1020050048828, + "y": 127.48400115966797 }, { - "x": 69.59100341796875, - "y": 71.81199645996094 + "x": 152.08099365234375, + "y": 129.88900756835938 }, { - "x": 68.4540023803711, - "y": 72.89600372314453 + "x": 150.02200317382812, + "y": 132.26199340820312 }, { - "x": 67.3010025024414, - "y": 73.96299743652344 + "x": 147.92599487304688, + "y": 134.6020050048828 }, { - "x": 66.13099670410156, - "y": 75.01100158691406 + "x": 145.79299926757812, + "y": 136.90899658203125 }, { - "x": 64.94400024414062, - "y": 76.04000091552734 + "x": 143.625, + "y": 139.1820068359375 }, { - "x": 63.742000579833984, - "y": 77.0510025024414 + "x": 141.42100524902344, + "y": 141.42100524902344 }, { - "x": 62.52399826049805, - "y": 78.04299926757812 + "x": 139.1820068359375, + "y": 143.625 }, { - "x": 61.290000915527344, - "y": 79.01499938964844 + "x": 136.90899658203125, + "y": 145.79299926757812 }, { - "x": 60.04199981689453, - "y": 79.96800231933594 + "x": 134.6020050048828, + "y": 147.92599487304688 }, { - "x": 58.77799987792969, - "y": 80.9010009765625 + "x": 132.26199340820312, + "y": 150.02200317382812 }, { - "x": 57.5, - "y": 81.81400299072266 + "x": 129.88900756835938, + "y": 152.08099365234375 }, { - "x": 56.20800018310547, - "y": 82.70800018310547 + "x": 127.48400115966797, + "y": 154.1020050048828 }, { - "x": 54.902000427246094, - "y": 83.58000183105469 + "x": 125.0479965209961, + "y": 156.08599853515625 }, { - "x": 53.582000732421875, - "y": 84.43199920654297 + "x": 122.58100128173828, + "y": 158.031005859375 }, { - "x": 52.249000549316406, - "y": 85.26399993896484 + "x": 120.08399963378906, + "y": 159.93600463867188 }, { - "x": 50.90399932861328, - "y": 86.0739974975586 + "x": 117.55699920654297, + "y": 161.80299377441406 }, { - "x": 49.54499816894531, - "y": 86.86299896240234 + "x": 115.0009994506836, + "y": 163.62899780273438 }, { - "x": 48.17499923706055, - "y": 87.62999725341797 + "x": 112.41600036621094, + "y": 165.41600036621094 }, { - "x": 46.79199981689453, - "y": 88.3759994506836 + "x": 109.80400085449219, + "y": 167.16099548339844 }, { - "x": 45.39899826049805, - "y": 89.0999984741211 + "x": 107.16500091552734, + "y": 168.86500549316406 }, { - "x": 43.99300003051758, - "y": 89.802001953125 + "x": 104.4990005493164, + "y": 170.5279998779297 }, { - "x": 42.57699966430664, - "y": 90.48200225830078 + "x": 101.80799865722656, + "y": 172.1479949951172 }, { - "x": 41.1510009765625, - "y": 91.13999938964844 + "x": 99.09100341796875, + "y": 173.7259979248047 }, { - "x": 39.7140007019043, - "y": 91.7750015258789 + "x": 96.3499984741211, + "y": 175.26100158691406 }, { - "x": 38.268001556396484, - "y": 92.38700103759766 + "x": 93.58499908447266, + "y": 176.7530059814453 }, { - "x": 36.8120002746582, - "y": 92.97699737548828 + "x": 90.7979965209961, + "y": 178.2010040283203 }, { - "x": 35.34700012207031, - "y": 93.54399871826172 + "x": 87.98699951171875, + "y": 179.60499572753906 }, { - "x": 33.87300109863281, - "y": 94.08799743652344 + "x": 85.15499877929688, + "y": 180.96499633789062 }, { - "x": 32.39099884033203, - "y": 94.60800170898438 + "x": 82.302001953125, + "y": 182.27999877929688 }, { - "x": 30.900999069213867, - "y": 95.1050033569336 + "x": 79.42900085449219, + "y": 183.5500030517578 }, { - "x": 29.40399932861328, - "y": 95.5790023803711 + "x": 76.53600311279297, + "y": 184.77499389648438 }, { - "x": 27.89900016784668, - "y": 96.02899932861328 + "x": 73.6240005493164, + "y": 185.9550018310547 + }, + { + "x": 70.69400024414062, + "y": 187.08799743652344 + }, + { + "x": 67.74700164794922, + "y": 188.17599487304688 + }, + { + "x": 64.78299713134766, + "y": 189.2169952392578 + }, + { + "x": 61.803001403808594, + "y": 190.21099853515625 + }, + { + "x": 58.80799865722656, + "y": 191.1580047607422 + }, + { + "x": 55.79800033569336, + "y": 192.05799865722656 + }, + { + "x": 52.77399826049805, + "y": 192.91099548339844 + }, + { + "x": 49.73699951171875, + "y": 193.71600341796875 + }, + { + "x": 46.68899917602539, + "y": 194.47300720214844 + }, + { + "x": 43.62799835205078, + "y": 195.18299865722656 + }, + { + "x": 40.55699920654297, + "y": 195.843994140625 + }, + { + "x": 37.47600173950195, + "y": 196.45700073242188 + }, + { + "x": 34.3849983215332, + "y": 197.02099609375 + }, + { + "x": 31.285999298095703, + "y": 197.53700256347656 + }, + { + "x": 28.18000030517578, + "y": 198.00399780273438 }, { "x": 26.5, - "y": 96.4229965209961 + "y": 198.22999572753906 } ], "isCurve": true, @@ -1109,254 +1269,334 @@ "route": [ { "x": -26.499000549316406, - "y": 96.4229965209961 + "y": 198.22999572753906 + }, + { + "x": -28.18000030517578, + "y": 198.00399780273438 + }, + { + "x": -31.285999298095703, + "y": 197.53700256347656 + }, + { + "x": -34.3849983215332, + "y": 197.02099609375 + }, + { + "x": -37.47600173950195, + "y": 196.45700073242188 + }, + { + "x": -40.55699920654297, + "y": 195.843994140625 + }, + { + "x": -43.62799835205078, + "y": 195.18299865722656 + }, + { + "x": -46.68899917602539, + "y": 194.47300720214844 + }, + { + "x": -49.73699951171875, + "y": 193.71600341796875 + }, + { + "x": -52.77399826049805, + "y": 192.91099548339844 + }, + { + "x": -55.79800033569336, + "y": 192.05799865722656 + }, + { + "x": -58.80799865722656, + "y": 191.1580047607422 }, { - "x": -27.89900016784668, - "y": 96.02899932861328 + "x": -61.803001403808594, + "y": 190.21099853515625 }, { - "x": -29.40399932861328, - "y": 95.5790023803711 + "x": -64.78299713134766, + "y": 189.2169952392578 }, { - "x": -30.900999069213867, - "y": 95.1050033569336 + "x": -67.74700164794922, + "y": 188.17599487304688 }, { - "x": -32.39099884033203, - "y": 94.60800170898438 + "x": -70.69400024414062, + "y": 187.08799743652344 }, { - "x": -33.87300109863281, - "y": 94.08799743652344 + "x": -73.6240005493164, + "y": 185.9550018310547 }, { - "x": -35.34700012207031, - "y": 93.54399871826172 + "x": -76.53600311279297, + "y": 184.77499389648438 }, { - "x": -36.8120002746582, - "y": 92.97699737548828 + "x": -79.42900085449219, + "y": 183.5500030517578 }, { - "x": -38.268001556396484, - "y": 92.38700103759766 + "x": -82.302001953125, + "y": 182.27999877929688 }, { - "x": -39.7140007019043, - "y": 91.7750015258789 + "x": -85.15499877929688, + "y": 180.96499633789062 }, { - "x": -41.1510009765625, - "y": 91.13999938964844 + "x": -87.98699951171875, + "y": 179.60499572753906 }, { - "x": -42.57699966430664, - "y": 90.48200225830078 + "x": -90.7979965209961, + "y": 178.2010040283203 }, { - "x": -43.99300003051758, - "y": 89.802001953125 + "x": -93.58499908447266, + "y": 176.7530059814453 }, { - "x": -45.39899826049805, - "y": 89.0999984741211 + "x": -96.3499984741211, + "y": 175.26100158691406 }, { - "x": -46.79199981689453, - "y": 88.3759994506836 + "x": -99.09100341796875, + "y": 173.7259979248047 }, { - "x": -48.17499923706055, - "y": 87.62999725341797 + "x": -101.80799865722656, + "y": 172.1479949951172 }, { - "x": -49.54499816894531, - "y": 86.86299896240234 + "x": -104.4990005493164, + "y": 170.5279998779297 }, { - "x": -50.90399932861328, - "y": 86.0739974975586 + "x": -107.16500091552734, + "y": 168.86500549316406 }, { - "x": -52.249000549316406, - "y": 85.26399993896484 + "x": -109.80400085449219, + "y": 167.16099548339844 }, { - "x": -53.582000732421875, - "y": 84.43199920654297 + "x": -112.41600036621094, + "y": 165.41600036621094 }, { - "x": -54.902000427246094, - "y": 83.58000183105469 + "x": -115.0009994506836, + "y": 163.62899780273438 }, { - "x": -56.20800018310547, - "y": 82.70800018310547 + "x": -117.55699920654297, + "y": 161.80299377441406 }, { - "x": -57.5, - "y": 81.81400299072266 + "x": -120.08399963378906, + "y": 159.93600463867188 }, { - "x": -58.77799987792969, - "y": 80.9010009765625 + "x": -122.58100128173828, + "y": 158.031005859375 }, { - "x": -60.04199981689453, - "y": 79.96800231933594 + "x": -125.0479965209961, + "y": 156.08599853515625 }, { - "x": -61.290000915527344, - "y": 79.01499938964844 + "x": -127.48400115966797, + "y": 154.1020050048828 }, { - "x": -62.52399826049805, - "y": 78.04299926757812 + "x": -129.88900756835938, + "y": 152.08099365234375 }, { - "x": -63.742000579833984, - "y": 77.0510025024414 + "x": -132.26199340820312, + "y": 150.02200317382812 }, { - "x": -64.94400024414062, - "y": 76.04000091552734 + "x": -134.6020050048828, + "y": 147.92599487304688 }, { - "x": -66.13099670410156, - "y": 75.01100158691406 + "x": -136.90899658203125, + "y": 145.79299926757812 }, { - "x": -67.3010025024414, - "y": 73.96299743652344 + "x": -139.1820068359375, + "y": 143.625 }, { - "x": -68.4540023803711, - "y": 72.89600372314453 + "x": -141.42100524902344, + "y": 141.42100524902344 }, { - "x": -69.59100341796875, - "y": 71.81199645996094 + "x": -143.625, + "y": 139.1820068359375 }, { - "x": -70.70999908447266, - "y": 70.70999908447266 + "x": -145.79299926757812, + "y": 136.90899658203125 }, { - "x": -71.81199645996094, - "y": 69.59100341796875 + "x": -147.92599487304688, + "y": 134.6020050048828 }, { - "x": -72.89600372314453, - "y": 68.4540023803711 + "x": -150.02200317382812, + "y": 132.26199340820312 }, { - "x": -73.96299743652344, - "y": 67.3010025024414 + "x": -152.08099365234375, + "y": 129.88900756835938 }, { - "x": -75.01100158691406, - "y": 66.13099670410156 + "x": -154.1020050048828, + "y": 127.48400115966797 }, { - "x": -76.04000091552734, - "y": 64.94400024414062 + "x": -156.08599853515625, + "y": 125.0479965209961 }, { - "x": -77.0510025024414, - "y": 63.742000579833984 + "x": -158.031005859375, + "y": 122.58100128173828 }, { - "x": -78.04299926757812, - "y": 62.52399826049805 + "x": -159.93600463867188, + "y": 120.08399963378906 }, { - "x": -79.01499938964844, - "y": 61.290000915527344 + "x": -161.80299377441406, + "y": 117.55699920654297 }, { - "x": -79.96800231933594, - "y": 60.04199981689453 + "x": -163.62899780273438, + "y": 115.0009994506836 }, { - "x": -80.9010009765625, - "y": 58.77799987792969 + "x": -165.41600036621094, + "y": 112.41600036621094 }, { - "x": -81.81400299072266, - "y": 57.5 + "x": -167.16099548339844, + "y": 109.80400085449219 }, { - "x": -82.70800018310547, - "y": 56.20800018310547 + "x": -168.86500549316406, + "y": 107.16500091552734 }, { - "x": -83.58000183105469, - "y": 54.902000427246094 + "x": -170.5279998779297, + "y": 104.4990005493164 }, { - "x": -84.43199920654297, - "y": 53.582000732421875 + "x": -172.1479949951172, + "y": 101.80799865722656 }, { - "x": -85.26399993896484, - "y": 52.249000549316406 + "x": -173.7259979248047, + "y": 99.09100341796875 }, { - "x": -86.0739974975586, - "y": 50.90399932861328 + "x": -175.26100158691406, + "y": 96.3499984741211 }, { - "x": -86.86299896240234, - "y": 49.54499816894531 + "x": -176.7530059814453, + "y": 93.58499908447266 }, { - "x": -87.62999725341797, - "y": 48.17499923706055 + "x": -178.2010040283203, + "y": 90.7979965209961 }, { - "x": -88.3759994506836, - "y": 46.79199981689453 + "x": -179.60499572753906, + "y": 87.98699951171875 }, { - "x": -89.0999984741211, - "y": 45.39899826049805 + "x": -180.96499633789062, + "y": 85.15499877929688 }, { - "x": -89.802001953125, - "y": 43.99300003051758 + "x": -182.27999877929688, + "y": 82.302001953125 }, { - "x": -90.48200225830078, - "y": 42.57699966430664 + "x": -183.5500030517578, + "y": 79.42900085449219 }, { - "x": -91.13999938964844, - "y": 41.1510009765625 + "x": -184.77499389648438, + "y": 76.53600311279297 }, { - "x": -91.7750015258789, - "y": 39.7140007019043 + "x": -185.9550018310547, + "y": 73.6240005493164 }, { - "x": -92.38700103759766, - "y": 38.268001556396484 + "x": -187.08799743652344, + "y": 70.69400024414062 }, { - "x": -92.97699737548828, - "y": 36.8120002746582 + "x": -188.17599487304688, + "y": 67.74700164794922 }, { - "x": -93.54399871826172, - "y": 35.34700012207031 + "x": -189.2169952392578, + "y": 64.78299713134766 }, { - "x": -94.08799743652344, - "y": 33.87300109863281 + "x": -190.21099853515625, + "y": 61.803001403808594 }, { - "x": -94.39399719238281, + "x": -191.1580047607422, + "y": 58.80799865722656 + }, + { + "x": -192.05799865722656, + "y": 55.79800033569336 + }, + { + "x": -192.91099548339844, + "y": 52.77399826049805 + }, + { + "x": -193.71600341796875, + "y": 49.73699951171875 + }, + { + "x": -194.47300720214844, + "y": 46.68899917602539 + }, + { + "x": -195.18299865722656, + "y": 43.62799835205078 + }, + { + "x": -195.843994140625, + "y": 40.55699920654297 + }, + { + "x": -196.45700073242188, + "y": 37.47600173950195 + }, + { + "x": -197.02099609375, + "y": 34.3849983215332 + }, + { + "x": -197.2519989013672, "y": 33 } ], @@ -1392,296 +1632,352 @@ "link": "", "route": [ { - "x": 339.5, - "y": -71.4209976196289 + "x": 539.5, + "y": -148.2259979248047 }, { - "x": 339.8909912109375, - "y": -71.31600189208984 + "x": 542.2160034179688, + "y": -147.85400390625 }, { - "x": 341.90301513671875, - "y": -70.73100280761719 + "x": 546.35302734375, + "y": -147.19900512695312 }, { - "x": 343.9010009765625, - "y": -70.1050033569336 + "x": 550.4760131835938, + "y": -146.45700073242188 }, { - "x": 345.885986328125, - "y": -69.43699645996094 + "x": 554.5819702148438, + "y": -145.62899780273438 }, { - "x": 347.85699462890625, - "y": -68.72799682617188 + "x": 558.6699829101562, + "y": -144.71499633789062 }, { - "x": 349.81201171875, - "y": -67.97699737548828 + "x": 562.7369995117188, + "y": -143.71600341796875 }, { - "x": 351.7510070800781, - "y": -67.18599700927734 + "x": 566.7830200195312, + "y": -142.6320037841797 }, { - "x": 353.6730041503906, - "y": -66.35399627685547 + "x": 570.8060302734375, + "y": -141.46299743652344 }, { - "x": 355.5769958496094, - "y": -65.48200225830078 + "x": 574.802978515625, + "y": -140.21099853515625 }, { - "x": 357.4630126953125, - "y": -64.57099914550781 + "x": 578.7730102539062, + "y": -138.875 }, { - "x": 359.3290100097656, - "y": -63.619998931884766 + "x": 582.7139892578125, + "y": -137.45599365234375 }, { - "x": 361.17498779296875, - "y": -62.630001068115234 + "x": 586.6240234375, + "y": -135.9550018310547 }, { - "x": 363, - "y": -61.60200119018555 + "x": 590.5029907226562, + "y": -134.3719940185547 }, { - "x": 364.802001953125, - "y": -60.5359992980957 + "x": 594.3469848632812, + "y": -132.70899963378906 }, { - "x": 366.5820007324219, - "y": -59.43199920654297 + "x": 598.155029296875, + "y": -130.96499633789062 }, { - "x": 368.3389892578125, - "y": -58.29199981689453 + "x": 601.927001953125, + "y": -129.14199829101562 }, { - "x": 370.0710144042969, - "y": -57.11399841308594 + "x": 605.6589965820312, + "y": -127.23999786376953 }, { - "x": 371.77801513671875, - "y": -55.9010009765625 + "x": 609.3499755859375, + "y": -125.26100158691406 }, { - "x": 373.4590148925781, - "y": -54.652000427246094 + "x": 613, + "y": -123.20500183105469 }, { - "x": 375.114013671875, - "y": -53.36899948120117 + "x": 616.60498046875, + "y": -121.0719985961914 }, { - "x": 376.74200439453125, - "y": -52.05099868774414 + "x": 620.1649780273438, + "y": -118.86499786376953 }, { - "x": 378.3420104980469, - "y": -50.69900131225586 + "x": 623.677978515625, + "y": -116.58399963378906 }, { - "x": 379.9129943847656, - "y": -49.31399917602539 + "x": 627.1420288085938, + "y": -114.22899627685547 }, { - "x": 381.4540100097656, - "y": -47.895999908447266 + "x": 630.5570068359375, + "y": -111.8030014038086 }, { - "x": 382.96600341796875, - "y": -46.446998596191406 + "x": 633.9190063476562, + "y": -109.30500030517578 }, { - "x": 384.4469909667969, - "y": -44.965999603271484 + "x": 637.22900390625, + "y": -106.73799896240234 }, { - "x": 385.89599609375, - "y": -43.45399856567383 + "x": 640.4840087890625, + "y": -104.10199737548828 }, { - "x": 387.3139953613281, - "y": -41.91299819946289 + "x": 643.6840209960938, + "y": -101.39900207519531 }, { - "x": 388.6990051269531, - "y": -40.34199905395508 + "x": 646.8259887695312, + "y": -98.62799835205078 }, { - "x": 390.0509948730469, - "y": -38.742000579833984 + "x": 649.9089965820312, + "y": -95.79299926757812 }, { - "x": 391.3689880371094, - "y": -37.11399841308594 + "x": 652.9320068359375, + "y": -92.89399719238281 }, { - "x": 392.6520080566406, - "y": -35.45899963378906 + "x": 655.8939819335938, + "y": -89.93199920654297 }, { - "x": 393.9010009765625, - "y": -33.77799987792969 + "x": 658.7930297851562, + "y": -86.90899658203125 }, { - "x": 395.114013671875, - "y": -32.07099914550781 + "x": 661.6279907226562, + "y": -83.82599639892578 }, { - "x": 396.2919921875, - "y": -30.339000701904297 + "x": 664.3989868164062, + "y": -80.68399810791016 }, { - "x": 397.4320068359375, - "y": -28.582000732421875 + "x": 667.1019897460938, + "y": -77.48400115966797 }, { - "x": 398.5360107421875, - "y": -26.802000045776367 + "x": 669.7379760742188, + "y": -74.22899627685547 }, { - "x": 399.60198974609375, - "y": -25 + "x": 672.3049926757812, + "y": -70.91899871826172 }, { - "x": 400.6300048828125, - "y": -23.174999237060547 + "x": 674.802978515625, + "y": -67.55699920654297 }, { - "x": 401.6199951171875, - "y": -21.32900047302246 + "x": 677.22900390625, + "y": -64.14199829101562 }, { - "x": 402.5710144042969, - "y": -19.46299934387207 + "x": 679.583984375, + "y": -60.678001403808594 }, { - "x": 403.48199462890625, - "y": -17.57699966430664 + "x": 681.864990234375, + "y": -57.165000915527344 }, { - "x": 404.35400390625, - "y": -15.67300033569336 + "x": 684.072021484375, + "y": -53.60499954223633 }, { - "x": 405.1860046386719, - "y": -13.75100040435791 + "x": 686.2050170898438, + "y": -50 }, { - "x": 405.97698974609375, - "y": -11.812000274658203 + "x": 688.260986328125, + "y": -46.349998474121094 }, { - "x": 406.7279968261719, - "y": -9.857000350952148 + "x": 690.239990234375, + "y": -42.659000396728516 }, { - "x": 407.43701171875, - "y": -7.886000156402588 + "x": 692.1420288085938, + "y": -38.926998138427734 }, { - "x": 408.1050109863281, - "y": -5.901000022888184 + "x": 693.9650268554688, + "y": -35.154998779296875 }, { - "x": 408.7309875488281, - "y": -3.9030001163482666 + "x": 695.708984375, + "y": -31.347000122070312 }, { - "x": 409.3160095214844, - "y": -1.8910000324249268 + "x": 697.3720092773438, + "y": -27.503000259399414 }, { - "x": 409.8580017089844, - "y": 0.13099999725818634 + "x": 698.9550170898438, + "y": -23.624000549316406 }, { - "x": 410.35699462890625, - "y": 2.1640000343322754 + "x": 700.4559936523438, + "y": -19.714000701904297 }, { - "x": 410.8139953613281, - "y": 4.208000183105469 + "x": 701.875, + "y": -15.77299976348877 }, { - "x": 411.2279968261719, - "y": 6.261000156402588 + "x": 703.2109985351562, + "y": -11.803000450134277 }, { - "x": 411.5989990234375, - "y": 8.322999954223633 + "x": 704.4630126953125, + "y": -7.806000232696533 }, { - "x": 411.927001953125, - "y": 10.390999794006348 + "x": 705.6320190429688, + "y": -3.7829999923706055 }, { - "x": 412.21099853515625, - "y": 12.465999603271484 + "x": 706.7160034179688, + "y": 0.2619999945163727 }, { - "x": 412.4519958496094, - "y": 14.54699993133545 + "x": 707.7150268554688, + "y": 4.328999996185303 }, { - "x": 412.64898681640625, - "y": 16.631999969482422 + "x": 708.6290283203125, + "y": 8.416999816894531 }, { - "x": 412.802001953125, - "y": 18.719999313354492 + "x": 709.4569702148438, + "y": 12.52299976348877 }, { - "x": 412.9119873046875, - "y": 20.812000274658203 + "x": 710.198974609375, + "y": 16.645999908447266 }, { - "x": 412.9779968261719, - "y": 22.905000686645508 + "x": 710.85400390625, + "y": 20.783000946044922 }, { - "x": 413, - "y": 25 + "x": 711.4219970703125, + "y": 24.933000564575195 + }, + { + "x": 711.9039916992188, + "y": 29.0939998626709 + }, + { + "x": 712.2979736328125, + "y": 33.263999938964844 + }, + { + "x": 712.60498046875, + "y": 37.441001892089844 + }, + { + "x": 712.823974609375, + "y": 41.624000549316406 + }, + { + "x": 712.9559936523438, + "y": 45.81100082397461 + }, + { + "x": 713, + "y": 50 + }, + { + "x": 712.9559936523438, + "y": 54.1879997253418 + }, + { + "x": 712.823974609375, + "y": 58.375 + }, + { + "x": 712.60498046875, + "y": 62.55799865722656 + }, + { + "x": 712.2979736328125, + "y": 66.73500061035156 }, { - "x": 412.9779968261719, - "y": 27.0939998626709 + "x": 711.9039916992188, + "y": 70.90499877929688 }, { - "x": 412.9119873046875, - "y": 29.187000274658203 + "x": 711.4219970703125, + "y": 75.06600189208984 }, { - "x": 412.802001953125, - "y": 31.27899932861328 + "x": 710.85400390625, + "y": 79.21600341796875 }, { - "x": 412.64898681640625, - "y": 33.367000579833984 + "x": 710.198974609375, + "y": 83.35299682617188 }, { - "x": 412.4519958496094, - "y": 35.45199966430664 + "x": 709.4569702148438, + "y": 87.47599792480469 }, { - "x": 412.21099853515625, - "y": 37.53300094604492 + "x": 708.6290283203125, + "y": 91.58200073242188 }, { - "x": 411.927001953125, - "y": 39.608001708984375 + "x": 707.7150268554688, + "y": 95.66999816894531 }, { - "x": 411.5989990234375, - "y": 41.67599868774414 + "x": 706.7160034179688, + "y": 99.73699951171875 }, { - "x": 411.5409851074219, - "y": 41.999000549316406 + "x": 705.6320190429688, + "y": 103.78299713134766 + }, + { + "x": 704.4630126953125, + "y": 107.80599975585938 + }, + { + "x": 703.2109985351562, + "y": 111.8030014038086 + }, + { + "x": 701.875, + "y": 115.77300262451172 + }, + { + "x": 701.4329833984375, + "y": 116.9990005493164 } ], "isCurve": true, @@ -1716,256 +2012,336 @@ "link": "", "route": [ { - "x": 373.10198974609375, - "y": 104.91799926757812 + "x": 662.3569946289062, + "y": 182.99899291992188 + }, + { + "x": 661.6279907226562, + "y": 183.8260040283203 + }, + { + "x": 658.7930297851562, + "y": 186.90899658203125 + }, + { + "x": 655.8939819335938, + "y": 189.9320068359375 + }, + { + "x": 652.9320068359375, + "y": 192.8939971923828 + }, + { + "x": 649.9089965820312, + "y": 195.79299926757812 + }, + { + "x": 646.8259887695312, + "y": 198.6280059814453 + }, + { + "x": 643.6840209960938, + "y": 201.3990020751953 + }, + { + "x": 640.4840087890625, + "y": 204.1020050048828 + }, + { + "x": 637.22900390625, + "y": 206.73800659179688 + }, + { + "x": 633.9190063476562, + "y": 209.30499267578125 + }, + { + "x": 630.5570068359375, + "y": 211.80299377441406 + }, + { + "x": 627.1420288085938, + "y": 214.22900390625 + }, + { + "x": 623.677978515625, + "y": 216.58399963378906 + }, + { + "x": 620.1649780273438, + "y": 218.86500549316406 + }, + { + "x": 616.60498046875, + "y": 221.07200622558594 + }, + { + "x": 613, + "y": 223.2050018310547 + }, + { + "x": 609.3499755859375, + "y": 225.26100158691406 }, { - "x": 371.77801513671875, - "y": 105.9010009765625 + "x": 605.6589965820312, + "y": 227.24000549316406 }, { - "x": 370.0710144042969, - "y": 107.11399841308594 + "x": 601.927001953125, + "y": 229.14199829101562 }, { - "x": 368.3389892578125, - "y": 108.29199981689453 + "x": 598.155029296875, + "y": 230.96499633789062 }, { - "x": 366.5820007324219, - "y": 109.43199920654297 + "x": 594.3469848632812, + "y": 232.70899963378906 }, { - "x": 364.802001953125, - "y": 110.53600311279297 + "x": 590.5029907226562, + "y": 234.3719940185547 }, { - "x": 363, - "y": 111.60199737548828 + "x": 586.6240234375, + "y": 235.9550018310547 }, { - "x": 361.17498779296875, - "y": 112.62999725341797 + "x": 582.7139892578125, + "y": 237.45599365234375 }, { - "x": 359.3290100097656, - "y": 113.62000274658203 + "x": 578.7730102539062, + "y": 238.875 }, { - "x": 357.4630126953125, - "y": 114.57099914550781 + "x": 574.802978515625, + "y": 240.21099853515625 }, { - "x": 355.5769958496094, - "y": 115.48200225830078 + "x": 570.8060302734375, + "y": 241.46299743652344 }, { - "x": 353.6730041503906, - "y": 116.35399627685547 + "x": 566.7830200195312, + "y": 242.6320037841797 }, { - "x": 351.7510070800781, - "y": 117.18599700927734 + "x": 562.7369995117188, + "y": 243.71600341796875 }, { - "x": 349.81201171875, - "y": 117.97699737548828 + "x": 558.6699829101562, + "y": 244.71499633789062 }, { - "x": 347.85699462890625, - "y": 118.72799682617188 + "x": 554.5819702148438, + "y": 245.62899780273438 }, { - "x": 345.885986328125, - "y": 119.43699645996094 + "x": 550.4760131835938, + "y": 246.45700073242188 }, { - "x": 343.9010009765625, - "y": 120.1050033569336 + "x": 546.35302734375, + "y": 247.19900512695312 }, { - "x": 341.90301513671875, - "y": 120.73100280761719 + "x": 542.2160034179688, + "y": 247.85400390625 }, { - "x": 339.8909912109375, - "y": 121.31600189208984 + "x": 538.0659790039062, + "y": 248.4219970703125 }, { - "x": 337.8680114746094, - "y": 121.85800170898438 + "x": 533.905029296875, + "y": 248.9040069580078 }, { - "x": 335.8349914550781, - "y": 122.35700225830078 + "x": 529.7349853515625, + "y": 249.29800415039062 }, { - "x": 333.7909851074219, - "y": 122.81400299072266 + "x": 525.5579833984375, + "y": 249.60499572753906 }, { - "x": 331.7380065917969, - "y": 123.22799682617188 + "x": 521.375, + "y": 249.82400512695312 }, { - "x": 329.6759948730469, - "y": 123.5989990234375 + "x": 517.18798828125, + "y": 249.95599365234375 }, { - "x": 327.6080017089844, - "y": 123.927001953125 + "x": 513, + "y": 250 }, { - "x": 325.5329895019531, - "y": 124.21099853515625 + "x": 508.8110046386719, + "y": 249.95599365234375 }, { - "x": 323.4519958496094, - "y": 124.4520034790039 + "x": 504.6239929199219, + "y": 249.82400512695312 }, { - "x": 321.36700439453125, - "y": 124.64900207519531 + "x": 500.4410095214844, + "y": 249.60499572753906 }, { - "x": 319.27899169921875, - "y": 124.802001953125 + "x": 496.2640075683594, + "y": 249.29800415039062 }, { - "x": 317.18701171875, - "y": 124.91200256347656 + "x": 492.093994140625, + "y": 248.9040069580078 }, { - "x": 315.093994140625, - "y": 124.97799682617188 + "x": 487.9330139160156, + "y": 248.4219970703125 }, { - "x": 313, - "y": 125 + "x": 483.7829895019531, + "y": 247.85400390625 }, { - "x": 310.9049987792969, - "y": 124.97799682617188 + "x": 479.64599609375, + "y": 247.19900512695312 }, { - "x": 308.81201171875, - "y": 124.91200256347656 + "x": 475.52301025390625, + "y": 246.45700073242188 }, { - "x": 306.7200012207031, - "y": 124.802001953125 + "x": 471.4169921875, + "y": 245.62899780273438 }, { - "x": 304.6319885253906, - "y": 124.64900207519531 + "x": 467.3290100097656, + "y": 244.71499633789062 }, { - "x": 302.5469970703125, - "y": 124.4520034790039 + "x": 463.2619934082031, + "y": 243.71600341796875 }, { - "x": 300.46600341796875, - "y": 124.21099853515625 + "x": 459.21600341796875, + "y": 242.6320037841797 }, { - "x": 298.3909912109375, - "y": 123.927001953125 + "x": 455.1929931640625, + "y": 241.46299743652344 }, { - "x": 296.322998046875, - "y": 123.5989990234375 + "x": 451.1960144042969, + "y": 240.21099853515625 }, { - "x": 294.260986328125, - "y": 123.22799682617188 + "x": 447.22601318359375, + "y": 238.875 }, { - "x": 292.2080078125, - "y": 122.81400299072266 + "x": 443.2850036621094, + "y": 237.45599365234375 }, { - "x": 290.16400146484375, - "y": 122.35700225830078 + "x": 439.375, + "y": 235.9550018310547 }, { - "x": 288.1310119628906, - "y": 121.85800170898438 + "x": 435.4960021972656, + "y": 234.3719940185547 }, { - "x": 286.1080017089844, - "y": 121.31600189208984 + "x": 431.6520080566406, + "y": 232.70899963378906 }, { - "x": 284.09600830078125, - "y": 120.73100280761719 + "x": 427.843994140625, + "y": 230.96499633789062 }, { - "x": 282.0979919433594, - "y": 120.1050033569336 + "x": 424.0719909667969, + "y": 229.14199829101562 }, { - "x": 280.1130065917969, - "y": 119.43699645996094 + "x": 420.3399963378906, + "y": 227.24000549316406 }, { - "x": 278.1419982910156, - "y": 118.72799682617188 + "x": 416.64898681640625, + "y": 225.26100158691406 }, { - "x": 276.18701171875, - "y": 117.97699737548828 + "x": 413, + "y": 223.2050018310547 }, { - "x": 274.24798583984375, - "y": 117.18599700927734 + "x": 409.3940124511719, + "y": 221.07200622558594 }, { - "x": 272.32598876953125, - "y": 116.35399627685547 + "x": 405.8340148925781, + "y": 218.86500549316406 }, { - "x": 270.4219970703125, - "y": 115.48200225830078 + "x": 402.3210144042969, + "y": 216.58399963378906 }, { - "x": 268.5360107421875, - "y": 114.57099914550781 + "x": 398.85699462890625, + "y": 214.22900390625 }, { - "x": 266.6700134277344, - "y": 113.62000274658203 + "x": 395.4419860839844, + "y": 211.80299377441406 }, { - "x": 264.8240051269531, - "y": 112.62999725341797 + "x": 392.0799865722656, + "y": 209.30499267578125 }, { - "x": 263, - "y": 111.60199737548828 + "x": 388.7699890136719, + "y": 206.73800659179688 }, { - "x": 261.1969909667969, - "y": 110.53600311279297 + "x": 385.5150146484375, + "y": 204.1020050048828 }, { - "x": 259.4169921875, - "y": 109.43199920654297 + "x": 382.31500244140625, + "y": 201.3990020751953 }, { - "x": 257.6600036621094, - "y": 108.29199981689453 + "x": 379.1730041503906, + "y": 198.6280059814453 }, { - "x": 255.92799377441406, - "y": 107.11399841308594 + "x": 376.0899963378906, + "y": 195.79299926757812 }, { - "x": 254.2209930419922, - "y": 105.9010009765625 + "x": 373.0669860839844, + "y": 192.8939971923828 }, { - "x": 252.89700317382812, - "y": 104.91799926757812 + "x": 370.1050109863281, + "y": 189.9320068359375 + }, + { + "x": 367.20599365234375, + "y": 186.90899658203125 + }, + { + "x": 364.3710021972656, + "y": 183.8260040283203 + }, + { + "x": 363.6419982910156, + "y": 183 } ], "isCurve": true, @@ -2000,344 +2376,376 @@ "link": "", "route": [ { - "x": 625.5, - "y": -96.41200256347656 + "x": 998.5, + "y": -198.21800231933594 + }, + { + "x": 1003.2860107421875, + "y": -197.53700256347656 + }, + { + "x": 1009.4760131835938, + "y": -196.45700073242188 + }, + { + "x": 1015.6279907226562, + "y": -195.18299865722656 }, { - "x": 626.8989868164062, - "y": -96.02899932861328 + "x": 1021.7369995117188, + "y": -193.71600341796875 }, { - "x": 629.9010009765625, - "y": -95.1050033569336 + "x": 1027.7979736328125, + "y": -192.05799865722656 }, { - "x": 632.8729858398438, - "y": -94.08799743652344 + "x": 1033.802978515625, + "y": -190.21099853515625 }, { - "x": 635.81201171875, - "y": -92.97699737548828 + "x": 1039.7469482421875, + "y": -188.17599487304688 }, { - "x": 638.7139892578125, - "y": -91.7750015258789 + "x": 1045.6240234375, + "y": -185.9550018310547 }, { - "x": 641.5770263671875, - "y": -90.48200225830078 + "x": 1051.428955078125, + "y": -183.5500030517578 }, { - "x": 644.3989868164062, - "y": -89.0999984741211 + "x": 1057.155029296875, + "y": -180.96499633789062 }, { - "x": 647.1749877929688, - "y": -87.62999725341797 + "x": 1062.7979736328125, + "y": -178.2010040283203 }, { - "x": 649.9039916992188, - "y": -86.0739974975586 + "x": 1068.3499755859375, + "y": -175.26100158691406 }, { - "x": 652.5819702148438, - "y": -84.43199920654297 + "x": 1073.8079833984375, + "y": -172.1479949951172 }, { - "x": 655.2080078125, - "y": -82.70800018310547 + "x": 1079.1650390625, + "y": -168.86500549316406 }, { - "x": 657.7780151367188, - "y": -80.9010009765625 + "x": 1084.416015625, + "y": -165.41600036621094 }, { - "x": 660.2899780273438, - "y": -79.01499938964844 + "x": 1089.5570068359375, + "y": -161.80299377441406 }, { - "x": 662.7420043945312, - "y": -77.0510025024414 + "x": 1094.5810546875, + "y": -158.031005859375 }, { - "x": 665.1309814453125, - "y": -75.01100158691406 + "x": 1099.4840087890625, + "y": -154.1020050048828 }, { - "x": 667.4539794921875, - "y": -72.89600372314453 + "x": 1104.261962890625, + "y": -150.02200317382812 }, { - "x": 669.7100219726562, - "y": -70.70999908447266 + "x": 1108.9090576171875, + "y": -145.79299926757812 }, { - "x": 671.89599609375, - "y": -68.4540023803711 + "x": 1113.4210205078125, + "y": -141.42100524902344 }, { - "x": 674.010986328125, - "y": -66.13099670410156 + "x": 1117.79296875, + "y": -136.90899658203125 }, { - "x": 676.051025390625, - "y": -63.742000579833984 + "x": 1122.02197265625, + "y": -132.26199340820312 }, { - "x": 678.0150146484375, - "y": -61.290000915527344 + "x": 1126.10205078125, + "y": -127.48400115966797 }, { - "x": 679.9010009765625, - "y": -58.77799987792969 + "x": 1130.031005859375, + "y": -122.58100128173828 }, { - "x": 681.7080078125, - "y": -56.20800018310547 + "x": 1133.802978515625, + "y": -117.55699920654297 }, { - "x": 683.4320068359375, - "y": -53.582000732421875 + "x": 1137.416015625, + "y": -112.41600036621094 }, { - "x": 685.073974609375, - "y": -50.90399932861328 + "x": 1140.864990234375, + "y": -107.16500091552734 }, { - "x": 686.6300048828125, - "y": -48.17499923706055 + "x": 1144.14794921875, + "y": -101.80799865722656 }, { - "x": 688.0999755859375, - "y": -45.39899826049805 + "x": 1147.260986328125, + "y": -96.3499984741211 }, { - "x": 689.4819946289062, - "y": -42.57699966430664 + "x": 1150.2010498046875, + "y": -90.7979965209961 }, { - "x": 690.7750244140625, - "y": -39.7140007019043 + "x": 1152.9649658203125, + "y": -85.15499877929688 }, { - "x": 691.9769897460938, - "y": -36.8120002746582 + "x": 1155.550048828125, + "y": -79.42900085449219 }, { - "x": 693.0880126953125, - "y": -33.87300109863281 + "x": 1157.9549560546875, + "y": -73.6240005493164 }, { - "x": 694.10498046875, - "y": -30.900999069213867 + "x": 1160.176025390625, + "y": -67.74700164794922 }, { - "x": 695.0289916992188, - "y": -27.89900016784668 + "x": 1162.2110595703125, + "y": -61.803001403808594 }, { - "x": 695.8579711914062, - "y": -24.868000030517578 + "x": 1164.0579833984375, + "y": -55.79800033569336 }, { - "x": 696.5910034179688, - "y": -21.81399917602539 + "x": 1165.7159423828125, + "y": -49.73699951171875 }, { - "x": 697.22802734375, - "y": -18.738000869750977 + "x": 1167.1829833984375, + "y": -43.62799835205078 }, { - "x": 697.7680053710938, - "y": -15.642999649047852 + "x": 1168.45703125, + "y": -37.47600173950195 }, { - "x": 698.2109985351562, - "y": -12.532999992370605 + "x": 1169.5369873046875, + "y": -31.285999298095703 }, { - "x": 698.5560302734375, - "y": -9.40999984741211 + "x": 1170.4219970703125, + "y": -25.06599998474121 }, { - "x": 698.802001953125, - "y": -6.2789998054504395 + "x": 1171.112060546875, + "y": -18.820999145507812 }, { - "x": 698.9500122070312, - "y": -3.1410000324249268 + "x": 1171.60498046875, + "y": -12.557999610900879 }, { - "x": 699, + "x": 1171.9010009765625, + "y": -6.2820000648498535 + }, + { + "x": 1172, "y": 0 }, { - "x": 698.9500122070312, - "y": 3.1410000324249268 + "x": 1171.9010009765625, + "y": 6.2820000648498535 + }, + { + "x": 1171.60498046875, + "y": 12.557999610900879 + }, + { + "x": 1171.112060546875, + "y": 18.820999145507812 + }, + { + "x": 1170.4219970703125, + "y": 25.06599998474121 + }, + { + "x": 1169.5369873046875, + "y": 31.285999298095703 }, { - "x": 698.802001953125, - "y": 6.2789998054504395 + "x": 1168.45703125, + "y": 37.47600173950195 }, { - "x": 698.5560302734375, - "y": 9.40999984741211 + "x": 1167.1829833984375, + "y": 43.62799835205078 }, { - "x": 698.2109985351562, - "y": 12.532999992370605 + "x": 1165.7159423828125, + "y": 49.73699951171875 }, { - "x": 697.7680053710938, - "y": 15.642999649047852 + "x": 1164.0579833984375, + "y": 55.79800033569336 }, { - "x": 697.22802734375, - "y": 18.738000869750977 + "x": 1162.2110595703125, + "y": 61.803001403808594 }, { - "x": 696.5910034179688, - "y": 21.81399917602539 + "x": 1160.176025390625, + "y": 67.74700164794922 }, { - "x": 695.8579711914062, - "y": 24.868000030517578 + "x": 1157.9549560546875, + "y": 73.6240005493164 }, { - "x": 695.0289916992188, - "y": 27.89900016784668 + "x": 1155.550048828125, + "y": 79.42900085449219 }, { - "x": 694.10498046875, - "y": 30.900999069213867 + "x": 1152.9649658203125, + "y": 85.15499877929688 }, { - "x": 693.0880126953125, - "y": 33.87300109863281 + "x": 1150.2010498046875, + "y": 90.7979965209961 }, { - "x": 691.9769897460938, - "y": 36.8120002746582 + "x": 1147.260986328125, + "y": 96.3499984741211 }, { - "x": 690.7750244140625, - "y": 39.7140007019043 + "x": 1144.14794921875, + "y": 101.80799865722656 }, { - "x": 689.4819946289062, - "y": 42.57699966430664 + "x": 1140.864990234375, + "y": 107.16500091552734 }, { - "x": 688.0999755859375, - "y": 45.39899826049805 + "x": 1137.416015625, + "y": 112.41600036621094 }, { - "x": 686.6300048828125, - "y": 48.17499923706055 + "x": 1133.802978515625, + "y": 117.55699920654297 }, { - "x": 685.073974609375, - "y": 50.90399932861328 + "x": 1130.031005859375, + "y": 122.58100128173828 }, { - "x": 683.4320068359375, - "y": 53.582000732421875 + "x": 1126.10205078125, + "y": 127.48400115966797 }, { - "x": 681.7080078125, - "y": 56.20800018310547 + "x": 1122.02197265625, + "y": 132.26199340820312 }, { - "x": 679.9010009765625, - "y": 58.77799987792969 + "x": 1117.79296875, + "y": 136.90899658203125 }, { - "x": 678.0150146484375, - "y": 61.290000915527344 + "x": 1113.4210205078125, + "y": 141.42100524902344 }, { - "x": 676.051025390625, - "y": 63.742000579833984 + "x": 1108.9090576171875, + "y": 145.79299926757812 }, { - "x": 674.010986328125, - "y": 66.13099670410156 + "x": 1104.261962890625, + "y": 150.02200317382812 }, { - "x": 671.89599609375, - "y": 68.4540023803711 + "x": 1099.4840087890625, + "y": 154.1020050048828 }, { - "x": 669.7100219726562, - "y": 70.70999908447266 + "x": 1094.5810546875, + "y": 158.031005859375 }, { - "x": 667.4539794921875, - "y": 72.89600372314453 + "x": 1089.5570068359375, + "y": 161.80299377441406 }, { - "x": 665.1309814453125, - "y": 75.01100158691406 + "x": 1084.416015625, + "y": 165.41600036621094 }, { - "x": 662.7420043945312, - "y": 77.0510025024414 + "x": 1079.1650390625, + "y": 168.86500549316406 }, { - "x": 660.2899780273438, - "y": 79.01499938964844 + "x": 1073.8079833984375, + "y": 172.1479949951172 }, { - "x": 657.7780151367188, - "y": 80.9010009765625 + "x": 1068.3499755859375, + "y": 175.26100158691406 }, { - "x": 655.2080078125, - "y": 82.70800018310547 + "x": 1062.7979736328125, + "y": 178.2010040283203 }, { - "x": 652.5819702148438, - "y": 84.43199920654297 + "x": 1057.155029296875, + "y": 180.96499633789062 }, { - "x": 649.9039916992188, - "y": 86.0739974975586 + "x": 1051.428955078125, + "y": 183.5500030517578 }, { - "x": 647.1749877929688, - "y": 87.62999725341797 + "x": 1045.6240234375, + "y": 185.9550018310547 }, { - "x": 644.3989868164062, - "y": 89.0999984741211 + "x": 1039.7469482421875, + "y": 188.17599487304688 }, { - "x": 641.5770263671875, - "y": 90.48200225830078 + "x": 1033.802978515625, + "y": 190.21099853515625 }, { - "x": 638.7139892578125, - "y": 91.7750015258789 + "x": 1027.7979736328125, + "y": 192.05799865722656 }, { - "x": 635.81201171875, - "y": 92.97699737548828 + "x": 1021.7369995117188, + "y": 193.71600341796875 }, { - "x": 632.8729858398438, - "y": 94.08799743652344 + "x": 1015.6279907226562, + "y": 195.18299865722656 }, { - "x": 629.9010009765625, - "y": 95.1050033569336 + "x": 1009.4760131835938, + "y": 196.45700073242188 }, { - "x": 626.8989868164062, - "y": 96.02899932861328 + "x": 1003.2860107421875, + "y": 197.53700256347656 }, { - "x": 625.5, - "y": 96.41200256347656 + "x": 998.5, + "y": 198.21800231933594 } ], "isCurve": true, diff --git a/e2etests/testdata/txtar/cycle-diagram/dagre/sketch.exp.svg b/e2etests/testdata/txtar/cycle-diagram/dagre/sketch.exp.svg index beb13e80bd..015478d741 100644 --- a/e2etests/testdata/txtar/cycle-diagram/dagre/sketch.exp.svg +++ b/e2etests/testdata/txtar/cycle-diagram/dagre/sketch.exp.svg @@ -1,9 +1,9 @@ -abcdabcab - - - - - - - - - - + .d2-153681122 .fill-N1{fill:#0A0F25;} + .d2-153681122 .fill-N2{fill:#676C7E;} + .d2-153681122 .fill-N3{fill:#9499AB;} + .d2-153681122 .fill-N4{fill:#CFD2DD;} + .d2-153681122 .fill-N5{fill:#DEE1EB;} + .d2-153681122 .fill-N6{fill:#EEF1F8;} + .d2-153681122 .fill-N7{fill:#FFFFFF;} + .d2-153681122 .fill-B1{fill:#0D32B2;} + .d2-153681122 .fill-B2{fill:#0D32B2;} + .d2-153681122 .fill-B3{fill:#E3E9FD;} + .d2-153681122 .fill-B4{fill:#E3E9FD;} + .d2-153681122 .fill-B5{fill:#EDF0FD;} + .d2-153681122 .fill-B6{fill:#F7F8FE;} + .d2-153681122 .fill-AA2{fill:#4A6FF3;} + .d2-153681122 .fill-AA4{fill:#EDF0FD;} + .d2-153681122 .fill-AA5{fill:#F7F8FE;} + .d2-153681122 .fill-AB4{fill:#EDF0FD;} + .d2-153681122 .fill-AB5{fill:#F7F8FE;} + .d2-153681122 .stroke-N1{stroke:#0A0F25;} + .d2-153681122 .stroke-N2{stroke:#676C7E;} + .d2-153681122 .stroke-N3{stroke:#9499AB;} + .d2-153681122 .stroke-N4{stroke:#CFD2DD;} + .d2-153681122 .stroke-N5{stroke:#DEE1EB;} + .d2-153681122 .stroke-N6{stroke:#EEF1F8;} + .d2-153681122 .stroke-N7{stroke:#FFFFFF;} + .d2-153681122 .stroke-B1{stroke:#0D32B2;} + .d2-153681122 .stroke-B2{stroke:#0D32B2;} + .d2-153681122 .stroke-B3{stroke:#E3E9FD;} + .d2-153681122 .stroke-B4{stroke:#E3E9FD;} + .d2-153681122 .stroke-B5{stroke:#EDF0FD;} + .d2-153681122 .stroke-B6{stroke:#F7F8FE;} + .d2-153681122 .stroke-AA2{stroke:#4A6FF3;} + .d2-153681122 .stroke-AA4{stroke:#EDF0FD;} + .d2-153681122 .stroke-AA5{stroke:#F7F8FE;} + .d2-153681122 .stroke-AB4{stroke:#EDF0FD;} + .d2-153681122 .stroke-AB5{stroke:#F7F8FE;} + .d2-153681122 .background-color-N1{background-color:#0A0F25;} + .d2-153681122 .background-color-N2{background-color:#676C7E;} + .d2-153681122 .background-color-N3{background-color:#9499AB;} + .d2-153681122 .background-color-N4{background-color:#CFD2DD;} + .d2-153681122 .background-color-N5{background-color:#DEE1EB;} + .d2-153681122 .background-color-N6{background-color:#EEF1F8;} + .d2-153681122 .background-color-N7{background-color:#FFFFFF;} + .d2-153681122 .background-color-B1{background-color:#0D32B2;} + .d2-153681122 .background-color-B2{background-color:#0D32B2;} + .d2-153681122 .background-color-B3{background-color:#E3E9FD;} + .d2-153681122 .background-color-B4{background-color:#E3E9FD;} + .d2-153681122 .background-color-B5{background-color:#EDF0FD;} + .d2-153681122 .background-color-B6{background-color:#F7F8FE;} + .d2-153681122 .background-color-AA2{background-color:#4A6FF3;} + .d2-153681122 .background-color-AA4{background-color:#EDF0FD;} + .d2-153681122 .background-color-AA5{background-color:#F7F8FE;} + .d2-153681122 .background-color-AB4{background-color:#EDF0FD;} + .d2-153681122 .background-color-AB5{background-color:#F7F8FE;} + .d2-153681122 .color-N1{color:#0A0F25;} + .d2-153681122 .color-N2{color:#676C7E;} + .d2-153681122 .color-N3{color:#9499AB;} + .d2-153681122 .color-N4{color:#CFD2DD;} + .d2-153681122 .color-N5{color:#DEE1EB;} + .d2-153681122 .color-N6{color:#EEF1F8;} + .d2-153681122 .color-N7{color:#FFFFFF;} + .d2-153681122 .color-B1{color:#0D32B2;} + .d2-153681122 .color-B2{color:#0D32B2;} + .d2-153681122 .color-B3{color:#E3E9FD;} + .d2-153681122 .color-B4{color:#E3E9FD;} + .d2-153681122 .color-B5{color:#EDF0FD;} + .d2-153681122 .color-B6{color:#F7F8FE;} + .d2-153681122 .color-AA2{color:#4A6FF3;} + .d2-153681122 .color-AA4{color:#EDF0FD;} + .d2-153681122 .color-AA5{color:#F7F8FE;} + .d2-153681122 .color-AB4{color:#EDF0FD;} + .d2-153681122 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker-d2-153681122);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker-d2-153681122);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright-d2-153681122);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright-d2-153681122);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright-d2-153681122);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright-d2-153681122);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark-d2-153681122);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright-d2-153681122);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright-d2-153681122);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright-d2-153681122);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright-d2-153681122);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker-d2-153681122);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark-d2-153681122);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal-d2-153681122);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal-d2-153681122);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright-d2-153681122);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright-d2-153681122);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright-d2-153681122);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>abcdabcab + + + + + + + + + + \ 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 d78744f1e4..6eb058a841 100644 --- a/e2etests/testdata/txtar/cycle-diagram/elk/board.exp.json +++ b/e2etests/testdata/txtar/cycle-diagram/elk/board.exp.json @@ -18,8 +18,8 @@ "x": 12, "y": 12 }, - "width": 254, - "height": 266, + "width": 454, + "height": 466, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -57,7 +57,7 @@ "type": "rectangle", "pos": { "x": -14, - "y": -121 + "y": -221 }, "width": 53, "height": 66, @@ -98,7 +98,7 @@ "id": "1.b", "type": "rectangle", "pos": { - "x": 85, + "x": 185, "y": -21 }, "width": 53, @@ -141,7 +141,7 @@ "type": "rectangle", "pos": { "x": -14, - "y": 79 + "y": 179 }, "width": 53, "height": 66, @@ -182,7 +182,7 @@ "id": "1.d", "type": "rectangle", "pos": { - "x": -115, + "x": -215, "y": -20 }, "width": 54, @@ -224,11 +224,11 @@ "id": "2", "type": "cycle", "pos": { - "x": 285, - "y": 36 + "x": 485, + "y": 61 }, - "width": 227, - "height": 217, + "width": 400, + "height": 367, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -265,8 +265,8 @@ "id": "2.a", "type": "rectangle", "pos": { - "x": 259, - "y": -96 + "x": 459, + "y": -171 }, "width": 53, "height": 66, @@ -307,8 +307,8 @@ "id": "2.b", "type": "rectangle", "pos": { - "x": 345, - "y": 53 + "x": 632, + "y": 128 }, "width": 53, "height": 66, @@ -349,8 +349,8 @@ "id": "2.c", "type": "rectangle", "pos": { - "x": 172, - "y": 54 + "x": 285, + "y": 129 }, "width": 53, "height": 66, @@ -391,11 +391,11 @@ "id": "3", "type": "cycle", "pos": { - "x": 531, + "x": 904, "y": 12 }, "width": 53, - "height": 266, + "height": 466, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -432,8 +432,8 @@ "id": "3.a", "type": "rectangle", "pos": { - "x": 505, - "y": -121 + "x": 878, + "y": -221 }, "width": 53, "height": 66, @@ -474,8 +474,8 @@ "id": "3.b", "type": "rectangle", "pos": { - "x": 505, - "y": 79 + "x": 878, + "y": 179 }, "width": 53, "height": 66, @@ -541,254 +541,334 @@ "route": [ { "x": 38.5, - "y": -84.4229965209961 + "y": -186.22999572753906 + }, + { + "x": 40.18000030517578, + "y": -186.00399780273438 + }, + { + "x": 43.2859992980957, + "y": -185.53700256347656 + }, + { + "x": 46.3849983215332, + "y": -185.02099609375 + }, + { + "x": 49.47600173950195, + "y": -184.45700073242188 + }, + { + "x": 52.55699920654297, + "y": -183.843994140625 + }, + { + "x": 55.62799835205078, + "y": -183.18299865722656 + }, + { + "x": 58.68899917602539, + "y": -182.47300720214844 + }, + { + "x": 61.73699951171875, + "y": -181.71600341796875 + }, + { + "x": 64.77400207519531, + "y": -180.91099548339844 + }, + { + "x": 67.7979965209961, + "y": -180.05799865722656 + }, + { + "x": 70.80799865722656, + "y": -179.1580047607422 + }, + { + "x": 73.8030014038086, + "y": -178.21099853515625 }, { - "x": 39.89899826049805, - "y": -84.02899932861328 + "x": 76.78299713134766, + "y": -177.2169952392578 }, { - "x": 41.40399932861328, - "y": -83.5790023803711 + "x": 79.74700164794922, + "y": -176.17599487304688 }, { - "x": 42.9010009765625, - "y": -83.1050033569336 + "x": 82.69400024414062, + "y": -175.08799743652344 }, { - "x": 44.39099884033203, - "y": -82.60800170898438 + "x": 85.6240005493164, + "y": -173.9550018310547 }, { - "x": 45.87300109863281, - "y": -82.08799743652344 + "x": 88.53600311279297, + "y": -172.77499389648438 }, { - "x": 47.34700012207031, - "y": -81.54399871826172 + "x": 91.42900085449219, + "y": -171.5500030517578 }, { - "x": 48.8120002746582, - "y": -80.97699737548828 + "x": 94.302001953125, + "y": -170.27999877929688 }, { - "x": 50.268001556396484, - "y": -80.38700103759766 + "x": 97.15499877929688, + "y": -168.96499633789062 }, { - "x": 51.7140007019043, - "y": -79.7750015258789 + "x": 99.98699951171875, + "y": -167.60499572753906 }, { - "x": 53.1510009765625, - "y": -79.13999938964844 + "x": 102.7979965209961, + "y": -166.2010040283203 }, { - "x": 54.57699966430664, - "y": -78.48200225830078 + "x": 105.58499908447266, + "y": -164.7530059814453 }, { - "x": 55.99300003051758, - "y": -77.802001953125 + "x": 108.3499984741211, + "y": -163.26100158691406 }, { - "x": 57.39899826049805, - "y": -77.0999984741211 + "x": 111.09100341796875, + "y": -161.7259979248047 }, { - "x": 58.79199981689453, - "y": -76.3759994506836 + "x": 113.80799865722656, + "y": -160.1479949951172 }, { - "x": 60.17499923706055, - "y": -75.62999725341797 + "x": 116.4990005493164, + "y": -158.5279998779297 }, { - "x": 61.54499816894531, - "y": -74.86299896240234 + "x": 119.16500091552734, + "y": -156.86500549316406 }, { - "x": 62.90399932861328, - "y": -74.0739974975586 + "x": 121.80400085449219, + "y": -155.16099548339844 }, { - "x": 64.2490005493164, - "y": -73.26399993896484 + "x": 124.41600036621094, + "y": -153.41600036621094 }, { - "x": 65.58200073242188, - "y": -72.43199920654297 + "x": 127.0009994506836, + "y": -151.62899780273438 }, { - "x": 66.9020004272461, - "y": -71.58000183105469 + "x": 129.5570068359375, + "y": -149.80299377441406 }, { - "x": 68.20800018310547, - "y": -70.70800018310547 + "x": 132.08399963378906, + "y": -147.93600463867188 }, { - "x": 69.5, - "y": -69.81400299072266 + "x": 134.58099365234375, + "y": -146.031005859375 }, { - "x": 70.77799987792969, - "y": -68.9010009765625 + "x": 137.04800415039062, + "y": -144.08599853515625 }, { - "x": 72.04199981689453, - "y": -67.96800231933594 + "x": 139.48399353027344, + "y": -142.1020050048828 }, { - "x": 73.29000091552734, - "y": -67.01499938964844 + "x": 141.88900756835938, + "y": -140.08099365234375 }, { - "x": 74.52400207519531, - "y": -66.04299926757812 + "x": 144.26199340820312, + "y": -138.02200317382812 }, { - "x": 75.74199676513672, - "y": -65.0510025024414 + "x": 146.6020050048828, + "y": -135.92599487304688 }, { - "x": 76.94400024414062, - "y": -64.04000091552734 + "x": 148.90899658203125, + "y": -133.79299926757812 }, { - "x": 78.13099670410156, - "y": -63.01100158691406 + "x": 151.1820068359375, + "y": -131.625 }, { - "x": 79.3010025024414, - "y": -61.9630012512207 + "x": 153.42100524902344, + "y": -129.42100524902344 }, { - "x": 80.4540023803711, - "y": -60.895999908447266 + "x": 155.625, + "y": -127.18199920654297 }, { - "x": 81.59100341796875, - "y": -59.8120002746582 + "x": 157.79299926757812, + "y": -124.90899658203125 }, { - "x": 82.70999908447266, - "y": -58.709999084472656 + "x": 159.92599487304688, + "y": -122.60199737548828 }, { - "x": 83.81199645996094, - "y": -57.590999603271484 + "x": 162.02200317382812, + "y": -120.26200103759766 }, { - "x": 84.89600372314453, - "y": -56.45399856567383 + "x": 164.08099365234375, + "y": -117.88899993896484 }, { - "x": 85.96299743652344, - "y": -55.30099868774414 + "x": 166.1020050048828, + "y": -115.48400115966797 }, { - "x": 87.01100158691406, - "y": -54.13100051879883 + "x": 168.08599853515625, + "y": -113.0479965209961 }, { - "x": 88.04000091552734, - "y": -52.944000244140625 + "x": 170.031005859375, + "y": -110.58100128173828 }, { - "x": 89.0510025024414, - "y": -51.742000579833984 + "x": 171.93600463867188, + "y": -108.08399963378906 }, { - "x": 90.04299926757812, - "y": -50.52399826049805 + "x": 173.80299377441406, + "y": -105.55699920654297 }, { - "x": 91.01499938964844, - "y": -49.290000915527344 + "x": 175.62899780273438, + "y": -103.0009994506836 }, { - "x": 91.96800231933594, - "y": -48.04199981689453 + "x": 177.41600036621094, + "y": -100.41600036621094 }, { - "x": 92.9010009765625, - "y": -46.77799987792969 + "x": 179.16099548339844, + "y": -97.80400085449219 }, { - "x": 93.81400299072266, - "y": -45.5 + "x": 180.86500549316406, + "y": -95.16500091552734 }, { - "x": 94.70800018310547, - "y": -44.20800018310547 + "x": 182.5279998779297, + "y": -92.4990005493164 }, { - "x": 95.58000183105469, - "y": -42.902000427246094 + "x": 184.1479949951172, + "y": -89.80799865722656 }, { - "x": 96.43199920654297, - "y": -41.582000732421875 + "x": 185.7259979248047, + "y": -87.09100341796875 }, { - "x": 97.26399993896484, - "y": -40.249000549316406 + "x": 187.26100158691406, + "y": -84.3499984741211 }, { - "x": 98.0739974975586, - "y": -38.90399932861328 + "x": 188.7530059814453, + "y": -81.58499908447266 }, { - "x": 98.86299896240234, - "y": -37.54499816894531 + "x": 190.2010040283203, + "y": -78.7979965209961 }, { - "x": 99.62999725341797, - "y": -36.17499923706055 + "x": 191.60499572753906, + "y": -75.98699951171875 }, { - "x": 100.3759994506836, - "y": -34.79199981689453 + "x": 192.96499633789062, + "y": -73.15499877929688 }, { - "x": 101.0999984741211, - "y": -33.39899826049805 + "x": 194.27999877929688, + "y": -70.302001953125 }, { - "x": 101.802001953125, - "y": -31.993000030517578 + "x": 195.5500030517578, + "y": -67.42900085449219 }, { - "x": 102.48200225830078, - "y": -30.57699966430664 + "x": 196.77499389648438, + "y": -64.53600311279297 }, { - "x": 103.13999938964844, - "y": -29.150999069213867 + "x": 197.9550018310547, + "y": -61.624000549316406 }, { - "x": 103.7750015258789, - "y": -27.714000701904297 + "x": 199.08799743652344, + "y": -58.694000244140625 }, { - "x": 104.38700103759766, - "y": -26.26799964904785 + "x": 200.17599487304688, + "y": -55.74700164794922 }, { - "x": 104.97699737548828, - "y": -24.812000274658203 + "x": 201.2169952392578, + "y": -52.78300094604492 }, { - "x": 105.54399871826172, - "y": -23.347000122070312 + "x": 202.21099853515625, + "y": -49.803001403808594 }, { - "x": 106.08799743652344, - "y": -21.87299919128418 + "x": 203.1580047607422, + "y": -46.80799865722656 }, { - "x": 106.39399719238281, + "x": 204.05799865722656, + "y": -43.79800033569336 + }, + { + "x": 204.91099548339844, + "y": -40.77399826049805 + }, + { + "x": 205.71600341796875, + "y": -37.73699951171875 + }, + { + "x": 206.47300720214844, + "y": -34.68899917602539 + }, + { + "x": 207.18299865722656, + "y": -31.628000259399414 + }, + { + "x": 207.843994140625, + "y": -28.55699920654297 + }, + { + "x": 208.45700073242188, + "y": -25.47599983215332 + }, + { + "x": 209.02099609375, + "y": -22.385000228881836 + }, + { + "x": 209.2519989013672, "y": -21 } ], @@ -824,256 +904,336 @@ "link": "", "route": [ { - "x": 106.39399719238281, + "x": 209.2519989013672, "y": 45 }, { - "x": 106.08799743652344, - "y": 45.87300109863281 + "x": 209.02099609375, + "y": 46.3849983215332 + }, + { + "x": 208.45700073242188, + "y": 49.47600173950195 + }, + { + "x": 207.843994140625, + "y": 52.55699920654297 + }, + { + "x": 207.18299865722656, + "y": 55.62799835205078 + }, + { + "x": 206.47300720214844, + "y": 58.68899917602539 + }, + { + "x": 205.71600341796875, + "y": 61.73699951171875 }, { - "x": 105.54399871826172, - "y": 47.34700012207031 + "x": 204.91099548339844, + "y": 64.77400207519531 }, { - "x": 104.97699737548828, - "y": 48.8120002746582 + "x": 204.05799865722656, + "y": 67.7979965209961 }, { - "x": 104.38700103759766, - "y": 50.268001556396484 + "x": 203.1580047607422, + "y": 70.80799865722656 }, { - "x": 103.7750015258789, - "y": 51.7140007019043 + "x": 202.21099853515625, + "y": 73.8030014038086 }, { - "x": 103.13999938964844, - "y": 53.1510009765625 + "x": 201.2169952392578, + "y": 76.78299713134766 }, { - "x": 102.48200225830078, - "y": 54.57699966430664 + "x": 200.17599487304688, + "y": 79.74700164794922 }, { - "x": 101.802001953125, - "y": 55.99300003051758 + "x": 199.08799743652344, + "y": 82.69400024414062 }, { - "x": 101.0999984741211, - "y": 57.39899826049805 + "x": 197.9550018310547, + "y": 85.6240005493164 }, { - "x": 100.3759994506836, - "y": 58.79199981689453 + "x": 196.77499389648438, + "y": 88.53600311279297 }, { - "x": 99.62999725341797, - "y": 60.17499923706055 + "x": 195.5500030517578, + "y": 91.42900085449219 }, { - "x": 98.86299896240234, - "y": 61.54499816894531 + "x": 194.27999877929688, + "y": 94.302001953125 }, { - "x": 98.0739974975586, - "y": 62.90399932861328 + "x": 192.96499633789062, + "y": 97.15499877929688 }, { - "x": 97.26399993896484, - "y": 64.2490005493164 + "x": 191.60499572753906, + "y": 99.98699951171875 }, { - "x": 96.43199920654297, - "y": 65.58200073242188 + "x": 190.2010040283203, + "y": 102.7979965209961 }, { - "x": 95.58000183105469, - "y": 66.9020004272461 + "x": 188.7530059814453, + "y": 105.58499908447266 }, { - "x": 94.70800018310547, - "y": 68.20800018310547 + "x": 187.26100158691406, + "y": 108.3499984741211 }, { - "x": 93.81400299072266, - "y": 69.5 + "x": 185.7259979248047, + "y": 111.09100341796875 }, { - "x": 92.9010009765625, - "y": 70.77799987792969 + "x": 184.1479949951172, + "y": 113.80799865722656 }, { - "x": 91.96800231933594, - "y": 72.04199981689453 + "x": 182.5279998779297, + "y": 116.4990005493164 }, { - "x": 91.01499938964844, - "y": 73.29000091552734 + "x": 180.86500549316406, + "y": 119.16500091552734 }, { - "x": 90.04299926757812, - "y": 74.52400207519531 + "x": 179.16099548339844, + "y": 121.80400085449219 }, { - "x": 89.0510025024414, - "y": 75.74199676513672 + "x": 177.41600036621094, + "y": 124.41600036621094 }, { - "x": 88.04000091552734, - "y": 76.94400024414062 + "x": 175.62899780273438, + "y": 127.0009994506836 }, { - "x": 87.01100158691406, - "y": 78.13099670410156 + "x": 173.80299377441406, + "y": 129.5570068359375 }, { - "x": 85.96299743652344, - "y": 79.3010025024414 + "x": 171.93600463867188, + "y": 132.08399963378906 }, { - "x": 84.89600372314453, - "y": 80.4540023803711 + "x": 170.031005859375, + "y": 134.58099365234375 }, { - "x": 83.81199645996094, - "y": 81.59100341796875 + "x": 168.08599853515625, + "y": 137.04800415039062 }, { - "x": 82.70999908447266, - "y": 82.70999908447266 + "x": 166.1020050048828, + "y": 139.48399353027344 }, { - "x": 81.59100341796875, - "y": 83.81199645996094 + "x": 164.08099365234375, + "y": 141.88900756835938 }, { - "x": 80.4540023803711, - "y": 84.89600372314453 + "x": 162.02200317382812, + "y": 144.26199340820312 }, { - "x": 79.3010025024414, - "y": 85.96299743652344 + "x": 159.92599487304688, + "y": 146.6020050048828 }, { - "x": 78.13099670410156, - "y": 87.01100158691406 + "x": 157.79299926757812, + "y": 148.90899658203125 }, { - "x": 76.94400024414062, - "y": 88.04000091552734 + "x": 155.625, + "y": 151.1820068359375 }, { - "x": 75.74199676513672, - "y": 89.0510025024414 + "x": 153.42100524902344, + "y": 153.42100524902344 }, { - "x": 74.52400207519531, - "y": 90.04299926757812 + "x": 151.1820068359375, + "y": 155.625 }, { - "x": 73.29000091552734, - "y": 91.01499938964844 + "x": 148.90899658203125, + "y": 157.79299926757812 }, { - "x": 72.04199981689453, - "y": 91.96800231933594 + "x": 146.6020050048828, + "y": 159.92599487304688 }, { - "x": 70.77799987792969, - "y": 92.9010009765625 + "x": 144.26199340820312, + "y": 162.02200317382812 }, { - "x": 69.5, - "y": 93.81400299072266 + "x": 141.88900756835938, + "y": 164.08099365234375 }, { - "x": 68.20800018310547, - "y": 94.70800018310547 + "x": 139.48399353027344, + "y": 166.1020050048828 }, { - "x": 66.9020004272461, - "y": 95.58000183105469 + "x": 137.04800415039062, + "y": 168.08599853515625 }, { - "x": 65.58200073242188, - "y": 96.43199920654297 + "x": 134.58099365234375, + "y": 170.031005859375 }, { - "x": 64.2490005493164, - "y": 97.26399993896484 + "x": 132.08399963378906, + "y": 171.93600463867188 }, { - "x": 62.90399932861328, - "y": 98.0739974975586 + "x": 129.5570068359375, + "y": 173.80299377441406 }, { - "x": 61.54499816894531, - "y": 98.86299896240234 + "x": 127.0009994506836, + "y": 175.62899780273438 }, { - "x": 60.17499923706055, - "y": 99.62999725341797 + "x": 124.41600036621094, + "y": 177.41600036621094 }, { - "x": 58.79199981689453, - "y": 100.3759994506836 + "x": 121.80400085449219, + "y": 179.16099548339844 }, { - "x": 57.39899826049805, - "y": 101.0999984741211 + "x": 119.16500091552734, + "y": 180.86500549316406 }, { - "x": 55.99300003051758, - "y": 101.802001953125 + "x": 116.4990005493164, + "y": 182.5279998779297 }, { - "x": 54.57699966430664, - "y": 102.48200225830078 + "x": 113.80799865722656, + "y": 184.1479949951172 }, { - "x": 53.1510009765625, - "y": 103.13999938964844 + "x": 111.09100341796875, + "y": 185.7259979248047 }, { - "x": 51.7140007019043, - "y": 103.7750015258789 + "x": 108.3499984741211, + "y": 187.26100158691406 }, { - "x": 50.268001556396484, - "y": 104.38700103759766 + "x": 105.58499908447266, + "y": 188.7530059814453 }, { - "x": 48.8120002746582, - "y": 104.97699737548828 + "x": 102.7979965209961, + "y": 190.2010040283203 }, { - "x": 47.34700012207031, - "y": 105.54399871826172 + "x": 99.98699951171875, + "y": 191.60499572753906 }, { - "x": 45.87300109863281, - "y": 106.08799743652344 + "x": 97.15499877929688, + "y": 192.96499633789062 }, { - "x": 44.39099884033203, - "y": 106.60800170898438 + "x": 94.302001953125, + "y": 194.27999877929688 }, { - "x": 42.9010009765625, - "y": 107.1050033569336 + "x": 91.42900085449219, + "y": 195.5500030517578 }, { - "x": 41.40399932861328, - "y": 107.5790023803711 + "x": 88.53600311279297, + "y": 196.77499389648438 }, { - "x": 39.89899826049805, - "y": 108.02899932861328 + "x": 85.6240005493164, + "y": 197.9550018310547 + }, + { + "x": 82.69400024414062, + "y": 199.08799743652344 + }, + { + "x": 79.74700164794922, + "y": 200.17599487304688 + }, + { + "x": 76.78299713134766, + "y": 201.2169952392578 + }, + { + "x": 73.8030014038086, + "y": 202.21099853515625 + }, + { + "x": 70.80799865722656, + "y": 203.1580047607422 + }, + { + "x": 67.7979965209961, + "y": 204.05799865722656 + }, + { + "x": 64.77400207519531, + "y": 204.91099548339844 + }, + { + "x": 61.73699951171875, + "y": 205.71600341796875 + }, + { + "x": 58.68899917602539, + "y": 206.47300720214844 + }, + { + "x": 55.62799835205078, + "y": 207.18299865722656 + }, + { + "x": 52.55699920654297, + "y": 207.843994140625 + }, + { + "x": 49.47600173950195, + "y": 208.45700073242188 + }, + { + "x": 46.3849983215332, + "y": 209.02099609375 + }, + { + "x": 43.2859992980957, + "y": 209.53700256347656 + }, + { + "x": 40.18000030517578, + "y": 210.00399780273438 }, { "x": 38.5, - "y": 108.4229965209961 + "y": 210.22999572753906 } ], "isCurve": true, @@ -1109,254 +1269,334 @@ "route": [ { "x": -14.49899959564209, - "y": 108.4229965209961 + "y": 210.22999572753906 + }, + { + "x": -16.18000030517578, + "y": 210.00399780273438 + }, + { + "x": -19.285999298095703, + "y": 209.53700256347656 + }, + { + "x": -22.385000228881836, + "y": 209.02099609375 + }, + { + "x": -25.47599983215332, + "y": 208.45700073242188 + }, + { + "x": -28.55699920654297, + "y": 207.843994140625 + }, + { + "x": -31.628000259399414, + "y": 207.18299865722656 + }, + { + "x": -34.68899917602539, + "y": 206.47300720214844 + }, + { + "x": -37.73699951171875, + "y": 205.71600341796875 + }, + { + "x": -40.77399826049805, + "y": 204.91099548339844 + }, + { + "x": -43.79800033569336, + "y": 204.05799865722656 + }, + { + "x": -46.80799865722656, + "y": 203.1580047607422 }, { - "x": -15.89900016784668, - "y": 108.02899932861328 + "x": -49.803001403808594, + "y": 202.21099853515625 }, { - "x": -17.40399932861328, - "y": 107.5790023803711 + "x": -52.78300094604492, + "y": 201.2169952392578 }, { - "x": -18.900999069213867, - "y": 107.1050033569336 + "x": -55.74700164794922, + "y": 200.17599487304688 }, { - "x": -20.391000747680664, - "y": 106.60800170898438 + "x": -58.694000244140625, + "y": 199.08799743652344 }, { - "x": -21.87299919128418, - "y": 106.08799743652344 + "x": -61.624000549316406, + "y": 197.9550018310547 }, { - "x": -23.347000122070312, - "y": 105.54399871826172 + "x": -64.53600311279297, + "y": 196.77499389648438 }, { - "x": -24.812000274658203, - "y": 104.97699737548828 + "x": -67.42900085449219, + "y": 195.5500030517578 }, { - "x": -26.26799964904785, - "y": 104.38700103759766 + "x": -70.302001953125, + "y": 194.27999877929688 }, { - "x": -27.714000701904297, - "y": 103.7750015258789 + "x": -73.15499877929688, + "y": 192.96499633789062 }, { - "x": -29.150999069213867, - "y": 103.13999938964844 + "x": -75.98699951171875, + "y": 191.60499572753906 }, { - "x": -30.57699966430664, - "y": 102.48200225830078 + "x": -78.7979965209961, + "y": 190.2010040283203 }, { - "x": -31.993000030517578, - "y": 101.802001953125 + "x": -81.58499908447266, + "y": 188.7530059814453 }, { - "x": -33.39899826049805, - "y": 101.0999984741211 + "x": -84.3499984741211, + "y": 187.26100158691406 }, { - "x": -34.79199981689453, - "y": 100.3759994506836 + "x": -87.09100341796875, + "y": 185.7259979248047 }, { - "x": -36.17499923706055, - "y": 99.62999725341797 + "x": -89.80799865722656, + "y": 184.1479949951172 }, { - "x": -37.54499816894531, - "y": 98.86299896240234 + "x": -92.4990005493164, + "y": 182.5279998779297 }, { - "x": -38.90399932861328, - "y": 98.0739974975586 + "x": -95.16500091552734, + "y": 180.86500549316406 }, { - "x": -40.249000549316406, - "y": 97.26399993896484 + "x": -97.80400085449219, + "y": 179.16099548339844 }, { - "x": -41.582000732421875, - "y": 96.43199920654297 + "x": -100.41600036621094, + "y": 177.41600036621094 }, { - "x": -42.902000427246094, - "y": 95.58000183105469 + "x": -103.0009994506836, + "y": 175.62899780273438 }, { - "x": -44.20800018310547, - "y": 94.70800018310547 + "x": -105.55699920654297, + "y": 173.80299377441406 }, { - "x": -45.5, - "y": 93.81400299072266 + "x": -108.08399963378906, + "y": 171.93600463867188 }, { - "x": -46.77799987792969, - "y": 92.9010009765625 + "x": -110.58100128173828, + "y": 170.031005859375 }, { - "x": -48.04199981689453, - "y": 91.96800231933594 + "x": -113.0479965209961, + "y": 168.08599853515625 }, { - "x": -49.290000915527344, - "y": 91.01499938964844 + "x": -115.48400115966797, + "y": 166.1020050048828 }, { - "x": -50.52399826049805, - "y": 90.04299926757812 + "x": -117.88899993896484, + "y": 164.08099365234375 }, { - "x": -51.742000579833984, - "y": 89.0510025024414 + "x": -120.26200103759766, + "y": 162.02200317382812 }, { - "x": -52.944000244140625, - "y": 88.04000091552734 + "x": -122.60199737548828, + "y": 159.92599487304688 }, { - "x": -54.13100051879883, - "y": 87.01100158691406 + "x": -124.90899658203125, + "y": 157.79299926757812 }, { - "x": -55.30099868774414, - "y": 85.96299743652344 + "x": -127.18199920654297, + "y": 155.625 }, { - "x": -56.45399856567383, - "y": 84.89600372314453 + "x": -129.42100524902344, + "y": 153.42100524902344 }, { - "x": -57.590999603271484, - "y": 83.81199645996094 + "x": -131.625, + "y": 151.1820068359375 }, { - "x": -58.709999084472656, - "y": 82.70999908447266 + "x": -133.79299926757812, + "y": 148.90899658203125 }, { - "x": -59.8120002746582, - "y": 81.59100341796875 + "x": -135.92599487304688, + "y": 146.6020050048828 }, { - "x": -60.895999908447266, - "y": 80.4540023803711 + "x": -138.02200317382812, + "y": 144.26199340820312 }, { - "x": -61.9630012512207, - "y": 79.3010025024414 + "x": -140.08099365234375, + "y": 141.88900756835938 }, { - "x": -63.01100158691406, - "y": 78.13099670410156 + "x": -142.1020050048828, + "y": 139.48399353027344 }, { - "x": -64.04000091552734, - "y": 76.94400024414062 + "x": -144.08599853515625, + "y": 137.04800415039062 }, { - "x": -65.0510025024414, - "y": 75.74199676513672 + "x": -146.031005859375, + "y": 134.58099365234375 }, { - "x": -66.04299926757812, - "y": 74.52400207519531 + "x": -147.93600463867188, + "y": 132.08399963378906 }, { - "x": -67.01499938964844, - "y": 73.29000091552734 + "x": -149.80299377441406, + "y": 129.5570068359375 }, { - "x": -67.96800231933594, - "y": 72.04199981689453 + "x": -151.62899780273438, + "y": 127.0009994506836 }, { - "x": -68.9010009765625, - "y": 70.77799987792969 + "x": -153.41600036621094, + "y": 124.41600036621094 }, { - "x": -69.81400299072266, - "y": 69.5 + "x": -155.16099548339844, + "y": 121.80400085449219 }, { - "x": -70.70800018310547, - "y": 68.20800018310547 + "x": -156.86500549316406, + "y": 119.16500091552734 }, { - "x": -71.58000183105469, - "y": 66.9020004272461 + "x": -158.5279998779297, + "y": 116.4990005493164 }, { - "x": -72.43199920654297, - "y": 65.58200073242188 + "x": -160.1479949951172, + "y": 113.80799865722656 }, { - "x": -73.26399993896484, - "y": 64.2490005493164 + "x": -161.7259979248047, + "y": 111.09100341796875 }, { - "x": -74.0739974975586, - "y": 62.90399932861328 + "x": -163.26100158691406, + "y": 108.3499984741211 }, { - "x": -74.86299896240234, - "y": 61.54499816894531 + "x": -164.7530059814453, + "y": 105.58499908447266 }, { - "x": -75.62999725341797, - "y": 60.17499923706055 + "x": -166.2010040283203, + "y": 102.7979965209961 }, { - "x": -76.3759994506836, - "y": 58.79199981689453 + "x": -167.60499572753906, + "y": 99.98699951171875 }, { - "x": -77.0999984741211, - "y": 57.39899826049805 + "x": -168.96499633789062, + "y": 97.15499877929688 }, { - "x": -77.802001953125, - "y": 55.99300003051758 + "x": -170.27999877929688, + "y": 94.302001953125 }, { - "x": -78.48200225830078, - "y": 54.57699966430664 + "x": -171.5500030517578, + "y": 91.42900085449219 }, { - "x": -79.13999938964844, - "y": 53.1510009765625 + "x": -172.77499389648438, + "y": 88.53600311279297 }, { - "x": -79.7750015258789, - "y": 51.7140007019043 + "x": -173.9550018310547, + "y": 85.6240005493164 }, { - "x": -80.38700103759766, - "y": 50.268001556396484 + "x": -175.08799743652344, + "y": 82.69400024414062 }, { - "x": -80.97699737548828, - "y": 48.8120002746582 + "x": -176.17599487304688, + "y": 79.74700164794922 }, { - "x": -81.54399871826172, - "y": 47.34700012207031 + "x": -177.2169952392578, + "y": 76.78299713134766 }, { - "x": -82.08799743652344, - "y": 45.87300109863281 + "x": -178.21099853515625, + "y": 73.8030014038086 }, { - "x": -82.39399719238281, + "x": -179.1580047607422, + "y": 70.80799865722656 + }, + { + "x": -180.05799865722656, + "y": 67.7979965209961 + }, + { + "x": -180.91099548339844, + "y": 64.77400207519531 + }, + { + "x": -181.71600341796875, + "y": 61.73699951171875 + }, + { + "x": -182.47300720214844, + "y": 58.68899917602539 + }, + { + "x": -183.18299865722656, + "y": 55.62799835205078 + }, + { + "x": -183.843994140625, + "y": 52.55699920654297 + }, + { + "x": -184.45700073242188, + "y": 49.47600173950195 + }, + { + "x": -185.02099609375, + "y": 46.3849983215332 + }, + { + "x": -185.2519989013672, "y": 45 } ], @@ -1392,296 +1632,352 @@ "link": "", "route": [ { - "x": 312, - "y": -59.42100143432617 + "x": 512, + "y": -136.2259979248047 }, { - "x": 312.3909912109375, - "y": -59.316001892089844 + "x": 514.7160034179688, + "y": -135.85400390625 }, { - "x": 314.40301513671875, - "y": -58.73099899291992 + "x": 518.85302734375, + "y": -135.19900512695312 }, { - "x": 316.4010009765625, - "y": -58.10499954223633 + "x": 522.9760131835938, + "y": -134.45700073242188 }, { - "x": 318.385986328125, - "y": -57.4370002746582 + "x": 527.0819702148438, + "y": -133.62899780273438 }, { - "x": 320.35699462890625, - "y": -56.72800064086914 + "x": 531.1699829101562, + "y": -132.71499633789062 }, { - "x": 322.31201171875, - "y": -55.97700119018555 + "x": 535.2369995117188, + "y": -131.71600341796875 }, { - "x": 324.2510070800781, - "y": -55.18600082397461 + "x": 539.2830200195312, + "y": -130.6320037841797 }, { - "x": 326.1730041503906, - "y": -54.354000091552734 + "x": 543.3060302734375, + "y": -129.46299743652344 }, { - "x": 328.0769958496094, - "y": -53.481998443603516 + "x": 547.302978515625, + "y": -128.21099853515625 }, { - "x": 329.9630126953125, - "y": -52.57099914550781 + "x": 551.2730102539062, + "y": -126.875 }, { - "x": 331.8290100097656, - "y": -51.619998931884766 + "x": 555.2139892578125, + "y": -125.45600128173828 }, { - "x": 333.67498779296875, - "y": -50.630001068115234 + "x": 559.1240234375, + "y": -123.95500183105469 }, { - "x": 335.5, - "y": -49.60200119018555 + "x": 563.0029907226562, + "y": -122.37200164794922 }, { - "x": 337.302001953125, - "y": -48.5359992980957 + "x": 566.8469848632812, + "y": -120.70899963378906 }, { - "x": 339.0820007324219, - "y": -47.43199920654297 + "x": 570.655029296875, + "y": -118.96499633789062 }, { - "x": 340.8389892578125, - "y": -46.29199981689453 + "x": 574.427001953125, + "y": -117.14199829101562 }, { - "x": 342.5710144042969, - "y": -45.11399841308594 + "x": 578.1589965820312, + "y": -115.23999786376953 }, { - "x": 344.27801513671875, - "y": -43.9010009765625 + "x": 581.8499755859375, + "y": -113.26100158691406 }, { - "x": 345.9590148925781, - "y": -42.652000427246094 + "x": 585.5, + "y": -111.20500183105469 }, { - "x": 347.614013671875, - "y": -41.36899948120117 + "x": 589.10498046875, + "y": -109.0719985961914 }, { - "x": 349.24200439453125, - "y": -40.05099868774414 + "x": 592.6649780273438, + "y": -106.86499786376953 }, { - "x": 350.8420104980469, - "y": -38.69900131225586 + "x": 596.177978515625, + "y": -104.58399963378906 }, { - "x": 352.4129943847656, - "y": -37.31399917602539 + "x": 599.6420288085938, + "y": -102.22899627685547 }, { - "x": 353.9540100097656, - "y": -35.895999908447266 + "x": 603.0570068359375, + "y": -99.8030014038086 }, { - "x": 355.46600341796875, - "y": -34.446998596191406 + "x": 606.4190063476562, + "y": -97.30500030517578 }, { - "x": 356.9469909667969, - "y": -32.965999603271484 + "x": 609.72900390625, + "y": -94.73799896240234 }, { - "x": 358.39599609375, - "y": -31.45400047302246 + "x": 612.9840087890625, + "y": -92.10199737548828 }, { - "x": 359.8139953613281, - "y": -29.913000106811523 + "x": 616.1840209960938, + "y": -89.39900207519531 }, { - "x": 361.1990051269531, - "y": -28.341999053955078 + "x": 619.3259887695312, + "y": -86.62799835205078 }, { - "x": 362.5509948730469, - "y": -26.742000579833984 + "x": 622.4089965820312, + "y": -83.79299926757812 }, { - "x": 363.8689880371094, - "y": -25.11400032043457 + "x": 625.4320068359375, + "y": -80.89399719238281 }, { - "x": 365.1520080566406, - "y": -23.458999633789062 + "x": 628.3939819335938, + "y": -77.93199920654297 }, { - "x": 366.4010009765625, - "y": -21.777999877929688 + "x": 631.2930297851562, + "y": -74.90899658203125 }, { - "x": 367.614013671875, - "y": -20.070999145507812 + "x": 634.1279907226562, + "y": -71.82599639892578 }, { - "x": 368.7919921875, - "y": -18.339000701904297 + "x": 636.8989868164062, + "y": -68.68399810791016 }, { - "x": 369.9320068359375, - "y": -16.582000732421875 + "x": 639.6019897460938, + "y": -65.48400115966797 }, { - "x": 371.0360107421875, - "y": -14.802000045776367 + "x": 642.2379760742188, + "y": -62.229000091552734 }, { - "x": 372.10198974609375, - "y": -13 + "x": 644.8049926757812, + "y": -58.91899871826172 }, { - "x": 373.1300048828125, - "y": -11.175000190734863 + "x": 647.302978515625, + "y": -55.55699920654297 }, { - "x": 374.1199951171875, - "y": -9.329000473022461 + "x": 649.72900390625, + "y": -52.141998291015625 }, { - "x": 375.0710144042969, - "y": -7.4629998207092285 + "x": 652.083984375, + "y": -48.678001403808594 }, { - "x": 375.98199462890625, - "y": -5.577000141143799 + "x": 654.364990234375, + "y": -45.165000915527344 }, { - "x": 376.85400390625, - "y": -3.6730000972747803 + "x": 656.572021484375, + "y": -41.60499954223633 }, { - "x": 377.6860046386719, - "y": -1.7510000467300415 + "x": 658.7050170898438, + "y": -38 }, { - "x": 378.47698974609375, - "y": 0.18700000643730164 + "x": 660.760986328125, + "y": -34.349998474121094 }, { - "x": 379.2279968261719, - "y": 2.1419999599456787 + "x": 662.739990234375, + "y": -30.659000396728516 }, { - "x": 379.93701171875, - "y": 4.11299991607666 + "x": 664.6420288085938, + "y": -26.927000045776367 }, { - "x": 380.6050109863281, - "y": 6.0980000495910645 + "x": 666.4650268554688, + "y": -23.155000686645508 }, { - "x": 381.2309875488281, - "y": 8.095999717712402 + "x": 668.208984375, + "y": -19.347000122070312 }, { - "x": 381.8160095214844, - "y": 10.107999801635742 + "x": 669.8720092773438, + "y": -15.503000259399414 }, { - "x": 382.3580017089844, - "y": 12.130999565124512 + "x": 671.4550170898438, + "y": -11.62399959564209 }, { - "x": 382.85699462890625, - "y": 14.163999557495117 + "x": 672.9559936523438, + "y": -7.714000225067139 }, { - "x": 383.3139953613281, - "y": 16.20800018310547 + "x": 674.375, + "y": -3.7730000019073486 }, { - "x": 383.7279968261719, - "y": 18.26099967956543 + "x": 675.7109985351562, + "y": 0.19599999487400055 }, { - "x": 384.0989990234375, - "y": 20.322999954223633 + "x": 676.9630126953125, + "y": 4.192999839782715 }, { - "x": 384.427001953125, - "y": 22.391000747680664 + "x": 678.1320190429688, + "y": 8.215999603271484 }, { - "x": 384.71099853515625, - "y": 24.465999603271484 + "x": 679.2160034179688, + "y": 12.26200008392334 }, { - "x": 384.9519958496094, - "y": 26.547000885009766 + "x": 680.2150268554688, + "y": 16.32900047302246 }, { - "x": 385.14898681640625, - "y": 28.631999969482422 + "x": 681.1290283203125, + "y": 20.41699981689453 }, { - "x": 385.302001953125, - "y": 30.719999313354492 + "x": 681.9569702148438, + "y": 24.523000717163086 }, { - "x": 385.4119873046875, - "y": 32.8120002746582 + "x": 682.698974609375, + "y": 28.645999908447266 }, { - "x": 385.4779968261719, - "y": 34.904998779296875 + "x": 683.35400390625, + "y": 32.78300094604492 }, { - "x": 385.5, - "y": 36.999000549316406 + "x": 683.9219970703125, + "y": 36.93299865722656 + }, + { + "x": 684.4039916992188, + "y": 41.09400177001953 + }, + { + "x": 684.7979736328125, + "y": 45.263999938964844 + }, + { + "x": 685.10498046875, + "y": 49.441001892089844 + }, + { + "x": 685.323974609375, + "y": 53.624000549316406 + }, + { + "x": 685.4559936523438, + "y": 57.81100082397461 + }, + { + "x": 685.5, + "y": 61.999000549316406 + }, + { + "x": 685.4559936523438, + "y": 66.18800354003906 + }, + { + "x": 685.323974609375, + "y": 70.375 + }, + { + "x": 685.10498046875, + "y": 74.55799865722656 + }, + { + "x": 684.7979736328125, + "y": 78.73500061035156 }, { - "x": 385.4779968261719, - "y": 39.09400177001953 + "x": 684.4039916992188, + "y": 82.90499877929688 }, { - "x": 385.4119873046875, - "y": 41.1870002746582 + "x": 683.9219970703125, + "y": 87.06600189208984 }, { - "x": 385.302001953125, - "y": 43.27899932861328 + "x": 683.35400390625, + "y": 91.21600341796875 }, { - "x": 385.14898681640625, - "y": 45.367000579833984 + "x": 682.698974609375, + "y": 95.35299682617188 }, { - "x": 384.9519958496094, - "y": 47.45199966430664 + "x": 681.9569702148438, + "y": 99.47599792480469 }, { - "x": 384.71099853515625, - "y": 49.53300094604492 + "x": 681.1290283203125, + "y": 103.58200073242188 }, { - "x": 384.427001953125, - "y": 51.608001708984375 + "x": 680.2150268554688, + "y": 107.66999816894531 }, { - "x": 384.0989990234375, - "y": 53.67599868774414 + "x": 679.2160034179688, + "y": 111.73699951171875 }, { - "x": 384.0409851074219, - "y": 53.999000549316406 + "x": 678.1320190429688, + "y": 115.78299713134766 + }, + { + "x": 676.9630126953125, + "y": 119.80599975585938 + }, + { + "x": 675.7109985351562, + "y": 123.8030014038086 + }, + { + "x": 674.375, + "y": 127.77300262451172 + }, + { + "x": 673.9329833984375, + "y": 128.99899291992188 } ], "isCurve": true, @@ -1716,256 +2012,336 @@ "link": "", "route": [ { - "x": 345.60198974609375, - "y": 116.91799926757812 + "x": 634.8569946289062, + "y": 194.99899291992188 + }, + { + "x": 634.1279907226562, + "y": 195.8260040283203 + }, + { + "x": 631.2930297851562, + "y": 198.90899658203125 + }, + { + "x": 628.3939819335938, + "y": 201.9320068359375 + }, + { + "x": 625.4320068359375, + "y": 204.8939971923828 + }, + { + "x": 622.4089965820312, + "y": 207.79299926757812 + }, + { + "x": 619.3259887695312, + "y": 210.6280059814453 + }, + { + "x": 616.1840209960938, + "y": 213.3990020751953 + }, + { + "x": 612.9840087890625, + "y": 216.1020050048828 + }, + { + "x": 609.72900390625, + "y": 218.73800659179688 + }, + { + "x": 606.4190063476562, + "y": 221.30499267578125 + }, + { + "x": 603.0570068359375, + "y": 223.80299377441406 + }, + { + "x": 599.6420288085938, + "y": 226.22900390625 + }, + { + "x": 596.177978515625, + "y": 228.58399963378906 + }, + { + "x": 592.6649780273438, + "y": 230.86500549316406 + }, + { + "x": 589.10498046875, + "y": 233.07200622558594 + }, + { + "x": 585.5, + "y": 235.2050018310547 + }, + { + "x": 581.8499755859375, + "y": 237.26100158691406 }, { - "x": 344.27801513671875, - "y": 117.9010009765625 + "x": 578.1589965820312, + "y": 239.24000549316406 }, { - "x": 342.5710144042969, - "y": 119.11399841308594 + "x": 574.427001953125, + "y": 241.14199829101562 }, { - "x": 340.8389892578125, - "y": 120.29199981689453 + "x": 570.655029296875, + "y": 242.96499633789062 }, { - "x": 339.0820007324219, - "y": 121.43199920654297 + "x": 566.8469848632812, + "y": 244.70899963378906 }, { - "x": 337.302001953125, - "y": 122.53600311279297 + "x": 563.0029907226562, + "y": 246.3719940185547 }, { - "x": 335.5, - "y": 123.60199737548828 + "x": 559.1240234375, + "y": 247.9550018310547 }, { - "x": 333.67498779296875, - "y": 124.62999725341797 + "x": 555.2139892578125, + "y": 249.45599365234375 }, { - "x": 331.8290100097656, - "y": 125.62000274658203 + "x": 551.2730102539062, + "y": 250.875 }, { - "x": 329.9630126953125, - "y": 126.57099914550781 + "x": 547.302978515625, + "y": 252.21099853515625 }, { - "x": 328.0769958496094, - "y": 127.48200225830078 + "x": 543.3060302734375, + "y": 253.46299743652344 }, { - "x": 326.1730041503906, - "y": 128.35400390625 + "x": 539.2830200195312, + "y": 254.6320037841797 }, { - "x": 324.2510070800781, - "y": 129.18600463867188 + "x": 535.2369995117188, + "y": 255.71600341796875 }, { - "x": 322.31201171875, - "y": 129.9770050048828 + "x": 531.1699829101562, + "y": 256.7149963378906 }, { - "x": 320.35699462890625, - "y": 130.72799682617188 + "x": 527.0819702148438, + "y": 257.6289978027344 }, { - "x": 318.385986328125, - "y": 131.43699645996094 + "x": 522.9760131835938, + "y": 258.4570007324219 }, { - "x": 316.4010009765625, - "y": 132.10499572753906 + "x": 518.85302734375, + "y": 259.1990051269531 }, { - "x": 314.40301513671875, - "y": 132.7310028076172 + "x": 514.7160034179688, + "y": 259.85400390625 }, { - "x": 312.3909912109375, - "y": 133.3159942626953 + "x": 510.5660095214844, + "y": 260.4219970703125 }, { - "x": 310.3680114746094, - "y": 133.85800170898438 + "x": 506.4049987792969, + "y": 260.90399169921875 }, { - "x": 308.3349914550781, - "y": 134.35699462890625 + "x": 502.2349853515625, + "y": 261.2980041503906 }, { - "x": 306.2909851074219, - "y": 134.81399536132812 + "x": 498.0580139160156, + "y": 261.6050109863281 }, { - "x": 304.2380065917969, - "y": 135.22799682617188 + "x": 493.875, + "y": 261.8240051269531 }, { - "x": 302.1759948730469, - "y": 135.5989990234375 + "x": 489.68798828125, + "y": 261.95599365234375 }, { - "x": 300.1080017089844, - "y": 135.927001953125 + "x": 485.5, + "y": 262 }, { - "x": 298.0329895019531, - "y": 136.21099853515625 + "x": 481.3110046386719, + "y": 261.95599365234375 }, { - "x": 295.9519958496094, - "y": 136.45199584960938 + "x": 477.1239929199219, + "y": 261.8240051269531 }, { - "x": 293.86700439453125, - "y": 136.6490020751953 + "x": 472.9410095214844, + "y": 261.6050109863281 }, { - "x": 291.77899169921875, - "y": 136.802001953125 + "x": 468.7640075683594, + "y": 261.2980041503906 }, { - "x": 289.68701171875, - "y": 136.91200256347656 + "x": 464.593994140625, + "y": 260.90399169921875 }, { - "x": 287.593994140625, - "y": 136.97799682617188 + "x": 460.4330139160156, + "y": 260.4219970703125 }, { - "x": 285.5, - "y": 137 + "x": 456.2829895019531, + "y": 259.85400390625 }, { - "x": 283.4049987792969, - "y": 136.97799682617188 + "x": 452.14599609375, + "y": 259.1990051269531 }, { - "x": 281.31201171875, - "y": 136.91200256347656 + "x": 448.02301025390625, + "y": 258.4570007324219 }, { - "x": 279.2200012207031, - "y": 136.802001953125 + "x": 443.9169921875, + "y": 257.6289978027344 }, { - "x": 277.1319885253906, - "y": 136.6490020751953 + "x": 439.8290100097656, + "y": 256.7149963378906 }, { - "x": 275.0469970703125, - "y": 136.45199584960938 + "x": 435.7619934082031, + "y": 255.71600341796875 }, { - "x": 272.96600341796875, - "y": 136.21099853515625 + "x": 431.71600341796875, + "y": 254.6320037841797 }, { - "x": 270.8909912109375, - "y": 135.927001953125 + "x": 427.6929931640625, + "y": 253.46299743652344 }, { - "x": 268.822998046875, - "y": 135.5989990234375 + "x": 423.6960144042969, + "y": 252.21099853515625 }, { - "x": 266.760986328125, - "y": 135.22799682617188 + "x": 419.72601318359375, + "y": 250.875 }, { - "x": 264.7080078125, - "y": 134.81399536132812 + "x": 415.7850036621094, + "y": 249.45599365234375 }, { - "x": 262.66400146484375, - "y": 134.35699462890625 + "x": 411.875, + "y": 247.9550018310547 }, { - "x": 260.6310119628906, - "y": 133.85800170898438 + "x": 407.9960021972656, + "y": 246.3719940185547 }, { - "x": 258.6080017089844, - "y": 133.3159942626953 + "x": 404.1520080566406, + "y": 244.70899963378906 }, { - "x": 256.59600830078125, - "y": 132.7310028076172 + "x": 400.343994140625, + "y": 242.96499633789062 }, { - "x": 254.59800720214844, - "y": 132.10499572753906 + "x": 396.5719909667969, + "y": 241.14199829101562 }, { - "x": 252.61300659179688, - "y": 131.43699645996094 + "x": 392.8399963378906, + "y": 239.24000549316406 }, { - "x": 250.64199829101562, - "y": 130.72799682617188 + "x": 389.14898681640625, + "y": 237.26100158691406 }, { - "x": 248.68699645996094, - "y": 129.9770050048828 + "x": 385.5, + "y": 235.2050018310547 }, { - "x": 246.7480010986328, - "y": 129.18600463867188 + "x": 381.8940124511719, + "y": 233.07200622558594 }, { - "x": 244.8260040283203, - "y": 128.35400390625 + "x": 378.3340148925781, + "y": 230.86500549316406 }, { - "x": 242.9219970703125, - "y": 127.48200225830078 + "x": 374.8210144042969, + "y": 228.58399963378906 }, { - "x": 241.03599548339844, - "y": 126.57099914550781 + "x": 371.35699462890625, + "y": 226.22900390625 }, { - "x": 239.1699981689453, - "y": 125.62000274658203 + "x": 367.9419860839844, + "y": 223.80299377441406 }, { - "x": 237.32400512695312, - "y": 124.62999725341797 + "x": 364.5799865722656, + "y": 221.30499267578125 }, { - "x": 235.5, - "y": 123.60199737548828 + "x": 361.2699890136719, + "y": 218.73800659179688 }, { - "x": 233.69700622558594, - "y": 122.53600311279297 + "x": 358.0150146484375, + "y": 216.1020050048828 }, { - "x": 231.91700744628906, - "y": 121.43199920654297 + "x": 354.81500244140625, + "y": 213.3990020751953 }, { - "x": 230.16000366210938, - "y": 120.29199981689453 + "x": 351.6730041503906, + "y": 210.6280059814453 }, { - "x": 228.42799377441406, - "y": 119.11399841308594 + "x": 348.5899963378906, + "y": 207.79299926757812 }, { - "x": 226.7209930419922, - "y": 117.9010009765625 + "x": 345.5669860839844, + "y": 204.8939971923828 }, { - "x": 225.39700317382812, - "y": 116.91799926757812 + "x": 342.6050109863281, + "y": 201.9320068359375 + }, + { + "x": 339.70599365234375, + "y": 198.90899658203125 + }, + { + "x": 336.8710021972656, + "y": 195.8260040283203 + }, + { + "x": 336.1419982910156, + "y": 195 } ], "isCurve": true, @@ -2000,344 +2376,376 @@ "link": "", "route": [ { - "x": 558.2050170898438, - "y": -84.41200256347656 + "x": 931.4099731445312, + "y": -186.21800231933594 + }, + { + "x": 936.197021484375, + "y": -185.53700256347656 + }, + { + "x": 942.385986328125, + "y": -184.45700073242188 + }, + { + "x": 948.5380249023438, + "y": -183.18299865722656 }, { - "x": 559.60400390625, - "y": -84.02899932861328 + "x": 954.6480102539062, + "y": -181.71600341796875 }, { - "x": 562.6060180664062, - "y": -83.1050033569336 + "x": 960.7080078125, + "y": -180.05799865722656 }, { - "x": 565.5780029296875, - "y": -82.08799743652344 + "x": 966.7130126953125, + "y": -178.21099853515625 }, { - "x": 568.5170288085938, - "y": -80.97699737548828 + "x": 972.656982421875, + "y": -176.17599487304688 }, { - "x": 571.4190063476562, - "y": -79.7750015258789 + "x": 978.5349731445312, + "y": -173.9550018310547 }, { - "x": 574.2830200195312, - "y": -78.48200225830078 + "x": 984.3389892578125, + "y": -171.5500030517578 }, { - "x": 577.10400390625, - "y": -77.0999984741211 + "x": 990.0659790039062, + "y": -168.96499633789062 }, { - "x": 579.8800048828125, - "y": -75.62999725341797 + "x": 995.7080078125, + "y": -166.2010040283203 }, { - "x": 582.6090087890625, - "y": -74.0739974975586 + "x": 1001.260009765625, + "y": -163.26100158691406 }, { - "x": 585.2869873046875, - "y": -72.43199920654297 + "x": 1006.718017578125, + "y": -160.1479949951172 }, { - "x": 587.9130249023438, - "y": -70.70800018310547 + "x": 1012.0750122070312, + "y": -156.86500549316406 }, { - "x": 590.4829711914062, - "y": -68.9010009765625 + "x": 1017.3259887695312, + "y": -153.41600036621094 }, { - "x": 592.9949951171875, - "y": -67.01499938964844 + "x": 1022.4669799804688, + "y": -149.80299377441406 }, { - "x": 595.447021484375, - "y": -65.0510025024414 + "x": 1027.490966796875, + "y": -146.031005859375 }, { - "x": 597.8359985351562, - "y": -63.01100158691406 + "x": 1032.39404296875, + "y": -142.1020050048828 }, { - "x": 600.1589965820312, - "y": -60.895999908447266 + "x": 1037.1719970703125, + "y": -138.02200317382812 }, { - "x": 602.4149780273438, - "y": -58.709999084472656 + "x": 1041.8189697265625, + "y": -133.79299926757812 }, { - "x": 604.6010131835938, - "y": -56.45399856567383 + "x": 1046.3310546875, + "y": -129.42100524902344 }, { - "x": 606.7160034179688, - "y": -54.13100051879883 + "x": 1050.7030029296875, + "y": -124.90899658203125 }, { - "x": 608.7559814453125, - "y": -51.742000579833984 + "x": 1054.9320068359375, + "y": -120.26200103759766 }, { - "x": 610.719970703125, - "y": -49.290000915527344 + "x": 1059.011962890625, + "y": -115.48400115966797 }, { - "x": 612.6060180664062, - "y": -46.77799987792969 + "x": 1062.9410400390625, + "y": -110.58100128173828 }, { - "x": 614.4130249023438, - "y": -44.20800018310547 + "x": 1066.7130126953125, + "y": -105.55699920654297 }, { - "x": 616.1370239257812, - "y": -41.582000732421875 + "x": 1070.3260498046875, + "y": -100.41600036621094 }, { - "x": 617.7789916992188, - "y": -38.90399932861328 + "x": 1073.7750244140625, + "y": -95.16500091552734 }, { - "x": 619.3350219726562, - "y": -36.17499923706055 + "x": 1077.0579833984375, + "y": -89.80799865722656 }, { - "x": 620.8049926757812, - "y": -33.39899826049805 + "x": 1080.1710205078125, + "y": -84.3499984741211 }, { - "x": 622.18701171875, - "y": -30.57699966430664 + "x": 1083.1109619140625, + "y": -78.7979965209961 }, { - "x": 623.47998046875, - "y": -27.714000701904297 + "x": 1085.875, + "y": -73.15499877929688 }, { - "x": 624.6820068359375, - "y": -24.812000274658203 + "x": 1088.4610595703125, + "y": -67.42900085449219 }, { - "x": 625.7930297851562, - "y": -21.87299919128418 + "x": 1090.864990234375, + "y": -61.624000549316406 }, { - "x": 626.8099975585938, - "y": -18.900999069213867 + "x": 1093.0860595703125, + "y": -55.74700164794922 }, { - "x": 627.7340087890625, - "y": -15.89900016784668 + "x": 1095.1209716796875, + "y": -49.803001403808594 }, { - "x": 628.56298828125, - "y": -12.868000030517578 + "x": 1096.968017578125, + "y": -43.79800033569336 }, { - "x": 629.2960205078125, - "y": -9.814000129699707 + "x": 1098.6259765625, + "y": -37.73699951171875 }, { - "x": 629.9329833984375, - "y": -6.73799991607666 + "x": 1100.093017578125, + "y": -31.628000259399414 }, { - "x": 630.4730224609375, - "y": -3.6429998874664307 + "x": 1101.366943359375, + "y": -25.47599983215332 }, { - "x": 630.916015625, - "y": -0.5329999923706055 + "x": 1102.447021484375, + "y": -19.285999298095703 }, { - "x": 631.260986328125, - "y": 2.5889999866485596 + "x": 1103.3330078125, + "y": -13.065999984741211 }, { - "x": 631.5070190429688, - "y": 5.71999979019165 + "x": 1104.02197265625, + "y": -6.821000099182129 }, { - "x": 631.655029296875, - "y": 8.857999801635742 + "x": 1104.5150146484375, + "y": -0.5580000281333923 }, { - "x": 631.7050170898438, + "x": 1104.81103515625, + "y": 5.7170000076293945 + }, + { + "x": 1104.9100341796875, "y": 12 }, { - "x": 631.655029296875, - "y": 15.140999794006348 + "x": 1104.81103515625, + "y": 18.281999588012695 + }, + { + "x": 1104.5150146484375, + "y": 24.558000564575195 + }, + { + "x": 1104.02197265625, + "y": 30.820999145507812 + }, + { + "x": 1103.3330078125, + "y": 37.066001892089844 + }, + { + "x": 1102.447021484375, + "y": 43.2859992980957 }, { - "x": 631.5070190429688, - "y": 18.27899932861328 + "x": 1101.366943359375, + "y": 49.47600173950195 }, { - "x": 631.260986328125, - "y": 21.40999984741211 + "x": 1100.093017578125, + "y": 55.62799835205078 }, { - "x": 630.916015625, - "y": 24.533000946044922 + "x": 1098.6259765625, + "y": 61.73699951171875 }, { - "x": 630.4730224609375, - "y": 27.64299964904785 + "x": 1096.968017578125, + "y": 67.7979965209961 }, { - "x": 629.9329833984375, - "y": 30.738000869750977 + "x": 1095.1209716796875, + "y": 73.8030014038086 }, { - "x": 629.2960205078125, - "y": 33.81399917602539 + "x": 1093.0860595703125, + "y": 79.74700164794922 }, { - "x": 628.56298828125, - "y": 36.86800003051758 + "x": 1090.864990234375, + "y": 85.6240005493164 }, { - "x": 627.7340087890625, - "y": 39.89899826049805 + "x": 1088.4610595703125, + "y": 91.42900085449219 }, { - "x": 626.8099975585938, - "y": 42.9010009765625 + "x": 1085.875, + "y": 97.15499877929688 }, { - "x": 625.7930297851562, - "y": 45.87300109863281 + "x": 1083.1109619140625, + "y": 102.7979965209961 }, { - "x": 624.6820068359375, - "y": 48.8120002746582 + "x": 1080.1710205078125, + "y": 108.3499984741211 }, { - "x": 623.47998046875, - "y": 51.7140007019043 + "x": 1077.0579833984375, + "y": 113.80799865722656 }, { - "x": 622.18701171875, - "y": 54.57699966430664 + "x": 1073.7750244140625, + "y": 119.16500091552734 }, { - "x": 620.8049926757812, - "y": 57.39899826049805 + "x": 1070.3260498046875, + "y": 124.41600036621094 }, { - "x": 619.3350219726562, - "y": 60.17499923706055 + "x": 1066.7130126953125, + "y": 129.5570068359375 }, { - "x": 617.7789916992188, - "y": 62.90399932861328 + "x": 1062.9410400390625, + "y": 134.58099365234375 }, { - "x": 616.1370239257812, - "y": 65.58200073242188 + "x": 1059.011962890625, + "y": 139.48399353027344 }, { - "x": 614.4130249023438, - "y": 68.20800018310547 + "x": 1054.9320068359375, + "y": 144.26199340820312 }, { - "x": 612.6060180664062, - "y": 70.77799987792969 + "x": 1050.7030029296875, + "y": 148.90899658203125 }, { - "x": 610.719970703125, - "y": 73.29000091552734 + "x": 1046.3310546875, + "y": 153.42100524902344 }, { - "x": 608.7559814453125, - "y": 75.74199676513672 + "x": 1041.8189697265625, + "y": 157.79299926757812 }, { - "x": 606.7160034179688, - "y": 78.13099670410156 + "x": 1037.1719970703125, + "y": 162.02200317382812 }, { - "x": 604.6010131835938, - "y": 80.4540023803711 + "x": 1032.39404296875, + "y": 166.1020050048828 }, { - "x": 602.4149780273438, - "y": 82.70999908447266 + "x": 1027.490966796875, + "y": 170.031005859375 }, { - "x": 600.1589965820312, - "y": 84.89600372314453 + "x": 1022.4669799804688, + "y": 173.80299377441406 }, { - "x": 597.8359985351562, - "y": 87.01100158691406 + "x": 1017.3259887695312, + "y": 177.41600036621094 }, { - "x": 595.447021484375, - "y": 89.0510025024414 + "x": 1012.0750122070312, + "y": 180.86500549316406 }, { - "x": 592.9949951171875, - "y": 91.01499938964844 + "x": 1006.718017578125, + "y": 184.1479949951172 }, { - "x": 590.4829711914062, - "y": 92.9010009765625 + "x": 1001.260009765625, + "y": 187.26100158691406 }, { - "x": 587.9130249023438, - "y": 94.70800018310547 + "x": 995.7080078125, + "y": 190.2010040283203 }, { - "x": 585.2869873046875, - "y": 96.43199920654297 + "x": 990.0659790039062, + "y": 192.96499633789062 }, { - "x": 582.6090087890625, - "y": 98.0739974975586 + "x": 984.3389892578125, + "y": 195.5500030517578 }, { - "x": 579.8800048828125, - "y": 99.62999725341797 + "x": 978.5349731445312, + "y": 197.9550018310547 }, { - "x": 577.10400390625, - "y": 101.0999984741211 + "x": 972.656982421875, + "y": 200.17599487304688 }, { - "x": 574.2830200195312, - "y": 102.48200225830078 + "x": 966.7130126953125, + "y": 202.21099853515625 }, { - "x": 571.4190063476562, - "y": 103.7750015258789 + "x": 960.7080078125, + "y": 204.05799865722656 }, { - "x": 568.5170288085938, - "y": 104.97699737548828 + "x": 954.6480102539062, + "y": 205.71600341796875 }, { - "x": 565.5780029296875, - "y": 106.08799743652344 + "x": 948.5380249023438, + "y": 207.18299865722656 }, { - "x": 562.6060180664062, - "y": 107.1050033569336 + "x": 942.385986328125, + "y": 208.45700073242188 }, { - "x": 559.60400390625, - "y": 108.02899932861328 + "x": 936.197021484375, + "y": 209.53700256347656 }, { - "x": 558.2050170898438, - "y": 108.41200256347656 + "x": 931.4099731445312, + "y": 210.21800231933594 } ], "isCurve": true, diff --git a/e2etests/testdata/txtar/cycle-diagram/elk/sketch.exp.svg b/e2etests/testdata/txtar/cycle-diagram/elk/sketch.exp.svg index 58c7ca7a87..21e65f752a 100644 --- a/e2etests/testdata/txtar/cycle-diagram/elk/sketch.exp.svg +++ b/e2etests/testdata/txtar/cycle-diagram/elk/sketch.exp.svg @@ -1,9 +1,9 @@ -abcdabcab - - - - - - - - - - + .d2-2891159010 .fill-N1{fill:#0A0F25;} + .d2-2891159010 .fill-N2{fill:#676C7E;} + .d2-2891159010 .fill-N3{fill:#9499AB;} + .d2-2891159010 .fill-N4{fill:#CFD2DD;} + .d2-2891159010 .fill-N5{fill:#DEE1EB;} + .d2-2891159010 .fill-N6{fill:#EEF1F8;} + .d2-2891159010 .fill-N7{fill:#FFFFFF;} + .d2-2891159010 .fill-B1{fill:#0D32B2;} + .d2-2891159010 .fill-B2{fill:#0D32B2;} + .d2-2891159010 .fill-B3{fill:#E3E9FD;} + .d2-2891159010 .fill-B4{fill:#E3E9FD;} + .d2-2891159010 .fill-B5{fill:#EDF0FD;} + .d2-2891159010 .fill-B6{fill:#F7F8FE;} + .d2-2891159010 .fill-AA2{fill:#4A6FF3;} + .d2-2891159010 .fill-AA4{fill:#EDF0FD;} + .d2-2891159010 .fill-AA5{fill:#F7F8FE;} + .d2-2891159010 .fill-AB4{fill:#EDF0FD;} + .d2-2891159010 .fill-AB5{fill:#F7F8FE;} + .d2-2891159010 .stroke-N1{stroke:#0A0F25;} + .d2-2891159010 .stroke-N2{stroke:#676C7E;} + .d2-2891159010 .stroke-N3{stroke:#9499AB;} + .d2-2891159010 .stroke-N4{stroke:#CFD2DD;} + .d2-2891159010 .stroke-N5{stroke:#DEE1EB;} + .d2-2891159010 .stroke-N6{stroke:#EEF1F8;} + .d2-2891159010 .stroke-N7{stroke:#FFFFFF;} + .d2-2891159010 .stroke-B1{stroke:#0D32B2;} + .d2-2891159010 .stroke-B2{stroke:#0D32B2;} + .d2-2891159010 .stroke-B3{stroke:#E3E9FD;} + .d2-2891159010 .stroke-B4{stroke:#E3E9FD;} + .d2-2891159010 .stroke-B5{stroke:#EDF0FD;} + .d2-2891159010 .stroke-B6{stroke:#F7F8FE;} + .d2-2891159010 .stroke-AA2{stroke:#4A6FF3;} + .d2-2891159010 .stroke-AA4{stroke:#EDF0FD;} + .d2-2891159010 .stroke-AA5{stroke:#F7F8FE;} + .d2-2891159010 .stroke-AB4{stroke:#EDF0FD;} + .d2-2891159010 .stroke-AB5{stroke:#F7F8FE;} + .d2-2891159010 .background-color-N1{background-color:#0A0F25;} + .d2-2891159010 .background-color-N2{background-color:#676C7E;} + .d2-2891159010 .background-color-N3{background-color:#9499AB;} + .d2-2891159010 .background-color-N4{background-color:#CFD2DD;} + .d2-2891159010 .background-color-N5{background-color:#DEE1EB;} + .d2-2891159010 .background-color-N6{background-color:#EEF1F8;} + .d2-2891159010 .background-color-N7{background-color:#FFFFFF;} + .d2-2891159010 .background-color-B1{background-color:#0D32B2;} + .d2-2891159010 .background-color-B2{background-color:#0D32B2;} + .d2-2891159010 .background-color-B3{background-color:#E3E9FD;} + .d2-2891159010 .background-color-B4{background-color:#E3E9FD;} + .d2-2891159010 .background-color-B5{background-color:#EDF0FD;} + .d2-2891159010 .background-color-B6{background-color:#F7F8FE;} + .d2-2891159010 .background-color-AA2{background-color:#4A6FF3;} + .d2-2891159010 .background-color-AA4{background-color:#EDF0FD;} + .d2-2891159010 .background-color-AA5{background-color:#F7F8FE;} + .d2-2891159010 .background-color-AB4{background-color:#EDF0FD;} + .d2-2891159010 .background-color-AB5{background-color:#F7F8FE;} + .d2-2891159010 .color-N1{color:#0A0F25;} + .d2-2891159010 .color-N2{color:#676C7E;} + .d2-2891159010 .color-N3{color:#9499AB;} + .d2-2891159010 .color-N4{color:#CFD2DD;} + .d2-2891159010 .color-N5{color:#DEE1EB;} + .d2-2891159010 .color-N6{color:#EEF1F8;} + .d2-2891159010 .color-N7{color:#FFFFFF;} + .d2-2891159010 .color-B1{color:#0D32B2;} + .d2-2891159010 .color-B2{color:#0D32B2;} + .d2-2891159010 .color-B3{color:#E3E9FD;} + .d2-2891159010 .color-B4{color:#E3E9FD;} + .d2-2891159010 .color-B5{color:#EDF0FD;} + .d2-2891159010 .color-B6{color:#F7F8FE;} + .d2-2891159010 .color-AA2{color:#4A6FF3;} + .d2-2891159010 .color-AA4{color:#EDF0FD;} + .d2-2891159010 .color-AA5{color:#F7F8FE;} + .d2-2891159010 .color-AB4{color:#EDF0FD;} + .d2-2891159010 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker-d2-2891159010);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker-d2-2891159010);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright-d2-2891159010);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright-d2-2891159010);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright-d2-2891159010);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright-d2-2891159010);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark-d2-2891159010);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright-d2-2891159010);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright-d2-2891159010);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright-d2-2891159010);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright-d2-2891159010);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker-d2-2891159010);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark-d2-2891159010);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal-d2-2891159010);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal-d2-2891159010);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright-d2-2891159010);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright-d2-2891159010);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright-d2-2891159010);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>abcdabcab + + + + + + + + + + \ No newline at end of file From 9731ae66b5136c6d4c94047ded412b131a2d42b1 Mon Sep 17 00:00:00 2001 From: Mayank Mohapatra <125661248+Mayank77maruti@users.noreply.github.com> Date: Sat, 22 Feb 2025 16:34:58 +0000 Subject: [PATCH 44/73] try --- d2layouts/d2cycle/layout.go | 96 ++++++++++++++----------------------- 1 file changed, 37 insertions(+), 59 deletions(-) diff --git a/d2layouts/d2cycle/layout.go b/d2layouts/d2cycle/layout.go index 81f94c1534..c63eb20397 100644 --- a/d2layouts/d2cycle/layout.go +++ b/d2layouts/d2cycle/layout.go @@ -33,13 +33,12 @@ func Layout(ctx context.Context, g *d2graph.Graph, layout d2graph.LayoutGraph) e positionObjects(objects, radius) for _, edge := range g.Edges { - createCircularArc(edge, radius) + createCircularArc(edge) } return nil } -// calculateRadius determines the radius of the circular layout based on the number and size of objects. func calculateRadius(objects []*d2graph.Object) float64 { numObjects := float64(len(objects)) maxSize := 0.0 @@ -51,10 +50,9 @@ func calculateRadius(objects []*d2graph.Object) float64 { return math.Max(minRadius, MIN_RADIUS) } -// positionObjects arranges objects in a circular pattern around the origin. func positionObjects(objects []*d2graph.Object, radius float64) { numObjects := float64(len(objects)) - angleOffset := -math.Pi / 2 // Start at the top of the circle + angleOffset := -math.Pi / 2 for i, obj := range objects { angle := angleOffset + (2*math.Pi*float64(i)/numObjects) @@ -67,8 +65,7 @@ func positionObjects(objects []*d2graph.Object, radius float64) { } } -// createCircularArc generates a curved edge route with corrected arrow orientation. -func createCircularArc(edge *d2graph.Edge, radius float64) { +func createCircularArc(edge *d2graph.Edge) { if edge.Src == nil || edge.Dst == nil { return } @@ -76,26 +73,32 @@ func createCircularArc(edge *d2graph.Edge, radius float64) { srcCenter := edge.Src.Center() dstCenter := edge.Dst.Center() - // Generate initial arc path from source center to destination center - path := generateArcPoints(srcCenter, dstCenter, radius, ARC_STEPS) + srcAngle := math.Atan2(srcCenter.Y, srcCenter.X) + dstAngle := math.Atan2(dstCenter.Y, dstCenter.X) + if dstAngle < srcAngle { + dstAngle += 2 * math.Pi + } - // Clamp endpoints to the boundaries of the source and destination boxes + arcRadius := math.Hypot(srcCenter.X, srcCenter.Y) + + path := make([]*geo.Point, 0, ARC_STEPS+1) + 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) + path = append(path, geo.NewPoint(x, y)) + } + path[0] = srcCenter + path[len(path)-1] = dstCenter + + // Clamp endpoints to the boundaries of the source and destination 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 - // Add a point before newDst along the tangent direction to correct arrow orientation - if len(path) >= 2 { - dstAngle := math.Atan2(newDst.Y, newDst.X) - tangent := geo.NewPoint(-math.Sin(dstAngle), math.Cos(dstAngle)) - ε := 0.01 * radius // Small offset, e.g., 1% of radius - preDst := geo.NewPoint(newDst.X+ε*tangent.X, newDst.Y+ε*tangent.Y) - // Insert preDst before newDst - path = append(path[:len(path)-1], preDst, newDst) - } - - // Trim redundant path points that fall inside node boundaries + // Trim redundant path points that fall inside node boundaries. path = trimPathPoints(path, edge.Src.Box) path = trimPathPoints(path, edge.Dst.Box) @@ -103,34 +106,9 @@ func createCircularArc(edge *d2graph.Edge, radius float64) { edge.IsCurve = true } -// generateArcPoints creates points along a circular arc from src to dst. -func generateArcPoints(src, dst *geo.Point, radius float64, steps int) []*geo.Point { - // Calculate angles relative to the center (0,0) - srcAngle := math.Atan2(src.Y, src.X) - dstAngle := math.Atan2(dst.Y, dst.X) - - // Ensure the arc goes the shorter way - if dstAngle < srcAngle { - dstAngle += 2 * math.Pi - } - angleDiff := dstAngle - srcAngle - if angleDiff > math.Pi { - dstAngle -= 2 * math.Pi - } - - // Generate points along the arc - path := make([]*geo.Point, 0, steps+1) - for i := 0; i <= steps; i++ { - t := float64(i) / float64(steps) - angle := srcAngle + t*(dstAngle-srcAngle) - x := radius * math.Cos(angle) - y := radius * math.Sin(angle) - path = append(path, geo.NewPoint(x, y)) - } - return path -} -// clampPointOutsideBox finds the first point outside the box and computes the precise intersection. +// clampPointOutsideBox walks forward along the path until it finds a point outside the box, +// then replaces the point with a precise intersection. func clampPointOutsideBox(box *geo.Box, path []*geo.Point, startIdx int) (int, *geo.Point) { if startIdx >= len(path)-1 { return startIdx, path[startIdx] @@ -153,7 +131,7 @@ func clampPointOutsideBox(box *geo.Box, path []*geo.Point, startIdx int) (int, * return len(path)-1, path[len(path)-1] } -// clampPointOutsideBoxReverse works similarly but traverses the path in reverse. +// clampPointOutsideBoxReverse works similarly but in reverse order. func clampPointOutsideBoxReverse(box *geo.Box, path []*geo.Point, endIdx int) (int, *geo.Point) { if endIdx <= 0 { return endIdx, path[endIdx] @@ -176,7 +154,8 @@ func clampPointOutsideBoxReverse(box *geo.Box, path []*geo.Point, endIdx int) (i return 0, path[0] } -// findPreciseIntersection calculates the closest intersection between a segment and box boundaries. +// findPreciseIntersection calculates intersection points between seg and all four sides of the box, +// then returns the intersection closest to seg.Start. func findPreciseIntersection(box *geo.Box, seg geo.Segment) *geo.Point { intersections := []struct { point *geo.Point @@ -191,9 +170,9 @@ func findPreciseIntersection(box *geo.Box, seg geo.Segment) *geo.Point { dx := seg.End.X - seg.Start.X dy := seg.End.Y - seg.Start.Y - // Check vertical boundaries + // Check vertical boundaries. if dx != 0 { - // Left boundary + // Left boundary. t := (left - seg.Start.X) / dx if t >= 0 && t <= 1 { y := seg.Start.Y + t*dy @@ -204,7 +183,7 @@ func findPreciseIntersection(box *geo.Box, seg geo.Segment) *geo.Point { }{geo.NewPoint(left, y), t}) } } - // Right boundary + // Right boundary. t = (right - seg.Start.X) / dx if t >= 0 && t <= 1 { y := seg.Start.Y + t*dy @@ -217,9 +196,9 @@ func findPreciseIntersection(box *geo.Box, seg geo.Segment) *geo.Point { } } - // Check horizontal boundaries + // Check horizontal boundaries. if dy != 0 { - // Top boundary + // Top boundary. t := (top - seg.Start.Y) / dy if t >= 0 && t <= 1 { x := seg.Start.X + t*dx @@ -230,7 +209,7 @@ func findPreciseIntersection(box *geo.Box, seg geo.Segment) *geo.Point { }{geo.NewPoint(x, top), t}) } } - // Bottom boundary + // Bottom boundary. t = (bottom - seg.Start.Y) / dy if t >= 0 && t <= 1 { x := seg.Start.X + t*dx @@ -247,14 +226,14 @@ func findPreciseIntersection(box *geo.Box, seg geo.Segment) *geo.Point { return nil } - // Sort intersections by t (distance from seg.Start) and return the closest + // Sort intersections by t (distance from seg.Start) and return the closest. sort.Slice(intersections, func(i, j int) bool { return intersections[i].t < intersections[j].t }) return intersections[0].point } -// trimPathPoints removes intermediate points inside the box while retaining endpoints. +// trimPathPoints removes intermediate points that fall inside the given box while preserving endpoints. func trimPathPoints(path []*geo.Point, box *geo.Box) []*geo.Point { if len(path) <= 2 { return path @@ -269,7 +248,7 @@ func trimPathPoints(path []*geo.Point, box *geo.Box) []*geo.Point { return trimmed } -// boxContains checks if a point is strictly inside the box (boundary points are outside). +// boxContains uses strict inequalities so that points exactly on the boundary are considered outside. func boxContains(b *geo.Box, p *geo.Point) bool { return p.X > b.TopLeft.X && p.X < b.TopLeft.X+b.Width && @@ -277,7 +256,6 @@ func boxContains(b *geo.Box, p *geo.Point) bool { p.Y < b.TopLeft.Y+b.Height } -// positionLabelsIcons sets default positions for labels and icons on objects. func positionLabelsIcons(obj *d2graph.Object) { if obj.Icon != nil && obj.IconPosition == nil { if len(obj.ChildrenArray) > 0 { From 3a0bab35c342c6a325aec4b31e1759227244bd44 Mon Sep 17 00:00:00 2001 From: Mayank Mohapatra <125661248+Mayank77maruti@users.noreply.github.com> Date: Sun, 23 Feb 2025 16:53:22 +0000 Subject: [PATCH 45/73] try --- d2layouts/d2cycle/layout.go | 37 +++++ .../txtar/cycle-diagram/dagre/board.exp.json | 24 +-- .../txtar/cycle-diagram/dagre/sketch.exp.svg | 152 +++++++++--------- .../txtar/cycle-diagram/elk/board.exp.json | 24 +-- .../txtar/cycle-diagram/elk/sketch.exp.svg | 152 +++++++++--------- 5 files changed, 213 insertions(+), 176 deletions(-) diff --git a/d2layouts/d2cycle/layout.go b/d2layouts/d2cycle/layout.go index c63eb20397..a2bc268ec2 100644 --- a/d2layouts/d2cycle/layout.go +++ b/d2layouts/d2cycle/layout.go @@ -104,6 +104,43 @@ func createCircularArc(edge *d2graph.Edge) { edge.Route = path edge.IsCurve = true + + // Adjust the last segment to ensure proper arrowhead direction + if len(edge.Route) >= 2 { + lastIndex := len(edge.Route) - 1 + lastPoint := edge.Route[lastIndex] + secondLastPoint := edge.Route[lastIndex-1] + + // Calculate tangent direction (perpendicular to radius vector) + tangentX := -lastPoint.Y + tangentY := lastPoint.X + mag := math.Hypot(tangentX, tangentY) + if mag > 0 { + tangentX /= mag + tangentY /= mag + } + const MIN_SEGMENT_LEN = 10.0 + // Calculate current segment 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 + + // 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) + } + } + } } diff --git a/e2etests/testdata/txtar/cycle-diagram/dagre/board.exp.json b/e2etests/testdata/txtar/cycle-diagram/dagre/board.exp.json index 78ed2dffeb..f260b08863 100644 --- a/e2etests/testdata/txtar/cycle-diagram/dagre/board.exp.json +++ b/e2etests/testdata/txtar/cycle-diagram/dagre/board.exp.json @@ -864,8 +864,8 @@ "y": -37.47600173950195 }, { - "x": 197.02099609375, - "y": -34.3849983215332 + "x": 195.6020050048828, + "y": -42.86199951171875 }, { "x": 197.2519989013672, @@ -1228,8 +1228,8 @@ "y": 197.53700256347656 }, { - "x": 28.18000030517578, - "y": 198.00399780273438 + "x": 36.4109992980957, + "y": 196.90499877929688 }, { "x": 26.5, @@ -1592,8 +1592,8 @@ "y": 37.47600173950195 }, { - "x": -197.02099609375, - "y": 34.3849983215332 + "x": -195.6020050048828, + "y": 42.86199951171875 }, { "x": -197.2519989013672, @@ -1972,8 +1972,8 @@ "y": 111.8030014038086 }, { - "x": 701.875, - "y": 115.77300262451172 + "x": 704.7830200195312, + "y": 107.5770034790039 }, { "x": 701.4329833984375, @@ -2336,8 +2336,8 @@ "y": 186.90899658203125 }, { - "x": 364.3710021972656, - "y": 183.8260040283203 + "x": 370.2919921875, + "y": 190.46800231933594 }, { "x": 363.6419982910156, @@ -2740,8 +2740,8 @@ "y": 196.45700073242188 }, { - "x": 1003.2860107421875, - "y": 197.53700256347656 + "x": 1008.4110107421875, + "y": 196.89300537109375 }, { "x": 998.5, diff --git a/e2etests/testdata/txtar/cycle-diagram/dagre/sketch.exp.svg b/e2etests/testdata/txtar/cycle-diagram/dagre/sketch.exp.svg index 015478d741..037adcdace 100644 --- a/e2etests/testdata/txtar/cycle-diagram/dagre/sketch.exp.svg +++ b/e2etests/testdata/txtar/cycle-diagram/dagre/sketch.exp.svg @@ -1,9 +1,9 @@ -abcdabcab + .d2-2450559997 .fill-N1{fill:#0A0F25;} + .d2-2450559997 .fill-N2{fill:#676C7E;} + .d2-2450559997 .fill-N3{fill:#9499AB;} + .d2-2450559997 .fill-N4{fill:#CFD2DD;} + .d2-2450559997 .fill-N5{fill:#DEE1EB;} + .d2-2450559997 .fill-N6{fill:#EEF1F8;} + .d2-2450559997 .fill-N7{fill:#FFFFFF;} + .d2-2450559997 .fill-B1{fill:#0D32B2;} + .d2-2450559997 .fill-B2{fill:#0D32B2;} + .d2-2450559997 .fill-B3{fill:#E3E9FD;} + .d2-2450559997 .fill-B4{fill:#E3E9FD;} + .d2-2450559997 .fill-B5{fill:#EDF0FD;} + .d2-2450559997 .fill-B6{fill:#F7F8FE;} + .d2-2450559997 .fill-AA2{fill:#4A6FF3;} + .d2-2450559997 .fill-AA4{fill:#EDF0FD;} + .d2-2450559997 .fill-AA5{fill:#F7F8FE;} + .d2-2450559997 .fill-AB4{fill:#EDF0FD;} + .d2-2450559997 .fill-AB5{fill:#F7F8FE;} + .d2-2450559997 .stroke-N1{stroke:#0A0F25;} + .d2-2450559997 .stroke-N2{stroke:#676C7E;} + .d2-2450559997 .stroke-N3{stroke:#9499AB;} + .d2-2450559997 .stroke-N4{stroke:#CFD2DD;} + .d2-2450559997 .stroke-N5{stroke:#DEE1EB;} + .d2-2450559997 .stroke-N6{stroke:#EEF1F8;} + .d2-2450559997 .stroke-N7{stroke:#FFFFFF;} + .d2-2450559997 .stroke-B1{stroke:#0D32B2;} + .d2-2450559997 .stroke-B2{stroke:#0D32B2;} + .d2-2450559997 .stroke-B3{stroke:#E3E9FD;} + .d2-2450559997 .stroke-B4{stroke:#E3E9FD;} + .d2-2450559997 .stroke-B5{stroke:#EDF0FD;} + .d2-2450559997 .stroke-B6{stroke:#F7F8FE;} + .d2-2450559997 .stroke-AA2{stroke:#4A6FF3;} + .d2-2450559997 .stroke-AA4{stroke:#EDF0FD;} + .d2-2450559997 .stroke-AA5{stroke:#F7F8FE;} + .d2-2450559997 .stroke-AB4{stroke:#EDF0FD;} + .d2-2450559997 .stroke-AB5{stroke:#F7F8FE;} + .d2-2450559997 .background-color-N1{background-color:#0A0F25;} + .d2-2450559997 .background-color-N2{background-color:#676C7E;} + .d2-2450559997 .background-color-N3{background-color:#9499AB;} + .d2-2450559997 .background-color-N4{background-color:#CFD2DD;} + .d2-2450559997 .background-color-N5{background-color:#DEE1EB;} + .d2-2450559997 .background-color-N6{background-color:#EEF1F8;} + .d2-2450559997 .background-color-N7{background-color:#FFFFFF;} + .d2-2450559997 .background-color-B1{background-color:#0D32B2;} + .d2-2450559997 .background-color-B2{background-color:#0D32B2;} + .d2-2450559997 .background-color-B3{background-color:#E3E9FD;} + .d2-2450559997 .background-color-B4{background-color:#E3E9FD;} + .d2-2450559997 .background-color-B5{background-color:#EDF0FD;} + .d2-2450559997 .background-color-B6{background-color:#F7F8FE;} + .d2-2450559997 .background-color-AA2{background-color:#4A6FF3;} + .d2-2450559997 .background-color-AA4{background-color:#EDF0FD;} + .d2-2450559997 .background-color-AA5{background-color:#F7F8FE;} + .d2-2450559997 .background-color-AB4{background-color:#EDF0FD;} + .d2-2450559997 .background-color-AB5{background-color:#F7F8FE;} + .d2-2450559997 .color-N1{color:#0A0F25;} + .d2-2450559997 .color-N2{color:#676C7E;} + .d2-2450559997 .color-N3{color:#9499AB;} + .d2-2450559997 .color-N4{color:#CFD2DD;} + .d2-2450559997 .color-N5{color:#DEE1EB;} + .d2-2450559997 .color-N6{color:#EEF1F8;} + .d2-2450559997 .color-N7{color:#FFFFFF;} + .d2-2450559997 .color-B1{color:#0D32B2;} + .d2-2450559997 .color-B2{color:#0D32B2;} + .d2-2450559997 .color-B3{color:#E3E9FD;} + .d2-2450559997 .color-B4{color:#E3E9FD;} + .d2-2450559997 .color-B5{color:#EDF0FD;} + .d2-2450559997 .color-B6{color:#F7F8FE;} + .d2-2450559997 .color-AA2{color:#4A6FF3;} + .d2-2450559997 .color-AA4{color:#EDF0FD;} + .d2-2450559997 .color-AA5{color:#F7F8FE;} + .d2-2450559997 .color-AB4{color:#EDF0FD;} + .d2-2450559997 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker-d2-2450559997);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker-d2-2450559997);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright-d2-2450559997);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright-d2-2450559997);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright-d2-2450559997);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright-d2-2450559997);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark-d2-2450559997);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright-d2-2450559997);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright-d2-2450559997);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright-d2-2450559997);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright-d2-2450559997);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker-d2-2450559997);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark-d2-2450559997);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal-d2-2450559997);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal-d2-2450559997);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright-d2-2450559997);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright-d2-2450559997);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright-d2-2450559997);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>abcdabcab diff --git a/e2etests/testdata/txtar/cycle-diagram/elk/board.exp.json b/e2etests/testdata/txtar/cycle-diagram/elk/board.exp.json index 6eb058a841..94712ff99d 100644 --- a/e2etests/testdata/txtar/cycle-diagram/elk/board.exp.json +++ b/e2etests/testdata/txtar/cycle-diagram/elk/board.exp.json @@ -864,8 +864,8 @@ "y": -25.47599983215332 }, { - "x": 209.02099609375, - "y": -22.385000228881836 + "x": 207.6020050048828, + "y": -30.86199951171875 }, { "x": 209.2519989013672, @@ -1228,8 +1228,8 @@ "y": 209.53700256347656 }, { - "x": 40.18000030517578, - "y": 210.00399780273438 + "x": 48.4109992980957, + "y": 208.90499877929688 }, { "x": 38.5, @@ -1592,8 +1592,8 @@ "y": 49.47600173950195 }, { - "x": -185.02099609375, - "y": 46.3849983215332 + "x": -183.6020050048828, + "y": 54.86199951171875 }, { "x": -185.2519989013672, @@ -1972,8 +1972,8 @@ "y": 123.8030014038086 }, { - "x": 674.375, - "y": 127.77300262451172 + "x": 677.2830200195312, + "y": 119.5770034790039 }, { "x": 673.9329833984375, @@ -2336,8 +2336,8 @@ "y": 198.90899658203125 }, { - "x": 336.8710021972656, - "y": 195.8260040283203 + "x": 342.7919921875, + "y": 202.46800231933594 }, { "x": 336.1419982910156, @@ -2740,8 +2740,8 @@ "y": 208.45700073242188 }, { - "x": 936.197021484375, - "y": 209.53700256347656 + "x": 941.3209838867188, + "y": 208.89300537109375 }, { "x": 931.4099731445312, diff --git a/e2etests/testdata/txtar/cycle-diagram/elk/sketch.exp.svg b/e2etests/testdata/txtar/cycle-diagram/elk/sketch.exp.svg index 21e65f752a..c894e3d67f 100644 --- a/e2etests/testdata/txtar/cycle-diagram/elk/sketch.exp.svg +++ b/e2etests/testdata/txtar/cycle-diagram/elk/sketch.exp.svg @@ -1,9 +1,9 @@ -abcdabcab + .d2-3675916959 .fill-N1{fill:#0A0F25;} + .d2-3675916959 .fill-N2{fill:#676C7E;} + .d2-3675916959 .fill-N3{fill:#9499AB;} + .d2-3675916959 .fill-N4{fill:#CFD2DD;} + .d2-3675916959 .fill-N5{fill:#DEE1EB;} + .d2-3675916959 .fill-N6{fill:#EEF1F8;} + .d2-3675916959 .fill-N7{fill:#FFFFFF;} + .d2-3675916959 .fill-B1{fill:#0D32B2;} + .d2-3675916959 .fill-B2{fill:#0D32B2;} + .d2-3675916959 .fill-B3{fill:#E3E9FD;} + .d2-3675916959 .fill-B4{fill:#E3E9FD;} + .d2-3675916959 .fill-B5{fill:#EDF0FD;} + .d2-3675916959 .fill-B6{fill:#F7F8FE;} + .d2-3675916959 .fill-AA2{fill:#4A6FF3;} + .d2-3675916959 .fill-AA4{fill:#EDF0FD;} + .d2-3675916959 .fill-AA5{fill:#F7F8FE;} + .d2-3675916959 .fill-AB4{fill:#EDF0FD;} + .d2-3675916959 .fill-AB5{fill:#F7F8FE;} + .d2-3675916959 .stroke-N1{stroke:#0A0F25;} + .d2-3675916959 .stroke-N2{stroke:#676C7E;} + .d2-3675916959 .stroke-N3{stroke:#9499AB;} + .d2-3675916959 .stroke-N4{stroke:#CFD2DD;} + .d2-3675916959 .stroke-N5{stroke:#DEE1EB;} + .d2-3675916959 .stroke-N6{stroke:#EEF1F8;} + .d2-3675916959 .stroke-N7{stroke:#FFFFFF;} + .d2-3675916959 .stroke-B1{stroke:#0D32B2;} + .d2-3675916959 .stroke-B2{stroke:#0D32B2;} + .d2-3675916959 .stroke-B3{stroke:#E3E9FD;} + .d2-3675916959 .stroke-B4{stroke:#E3E9FD;} + .d2-3675916959 .stroke-B5{stroke:#EDF0FD;} + .d2-3675916959 .stroke-B6{stroke:#F7F8FE;} + .d2-3675916959 .stroke-AA2{stroke:#4A6FF3;} + .d2-3675916959 .stroke-AA4{stroke:#EDF0FD;} + .d2-3675916959 .stroke-AA5{stroke:#F7F8FE;} + .d2-3675916959 .stroke-AB4{stroke:#EDF0FD;} + .d2-3675916959 .stroke-AB5{stroke:#F7F8FE;} + .d2-3675916959 .background-color-N1{background-color:#0A0F25;} + .d2-3675916959 .background-color-N2{background-color:#676C7E;} + .d2-3675916959 .background-color-N3{background-color:#9499AB;} + .d2-3675916959 .background-color-N4{background-color:#CFD2DD;} + .d2-3675916959 .background-color-N5{background-color:#DEE1EB;} + .d2-3675916959 .background-color-N6{background-color:#EEF1F8;} + .d2-3675916959 .background-color-N7{background-color:#FFFFFF;} + .d2-3675916959 .background-color-B1{background-color:#0D32B2;} + .d2-3675916959 .background-color-B2{background-color:#0D32B2;} + .d2-3675916959 .background-color-B3{background-color:#E3E9FD;} + .d2-3675916959 .background-color-B4{background-color:#E3E9FD;} + .d2-3675916959 .background-color-B5{background-color:#EDF0FD;} + .d2-3675916959 .background-color-B6{background-color:#F7F8FE;} + .d2-3675916959 .background-color-AA2{background-color:#4A6FF3;} + .d2-3675916959 .background-color-AA4{background-color:#EDF0FD;} + .d2-3675916959 .background-color-AA5{background-color:#F7F8FE;} + .d2-3675916959 .background-color-AB4{background-color:#EDF0FD;} + .d2-3675916959 .background-color-AB5{background-color:#F7F8FE;} + .d2-3675916959 .color-N1{color:#0A0F25;} + .d2-3675916959 .color-N2{color:#676C7E;} + .d2-3675916959 .color-N3{color:#9499AB;} + .d2-3675916959 .color-N4{color:#CFD2DD;} + .d2-3675916959 .color-N5{color:#DEE1EB;} + .d2-3675916959 .color-N6{color:#EEF1F8;} + .d2-3675916959 .color-N7{color:#FFFFFF;} + .d2-3675916959 .color-B1{color:#0D32B2;} + .d2-3675916959 .color-B2{color:#0D32B2;} + .d2-3675916959 .color-B3{color:#E3E9FD;} + .d2-3675916959 .color-B4{color:#E3E9FD;} + .d2-3675916959 .color-B5{color:#EDF0FD;} + .d2-3675916959 .color-B6{color:#F7F8FE;} + .d2-3675916959 .color-AA2{color:#4A6FF3;} + .d2-3675916959 .color-AA4{color:#EDF0FD;} + .d2-3675916959 .color-AA5{color:#F7F8FE;} + .d2-3675916959 .color-AB4{color:#EDF0FD;} + .d2-3675916959 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker-d2-3675916959);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker-d2-3675916959);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright-d2-3675916959);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright-d2-3675916959);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright-d2-3675916959);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright-d2-3675916959);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark-d2-3675916959);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright-d2-3675916959);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright-d2-3675916959);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright-d2-3675916959);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright-d2-3675916959);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker-d2-3675916959);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark-d2-3675916959);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal-d2-3675916959);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal-d2-3675916959);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright-d2-3675916959);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright-d2-3675916959);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright-d2-3675916959);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>abcdabcab From d4dac38d75b970803e4bd0fb1ecfdc85e2a3a3ac Mon Sep 17 00:00:00 2001 From: Mayank Mohapatra <125661248+Mayank77maruti@users.noreply.github.com> Date: Sun, 23 Feb 2025 16:54:14 +0000 Subject: [PATCH 46/73] try --- d2layouts/d2cycle/layout.go | 2 +- .../txtar/cycle-diagram/dagre/board.exp.json | 24 +-- .../txtar/cycle-diagram/dagre/sketch.exp.svg | 152 +++++++++--------- .../txtar/cycle-diagram/elk/board.exp.json | 24 +-- .../txtar/cycle-diagram/elk/sketch.exp.svg | 152 +++++++++--------- 5 files changed, 177 insertions(+), 177 deletions(-) diff --git a/d2layouts/d2cycle/layout.go b/d2layouts/d2cycle/layout.go index a2bc268ec2..051b9891a5 100644 --- a/d2layouts/d2cycle/layout.go +++ b/d2layouts/d2cycle/layout.go @@ -119,7 +119,7 @@ func createCircularArc(edge *d2graph.Edge) { tangentX /= mag tangentY /= mag } - const MIN_SEGMENT_LEN = 10.0 + const MIN_SEGMENT_LEN = 20.0 // Calculate current segment direction dx := lastPoint.X - secondLastPoint.X dy := lastPoint.Y - secondLastPoint.Y diff --git a/e2etests/testdata/txtar/cycle-diagram/dagre/board.exp.json b/e2etests/testdata/txtar/cycle-diagram/dagre/board.exp.json index f260b08863..6ea0c16f67 100644 --- a/e2etests/testdata/txtar/cycle-diagram/dagre/board.exp.json +++ b/e2etests/testdata/txtar/cycle-diagram/dagre/board.exp.json @@ -864,8 +864,8 @@ "y": -37.47600173950195 }, { - "x": 195.6020050048828, - "y": -42.86199951171875 + "x": 193.95199584960938, + "y": -52.724998474121094 }, { "x": 197.2519989013672, @@ -1228,8 +1228,8 @@ "y": 197.53700256347656 }, { - "x": 36.4109992980957, - "y": 196.90499877929688 + "x": 46.323001861572266, + "y": 195.5800018310547 }, { "x": 26.5, @@ -1592,8 +1592,8 @@ "y": 37.47600173950195 }, { - "x": -195.6020050048828, - "y": 42.86199951171875 + "x": -193.95199584960938, + "y": 52.724998474121094 }, { "x": -197.2519989013672, @@ -1972,8 +1972,8 @@ "y": 111.8030014038086 }, { - "x": 704.7830200195312, - "y": 107.5770034790039 + "x": 708.1329956054688, + "y": 98.15499877929688 }, { "x": 701.4329833984375, @@ -2336,8 +2336,8 @@ "y": 186.90899658203125 }, { - "x": 370.2919921875, - "y": 190.46800231933594 + "x": 376.9429931640625, + "y": 197.93600463867188 }, { "x": 363.6419982910156, @@ -2740,8 +2740,8 @@ "y": 196.45700073242188 }, { - "x": 1008.4110107421875, - "y": 196.89300537109375 + "x": 1018.322998046875, + "y": 195.5679931640625 }, { "x": 998.5, diff --git a/e2etests/testdata/txtar/cycle-diagram/dagre/sketch.exp.svg b/e2etests/testdata/txtar/cycle-diagram/dagre/sketch.exp.svg index 037adcdace..8a8b6166a5 100644 --- a/e2etests/testdata/txtar/cycle-diagram/dagre/sketch.exp.svg +++ b/e2etests/testdata/txtar/cycle-diagram/dagre/sketch.exp.svg @@ -1,9 +1,9 @@ -abcdabcab + .d2-1335890465 .fill-N1{fill:#0A0F25;} + .d2-1335890465 .fill-N2{fill:#676C7E;} + .d2-1335890465 .fill-N3{fill:#9499AB;} + .d2-1335890465 .fill-N4{fill:#CFD2DD;} + .d2-1335890465 .fill-N5{fill:#DEE1EB;} + .d2-1335890465 .fill-N6{fill:#EEF1F8;} + .d2-1335890465 .fill-N7{fill:#FFFFFF;} + .d2-1335890465 .fill-B1{fill:#0D32B2;} + .d2-1335890465 .fill-B2{fill:#0D32B2;} + .d2-1335890465 .fill-B3{fill:#E3E9FD;} + .d2-1335890465 .fill-B4{fill:#E3E9FD;} + .d2-1335890465 .fill-B5{fill:#EDF0FD;} + .d2-1335890465 .fill-B6{fill:#F7F8FE;} + .d2-1335890465 .fill-AA2{fill:#4A6FF3;} + .d2-1335890465 .fill-AA4{fill:#EDF0FD;} + .d2-1335890465 .fill-AA5{fill:#F7F8FE;} + .d2-1335890465 .fill-AB4{fill:#EDF0FD;} + .d2-1335890465 .fill-AB5{fill:#F7F8FE;} + .d2-1335890465 .stroke-N1{stroke:#0A0F25;} + .d2-1335890465 .stroke-N2{stroke:#676C7E;} + .d2-1335890465 .stroke-N3{stroke:#9499AB;} + .d2-1335890465 .stroke-N4{stroke:#CFD2DD;} + .d2-1335890465 .stroke-N5{stroke:#DEE1EB;} + .d2-1335890465 .stroke-N6{stroke:#EEF1F8;} + .d2-1335890465 .stroke-N7{stroke:#FFFFFF;} + .d2-1335890465 .stroke-B1{stroke:#0D32B2;} + .d2-1335890465 .stroke-B2{stroke:#0D32B2;} + .d2-1335890465 .stroke-B3{stroke:#E3E9FD;} + .d2-1335890465 .stroke-B4{stroke:#E3E9FD;} + .d2-1335890465 .stroke-B5{stroke:#EDF0FD;} + .d2-1335890465 .stroke-B6{stroke:#F7F8FE;} + .d2-1335890465 .stroke-AA2{stroke:#4A6FF3;} + .d2-1335890465 .stroke-AA4{stroke:#EDF0FD;} + .d2-1335890465 .stroke-AA5{stroke:#F7F8FE;} + .d2-1335890465 .stroke-AB4{stroke:#EDF0FD;} + .d2-1335890465 .stroke-AB5{stroke:#F7F8FE;} + .d2-1335890465 .background-color-N1{background-color:#0A0F25;} + .d2-1335890465 .background-color-N2{background-color:#676C7E;} + .d2-1335890465 .background-color-N3{background-color:#9499AB;} + .d2-1335890465 .background-color-N4{background-color:#CFD2DD;} + .d2-1335890465 .background-color-N5{background-color:#DEE1EB;} + .d2-1335890465 .background-color-N6{background-color:#EEF1F8;} + .d2-1335890465 .background-color-N7{background-color:#FFFFFF;} + .d2-1335890465 .background-color-B1{background-color:#0D32B2;} + .d2-1335890465 .background-color-B2{background-color:#0D32B2;} + .d2-1335890465 .background-color-B3{background-color:#E3E9FD;} + .d2-1335890465 .background-color-B4{background-color:#E3E9FD;} + .d2-1335890465 .background-color-B5{background-color:#EDF0FD;} + .d2-1335890465 .background-color-B6{background-color:#F7F8FE;} + .d2-1335890465 .background-color-AA2{background-color:#4A6FF3;} + .d2-1335890465 .background-color-AA4{background-color:#EDF0FD;} + .d2-1335890465 .background-color-AA5{background-color:#F7F8FE;} + .d2-1335890465 .background-color-AB4{background-color:#EDF0FD;} + .d2-1335890465 .background-color-AB5{background-color:#F7F8FE;} + .d2-1335890465 .color-N1{color:#0A0F25;} + .d2-1335890465 .color-N2{color:#676C7E;} + .d2-1335890465 .color-N3{color:#9499AB;} + .d2-1335890465 .color-N4{color:#CFD2DD;} + .d2-1335890465 .color-N5{color:#DEE1EB;} + .d2-1335890465 .color-N6{color:#EEF1F8;} + .d2-1335890465 .color-N7{color:#FFFFFF;} + .d2-1335890465 .color-B1{color:#0D32B2;} + .d2-1335890465 .color-B2{color:#0D32B2;} + .d2-1335890465 .color-B3{color:#E3E9FD;} + .d2-1335890465 .color-B4{color:#E3E9FD;} + .d2-1335890465 .color-B5{color:#EDF0FD;} + .d2-1335890465 .color-B6{color:#F7F8FE;} + .d2-1335890465 .color-AA2{color:#4A6FF3;} + .d2-1335890465 .color-AA4{color:#EDF0FD;} + .d2-1335890465 .color-AA5{color:#F7F8FE;} + .d2-1335890465 .color-AB4{color:#EDF0FD;} + .d2-1335890465 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker-d2-1335890465);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker-d2-1335890465);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright-d2-1335890465);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright-d2-1335890465);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright-d2-1335890465);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright-d2-1335890465);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark-d2-1335890465);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright-d2-1335890465);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright-d2-1335890465);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright-d2-1335890465);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright-d2-1335890465);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker-d2-1335890465);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark-d2-1335890465);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal-d2-1335890465);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal-d2-1335890465);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright-d2-1335890465);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright-d2-1335890465);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright-d2-1335890465);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>abcdabcab diff --git a/e2etests/testdata/txtar/cycle-diagram/elk/board.exp.json b/e2etests/testdata/txtar/cycle-diagram/elk/board.exp.json index 94712ff99d..bb3b8eaa9a 100644 --- a/e2etests/testdata/txtar/cycle-diagram/elk/board.exp.json +++ b/e2etests/testdata/txtar/cycle-diagram/elk/board.exp.json @@ -864,8 +864,8 @@ "y": -25.47599983215332 }, { - "x": 207.6020050048828, - "y": -30.86199951171875 + "x": 205.95199584960938, + "y": -40.724998474121094 }, { "x": 209.2519989013672, @@ -1228,8 +1228,8 @@ "y": 209.53700256347656 }, { - "x": 48.4109992980957, - "y": 208.90499877929688 + "x": 58.323001861572266, + "y": 207.5800018310547 }, { "x": 38.5, @@ -1592,8 +1592,8 @@ "y": 49.47600173950195 }, { - "x": -183.6020050048828, - "y": 54.86199951171875 + "x": -181.95199584960938, + "y": 64.7249984741211 }, { "x": -185.2519989013672, @@ -1972,8 +1972,8 @@ "y": 123.8030014038086 }, { - "x": 677.2830200195312, - "y": 119.5770034790039 + "x": 680.6329956054688, + "y": 110.15499877929688 }, { "x": 673.9329833984375, @@ -2336,8 +2336,8 @@ "y": 198.90899658203125 }, { - "x": 342.7919921875, - "y": 202.46800231933594 + "x": 349.4429931640625, + "y": 209.93600463867188 }, { "x": 336.1419982910156, @@ -2740,8 +2740,8 @@ "y": 208.45700073242188 }, { - "x": 941.3209838867188, - "y": 208.89300537109375 + "x": 951.2329711914062, + "y": 207.5679931640625 }, { "x": 931.4099731445312, diff --git a/e2etests/testdata/txtar/cycle-diagram/elk/sketch.exp.svg b/e2etests/testdata/txtar/cycle-diagram/elk/sketch.exp.svg index c894e3d67f..2f3be69dd6 100644 --- a/e2etests/testdata/txtar/cycle-diagram/elk/sketch.exp.svg +++ b/e2etests/testdata/txtar/cycle-diagram/elk/sketch.exp.svg @@ -1,9 +1,9 @@ -abcdabcab + .d2-438575134 .fill-N1{fill:#0A0F25;} + .d2-438575134 .fill-N2{fill:#676C7E;} + .d2-438575134 .fill-N3{fill:#9499AB;} + .d2-438575134 .fill-N4{fill:#CFD2DD;} + .d2-438575134 .fill-N5{fill:#DEE1EB;} + .d2-438575134 .fill-N6{fill:#EEF1F8;} + .d2-438575134 .fill-N7{fill:#FFFFFF;} + .d2-438575134 .fill-B1{fill:#0D32B2;} + .d2-438575134 .fill-B2{fill:#0D32B2;} + .d2-438575134 .fill-B3{fill:#E3E9FD;} + .d2-438575134 .fill-B4{fill:#E3E9FD;} + .d2-438575134 .fill-B5{fill:#EDF0FD;} + .d2-438575134 .fill-B6{fill:#F7F8FE;} + .d2-438575134 .fill-AA2{fill:#4A6FF3;} + .d2-438575134 .fill-AA4{fill:#EDF0FD;} + .d2-438575134 .fill-AA5{fill:#F7F8FE;} + .d2-438575134 .fill-AB4{fill:#EDF0FD;} + .d2-438575134 .fill-AB5{fill:#F7F8FE;} + .d2-438575134 .stroke-N1{stroke:#0A0F25;} + .d2-438575134 .stroke-N2{stroke:#676C7E;} + .d2-438575134 .stroke-N3{stroke:#9499AB;} + .d2-438575134 .stroke-N4{stroke:#CFD2DD;} + .d2-438575134 .stroke-N5{stroke:#DEE1EB;} + .d2-438575134 .stroke-N6{stroke:#EEF1F8;} + .d2-438575134 .stroke-N7{stroke:#FFFFFF;} + .d2-438575134 .stroke-B1{stroke:#0D32B2;} + .d2-438575134 .stroke-B2{stroke:#0D32B2;} + .d2-438575134 .stroke-B3{stroke:#E3E9FD;} + .d2-438575134 .stroke-B4{stroke:#E3E9FD;} + .d2-438575134 .stroke-B5{stroke:#EDF0FD;} + .d2-438575134 .stroke-B6{stroke:#F7F8FE;} + .d2-438575134 .stroke-AA2{stroke:#4A6FF3;} + .d2-438575134 .stroke-AA4{stroke:#EDF0FD;} + .d2-438575134 .stroke-AA5{stroke:#F7F8FE;} + .d2-438575134 .stroke-AB4{stroke:#EDF0FD;} + .d2-438575134 .stroke-AB5{stroke:#F7F8FE;} + .d2-438575134 .background-color-N1{background-color:#0A0F25;} + .d2-438575134 .background-color-N2{background-color:#676C7E;} + .d2-438575134 .background-color-N3{background-color:#9499AB;} + .d2-438575134 .background-color-N4{background-color:#CFD2DD;} + .d2-438575134 .background-color-N5{background-color:#DEE1EB;} + .d2-438575134 .background-color-N6{background-color:#EEF1F8;} + .d2-438575134 .background-color-N7{background-color:#FFFFFF;} + .d2-438575134 .background-color-B1{background-color:#0D32B2;} + .d2-438575134 .background-color-B2{background-color:#0D32B2;} + .d2-438575134 .background-color-B3{background-color:#E3E9FD;} + .d2-438575134 .background-color-B4{background-color:#E3E9FD;} + .d2-438575134 .background-color-B5{background-color:#EDF0FD;} + .d2-438575134 .background-color-B6{background-color:#F7F8FE;} + .d2-438575134 .background-color-AA2{background-color:#4A6FF3;} + .d2-438575134 .background-color-AA4{background-color:#EDF0FD;} + .d2-438575134 .background-color-AA5{background-color:#F7F8FE;} + .d2-438575134 .background-color-AB4{background-color:#EDF0FD;} + .d2-438575134 .background-color-AB5{background-color:#F7F8FE;} + .d2-438575134 .color-N1{color:#0A0F25;} + .d2-438575134 .color-N2{color:#676C7E;} + .d2-438575134 .color-N3{color:#9499AB;} + .d2-438575134 .color-N4{color:#CFD2DD;} + .d2-438575134 .color-N5{color:#DEE1EB;} + .d2-438575134 .color-N6{color:#EEF1F8;} + .d2-438575134 .color-N7{color:#FFFFFF;} + .d2-438575134 .color-B1{color:#0D32B2;} + .d2-438575134 .color-B2{color:#0D32B2;} + .d2-438575134 .color-B3{color:#E3E9FD;} + .d2-438575134 .color-B4{color:#E3E9FD;} + .d2-438575134 .color-B5{color:#EDF0FD;} + .d2-438575134 .color-B6{color:#F7F8FE;} + .d2-438575134 .color-AA2{color:#4A6FF3;} + .d2-438575134 .color-AA4{color:#EDF0FD;} + .d2-438575134 .color-AA5{color:#F7F8FE;} + .d2-438575134 .color-AB4{color:#EDF0FD;} + .d2-438575134 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker-d2-438575134);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker-d2-438575134);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright-d2-438575134);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright-d2-438575134);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright-d2-438575134);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright-d2-438575134);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark-d2-438575134);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright-d2-438575134);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright-d2-438575134);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright-d2-438575134);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright-d2-438575134);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker-d2-438575134);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark-d2-438575134);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal-d2-438575134);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal-d2-438575134);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright-d2-438575134);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright-d2-438575134);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright-d2-438575134);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>abcdabcab From 1d8426ee845910e8c50a795af85595b1deac3ee4 Mon Sep 17 00:00:00 2001 From: Mayank Mohapatra <125661248+Mayank77maruti@users.noreply.github.com> Date: Sun, 23 Feb 2025 16:55:11 +0000 Subject: [PATCH 47/73] try --- d2layouts/d2cycle/layout.go | 2 +- .../txtar/cycle-diagram/dagre/board.exp.json | 24 +-- .../txtar/cycle-diagram/dagre/sketch.exp.svg | 152 +++++++++--------- .../txtar/cycle-diagram/elk/board.exp.json | 24 +-- .../txtar/cycle-diagram/elk/sketch.exp.svg | 152 +++++++++--------- 5 files changed, 177 insertions(+), 177 deletions(-) diff --git a/d2layouts/d2cycle/layout.go b/d2layouts/d2cycle/layout.go index 051b9891a5..5f54addb48 100644 --- a/d2layouts/d2cycle/layout.go +++ b/d2layouts/d2cycle/layout.go @@ -119,7 +119,7 @@ func createCircularArc(edge *d2graph.Edge) { tangentX /= mag tangentY /= mag } - const MIN_SEGMENT_LEN = 20.0 + const MIN_SEGMENT_LEN = 0.0 // Calculate current segment direction dx := lastPoint.X - secondLastPoint.X dy := lastPoint.Y - secondLastPoint.Y diff --git a/e2etests/testdata/txtar/cycle-diagram/dagre/board.exp.json b/e2etests/testdata/txtar/cycle-diagram/dagre/board.exp.json index 6ea0c16f67..78ed2dffeb 100644 --- a/e2etests/testdata/txtar/cycle-diagram/dagre/board.exp.json +++ b/e2etests/testdata/txtar/cycle-diagram/dagre/board.exp.json @@ -864,8 +864,8 @@ "y": -37.47600173950195 }, { - "x": 193.95199584960938, - "y": -52.724998474121094 + "x": 197.02099609375, + "y": -34.3849983215332 }, { "x": 197.2519989013672, @@ -1228,8 +1228,8 @@ "y": 197.53700256347656 }, { - "x": 46.323001861572266, - "y": 195.5800018310547 + "x": 28.18000030517578, + "y": 198.00399780273438 }, { "x": 26.5, @@ -1592,8 +1592,8 @@ "y": 37.47600173950195 }, { - "x": -193.95199584960938, - "y": 52.724998474121094 + "x": -197.02099609375, + "y": 34.3849983215332 }, { "x": -197.2519989013672, @@ -1972,8 +1972,8 @@ "y": 111.8030014038086 }, { - "x": 708.1329956054688, - "y": 98.15499877929688 + "x": 701.875, + "y": 115.77300262451172 }, { "x": 701.4329833984375, @@ -2336,8 +2336,8 @@ "y": 186.90899658203125 }, { - "x": 376.9429931640625, - "y": 197.93600463867188 + "x": 364.3710021972656, + "y": 183.8260040283203 }, { "x": 363.6419982910156, @@ -2740,8 +2740,8 @@ "y": 196.45700073242188 }, { - "x": 1018.322998046875, - "y": 195.5679931640625 + "x": 1003.2860107421875, + "y": 197.53700256347656 }, { "x": 998.5, diff --git a/e2etests/testdata/txtar/cycle-diagram/dagre/sketch.exp.svg b/e2etests/testdata/txtar/cycle-diagram/dagre/sketch.exp.svg index 8a8b6166a5..015478d741 100644 --- a/e2etests/testdata/txtar/cycle-diagram/dagre/sketch.exp.svg +++ b/e2etests/testdata/txtar/cycle-diagram/dagre/sketch.exp.svg @@ -1,9 +1,9 @@ -abcdabcab + .d2-153681122 .fill-N1{fill:#0A0F25;} + .d2-153681122 .fill-N2{fill:#676C7E;} + .d2-153681122 .fill-N3{fill:#9499AB;} + .d2-153681122 .fill-N4{fill:#CFD2DD;} + .d2-153681122 .fill-N5{fill:#DEE1EB;} + .d2-153681122 .fill-N6{fill:#EEF1F8;} + .d2-153681122 .fill-N7{fill:#FFFFFF;} + .d2-153681122 .fill-B1{fill:#0D32B2;} + .d2-153681122 .fill-B2{fill:#0D32B2;} + .d2-153681122 .fill-B3{fill:#E3E9FD;} + .d2-153681122 .fill-B4{fill:#E3E9FD;} + .d2-153681122 .fill-B5{fill:#EDF0FD;} + .d2-153681122 .fill-B6{fill:#F7F8FE;} + .d2-153681122 .fill-AA2{fill:#4A6FF3;} + .d2-153681122 .fill-AA4{fill:#EDF0FD;} + .d2-153681122 .fill-AA5{fill:#F7F8FE;} + .d2-153681122 .fill-AB4{fill:#EDF0FD;} + .d2-153681122 .fill-AB5{fill:#F7F8FE;} + .d2-153681122 .stroke-N1{stroke:#0A0F25;} + .d2-153681122 .stroke-N2{stroke:#676C7E;} + .d2-153681122 .stroke-N3{stroke:#9499AB;} + .d2-153681122 .stroke-N4{stroke:#CFD2DD;} + .d2-153681122 .stroke-N5{stroke:#DEE1EB;} + .d2-153681122 .stroke-N6{stroke:#EEF1F8;} + .d2-153681122 .stroke-N7{stroke:#FFFFFF;} + .d2-153681122 .stroke-B1{stroke:#0D32B2;} + .d2-153681122 .stroke-B2{stroke:#0D32B2;} + .d2-153681122 .stroke-B3{stroke:#E3E9FD;} + .d2-153681122 .stroke-B4{stroke:#E3E9FD;} + .d2-153681122 .stroke-B5{stroke:#EDF0FD;} + .d2-153681122 .stroke-B6{stroke:#F7F8FE;} + .d2-153681122 .stroke-AA2{stroke:#4A6FF3;} + .d2-153681122 .stroke-AA4{stroke:#EDF0FD;} + .d2-153681122 .stroke-AA5{stroke:#F7F8FE;} + .d2-153681122 .stroke-AB4{stroke:#EDF0FD;} + .d2-153681122 .stroke-AB5{stroke:#F7F8FE;} + .d2-153681122 .background-color-N1{background-color:#0A0F25;} + .d2-153681122 .background-color-N2{background-color:#676C7E;} + .d2-153681122 .background-color-N3{background-color:#9499AB;} + .d2-153681122 .background-color-N4{background-color:#CFD2DD;} + .d2-153681122 .background-color-N5{background-color:#DEE1EB;} + .d2-153681122 .background-color-N6{background-color:#EEF1F8;} + .d2-153681122 .background-color-N7{background-color:#FFFFFF;} + .d2-153681122 .background-color-B1{background-color:#0D32B2;} + .d2-153681122 .background-color-B2{background-color:#0D32B2;} + .d2-153681122 .background-color-B3{background-color:#E3E9FD;} + .d2-153681122 .background-color-B4{background-color:#E3E9FD;} + .d2-153681122 .background-color-B5{background-color:#EDF0FD;} + .d2-153681122 .background-color-B6{background-color:#F7F8FE;} + .d2-153681122 .background-color-AA2{background-color:#4A6FF3;} + .d2-153681122 .background-color-AA4{background-color:#EDF0FD;} + .d2-153681122 .background-color-AA5{background-color:#F7F8FE;} + .d2-153681122 .background-color-AB4{background-color:#EDF0FD;} + .d2-153681122 .background-color-AB5{background-color:#F7F8FE;} + .d2-153681122 .color-N1{color:#0A0F25;} + .d2-153681122 .color-N2{color:#676C7E;} + .d2-153681122 .color-N3{color:#9499AB;} + .d2-153681122 .color-N4{color:#CFD2DD;} + .d2-153681122 .color-N5{color:#DEE1EB;} + .d2-153681122 .color-N6{color:#EEF1F8;} + .d2-153681122 .color-N7{color:#FFFFFF;} + .d2-153681122 .color-B1{color:#0D32B2;} + .d2-153681122 .color-B2{color:#0D32B2;} + .d2-153681122 .color-B3{color:#E3E9FD;} + .d2-153681122 .color-B4{color:#E3E9FD;} + .d2-153681122 .color-B5{color:#EDF0FD;} + .d2-153681122 .color-B6{color:#F7F8FE;} + .d2-153681122 .color-AA2{color:#4A6FF3;} + .d2-153681122 .color-AA4{color:#EDF0FD;} + .d2-153681122 .color-AA5{color:#F7F8FE;} + .d2-153681122 .color-AB4{color:#EDF0FD;} + .d2-153681122 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker-d2-153681122);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker-d2-153681122);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright-d2-153681122);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright-d2-153681122);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright-d2-153681122);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright-d2-153681122);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark-d2-153681122);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright-d2-153681122);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright-d2-153681122);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright-d2-153681122);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright-d2-153681122);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker-d2-153681122);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark-d2-153681122);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal-d2-153681122);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal-d2-153681122);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright-d2-153681122);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright-d2-153681122);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright-d2-153681122);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>abcdabcab diff --git a/e2etests/testdata/txtar/cycle-diagram/elk/board.exp.json b/e2etests/testdata/txtar/cycle-diagram/elk/board.exp.json index bb3b8eaa9a..6eb058a841 100644 --- a/e2etests/testdata/txtar/cycle-diagram/elk/board.exp.json +++ b/e2etests/testdata/txtar/cycle-diagram/elk/board.exp.json @@ -864,8 +864,8 @@ "y": -25.47599983215332 }, { - "x": 205.95199584960938, - "y": -40.724998474121094 + "x": 209.02099609375, + "y": -22.385000228881836 }, { "x": 209.2519989013672, @@ -1228,8 +1228,8 @@ "y": 209.53700256347656 }, { - "x": 58.323001861572266, - "y": 207.5800018310547 + "x": 40.18000030517578, + "y": 210.00399780273438 }, { "x": 38.5, @@ -1592,8 +1592,8 @@ "y": 49.47600173950195 }, { - "x": -181.95199584960938, - "y": 64.7249984741211 + "x": -185.02099609375, + "y": 46.3849983215332 }, { "x": -185.2519989013672, @@ -1972,8 +1972,8 @@ "y": 123.8030014038086 }, { - "x": 680.6329956054688, - "y": 110.15499877929688 + "x": 674.375, + "y": 127.77300262451172 }, { "x": 673.9329833984375, @@ -2336,8 +2336,8 @@ "y": 198.90899658203125 }, { - "x": 349.4429931640625, - "y": 209.93600463867188 + "x": 336.8710021972656, + "y": 195.8260040283203 }, { "x": 336.1419982910156, @@ -2740,8 +2740,8 @@ "y": 208.45700073242188 }, { - "x": 951.2329711914062, - "y": 207.5679931640625 + "x": 936.197021484375, + "y": 209.53700256347656 }, { "x": 931.4099731445312, diff --git a/e2etests/testdata/txtar/cycle-diagram/elk/sketch.exp.svg b/e2etests/testdata/txtar/cycle-diagram/elk/sketch.exp.svg index 2f3be69dd6..21e65f752a 100644 --- a/e2etests/testdata/txtar/cycle-diagram/elk/sketch.exp.svg +++ b/e2etests/testdata/txtar/cycle-diagram/elk/sketch.exp.svg @@ -1,9 +1,9 @@ -abcdabcab + .d2-2891159010 .fill-N1{fill:#0A0F25;} + .d2-2891159010 .fill-N2{fill:#676C7E;} + .d2-2891159010 .fill-N3{fill:#9499AB;} + .d2-2891159010 .fill-N4{fill:#CFD2DD;} + .d2-2891159010 .fill-N5{fill:#DEE1EB;} + .d2-2891159010 .fill-N6{fill:#EEF1F8;} + .d2-2891159010 .fill-N7{fill:#FFFFFF;} + .d2-2891159010 .fill-B1{fill:#0D32B2;} + .d2-2891159010 .fill-B2{fill:#0D32B2;} + .d2-2891159010 .fill-B3{fill:#E3E9FD;} + .d2-2891159010 .fill-B4{fill:#E3E9FD;} + .d2-2891159010 .fill-B5{fill:#EDF0FD;} + .d2-2891159010 .fill-B6{fill:#F7F8FE;} + .d2-2891159010 .fill-AA2{fill:#4A6FF3;} + .d2-2891159010 .fill-AA4{fill:#EDF0FD;} + .d2-2891159010 .fill-AA5{fill:#F7F8FE;} + .d2-2891159010 .fill-AB4{fill:#EDF0FD;} + .d2-2891159010 .fill-AB5{fill:#F7F8FE;} + .d2-2891159010 .stroke-N1{stroke:#0A0F25;} + .d2-2891159010 .stroke-N2{stroke:#676C7E;} + .d2-2891159010 .stroke-N3{stroke:#9499AB;} + .d2-2891159010 .stroke-N4{stroke:#CFD2DD;} + .d2-2891159010 .stroke-N5{stroke:#DEE1EB;} + .d2-2891159010 .stroke-N6{stroke:#EEF1F8;} + .d2-2891159010 .stroke-N7{stroke:#FFFFFF;} + .d2-2891159010 .stroke-B1{stroke:#0D32B2;} + .d2-2891159010 .stroke-B2{stroke:#0D32B2;} + .d2-2891159010 .stroke-B3{stroke:#E3E9FD;} + .d2-2891159010 .stroke-B4{stroke:#E3E9FD;} + .d2-2891159010 .stroke-B5{stroke:#EDF0FD;} + .d2-2891159010 .stroke-B6{stroke:#F7F8FE;} + .d2-2891159010 .stroke-AA2{stroke:#4A6FF3;} + .d2-2891159010 .stroke-AA4{stroke:#EDF0FD;} + .d2-2891159010 .stroke-AA5{stroke:#F7F8FE;} + .d2-2891159010 .stroke-AB4{stroke:#EDF0FD;} + .d2-2891159010 .stroke-AB5{stroke:#F7F8FE;} + .d2-2891159010 .background-color-N1{background-color:#0A0F25;} + .d2-2891159010 .background-color-N2{background-color:#676C7E;} + .d2-2891159010 .background-color-N3{background-color:#9499AB;} + .d2-2891159010 .background-color-N4{background-color:#CFD2DD;} + .d2-2891159010 .background-color-N5{background-color:#DEE1EB;} + .d2-2891159010 .background-color-N6{background-color:#EEF1F8;} + .d2-2891159010 .background-color-N7{background-color:#FFFFFF;} + .d2-2891159010 .background-color-B1{background-color:#0D32B2;} + .d2-2891159010 .background-color-B2{background-color:#0D32B2;} + .d2-2891159010 .background-color-B3{background-color:#E3E9FD;} + .d2-2891159010 .background-color-B4{background-color:#E3E9FD;} + .d2-2891159010 .background-color-B5{background-color:#EDF0FD;} + .d2-2891159010 .background-color-B6{background-color:#F7F8FE;} + .d2-2891159010 .background-color-AA2{background-color:#4A6FF3;} + .d2-2891159010 .background-color-AA4{background-color:#EDF0FD;} + .d2-2891159010 .background-color-AA5{background-color:#F7F8FE;} + .d2-2891159010 .background-color-AB4{background-color:#EDF0FD;} + .d2-2891159010 .background-color-AB5{background-color:#F7F8FE;} + .d2-2891159010 .color-N1{color:#0A0F25;} + .d2-2891159010 .color-N2{color:#676C7E;} + .d2-2891159010 .color-N3{color:#9499AB;} + .d2-2891159010 .color-N4{color:#CFD2DD;} + .d2-2891159010 .color-N5{color:#DEE1EB;} + .d2-2891159010 .color-N6{color:#EEF1F8;} + .d2-2891159010 .color-N7{color:#FFFFFF;} + .d2-2891159010 .color-B1{color:#0D32B2;} + .d2-2891159010 .color-B2{color:#0D32B2;} + .d2-2891159010 .color-B3{color:#E3E9FD;} + .d2-2891159010 .color-B4{color:#E3E9FD;} + .d2-2891159010 .color-B5{color:#EDF0FD;} + .d2-2891159010 .color-B6{color:#F7F8FE;} + .d2-2891159010 .color-AA2{color:#4A6FF3;} + .d2-2891159010 .color-AA4{color:#EDF0FD;} + .d2-2891159010 .color-AA5{color:#F7F8FE;} + .d2-2891159010 .color-AB4{color:#EDF0FD;} + .d2-2891159010 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker-d2-2891159010);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker-d2-2891159010);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright-d2-2891159010);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright-d2-2891159010);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright-d2-2891159010);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright-d2-2891159010);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark-d2-2891159010);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright-d2-2891159010);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright-d2-2891159010);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright-d2-2891159010);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright-d2-2891159010);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker-d2-2891159010);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark-d2-2891159010);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal-d2-2891159010);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal-d2-2891159010);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright-d2-2891159010);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright-d2-2891159010);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright-d2-2891159010);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>abcdabcab From a0ed5366ffa73b616c28227369f593357371c175 Mon Sep 17 00:00:00 2001 From: Mayank Mohapatra <125661248+Mayank77maruti@users.noreply.github.com> Date: Sun, 23 Feb 2025 16:55:40 +0000 Subject: [PATCH 48/73] try --- d2layouts/d2cycle/layout.go | 2 +- .../txtar/cycle-diagram/dagre/board.exp.json | 24 +-- .../txtar/cycle-diagram/dagre/sketch.exp.svg | 152 +++++++++--------- .../txtar/cycle-diagram/elk/board.exp.json | 24 +-- .../txtar/cycle-diagram/elk/sketch.exp.svg | 152 +++++++++--------- 5 files changed, 177 insertions(+), 177 deletions(-) diff --git a/d2layouts/d2cycle/layout.go b/d2layouts/d2cycle/layout.go index 5f54addb48..aa12f60c2f 100644 --- a/d2layouts/d2cycle/layout.go +++ b/d2layouts/d2cycle/layout.go @@ -119,7 +119,7 @@ func createCircularArc(edge *d2graph.Edge) { tangentX /= mag tangentY /= mag } - const MIN_SEGMENT_LEN = 0.0 + const MIN_SEGMENT_LEN = 5.0 // Calculate current segment direction dx := lastPoint.X - secondLastPoint.X dy := lastPoint.Y - secondLastPoint.Y diff --git a/e2etests/testdata/txtar/cycle-diagram/dagre/board.exp.json b/e2etests/testdata/txtar/cycle-diagram/dagre/board.exp.json index 78ed2dffeb..40871051ef 100644 --- a/e2etests/testdata/txtar/cycle-diagram/dagre/board.exp.json +++ b/e2etests/testdata/txtar/cycle-diagram/dagre/board.exp.json @@ -864,8 +864,8 @@ "y": -37.47600173950195 }, { - "x": 197.02099609375, - "y": -34.3849983215332 + "x": 196.427001953125, + "y": -37.930999755859375 }, { "x": 197.2519989013672, @@ -1228,8 +1228,8 @@ "y": 197.53700256347656 }, { - "x": 28.18000030517578, - "y": 198.00399780273438 + "x": 31.454999923706055, + "y": 197.56700134277344 }, { "x": 26.5, @@ -1592,8 +1592,8 @@ "y": 37.47600173950195 }, { - "x": -197.02099609375, - "y": 34.3849983215332 + "x": -196.427001953125, + "y": 37.930999755859375 }, { "x": -197.2519989013672, @@ -1972,8 +1972,8 @@ "y": 111.8030014038086 }, { - "x": 701.875, - "y": 115.77300262451172 + "x": 703.1079711914062, + "y": 112.28800201416016 }, { "x": 701.4329833984375, @@ -2336,8 +2336,8 @@ "y": 186.90899658203125 }, { - "x": 364.3710021972656, - "y": 183.8260040283203 + "x": 366.9670104980469, + "y": 186.73399353027344 }, { "x": 363.6419982910156, @@ -2740,8 +2740,8 @@ "y": 196.45700073242188 }, { - "x": 1003.2860107421875, - "y": 197.53700256347656 + "x": 1003.4550170898438, + "y": 197.55599975585938 }, { "x": 998.5, diff --git a/e2etests/testdata/txtar/cycle-diagram/dagre/sketch.exp.svg b/e2etests/testdata/txtar/cycle-diagram/dagre/sketch.exp.svg index 015478d741..aceaca5ed4 100644 --- a/e2etests/testdata/txtar/cycle-diagram/dagre/sketch.exp.svg +++ b/e2etests/testdata/txtar/cycle-diagram/dagre/sketch.exp.svg @@ -1,9 +1,9 @@ -abcdabcab + .d2-848448543 .fill-N1{fill:#0A0F25;} + .d2-848448543 .fill-N2{fill:#676C7E;} + .d2-848448543 .fill-N3{fill:#9499AB;} + .d2-848448543 .fill-N4{fill:#CFD2DD;} + .d2-848448543 .fill-N5{fill:#DEE1EB;} + .d2-848448543 .fill-N6{fill:#EEF1F8;} + .d2-848448543 .fill-N7{fill:#FFFFFF;} + .d2-848448543 .fill-B1{fill:#0D32B2;} + .d2-848448543 .fill-B2{fill:#0D32B2;} + .d2-848448543 .fill-B3{fill:#E3E9FD;} + .d2-848448543 .fill-B4{fill:#E3E9FD;} + .d2-848448543 .fill-B5{fill:#EDF0FD;} + .d2-848448543 .fill-B6{fill:#F7F8FE;} + .d2-848448543 .fill-AA2{fill:#4A6FF3;} + .d2-848448543 .fill-AA4{fill:#EDF0FD;} + .d2-848448543 .fill-AA5{fill:#F7F8FE;} + .d2-848448543 .fill-AB4{fill:#EDF0FD;} + .d2-848448543 .fill-AB5{fill:#F7F8FE;} + .d2-848448543 .stroke-N1{stroke:#0A0F25;} + .d2-848448543 .stroke-N2{stroke:#676C7E;} + .d2-848448543 .stroke-N3{stroke:#9499AB;} + .d2-848448543 .stroke-N4{stroke:#CFD2DD;} + .d2-848448543 .stroke-N5{stroke:#DEE1EB;} + .d2-848448543 .stroke-N6{stroke:#EEF1F8;} + .d2-848448543 .stroke-N7{stroke:#FFFFFF;} + .d2-848448543 .stroke-B1{stroke:#0D32B2;} + .d2-848448543 .stroke-B2{stroke:#0D32B2;} + .d2-848448543 .stroke-B3{stroke:#E3E9FD;} + .d2-848448543 .stroke-B4{stroke:#E3E9FD;} + .d2-848448543 .stroke-B5{stroke:#EDF0FD;} + .d2-848448543 .stroke-B6{stroke:#F7F8FE;} + .d2-848448543 .stroke-AA2{stroke:#4A6FF3;} + .d2-848448543 .stroke-AA4{stroke:#EDF0FD;} + .d2-848448543 .stroke-AA5{stroke:#F7F8FE;} + .d2-848448543 .stroke-AB4{stroke:#EDF0FD;} + .d2-848448543 .stroke-AB5{stroke:#F7F8FE;} + .d2-848448543 .background-color-N1{background-color:#0A0F25;} + .d2-848448543 .background-color-N2{background-color:#676C7E;} + .d2-848448543 .background-color-N3{background-color:#9499AB;} + .d2-848448543 .background-color-N4{background-color:#CFD2DD;} + .d2-848448543 .background-color-N5{background-color:#DEE1EB;} + .d2-848448543 .background-color-N6{background-color:#EEF1F8;} + .d2-848448543 .background-color-N7{background-color:#FFFFFF;} + .d2-848448543 .background-color-B1{background-color:#0D32B2;} + .d2-848448543 .background-color-B2{background-color:#0D32B2;} + .d2-848448543 .background-color-B3{background-color:#E3E9FD;} + .d2-848448543 .background-color-B4{background-color:#E3E9FD;} + .d2-848448543 .background-color-B5{background-color:#EDF0FD;} + .d2-848448543 .background-color-B6{background-color:#F7F8FE;} + .d2-848448543 .background-color-AA2{background-color:#4A6FF3;} + .d2-848448543 .background-color-AA4{background-color:#EDF0FD;} + .d2-848448543 .background-color-AA5{background-color:#F7F8FE;} + .d2-848448543 .background-color-AB4{background-color:#EDF0FD;} + .d2-848448543 .background-color-AB5{background-color:#F7F8FE;} + .d2-848448543 .color-N1{color:#0A0F25;} + .d2-848448543 .color-N2{color:#676C7E;} + .d2-848448543 .color-N3{color:#9499AB;} + .d2-848448543 .color-N4{color:#CFD2DD;} + .d2-848448543 .color-N5{color:#DEE1EB;} + .d2-848448543 .color-N6{color:#EEF1F8;} + .d2-848448543 .color-N7{color:#FFFFFF;} + .d2-848448543 .color-B1{color:#0D32B2;} + .d2-848448543 .color-B2{color:#0D32B2;} + .d2-848448543 .color-B3{color:#E3E9FD;} + .d2-848448543 .color-B4{color:#E3E9FD;} + .d2-848448543 .color-B5{color:#EDF0FD;} + .d2-848448543 .color-B6{color:#F7F8FE;} + .d2-848448543 .color-AA2{color:#4A6FF3;} + .d2-848448543 .color-AA4{color:#EDF0FD;} + .d2-848448543 .color-AA5{color:#F7F8FE;} + .d2-848448543 .color-AB4{color:#EDF0FD;} + .d2-848448543 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker-d2-848448543);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker-d2-848448543);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright-d2-848448543);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright-d2-848448543);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright-d2-848448543);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright-d2-848448543);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark-d2-848448543);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright-d2-848448543);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright-d2-848448543);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright-d2-848448543);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright-d2-848448543);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker-d2-848448543);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark-d2-848448543);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal-d2-848448543);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal-d2-848448543);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright-d2-848448543);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright-d2-848448543);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright-d2-848448543);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>abcdabcab diff --git a/e2etests/testdata/txtar/cycle-diagram/elk/board.exp.json b/e2etests/testdata/txtar/cycle-diagram/elk/board.exp.json index 6eb058a841..f9562b4270 100644 --- a/e2etests/testdata/txtar/cycle-diagram/elk/board.exp.json +++ b/e2etests/testdata/txtar/cycle-diagram/elk/board.exp.json @@ -864,8 +864,8 @@ "y": -25.47599983215332 }, { - "x": 209.02099609375, - "y": -22.385000228881836 + "x": 208.427001953125, + "y": -25.930999755859375 }, { "x": 209.2519989013672, @@ -1228,8 +1228,8 @@ "y": 209.53700256347656 }, { - "x": 40.18000030517578, - "y": 210.00399780273438 + "x": 43.45500183105469, + "y": 209.56700134277344 }, { "x": 38.5, @@ -1592,8 +1592,8 @@ "y": 49.47600173950195 }, { - "x": -185.02099609375, - "y": 46.3849983215332 + "x": -184.427001953125, + "y": 49.930999755859375 }, { "x": -185.2519989013672, @@ -1972,8 +1972,8 @@ "y": 123.8030014038086 }, { - "x": 674.375, - "y": 127.77300262451172 + "x": 675.6079711914062, + "y": 124.28800201416016 }, { "x": 673.9329833984375, @@ -2336,8 +2336,8 @@ "y": 198.90899658203125 }, { - "x": 336.8710021972656, - "y": 195.8260040283203 + "x": 339.4670104980469, + "y": 198.73399353027344 }, { "x": 336.1419982910156, @@ -2740,8 +2740,8 @@ "y": 208.45700073242188 }, { - "x": 936.197021484375, - "y": 209.53700256347656 + "x": 936.3660278320312, + "y": 209.55599975585938 }, { "x": 931.4099731445312, diff --git a/e2etests/testdata/txtar/cycle-diagram/elk/sketch.exp.svg b/e2etests/testdata/txtar/cycle-diagram/elk/sketch.exp.svg index 21e65f752a..b03bc77fdb 100644 --- a/e2etests/testdata/txtar/cycle-diagram/elk/sketch.exp.svg +++ b/e2etests/testdata/txtar/cycle-diagram/elk/sketch.exp.svg @@ -1,9 +1,9 @@ -abcdabcab + .d2-3526019064 .fill-N1{fill:#0A0F25;} + .d2-3526019064 .fill-N2{fill:#676C7E;} + .d2-3526019064 .fill-N3{fill:#9499AB;} + .d2-3526019064 .fill-N4{fill:#CFD2DD;} + .d2-3526019064 .fill-N5{fill:#DEE1EB;} + .d2-3526019064 .fill-N6{fill:#EEF1F8;} + .d2-3526019064 .fill-N7{fill:#FFFFFF;} + .d2-3526019064 .fill-B1{fill:#0D32B2;} + .d2-3526019064 .fill-B2{fill:#0D32B2;} + .d2-3526019064 .fill-B3{fill:#E3E9FD;} + .d2-3526019064 .fill-B4{fill:#E3E9FD;} + .d2-3526019064 .fill-B5{fill:#EDF0FD;} + .d2-3526019064 .fill-B6{fill:#F7F8FE;} + .d2-3526019064 .fill-AA2{fill:#4A6FF3;} + .d2-3526019064 .fill-AA4{fill:#EDF0FD;} + .d2-3526019064 .fill-AA5{fill:#F7F8FE;} + .d2-3526019064 .fill-AB4{fill:#EDF0FD;} + .d2-3526019064 .fill-AB5{fill:#F7F8FE;} + .d2-3526019064 .stroke-N1{stroke:#0A0F25;} + .d2-3526019064 .stroke-N2{stroke:#676C7E;} + .d2-3526019064 .stroke-N3{stroke:#9499AB;} + .d2-3526019064 .stroke-N4{stroke:#CFD2DD;} + .d2-3526019064 .stroke-N5{stroke:#DEE1EB;} + .d2-3526019064 .stroke-N6{stroke:#EEF1F8;} + .d2-3526019064 .stroke-N7{stroke:#FFFFFF;} + .d2-3526019064 .stroke-B1{stroke:#0D32B2;} + .d2-3526019064 .stroke-B2{stroke:#0D32B2;} + .d2-3526019064 .stroke-B3{stroke:#E3E9FD;} + .d2-3526019064 .stroke-B4{stroke:#E3E9FD;} + .d2-3526019064 .stroke-B5{stroke:#EDF0FD;} + .d2-3526019064 .stroke-B6{stroke:#F7F8FE;} + .d2-3526019064 .stroke-AA2{stroke:#4A6FF3;} + .d2-3526019064 .stroke-AA4{stroke:#EDF0FD;} + .d2-3526019064 .stroke-AA5{stroke:#F7F8FE;} + .d2-3526019064 .stroke-AB4{stroke:#EDF0FD;} + .d2-3526019064 .stroke-AB5{stroke:#F7F8FE;} + .d2-3526019064 .background-color-N1{background-color:#0A0F25;} + .d2-3526019064 .background-color-N2{background-color:#676C7E;} + .d2-3526019064 .background-color-N3{background-color:#9499AB;} + .d2-3526019064 .background-color-N4{background-color:#CFD2DD;} + .d2-3526019064 .background-color-N5{background-color:#DEE1EB;} + .d2-3526019064 .background-color-N6{background-color:#EEF1F8;} + .d2-3526019064 .background-color-N7{background-color:#FFFFFF;} + .d2-3526019064 .background-color-B1{background-color:#0D32B2;} + .d2-3526019064 .background-color-B2{background-color:#0D32B2;} + .d2-3526019064 .background-color-B3{background-color:#E3E9FD;} + .d2-3526019064 .background-color-B4{background-color:#E3E9FD;} + .d2-3526019064 .background-color-B5{background-color:#EDF0FD;} + .d2-3526019064 .background-color-B6{background-color:#F7F8FE;} + .d2-3526019064 .background-color-AA2{background-color:#4A6FF3;} + .d2-3526019064 .background-color-AA4{background-color:#EDF0FD;} + .d2-3526019064 .background-color-AA5{background-color:#F7F8FE;} + .d2-3526019064 .background-color-AB4{background-color:#EDF0FD;} + .d2-3526019064 .background-color-AB5{background-color:#F7F8FE;} + .d2-3526019064 .color-N1{color:#0A0F25;} + .d2-3526019064 .color-N2{color:#676C7E;} + .d2-3526019064 .color-N3{color:#9499AB;} + .d2-3526019064 .color-N4{color:#CFD2DD;} + .d2-3526019064 .color-N5{color:#DEE1EB;} + .d2-3526019064 .color-N6{color:#EEF1F8;} + .d2-3526019064 .color-N7{color:#FFFFFF;} + .d2-3526019064 .color-B1{color:#0D32B2;} + .d2-3526019064 .color-B2{color:#0D32B2;} + .d2-3526019064 .color-B3{color:#E3E9FD;} + .d2-3526019064 .color-B4{color:#E3E9FD;} + .d2-3526019064 .color-B5{color:#EDF0FD;} + .d2-3526019064 .color-B6{color:#F7F8FE;} + .d2-3526019064 .color-AA2{color:#4A6FF3;} + .d2-3526019064 .color-AA4{color:#EDF0FD;} + .d2-3526019064 .color-AA5{color:#F7F8FE;} + .d2-3526019064 .color-AB4{color:#EDF0FD;} + .d2-3526019064 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker-d2-3526019064);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker-d2-3526019064);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright-d2-3526019064);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright-d2-3526019064);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright-d2-3526019064);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright-d2-3526019064);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark-d2-3526019064);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright-d2-3526019064);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright-d2-3526019064);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright-d2-3526019064);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright-d2-3526019064);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker-d2-3526019064);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark-d2-3526019064);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal-d2-3526019064);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal-d2-3526019064);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright-d2-3526019064);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright-d2-3526019064);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright-d2-3526019064);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>abcdabcab From bcf1a001e0b532185d3bf6a6fbf503a9d8910cdd Mon Sep 17 00:00:00 2001 From: Mayank Mohapatra <125661248+Mayank77maruti@users.noreply.github.com> Date: Sun, 23 Feb 2025 16:56:13 +0000 Subject: [PATCH 49/73] try --- d2layouts/d2cycle/layout.go | 2 +- .../txtar/cycle-diagram/dagre/board.exp.json | 24 +-- .../txtar/cycle-diagram/dagre/sketch.exp.svg | 152 +++++++++--------- .../txtar/cycle-diagram/elk/board.exp.json | 24 +-- .../txtar/cycle-diagram/elk/sketch.exp.svg | 152 +++++++++--------- 5 files changed, 177 insertions(+), 177 deletions(-) diff --git a/d2layouts/d2cycle/layout.go b/d2layouts/d2cycle/layout.go index aa12f60c2f..0a24969e14 100644 --- a/d2layouts/d2cycle/layout.go +++ b/d2layouts/d2cycle/layout.go @@ -119,7 +119,7 @@ func createCircularArc(edge *d2graph.Edge) { tangentX /= mag tangentY /= mag } - const MIN_SEGMENT_LEN = 5.0 + const MIN_SEGMENT_LEN = 2.0 // Calculate current segment direction dx := lastPoint.X - secondLastPoint.X dy := lastPoint.Y - secondLastPoint.Y diff --git a/e2etests/testdata/txtar/cycle-diagram/dagre/board.exp.json b/e2etests/testdata/txtar/cycle-diagram/dagre/board.exp.json index 40871051ef..80eafaf85f 100644 --- a/e2etests/testdata/txtar/cycle-diagram/dagre/board.exp.json +++ b/e2etests/testdata/txtar/cycle-diagram/dagre/board.exp.json @@ -864,8 +864,8 @@ "y": -37.47600173950195 }, { - "x": 196.427001953125, - "y": -37.930999755859375 + "x": 196.9219970703125, + "y": -34.97200012207031 }, { "x": 197.2519989013672, @@ -1228,8 +1228,8 @@ "y": 197.53700256347656 }, { - "x": 31.454999923706055, - "y": 197.56700134277344 + "x": 28.48200035095215, + "y": 197.96499633789062 }, { "x": 26.5, @@ -1592,8 +1592,8 @@ "y": 37.47600173950195 }, { - "x": -196.427001953125, - "y": 37.930999755859375 + "x": -196.9219970703125, + "y": 34.97200012207031 }, { "x": -197.2519989013672, @@ -1972,8 +1972,8 @@ "y": 111.8030014038086 }, { - "x": 703.1079711914062, - "y": 112.28800201416016 + "x": 702.10302734375, + "y": 115.11499786376953 }, { "x": 701.4329833984375, @@ -2336,8 +2336,8 @@ "y": 186.90899658203125 }, { - "x": 366.9670104980469, - "y": 186.73399353027344 + "x": 364.97198486328125, + "y": 184.4929962158203 }, { "x": 363.6419982910156, @@ -2740,8 +2740,8 @@ "y": 196.45700073242188 }, { - "x": 1003.4550170898438, - "y": 197.55599975585938 + "x": 1003.2860107421875, + "y": 197.53700256347656 }, { "x": 998.5, diff --git a/e2etests/testdata/txtar/cycle-diagram/dagre/sketch.exp.svg b/e2etests/testdata/txtar/cycle-diagram/dagre/sketch.exp.svg index aceaca5ed4..65eb5522d5 100644 --- a/e2etests/testdata/txtar/cycle-diagram/dagre/sketch.exp.svg +++ b/e2etests/testdata/txtar/cycle-diagram/dagre/sketch.exp.svg @@ -1,9 +1,9 @@ -abcdabcab + .d2-2192699184 .fill-N1{fill:#0A0F25;} + .d2-2192699184 .fill-N2{fill:#676C7E;} + .d2-2192699184 .fill-N3{fill:#9499AB;} + .d2-2192699184 .fill-N4{fill:#CFD2DD;} + .d2-2192699184 .fill-N5{fill:#DEE1EB;} + .d2-2192699184 .fill-N6{fill:#EEF1F8;} + .d2-2192699184 .fill-N7{fill:#FFFFFF;} + .d2-2192699184 .fill-B1{fill:#0D32B2;} + .d2-2192699184 .fill-B2{fill:#0D32B2;} + .d2-2192699184 .fill-B3{fill:#E3E9FD;} + .d2-2192699184 .fill-B4{fill:#E3E9FD;} + .d2-2192699184 .fill-B5{fill:#EDF0FD;} + .d2-2192699184 .fill-B6{fill:#F7F8FE;} + .d2-2192699184 .fill-AA2{fill:#4A6FF3;} + .d2-2192699184 .fill-AA4{fill:#EDF0FD;} + .d2-2192699184 .fill-AA5{fill:#F7F8FE;} + .d2-2192699184 .fill-AB4{fill:#EDF0FD;} + .d2-2192699184 .fill-AB5{fill:#F7F8FE;} + .d2-2192699184 .stroke-N1{stroke:#0A0F25;} + .d2-2192699184 .stroke-N2{stroke:#676C7E;} + .d2-2192699184 .stroke-N3{stroke:#9499AB;} + .d2-2192699184 .stroke-N4{stroke:#CFD2DD;} + .d2-2192699184 .stroke-N5{stroke:#DEE1EB;} + .d2-2192699184 .stroke-N6{stroke:#EEF1F8;} + .d2-2192699184 .stroke-N7{stroke:#FFFFFF;} + .d2-2192699184 .stroke-B1{stroke:#0D32B2;} + .d2-2192699184 .stroke-B2{stroke:#0D32B2;} + .d2-2192699184 .stroke-B3{stroke:#E3E9FD;} + .d2-2192699184 .stroke-B4{stroke:#E3E9FD;} + .d2-2192699184 .stroke-B5{stroke:#EDF0FD;} + .d2-2192699184 .stroke-B6{stroke:#F7F8FE;} + .d2-2192699184 .stroke-AA2{stroke:#4A6FF3;} + .d2-2192699184 .stroke-AA4{stroke:#EDF0FD;} + .d2-2192699184 .stroke-AA5{stroke:#F7F8FE;} + .d2-2192699184 .stroke-AB4{stroke:#EDF0FD;} + .d2-2192699184 .stroke-AB5{stroke:#F7F8FE;} + .d2-2192699184 .background-color-N1{background-color:#0A0F25;} + .d2-2192699184 .background-color-N2{background-color:#676C7E;} + .d2-2192699184 .background-color-N3{background-color:#9499AB;} + .d2-2192699184 .background-color-N4{background-color:#CFD2DD;} + .d2-2192699184 .background-color-N5{background-color:#DEE1EB;} + .d2-2192699184 .background-color-N6{background-color:#EEF1F8;} + .d2-2192699184 .background-color-N7{background-color:#FFFFFF;} + .d2-2192699184 .background-color-B1{background-color:#0D32B2;} + .d2-2192699184 .background-color-B2{background-color:#0D32B2;} + .d2-2192699184 .background-color-B3{background-color:#E3E9FD;} + .d2-2192699184 .background-color-B4{background-color:#E3E9FD;} + .d2-2192699184 .background-color-B5{background-color:#EDF0FD;} + .d2-2192699184 .background-color-B6{background-color:#F7F8FE;} + .d2-2192699184 .background-color-AA2{background-color:#4A6FF3;} + .d2-2192699184 .background-color-AA4{background-color:#EDF0FD;} + .d2-2192699184 .background-color-AA5{background-color:#F7F8FE;} + .d2-2192699184 .background-color-AB4{background-color:#EDF0FD;} + .d2-2192699184 .background-color-AB5{background-color:#F7F8FE;} + .d2-2192699184 .color-N1{color:#0A0F25;} + .d2-2192699184 .color-N2{color:#676C7E;} + .d2-2192699184 .color-N3{color:#9499AB;} + .d2-2192699184 .color-N4{color:#CFD2DD;} + .d2-2192699184 .color-N5{color:#DEE1EB;} + .d2-2192699184 .color-N6{color:#EEF1F8;} + .d2-2192699184 .color-N7{color:#FFFFFF;} + .d2-2192699184 .color-B1{color:#0D32B2;} + .d2-2192699184 .color-B2{color:#0D32B2;} + .d2-2192699184 .color-B3{color:#E3E9FD;} + .d2-2192699184 .color-B4{color:#E3E9FD;} + .d2-2192699184 .color-B5{color:#EDF0FD;} + .d2-2192699184 .color-B6{color:#F7F8FE;} + .d2-2192699184 .color-AA2{color:#4A6FF3;} + .d2-2192699184 .color-AA4{color:#EDF0FD;} + .d2-2192699184 .color-AA5{color:#F7F8FE;} + .d2-2192699184 .color-AB4{color:#EDF0FD;} + .d2-2192699184 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker-d2-2192699184);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker-d2-2192699184);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright-d2-2192699184);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright-d2-2192699184);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright-d2-2192699184);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright-d2-2192699184);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark-d2-2192699184);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright-d2-2192699184);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright-d2-2192699184);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright-d2-2192699184);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright-d2-2192699184);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker-d2-2192699184);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark-d2-2192699184);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal-d2-2192699184);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal-d2-2192699184);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright-d2-2192699184);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright-d2-2192699184);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright-d2-2192699184);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>abcdabcab diff --git a/e2etests/testdata/txtar/cycle-diagram/elk/board.exp.json b/e2etests/testdata/txtar/cycle-diagram/elk/board.exp.json index f9562b4270..705165701c 100644 --- a/e2etests/testdata/txtar/cycle-diagram/elk/board.exp.json +++ b/e2etests/testdata/txtar/cycle-diagram/elk/board.exp.json @@ -864,8 +864,8 @@ "y": -25.47599983215332 }, { - "x": 208.427001953125, - "y": -25.930999755859375 + "x": 208.9219970703125, + "y": -22.972000122070312 }, { "x": 209.2519989013672, @@ -1228,8 +1228,8 @@ "y": 209.53700256347656 }, { - "x": 43.45500183105469, - "y": 209.56700134277344 + "x": 40.481998443603516, + "y": 209.96499633789062 }, { "x": 38.5, @@ -1592,8 +1592,8 @@ "y": 49.47600173950195 }, { - "x": -184.427001953125, - "y": 49.930999755859375 + "x": -184.9219970703125, + "y": 46.97200012207031 }, { "x": -185.2519989013672, @@ -1972,8 +1972,8 @@ "y": 123.8030014038086 }, { - "x": 675.6079711914062, - "y": 124.28800201416016 + "x": 674.60302734375, + "y": 127.11499786376953 }, { "x": 673.9329833984375, @@ -2336,8 +2336,8 @@ "y": 198.90899658203125 }, { - "x": 339.4670104980469, - "y": 198.73399353027344 + "x": 337.47198486328125, + "y": 196.4929962158203 }, { "x": 336.1419982910156, @@ -2740,8 +2740,8 @@ "y": 208.45700073242188 }, { - "x": 936.3660278320312, - "y": 209.55599975585938 + "x": 936.197021484375, + "y": 209.53700256347656 }, { "x": 931.4099731445312, diff --git a/e2etests/testdata/txtar/cycle-diagram/elk/sketch.exp.svg b/e2etests/testdata/txtar/cycle-diagram/elk/sketch.exp.svg index b03bc77fdb..9144454e4f 100644 --- a/e2etests/testdata/txtar/cycle-diagram/elk/sketch.exp.svg +++ b/e2etests/testdata/txtar/cycle-diagram/elk/sketch.exp.svg @@ -1,9 +1,9 @@ -abcdabcab + .d2-607506924 .fill-N1{fill:#0A0F25;} + .d2-607506924 .fill-N2{fill:#676C7E;} + .d2-607506924 .fill-N3{fill:#9499AB;} + .d2-607506924 .fill-N4{fill:#CFD2DD;} + .d2-607506924 .fill-N5{fill:#DEE1EB;} + .d2-607506924 .fill-N6{fill:#EEF1F8;} + .d2-607506924 .fill-N7{fill:#FFFFFF;} + .d2-607506924 .fill-B1{fill:#0D32B2;} + .d2-607506924 .fill-B2{fill:#0D32B2;} + .d2-607506924 .fill-B3{fill:#E3E9FD;} + .d2-607506924 .fill-B4{fill:#E3E9FD;} + .d2-607506924 .fill-B5{fill:#EDF0FD;} + .d2-607506924 .fill-B6{fill:#F7F8FE;} + .d2-607506924 .fill-AA2{fill:#4A6FF3;} + .d2-607506924 .fill-AA4{fill:#EDF0FD;} + .d2-607506924 .fill-AA5{fill:#F7F8FE;} + .d2-607506924 .fill-AB4{fill:#EDF0FD;} + .d2-607506924 .fill-AB5{fill:#F7F8FE;} + .d2-607506924 .stroke-N1{stroke:#0A0F25;} + .d2-607506924 .stroke-N2{stroke:#676C7E;} + .d2-607506924 .stroke-N3{stroke:#9499AB;} + .d2-607506924 .stroke-N4{stroke:#CFD2DD;} + .d2-607506924 .stroke-N5{stroke:#DEE1EB;} + .d2-607506924 .stroke-N6{stroke:#EEF1F8;} + .d2-607506924 .stroke-N7{stroke:#FFFFFF;} + .d2-607506924 .stroke-B1{stroke:#0D32B2;} + .d2-607506924 .stroke-B2{stroke:#0D32B2;} + .d2-607506924 .stroke-B3{stroke:#E3E9FD;} + .d2-607506924 .stroke-B4{stroke:#E3E9FD;} + .d2-607506924 .stroke-B5{stroke:#EDF0FD;} + .d2-607506924 .stroke-B6{stroke:#F7F8FE;} + .d2-607506924 .stroke-AA2{stroke:#4A6FF3;} + .d2-607506924 .stroke-AA4{stroke:#EDF0FD;} + .d2-607506924 .stroke-AA5{stroke:#F7F8FE;} + .d2-607506924 .stroke-AB4{stroke:#EDF0FD;} + .d2-607506924 .stroke-AB5{stroke:#F7F8FE;} + .d2-607506924 .background-color-N1{background-color:#0A0F25;} + .d2-607506924 .background-color-N2{background-color:#676C7E;} + .d2-607506924 .background-color-N3{background-color:#9499AB;} + .d2-607506924 .background-color-N4{background-color:#CFD2DD;} + .d2-607506924 .background-color-N5{background-color:#DEE1EB;} + .d2-607506924 .background-color-N6{background-color:#EEF1F8;} + .d2-607506924 .background-color-N7{background-color:#FFFFFF;} + .d2-607506924 .background-color-B1{background-color:#0D32B2;} + .d2-607506924 .background-color-B2{background-color:#0D32B2;} + .d2-607506924 .background-color-B3{background-color:#E3E9FD;} + .d2-607506924 .background-color-B4{background-color:#E3E9FD;} + .d2-607506924 .background-color-B5{background-color:#EDF0FD;} + .d2-607506924 .background-color-B6{background-color:#F7F8FE;} + .d2-607506924 .background-color-AA2{background-color:#4A6FF3;} + .d2-607506924 .background-color-AA4{background-color:#EDF0FD;} + .d2-607506924 .background-color-AA5{background-color:#F7F8FE;} + .d2-607506924 .background-color-AB4{background-color:#EDF0FD;} + .d2-607506924 .background-color-AB5{background-color:#F7F8FE;} + .d2-607506924 .color-N1{color:#0A0F25;} + .d2-607506924 .color-N2{color:#676C7E;} + .d2-607506924 .color-N3{color:#9499AB;} + .d2-607506924 .color-N4{color:#CFD2DD;} + .d2-607506924 .color-N5{color:#DEE1EB;} + .d2-607506924 .color-N6{color:#EEF1F8;} + .d2-607506924 .color-N7{color:#FFFFFF;} + .d2-607506924 .color-B1{color:#0D32B2;} + .d2-607506924 .color-B2{color:#0D32B2;} + .d2-607506924 .color-B3{color:#E3E9FD;} + .d2-607506924 .color-B4{color:#E3E9FD;} + .d2-607506924 .color-B5{color:#EDF0FD;} + .d2-607506924 .color-B6{color:#F7F8FE;} + .d2-607506924 .color-AA2{color:#4A6FF3;} + .d2-607506924 .color-AA4{color:#EDF0FD;} + .d2-607506924 .color-AA5{color:#F7F8FE;} + .d2-607506924 .color-AB4{color:#EDF0FD;} + .d2-607506924 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker-d2-607506924);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker-d2-607506924);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright-d2-607506924);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright-d2-607506924);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright-d2-607506924);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright-d2-607506924);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark-d2-607506924);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright-d2-607506924);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright-d2-607506924);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright-d2-607506924);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright-d2-607506924);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker-d2-607506924);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark-d2-607506924);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal-d2-607506924);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal-d2-607506924);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright-d2-607506924);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright-d2-607506924);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright-d2-607506924);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>abcdabcab From 9e47cf03dc1893c3b433766db81096d71689fc0c Mon Sep 17 00:00:00 2001 From: Mayank Mohapatra <125661248+Mayank77maruti@users.noreply.github.com> Date: Sun, 23 Feb 2025 16:56:46 +0000 Subject: [PATCH 50/73] try --- d2layouts/d2cycle/layout.go | 2 +- .../txtar/cycle-diagram/dagre/board.exp.json | 20 +-- .../txtar/cycle-diagram/dagre/sketch.exp.svg | 152 +++++++++--------- .../txtar/cycle-diagram/elk/board.exp.json | 20 +-- .../txtar/cycle-diagram/elk/sketch.exp.svg | 152 +++++++++--------- 5 files changed, 173 insertions(+), 173 deletions(-) diff --git a/d2layouts/d2cycle/layout.go b/d2layouts/d2cycle/layout.go index 0a24969e14..6b43701ef3 100644 --- a/d2layouts/d2cycle/layout.go +++ b/d2layouts/d2cycle/layout.go @@ -119,7 +119,7 @@ func createCircularArc(edge *d2graph.Edge) { tangentX /= mag tangentY /= mag } - const MIN_SEGMENT_LEN = 2.0 + const MIN_SEGMENT_LEN = 3.0 // Calculate current segment direction dx := lastPoint.X - secondLastPoint.X dy := lastPoint.Y - secondLastPoint.Y diff --git a/e2etests/testdata/txtar/cycle-diagram/dagre/board.exp.json b/e2etests/testdata/txtar/cycle-diagram/dagre/board.exp.json index 80eafaf85f..05c69e8ef7 100644 --- a/e2etests/testdata/txtar/cycle-diagram/dagre/board.exp.json +++ b/e2etests/testdata/txtar/cycle-diagram/dagre/board.exp.json @@ -864,8 +864,8 @@ "y": -37.47600173950195 }, { - "x": 196.9219970703125, - "y": -34.97200012207031 + "x": 196.7570037841797, + "y": -35.95800018310547 }, { "x": 197.2519989013672, @@ -1228,8 +1228,8 @@ "y": 197.53700256347656 }, { - "x": 28.48200035095215, - "y": 197.96499633789062 + "x": 29.472999572753906, + "y": 197.83200073242188 }, { "x": 26.5, @@ -1592,8 +1592,8 @@ "y": 37.47600173950195 }, { - "x": -196.9219970703125, - "y": 34.97200012207031 + "x": -196.7570037841797, + "y": 35.95800018310547 }, { "x": -197.2519989013672, @@ -1972,8 +1972,8 @@ "y": 111.8030014038086 }, { - "x": 702.10302734375, - "y": 115.11499786376953 + "x": 702.43798828125, + "y": 114.1729965209961 }, { "x": 701.4329833984375, @@ -2336,8 +2336,8 @@ "y": 186.90899658203125 }, { - "x": 364.97198486328125, - "y": 184.4929962158203 + "x": 365.6369934082031, + "y": 185.24000549316406 }, { "x": 363.6419982910156, diff --git a/e2etests/testdata/txtar/cycle-diagram/dagre/sketch.exp.svg b/e2etests/testdata/txtar/cycle-diagram/dagre/sketch.exp.svg index 65eb5522d5..7146e41621 100644 --- a/e2etests/testdata/txtar/cycle-diagram/dagre/sketch.exp.svg +++ b/e2etests/testdata/txtar/cycle-diagram/dagre/sketch.exp.svg @@ -1,9 +1,9 @@ -abcdabcab + .d2-1647598332 .fill-N1{fill:#0A0F25;} + .d2-1647598332 .fill-N2{fill:#676C7E;} + .d2-1647598332 .fill-N3{fill:#9499AB;} + .d2-1647598332 .fill-N4{fill:#CFD2DD;} + .d2-1647598332 .fill-N5{fill:#DEE1EB;} + .d2-1647598332 .fill-N6{fill:#EEF1F8;} + .d2-1647598332 .fill-N7{fill:#FFFFFF;} + .d2-1647598332 .fill-B1{fill:#0D32B2;} + .d2-1647598332 .fill-B2{fill:#0D32B2;} + .d2-1647598332 .fill-B3{fill:#E3E9FD;} + .d2-1647598332 .fill-B4{fill:#E3E9FD;} + .d2-1647598332 .fill-B5{fill:#EDF0FD;} + .d2-1647598332 .fill-B6{fill:#F7F8FE;} + .d2-1647598332 .fill-AA2{fill:#4A6FF3;} + .d2-1647598332 .fill-AA4{fill:#EDF0FD;} + .d2-1647598332 .fill-AA5{fill:#F7F8FE;} + .d2-1647598332 .fill-AB4{fill:#EDF0FD;} + .d2-1647598332 .fill-AB5{fill:#F7F8FE;} + .d2-1647598332 .stroke-N1{stroke:#0A0F25;} + .d2-1647598332 .stroke-N2{stroke:#676C7E;} + .d2-1647598332 .stroke-N3{stroke:#9499AB;} + .d2-1647598332 .stroke-N4{stroke:#CFD2DD;} + .d2-1647598332 .stroke-N5{stroke:#DEE1EB;} + .d2-1647598332 .stroke-N6{stroke:#EEF1F8;} + .d2-1647598332 .stroke-N7{stroke:#FFFFFF;} + .d2-1647598332 .stroke-B1{stroke:#0D32B2;} + .d2-1647598332 .stroke-B2{stroke:#0D32B2;} + .d2-1647598332 .stroke-B3{stroke:#E3E9FD;} + .d2-1647598332 .stroke-B4{stroke:#E3E9FD;} + .d2-1647598332 .stroke-B5{stroke:#EDF0FD;} + .d2-1647598332 .stroke-B6{stroke:#F7F8FE;} + .d2-1647598332 .stroke-AA2{stroke:#4A6FF3;} + .d2-1647598332 .stroke-AA4{stroke:#EDF0FD;} + .d2-1647598332 .stroke-AA5{stroke:#F7F8FE;} + .d2-1647598332 .stroke-AB4{stroke:#EDF0FD;} + .d2-1647598332 .stroke-AB5{stroke:#F7F8FE;} + .d2-1647598332 .background-color-N1{background-color:#0A0F25;} + .d2-1647598332 .background-color-N2{background-color:#676C7E;} + .d2-1647598332 .background-color-N3{background-color:#9499AB;} + .d2-1647598332 .background-color-N4{background-color:#CFD2DD;} + .d2-1647598332 .background-color-N5{background-color:#DEE1EB;} + .d2-1647598332 .background-color-N6{background-color:#EEF1F8;} + .d2-1647598332 .background-color-N7{background-color:#FFFFFF;} + .d2-1647598332 .background-color-B1{background-color:#0D32B2;} + .d2-1647598332 .background-color-B2{background-color:#0D32B2;} + .d2-1647598332 .background-color-B3{background-color:#E3E9FD;} + .d2-1647598332 .background-color-B4{background-color:#E3E9FD;} + .d2-1647598332 .background-color-B5{background-color:#EDF0FD;} + .d2-1647598332 .background-color-B6{background-color:#F7F8FE;} + .d2-1647598332 .background-color-AA2{background-color:#4A6FF3;} + .d2-1647598332 .background-color-AA4{background-color:#EDF0FD;} + .d2-1647598332 .background-color-AA5{background-color:#F7F8FE;} + .d2-1647598332 .background-color-AB4{background-color:#EDF0FD;} + .d2-1647598332 .background-color-AB5{background-color:#F7F8FE;} + .d2-1647598332 .color-N1{color:#0A0F25;} + .d2-1647598332 .color-N2{color:#676C7E;} + .d2-1647598332 .color-N3{color:#9499AB;} + .d2-1647598332 .color-N4{color:#CFD2DD;} + .d2-1647598332 .color-N5{color:#DEE1EB;} + .d2-1647598332 .color-N6{color:#EEF1F8;} + .d2-1647598332 .color-N7{color:#FFFFFF;} + .d2-1647598332 .color-B1{color:#0D32B2;} + .d2-1647598332 .color-B2{color:#0D32B2;} + .d2-1647598332 .color-B3{color:#E3E9FD;} + .d2-1647598332 .color-B4{color:#E3E9FD;} + .d2-1647598332 .color-B5{color:#EDF0FD;} + .d2-1647598332 .color-B6{color:#F7F8FE;} + .d2-1647598332 .color-AA2{color:#4A6FF3;} + .d2-1647598332 .color-AA4{color:#EDF0FD;} + .d2-1647598332 .color-AA5{color:#F7F8FE;} + .d2-1647598332 .color-AB4{color:#EDF0FD;} + .d2-1647598332 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker-d2-1647598332);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker-d2-1647598332);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright-d2-1647598332);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright-d2-1647598332);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright-d2-1647598332);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright-d2-1647598332);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark-d2-1647598332);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright-d2-1647598332);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright-d2-1647598332);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright-d2-1647598332);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright-d2-1647598332);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker-d2-1647598332);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark-d2-1647598332);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal-d2-1647598332);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal-d2-1647598332);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright-d2-1647598332);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright-d2-1647598332);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright-d2-1647598332);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>abcdabcab diff --git a/e2etests/testdata/txtar/cycle-diagram/elk/board.exp.json b/e2etests/testdata/txtar/cycle-diagram/elk/board.exp.json index 705165701c..89c1a9e884 100644 --- a/e2etests/testdata/txtar/cycle-diagram/elk/board.exp.json +++ b/e2etests/testdata/txtar/cycle-diagram/elk/board.exp.json @@ -864,8 +864,8 @@ "y": -25.47599983215332 }, { - "x": 208.9219970703125, - "y": -22.972000122070312 + "x": 208.7570037841797, + "y": -23.95800018310547 }, { "x": 209.2519989013672, @@ -1228,8 +1228,8 @@ "y": 209.53700256347656 }, { - "x": 40.481998443603516, - "y": 209.96499633789062 + "x": 41.472999572753906, + "y": 209.83200073242188 }, { "x": 38.5, @@ -1592,8 +1592,8 @@ "y": 49.47600173950195 }, { - "x": -184.9219970703125, - "y": 46.97200012207031 + "x": -184.7570037841797, + "y": 47.95800018310547 }, { "x": -185.2519989013672, @@ -1972,8 +1972,8 @@ "y": 123.8030014038086 }, { - "x": 674.60302734375, - "y": 127.11499786376953 + "x": 674.93798828125, + "y": 126.1729965209961 }, { "x": 673.9329833984375, @@ -2336,8 +2336,8 @@ "y": 198.90899658203125 }, { - "x": 337.47198486328125, - "y": 196.4929962158203 + "x": 338.1369934082031, + "y": 197.24000549316406 }, { "x": 336.1419982910156, diff --git a/e2etests/testdata/txtar/cycle-diagram/elk/sketch.exp.svg b/e2etests/testdata/txtar/cycle-diagram/elk/sketch.exp.svg index 9144454e4f..0609a3905d 100644 --- a/e2etests/testdata/txtar/cycle-diagram/elk/sketch.exp.svg +++ b/e2etests/testdata/txtar/cycle-diagram/elk/sketch.exp.svg @@ -1,9 +1,9 @@ -abcdabcab + .d2-771028173 .fill-N1{fill:#0A0F25;} + .d2-771028173 .fill-N2{fill:#676C7E;} + .d2-771028173 .fill-N3{fill:#9499AB;} + .d2-771028173 .fill-N4{fill:#CFD2DD;} + .d2-771028173 .fill-N5{fill:#DEE1EB;} + .d2-771028173 .fill-N6{fill:#EEF1F8;} + .d2-771028173 .fill-N7{fill:#FFFFFF;} + .d2-771028173 .fill-B1{fill:#0D32B2;} + .d2-771028173 .fill-B2{fill:#0D32B2;} + .d2-771028173 .fill-B3{fill:#E3E9FD;} + .d2-771028173 .fill-B4{fill:#E3E9FD;} + .d2-771028173 .fill-B5{fill:#EDF0FD;} + .d2-771028173 .fill-B6{fill:#F7F8FE;} + .d2-771028173 .fill-AA2{fill:#4A6FF3;} + .d2-771028173 .fill-AA4{fill:#EDF0FD;} + .d2-771028173 .fill-AA5{fill:#F7F8FE;} + .d2-771028173 .fill-AB4{fill:#EDF0FD;} + .d2-771028173 .fill-AB5{fill:#F7F8FE;} + .d2-771028173 .stroke-N1{stroke:#0A0F25;} + .d2-771028173 .stroke-N2{stroke:#676C7E;} + .d2-771028173 .stroke-N3{stroke:#9499AB;} + .d2-771028173 .stroke-N4{stroke:#CFD2DD;} + .d2-771028173 .stroke-N5{stroke:#DEE1EB;} + .d2-771028173 .stroke-N6{stroke:#EEF1F8;} + .d2-771028173 .stroke-N7{stroke:#FFFFFF;} + .d2-771028173 .stroke-B1{stroke:#0D32B2;} + .d2-771028173 .stroke-B2{stroke:#0D32B2;} + .d2-771028173 .stroke-B3{stroke:#E3E9FD;} + .d2-771028173 .stroke-B4{stroke:#E3E9FD;} + .d2-771028173 .stroke-B5{stroke:#EDF0FD;} + .d2-771028173 .stroke-B6{stroke:#F7F8FE;} + .d2-771028173 .stroke-AA2{stroke:#4A6FF3;} + .d2-771028173 .stroke-AA4{stroke:#EDF0FD;} + .d2-771028173 .stroke-AA5{stroke:#F7F8FE;} + .d2-771028173 .stroke-AB4{stroke:#EDF0FD;} + .d2-771028173 .stroke-AB5{stroke:#F7F8FE;} + .d2-771028173 .background-color-N1{background-color:#0A0F25;} + .d2-771028173 .background-color-N2{background-color:#676C7E;} + .d2-771028173 .background-color-N3{background-color:#9499AB;} + .d2-771028173 .background-color-N4{background-color:#CFD2DD;} + .d2-771028173 .background-color-N5{background-color:#DEE1EB;} + .d2-771028173 .background-color-N6{background-color:#EEF1F8;} + .d2-771028173 .background-color-N7{background-color:#FFFFFF;} + .d2-771028173 .background-color-B1{background-color:#0D32B2;} + .d2-771028173 .background-color-B2{background-color:#0D32B2;} + .d2-771028173 .background-color-B3{background-color:#E3E9FD;} + .d2-771028173 .background-color-B4{background-color:#E3E9FD;} + .d2-771028173 .background-color-B5{background-color:#EDF0FD;} + .d2-771028173 .background-color-B6{background-color:#F7F8FE;} + .d2-771028173 .background-color-AA2{background-color:#4A6FF3;} + .d2-771028173 .background-color-AA4{background-color:#EDF0FD;} + .d2-771028173 .background-color-AA5{background-color:#F7F8FE;} + .d2-771028173 .background-color-AB4{background-color:#EDF0FD;} + .d2-771028173 .background-color-AB5{background-color:#F7F8FE;} + .d2-771028173 .color-N1{color:#0A0F25;} + .d2-771028173 .color-N2{color:#676C7E;} + .d2-771028173 .color-N3{color:#9499AB;} + .d2-771028173 .color-N4{color:#CFD2DD;} + .d2-771028173 .color-N5{color:#DEE1EB;} + .d2-771028173 .color-N6{color:#EEF1F8;} + .d2-771028173 .color-N7{color:#FFFFFF;} + .d2-771028173 .color-B1{color:#0D32B2;} + .d2-771028173 .color-B2{color:#0D32B2;} + .d2-771028173 .color-B3{color:#E3E9FD;} + .d2-771028173 .color-B4{color:#E3E9FD;} + .d2-771028173 .color-B5{color:#EDF0FD;} + .d2-771028173 .color-B6{color:#F7F8FE;} + .d2-771028173 .color-AA2{color:#4A6FF3;} + .d2-771028173 .color-AA4{color:#EDF0FD;} + .d2-771028173 .color-AA5{color:#F7F8FE;} + .d2-771028173 .color-AB4{color:#EDF0FD;} + .d2-771028173 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker-d2-771028173);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker-d2-771028173);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright-d2-771028173);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright-d2-771028173);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright-d2-771028173);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright-d2-771028173);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark-d2-771028173);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright-d2-771028173);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright-d2-771028173);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright-d2-771028173);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright-d2-771028173);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker-d2-771028173);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark-d2-771028173);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal-d2-771028173);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal-d2-771028173);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright-d2-771028173);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright-d2-771028173);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright-d2-771028173);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>abcdabcab From 4ee9617eb2339df72a8b76d061f0e67fd8155e6c Mon Sep 17 00:00:00 2001 From: Mayank Mohapatra <125661248+Mayank77maruti@users.noreply.github.com> Date: Sun, 23 Feb 2025 16:57:17 +0000 Subject: [PATCH 51/73] try --- d2layouts/d2cycle/layout.go | 2 +- .../txtar/cycle-diagram/dagre/board.exp.json | 20 +-- .../txtar/cycle-diagram/dagre/sketch.exp.svg | 152 +++++++++--------- .../txtar/cycle-diagram/elk/board.exp.json | 20 +-- .../txtar/cycle-diagram/elk/sketch.exp.svg | 152 +++++++++--------- 5 files changed, 173 insertions(+), 173 deletions(-) diff --git a/d2layouts/d2cycle/layout.go b/d2layouts/d2cycle/layout.go index 6b43701ef3..f19b43eca0 100644 --- a/d2layouts/d2cycle/layout.go +++ b/d2layouts/d2cycle/layout.go @@ -119,7 +119,7 @@ func createCircularArc(edge *d2graph.Edge) { tangentX /= mag tangentY /= mag } - const MIN_SEGMENT_LEN = 3.0 + const MIN_SEGMENT_LEN = 4.5 // Calculate current segment direction dx := lastPoint.X - secondLastPoint.X dy := lastPoint.Y - secondLastPoint.Y diff --git a/e2etests/testdata/txtar/cycle-diagram/dagre/board.exp.json b/e2etests/testdata/txtar/cycle-diagram/dagre/board.exp.json index 05c69e8ef7..8f7dc1e95f 100644 --- a/e2etests/testdata/txtar/cycle-diagram/dagre/board.exp.json +++ b/e2etests/testdata/txtar/cycle-diagram/dagre/board.exp.json @@ -864,8 +864,8 @@ "y": -37.47600173950195 }, { - "x": 196.7570037841797, - "y": -35.95800018310547 + "x": 196.50999450683594, + "y": -37.4379997253418 }, { "x": 197.2519989013672, @@ -1228,8 +1228,8 @@ "y": 197.53700256347656 }, { - "x": 29.472999572753906, - "y": 197.83200073242188 + "x": 30.959999084472656, + "y": 197.63400268554688 }, { "x": 26.5, @@ -1592,8 +1592,8 @@ "y": 37.47600173950195 }, { - "x": -196.7570037841797, - "y": 35.95800018310547 + "x": -196.50999450683594, + "y": 37.4379997253418 }, { "x": -197.2519989013672, @@ -1972,8 +1972,8 @@ "y": 111.8030014038086 }, { - "x": 702.43798828125, - "y": 114.1729965209961 + "x": 702.9409790039062, + "y": 112.76000213623047 }, { "x": 701.4329833984375, @@ -2336,8 +2336,8 @@ "y": 186.90899658203125 }, { - "x": 365.6369934082031, - "y": 185.24000549316406 + "x": 366.635009765625, + "y": 186.36000061035156 }, { "x": 363.6419982910156, diff --git a/e2etests/testdata/txtar/cycle-diagram/dagre/sketch.exp.svg b/e2etests/testdata/txtar/cycle-diagram/dagre/sketch.exp.svg index 7146e41621..7fa010dec5 100644 --- a/e2etests/testdata/txtar/cycle-diagram/dagre/sketch.exp.svg +++ b/e2etests/testdata/txtar/cycle-diagram/dagre/sketch.exp.svg @@ -1,9 +1,9 @@ -abcdabcab + .d2-3422581343 .fill-N1{fill:#0A0F25;} + .d2-3422581343 .fill-N2{fill:#676C7E;} + .d2-3422581343 .fill-N3{fill:#9499AB;} + .d2-3422581343 .fill-N4{fill:#CFD2DD;} + .d2-3422581343 .fill-N5{fill:#DEE1EB;} + .d2-3422581343 .fill-N6{fill:#EEF1F8;} + .d2-3422581343 .fill-N7{fill:#FFFFFF;} + .d2-3422581343 .fill-B1{fill:#0D32B2;} + .d2-3422581343 .fill-B2{fill:#0D32B2;} + .d2-3422581343 .fill-B3{fill:#E3E9FD;} + .d2-3422581343 .fill-B4{fill:#E3E9FD;} + .d2-3422581343 .fill-B5{fill:#EDF0FD;} + .d2-3422581343 .fill-B6{fill:#F7F8FE;} + .d2-3422581343 .fill-AA2{fill:#4A6FF3;} + .d2-3422581343 .fill-AA4{fill:#EDF0FD;} + .d2-3422581343 .fill-AA5{fill:#F7F8FE;} + .d2-3422581343 .fill-AB4{fill:#EDF0FD;} + .d2-3422581343 .fill-AB5{fill:#F7F8FE;} + .d2-3422581343 .stroke-N1{stroke:#0A0F25;} + .d2-3422581343 .stroke-N2{stroke:#676C7E;} + .d2-3422581343 .stroke-N3{stroke:#9499AB;} + .d2-3422581343 .stroke-N4{stroke:#CFD2DD;} + .d2-3422581343 .stroke-N5{stroke:#DEE1EB;} + .d2-3422581343 .stroke-N6{stroke:#EEF1F8;} + .d2-3422581343 .stroke-N7{stroke:#FFFFFF;} + .d2-3422581343 .stroke-B1{stroke:#0D32B2;} + .d2-3422581343 .stroke-B2{stroke:#0D32B2;} + .d2-3422581343 .stroke-B3{stroke:#E3E9FD;} + .d2-3422581343 .stroke-B4{stroke:#E3E9FD;} + .d2-3422581343 .stroke-B5{stroke:#EDF0FD;} + .d2-3422581343 .stroke-B6{stroke:#F7F8FE;} + .d2-3422581343 .stroke-AA2{stroke:#4A6FF3;} + .d2-3422581343 .stroke-AA4{stroke:#EDF0FD;} + .d2-3422581343 .stroke-AA5{stroke:#F7F8FE;} + .d2-3422581343 .stroke-AB4{stroke:#EDF0FD;} + .d2-3422581343 .stroke-AB5{stroke:#F7F8FE;} + .d2-3422581343 .background-color-N1{background-color:#0A0F25;} + .d2-3422581343 .background-color-N2{background-color:#676C7E;} + .d2-3422581343 .background-color-N3{background-color:#9499AB;} + .d2-3422581343 .background-color-N4{background-color:#CFD2DD;} + .d2-3422581343 .background-color-N5{background-color:#DEE1EB;} + .d2-3422581343 .background-color-N6{background-color:#EEF1F8;} + .d2-3422581343 .background-color-N7{background-color:#FFFFFF;} + .d2-3422581343 .background-color-B1{background-color:#0D32B2;} + .d2-3422581343 .background-color-B2{background-color:#0D32B2;} + .d2-3422581343 .background-color-B3{background-color:#E3E9FD;} + .d2-3422581343 .background-color-B4{background-color:#E3E9FD;} + .d2-3422581343 .background-color-B5{background-color:#EDF0FD;} + .d2-3422581343 .background-color-B6{background-color:#F7F8FE;} + .d2-3422581343 .background-color-AA2{background-color:#4A6FF3;} + .d2-3422581343 .background-color-AA4{background-color:#EDF0FD;} + .d2-3422581343 .background-color-AA5{background-color:#F7F8FE;} + .d2-3422581343 .background-color-AB4{background-color:#EDF0FD;} + .d2-3422581343 .background-color-AB5{background-color:#F7F8FE;} + .d2-3422581343 .color-N1{color:#0A0F25;} + .d2-3422581343 .color-N2{color:#676C7E;} + .d2-3422581343 .color-N3{color:#9499AB;} + .d2-3422581343 .color-N4{color:#CFD2DD;} + .d2-3422581343 .color-N5{color:#DEE1EB;} + .d2-3422581343 .color-N6{color:#EEF1F8;} + .d2-3422581343 .color-N7{color:#FFFFFF;} + .d2-3422581343 .color-B1{color:#0D32B2;} + .d2-3422581343 .color-B2{color:#0D32B2;} + .d2-3422581343 .color-B3{color:#E3E9FD;} + .d2-3422581343 .color-B4{color:#E3E9FD;} + .d2-3422581343 .color-B5{color:#EDF0FD;} + .d2-3422581343 .color-B6{color:#F7F8FE;} + .d2-3422581343 .color-AA2{color:#4A6FF3;} + .d2-3422581343 .color-AA4{color:#EDF0FD;} + .d2-3422581343 .color-AA5{color:#F7F8FE;} + .d2-3422581343 .color-AB4{color:#EDF0FD;} + .d2-3422581343 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker-d2-3422581343);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker-d2-3422581343);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright-d2-3422581343);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright-d2-3422581343);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright-d2-3422581343);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright-d2-3422581343);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark-d2-3422581343);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright-d2-3422581343);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright-d2-3422581343);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright-d2-3422581343);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright-d2-3422581343);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker-d2-3422581343);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark-d2-3422581343);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal-d2-3422581343);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal-d2-3422581343);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright-d2-3422581343);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright-d2-3422581343);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright-d2-3422581343);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>abcdabcab diff --git a/e2etests/testdata/txtar/cycle-diagram/elk/board.exp.json b/e2etests/testdata/txtar/cycle-diagram/elk/board.exp.json index 89c1a9e884..47987011af 100644 --- a/e2etests/testdata/txtar/cycle-diagram/elk/board.exp.json +++ b/e2etests/testdata/txtar/cycle-diagram/elk/board.exp.json @@ -864,8 +864,8 @@ "y": -25.47599983215332 }, { - "x": 208.7570037841797, - "y": -23.95800018310547 + "x": 208.50999450683594, + "y": -25.437999725341797 }, { "x": 209.2519989013672, @@ -1228,8 +1228,8 @@ "y": 209.53700256347656 }, { - "x": 41.472999572753906, - "y": 209.83200073242188 + "x": 42.959999084472656, + "y": 209.63400268554688 }, { "x": 38.5, @@ -1592,8 +1592,8 @@ "y": 49.47600173950195 }, { - "x": -184.7570037841797, - "y": 47.95800018310547 + "x": -184.50999450683594, + "y": 49.4379997253418 }, { "x": -185.2519989013672, @@ -1972,8 +1972,8 @@ "y": 123.8030014038086 }, { - "x": 674.93798828125, - "y": 126.1729965209961 + "x": 675.4409790039062, + "y": 124.76000213623047 }, { "x": 673.9329833984375, @@ -2336,8 +2336,8 @@ "y": 198.90899658203125 }, { - "x": 338.1369934082031, - "y": 197.24000549316406 + "x": 339.135009765625, + "y": 198.36000061035156 }, { "x": 336.1419982910156, diff --git a/e2etests/testdata/txtar/cycle-diagram/elk/sketch.exp.svg b/e2etests/testdata/txtar/cycle-diagram/elk/sketch.exp.svg index 0609a3905d..22603e02f2 100644 --- a/e2etests/testdata/txtar/cycle-diagram/elk/sketch.exp.svg +++ b/e2etests/testdata/txtar/cycle-diagram/elk/sketch.exp.svg @@ -1,9 +1,9 @@ -abcdabcab + .d2-1526113461 .fill-N1{fill:#0A0F25;} + .d2-1526113461 .fill-N2{fill:#676C7E;} + .d2-1526113461 .fill-N3{fill:#9499AB;} + .d2-1526113461 .fill-N4{fill:#CFD2DD;} + .d2-1526113461 .fill-N5{fill:#DEE1EB;} + .d2-1526113461 .fill-N6{fill:#EEF1F8;} + .d2-1526113461 .fill-N7{fill:#FFFFFF;} + .d2-1526113461 .fill-B1{fill:#0D32B2;} + .d2-1526113461 .fill-B2{fill:#0D32B2;} + .d2-1526113461 .fill-B3{fill:#E3E9FD;} + .d2-1526113461 .fill-B4{fill:#E3E9FD;} + .d2-1526113461 .fill-B5{fill:#EDF0FD;} + .d2-1526113461 .fill-B6{fill:#F7F8FE;} + .d2-1526113461 .fill-AA2{fill:#4A6FF3;} + .d2-1526113461 .fill-AA4{fill:#EDF0FD;} + .d2-1526113461 .fill-AA5{fill:#F7F8FE;} + .d2-1526113461 .fill-AB4{fill:#EDF0FD;} + .d2-1526113461 .fill-AB5{fill:#F7F8FE;} + .d2-1526113461 .stroke-N1{stroke:#0A0F25;} + .d2-1526113461 .stroke-N2{stroke:#676C7E;} + .d2-1526113461 .stroke-N3{stroke:#9499AB;} + .d2-1526113461 .stroke-N4{stroke:#CFD2DD;} + .d2-1526113461 .stroke-N5{stroke:#DEE1EB;} + .d2-1526113461 .stroke-N6{stroke:#EEF1F8;} + .d2-1526113461 .stroke-N7{stroke:#FFFFFF;} + .d2-1526113461 .stroke-B1{stroke:#0D32B2;} + .d2-1526113461 .stroke-B2{stroke:#0D32B2;} + .d2-1526113461 .stroke-B3{stroke:#E3E9FD;} + .d2-1526113461 .stroke-B4{stroke:#E3E9FD;} + .d2-1526113461 .stroke-B5{stroke:#EDF0FD;} + .d2-1526113461 .stroke-B6{stroke:#F7F8FE;} + .d2-1526113461 .stroke-AA2{stroke:#4A6FF3;} + .d2-1526113461 .stroke-AA4{stroke:#EDF0FD;} + .d2-1526113461 .stroke-AA5{stroke:#F7F8FE;} + .d2-1526113461 .stroke-AB4{stroke:#EDF0FD;} + .d2-1526113461 .stroke-AB5{stroke:#F7F8FE;} + .d2-1526113461 .background-color-N1{background-color:#0A0F25;} + .d2-1526113461 .background-color-N2{background-color:#676C7E;} + .d2-1526113461 .background-color-N3{background-color:#9499AB;} + .d2-1526113461 .background-color-N4{background-color:#CFD2DD;} + .d2-1526113461 .background-color-N5{background-color:#DEE1EB;} + .d2-1526113461 .background-color-N6{background-color:#EEF1F8;} + .d2-1526113461 .background-color-N7{background-color:#FFFFFF;} + .d2-1526113461 .background-color-B1{background-color:#0D32B2;} + .d2-1526113461 .background-color-B2{background-color:#0D32B2;} + .d2-1526113461 .background-color-B3{background-color:#E3E9FD;} + .d2-1526113461 .background-color-B4{background-color:#E3E9FD;} + .d2-1526113461 .background-color-B5{background-color:#EDF0FD;} + .d2-1526113461 .background-color-B6{background-color:#F7F8FE;} + .d2-1526113461 .background-color-AA2{background-color:#4A6FF3;} + .d2-1526113461 .background-color-AA4{background-color:#EDF0FD;} + .d2-1526113461 .background-color-AA5{background-color:#F7F8FE;} + .d2-1526113461 .background-color-AB4{background-color:#EDF0FD;} + .d2-1526113461 .background-color-AB5{background-color:#F7F8FE;} + .d2-1526113461 .color-N1{color:#0A0F25;} + .d2-1526113461 .color-N2{color:#676C7E;} + .d2-1526113461 .color-N3{color:#9499AB;} + .d2-1526113461 .color-N4{color:#CFD2DD;} + .d2-1526113461 .color-N5{color:#DEE1EB;} + .d2-1526113461 .color-N6{color:#EEF1F8;} + .d2-1526113461 .color-N7{color:#FFFFFF;} + .d2-1526113461 .color-B1{color:#0D32B2;} + .d2-1526113461 .color-B2{color:#0D32B2;} + .d2-1526113461 .color-B3{color:#E3E9FD;} + .d2-1526113461 .color-B4{color:#E3E9FD;} + .d2-1526113461 .color-B5{color:#EDF0FD;} + .d2-1526113461 .color-B6{color:#F7F8FE;} + .d2-1526113461 .color-AA2{color:#4A6FF3;} + .d2-1526113461 .color-AA4{color:#EDF0FD;} + .d2-1526113461 .color-AA5{color:#F7F8FE;} + .d2-1526113461 .color-AB4{color:#EDF0FD;} + .d2-1526113461 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker-d2-1526113461);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker-d2-1526113461);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright-d2-1526113461);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright-d2-1526113461);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright-d2-1526113461);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright-d2-1526113461);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark-d2-1526113461);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright-d2-1526113461);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright-d2-1526113461);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright-d2-1526113461);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright-d2-1526113461);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker-d2-1526113461);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark-d2-1526113461);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal-d2-1526113461);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal-d2-1526113461);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright-d2-1526113461);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright-d2-1526113461);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright-d2-1526113461);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>abcdabcab From 460a118e749d3d0a88b55b8e6259ff3e3a1609a2 Mon Sep 17 00:00:00 2001 From: Mayank Mohapatra <125661248+Mayank77maruti@users.noreply.github.com> Date: Sun, 23 Feb 2025 16:57:48 +0000 Subject: [PATCH 52/73] try --- d2layouts/d2cycle/layout.go | 2 +- .../txtar/cycle-diagram/dagre/board.exp.json | 20 +-- .../txtar/cycle-diagram/dagre/sketch.exp.svg | 152 +++++++++--------- .../txtar/cycle-diagram/elk/board.exp.json | 20 +-- .../txtar/cycle-diagram/elk/sketch.exp.svg | 152 +++++++++--------- 5 files changed, 173 insertions(+), 173 deletions(-) diff --git a/d2layouts/d2cycle/layout.go b/d2layouts/d2cycle/layout.go index f19b43eca0..30a3b958b4 100644 --- a/d2layouts/d2cycle/layout.go +++ b/d2layouts/d2cycle/layout.go @@ -119,7 +119,7 @@ func createCircularArc(edge *d2graph.Edge) { tangentX /= mag tangentY /= mag } - const MIN_SEGMENT_LEN = 4.5 + const MIN_SEGMENT_LEN = 4.2 // Calculate current segment direction dx := lastPoint.X - secondLastPoint.X dy := lastPoint.Y - secondLastPoint.Y diff --git a/e2etests/testdata/txtar/cycle-diagram/dagre/board.exp.json b/e2etests/testdata/txtar/cycle-diagram/dagre/board.exp.json index 8f7dc1e95f..3ee336ef21 100644 --- a/e2etests/testdata/txtar/cycle-diagram/dagre/board.exp.json +++ b/e2etests/testdata/txtar/cycle-diagram/dagre/board.exp.json @@ -864,8 +864,8 @@ "y": -37.47600173950195 }, { - "x": 196.50999450683594, - "y": -37.4379997253418 + "x": 196.5590057373047, + "y": -37.141998291015625 }, { "x": 197.2519989013672, @@ -1228,8 +1228,8 @@ "y": 197.53700256347656 }, { - "x": 30.959999084472656, - "y": 197.63400268554688 + "x": 30.66200065612793, + "y": 197.67300415039062 }, { "x": 26.5, @@ -1592,8 +1592,8 @@ "y": 37.47600173950195 }, { - "x": -196.50999450683594, - "y": 37.4379997253418 + "x": -196.5590057373047, + "y": 37.141998291015625 }, { "x": -197.2519989013672, @@ -1972,8 +1972,8 @@ "y": 111.8030014038086 }, { - "x": 702.9409790039062, - "y": 112.76000213623047 + "x": 702.8400268554688, + "y": 113.04199981689453 }, { "x": 701.4329833984375, @@ -2336,8 +2336,8 @@ "y": 186.90899658203125 }, { - "x": 366.635009765625, - "y": 186.36000061035156 + "x": 366.43499755859375, + "y": 186.13600158691406 }, { "x": 363.6419982910156, diff --git a/e2etests/testdata/txtar/cycle-diagram/dagre/sketch.exp.svg b/e2etests/testdata/txtar/cycle-diagram/dagre/sketch.exp.svg index 7fa010dec5..39fc6f10a4 100644 --- a/e2etests/testdata/txtar/cycle-diagram/dagre/sketch.exp.svg +++ b/e2etests/testdata/txtar/cycle-diagram/dagre/sketch.exp.svg @@ -1,9 +1,9 @@ -abcdabcab + .d2-1843864254 .fill-N1{fill:#0A0F25;} + .d2-1843864254 .fill-N2{fill:#676C7E;} + .d2-1843864254 .fill-N3{fill:#9499AB;} + .d2-1843864254 .fill-N4{fill:#CFD2DD;} + .d2-1843864254 .fill-N5{fill:#DEE1EB;} + .d2-1843864254 .fill-N6{fill:#EEF1F8;} + .d2-1843864254 .fill-N7{fill:#FFFFFF;} + .d2-1843864254 .fill-B1{fill:#0D32B2;} + .d2-1843864254 .fill-B2{fill:#0D32B2;} + .d2-1843864254 .fill-B3{fill:#E3E9FD;} + .d2-1843864254 .fill-B4{fill:#E3E9FD;} + .d2-1843864254 .fill-B5{fill:#EDF0FD;} + .d2-1843864254 .fill-B6{fill:#F7F8FE;} + .d2-1843864254 .fill-AA2{fill:#4A6FF3;} + .d2-1843864254 .fill-AA4{fill:#EDF0FD;} + .d2-1843864254 .fill-AA5{fill:#F7F8FE;} + .d2-1843864254 .fill-AB4{fill:#EDF0FD;} + .d2-1843864254 .fill-AB5{fill:#F7F8FE;} + .d2-1843864254 .stroke-N1{stroke:#0A0F25;} + .d2-1843864254 .stroke-N2{stroke:#676C7E;} + .d2-1843864254 .stroke-N3{stroke:#9499AB;} + .d2-1843864254 .stroke-N4{stroke:#CFD2DD;} + .d2-1843864254 .stroke-N5{stroke:#DEE1EB;} + .d2-1843864254 .stroke-N6{stroke:#EEF1F8;} + .d2-1843864254 .stroke-N7{stroke:#FFFFFF;} + .d2-1843864254 .stroke-B1{stroke:#0D32B2;} + .d2-1843864254 .stroke-B2{stroke:#0D32B2;} + .d2-1843864254 .stroke-B3{stroke:#E3E9FD;} + .d2-1843864254 .stroke-B4{stroke:#E3E9FD;} + .d2-1843864254 .stroke-B5{stroke:#EDF0FD;} + .d2-1843864254 .stroke-B6{stroke:#F7F8FE;} + .d2-1843864254 .stroke-AA2{stroke:#4A6FF3;} + .d2-1843864254 .stroke-AA4{stroke:#EDF0FD;} + .d2-1843864254 .stroke-AA5{stroke:#F7F8FE;} + .d2-1843864254 .stroke-AB4{stroke:#EDF0FD;} + .d2-1843864254 .stroke-AB5{stroke:#F7F8FE;} + .d2-1843864254 .background-color-N1{background-color:#0A0F25;} + .d2-1843864254 .background-color-N2{background-color:#676C7E;} + .d2-1843864254 .background-color-N3{background-color:#9499AB;} + .d2-1843864254 .background-color-N4{background-color:#CFD2DD;} + .d2-1843864254 .background-color-N5{background-color:#DEE1EB;} + .d2-1843864254 .background-color-N6{background-color:#EEF1F8;} + .d2-1843864254 .background-color-N7{background-color:#FFFFFF;} + .d2-1843864254 .background-color-B1{background-color:#0D32B2;} + .d2-1843864254 .background-color-B2{background-color:#0D32B2;} + .d2-1843864254 .background-color-B3{background-color:#E3E9FD;} + .d2-1843864254 .background-color-B4{background-color:#E3E9FD;} + .d2-1843864254 .background-color-B5{background-color:#EDF0FD;} + .d2-1843864254 .background-color-B6{background-color:#F7F8FE;} + .d2-1843864254 .background-color-AA2{background-color:#4A6FF3;} + .d2-1843864254 .background-color-AA4{background-color:#EDF0FD;} + .d2-1843864254 .background-color-AA5{background-color:#F7F8FE;} + .d2-1843864254 .background-color-AB4{background-color:#EDF0FD;} + .d2-1843864254 .background-color-AB5{background-color:#F7F8FE;} + .d2-1843864254 .color-N1{color:#0A0F25;} + .d2-1843864254 .color-N2{color:#676C7E;} + .d2-1843864254 .color-N3{color:#9499AB;} + .d2-1843864254 .color-N4{color:#CFD2DD;} + .d2-1843864254 .color-N5{color:#DEE1EB;} + .d2-1843864254 .color-N6{color:#EEF1F8;} + .d2-1843864254 .color-N7{color:#FFFFFF;} + .d2-1843864254 .color-B1{color:#0D32B2;} + .d2-1843864254 .color-B2{color:#0D32B2;} + .d2-1843864254 .color-B3{color:#E3E9FD;} + .d2-1843864254 .color-B4{color:#E3E9FD;} + .d2-1843864254 .color-B5{color:#EDF0FD;} + .d2-1843864254 .color-B6{color:#F7F8FE;} + .d2-1843864254 .color-AA2{color:#4A6FF3;} + .d2-1843864254 .color-AA4{color:#EDF0FD;} + .d2-1843864254 .color-AA5{color:#F7F8FE;} + .d2-1843864254 .color-AB4{color:#EDF0FD;} + .d2-1843864254 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker-d2-1843864254);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker-d2-1843864254);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright-d2-1843864254);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright-d2-1843864254);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright-d2-1843864254);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright-d2-1843864254);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark-d2-1843864254);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright-d2-1843864254);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright-d2-1843864254);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright-d2-1843864254);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright-d2-1843864254);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker-d2-1843864254);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark-d2-1843864254);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal-d2-1843864254);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal-d2-1843864254);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright-d2-1843864254);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright-d2-1843864254);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright-d2-1843864254);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>abcdabcab diff --git a/e2etests/testdata/txtar/cycle-diagram/elk/board.exp.json b/e2etests/testdata/txtar/cycle-diagram/elk/board.exp.json index 47987011af..cdd83c7106 100644 --- a/e2etests/testdata/txtar/cycle-diagram/elk/board.exp.json +++ b/e2etests/testdata/txtar/cycle-diagram/elk/board.exp.json @@ -864,8 +864,8 @@ "y": -25.47599983215332 }, { - "x": 208.50999450683594, - "y": -25.437999725341797 + "x": 208.5590057373047, + "y": -25.142000198364258 }, { "x": 209.2519989013672, @@ -1228,8 +1228,8 @@ "y": 209.53700256347656 }, { - "x": 42.959999084472656, - "y": 209.63400268554688 + "x": 42.6619987487793, + "y": 209.67300415039062 }, { "x": 38.5, @@ -1592,8 +1592,8 @@ "y": 49.47600173950195 }, { - "x": -184.50999450683594, - "y": 49.4379997253418 + "x": -184.5590057373047, + "y": 49.141998291015625 }, { "x": -185.2519989013672, @@ -1972,8 +1972,8 @@ "y": 123.8030014038086 }, { - "x": 675.4409790039062, - "y": 124.76000213623047 + "x": 675.3400268554688, + "y": 125.04199981689453 }, { "x": 673.9329833984375, @@ -2336,8 +2336,8 @@ "y": 198.90899658203125 }, { - "x": 339.135009765625, - "y": 198.36000061035156 + "x": 338.93499755859375, + "y": 198.13600158691406 }, { "x": 336.1419982910156, diff --git a/e2etests/testdata/txtar/cycle-diagram/elk/sketch.exp.svg b/e2etests/testdata/txtar/cycle-diagram/elk/sketch.exp.svg index 22603e02f2..998c1c749c 100644 --- a/e2etests/testdata/txtar/cycle-diagram/elk/sketch.exp.svg +++ b/e2etests/testdata/txtar/cycle-diagram/elk/sketch.exp.svg @@ -1,9 +1,9 @@ -abcdabcab + .d2-482289501 .fill-N1{fill:#0A0F25;} + .d2-482289501 .fill-N2{fill:#676C7E;} + .d2-482289501 .fill-N3{fill:#9499AB;} + .d2-482289501 .fill-N4{fill:#CFD2DD;} + .d2-482289501 .fill-N5{fill:#DEE1EB;} + .d2-482289501 .fill-N6{fill:#EEF1F8;} + .d2-482289501 .fill-N7{fill:#FFFFFF;} + .d2-482289501 .fill-B1{fill:#0D32B2;} + .d2-482289501 .fill-B2{fill:#0D32B2;} + .d2-482289501 .fill-B3{fill:#E3E9FD;} + .d2-482289501 .fill-B4{fill:#E3E9FD;} + .d2-482289501 .fill-B5{fill:#EDF0FD;} + .d2-482289501 .fill-B6{fill:#F7F8FE;} + .d2-482289501 .fill-AA2{fill:#4A6FF3;} + .d2-482289501 .fill-AA4{fill:#EDF0FD;} + .d2-482289501 .fill-AA5{fill:#F7F8FE;} + .d2-482289501 .fill-AB4{fill:#EDF0FD;} + .d2-482289501 .fill-AB5{fill:#F7F8FE;} + .d2-482289501 .stroke-N1{stroke:#0A0F25;} + .d2-482289501 .stroke-N2{stroke:#676C7E;} + .d2-482289501 .stroke-N3{stroke:#9499AB;} + .d2-482289501 .stroke-N4{stroke:#CFD2DD;} + .d2-482289501 .stroke-N5{stroke:#DEE1EB;} + .d2-482289501 .stroke-N6{stroke:#EEF1F8;} + .d2-482289501 .stroke-N7{stroke:#FFFFFF;} + .d2-482289501 .stroke-B1{stroke:#0D32B2;} + .d2-482289501 .stroke-B2{stroke:#0D32B2;} + .d2-482289501 .stroke-B3{stroke:#E3E9FD;} + .d2-482289501 .stroke-B4{stroke:#E3E9FD;} + .d2-482289501 .stroke-B5{stroke:#EDF0FD;} + .d2-482289501 .stroke-B6{stroke:#F7F8FE;} + .d2-482289501 .stroke-AA2{stroke:#4A6FF3;} + .d2-482289501 .stroke-AA4{stroke:#EDF0FD;} + .d2-482289501 .stroke-AA5{stroke:#F7F8FE;} + .d2-482289501 .stroke-AB4{stroke:#EDF0FD;} + .d2-482289501 .stroke-AB5{stroke:#F7F8FE;} + .d2-482289501 .background-color-N1{background-color:#0A0F25;} + .d2-482289501 .background-color-N2{background-color:#676C7E;} + .d2-482289501 .background-color-N3{background-color:#9499AB;} + .d2-482289501 .background-color-N4{background-color:#CFD2DD;} + .d2-482289501 .background-color-N5{background-color:#DEE1EB;} + .d2-482289501 .background-color-N6{background-color:#EEF1F8;} + .d2-482289501 .background-color-N7{background-color:#FFFFFF;} + .d2-482289501 .background-color-B1{background-color:#0D32B2;} + .d2-482289501 .background-color-B2{background-color:#0D32B2;} + .d2-482289501 .background-color-B3{background-color:#E3E9FD;} + .d2-482289501 .background-color-B4{background-color:#E3E9FD;} + .d2-482289501 .background-color-B5{background-color:#EDF0FD;} + .d2-482289501 .background-color-B6{background-color:#F7F8FE;} + .d2-482289501 .background-color-AA2{background-color:#4A6FF3;} + .d2-482289501 .background-color-AA4{background-color:#EDF0FD;} + .d2-482289501 .background-color-AA5{background-color:#F7F8FE;} + .d2-482289501 .background-color-AB4{background-color:#EDF0FD;} + .d2-482289501 .background-color-AB5{background-color:#F7F8FE;} + .d2-482289501 .color-N1{color:#0A0F25;} + .d2-482289501 .color-N2{color:#676C7E;} + .d2-482289501 .color-N3{color:#9499AB;} + .d2-482289501 .color-N4{color:#CFD2DD;} + .d2-482289501 .color-N5{color:#DEE1EB;} + .d2-482289501 .color-N6{color:#EEF1F8;} + .d2-482289501 .color-N7{color:#FFFFFF;} + .d2-482289501 .color-B1{color:#0D32B2;} + .d2-482289501 .color-B2{color:#0D32B2;} + .d2-482289501 .color-B3{color:#E3E9FD;} + .d2-482289501 .color-B4{color:#E3E9FD;} + .d2-482289501 .color-B5{color:#EDF0FD;} + .d2-482289501 .color-B6{color:#F7F8FE;} + .d2-482289501 .color-AA2{color:#4A6FF3;} + .d2-482289501 .color-AA4{color:#EDF0FD;} + .d2-482289501 .color-AA5{color:#F7F8FE;} + .d2-482289501 .color-AB4{color:#EDF0FD;} + .d2-482289501 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker-d2-482289501);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker-d2-482289501);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright-d2-482289501);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright-d2-482289501);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright-d2-482289501);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright-d2-482289501);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark-d2-482289501);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright-d2-482289501);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright-d2-482289501);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright-d2-482289501);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright-d2-482289501);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker-d2-482289501);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark-d2-482289501);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal-d2-482289501);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal-d2-482289501);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright-d2-482289501);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright-d2-482289501);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright-d2-482289501);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>abcdabcab From ba50bfd2ccd3c53bb8fe7591e4fb99e40f318389 Mon Sep 17 00:00:00 2001 From: Mayank Mohapatra <125661248+Mayank77maruti@users.noreply.github.com> Date: Sun, 23 Feb 2025 16:58:18 +0000 Subject: [PATCH 53/73] try --- d2layouts/d2cycle/layout.go | 2 +- .../txtar/cycle-diagram/dagre/board.exp.json | 20 +-- .../txtar/cycle-diagram/dagre/sketch.exp.svg | 152 +++++++++--------- .../txtar/cycle-diagram/elk/board.exp.json | 20 +-- .../txtar/cycle-diagram/elk/sketch.exp.svg | 152 +++++++++--------- 5 files changed, 173 insertions(+), 173 deletions(-) diff --git a/d2layouts/d2cycle/layout.go b/d2layouts/d2cycle/layout.go index 30a3b958b4..8c276786d8 100644 --- a/d2layouts/d2cycle/layout.go +++ b/d2layouts/d2cycle/layout.go @@ -119,7 +119,7 @@ func createCircularArc(edge *d2graph.Edge) { tangentX /= mag tangentY /= mag } - const MIN_SEGMENT_LEN = 4.2 + const MIN_SEGMENT_LEN = 4.255 // Calculate current segment direction dx := lastPoint.X - secondLastPoint.X dy := lastPoint.Y - secondLastPoint.Y diff --git a/e2etests/testdata/txtar/cycle-diagram/dagre/board.exp.json b/e2etests/testdata/txtar/cycle-diagram/dagre/board.exp.json index 3ee336ef21..22305b18dc 100644 --- a/e2etests/testdata/txtar/cycle-diagram/dagre/board.exp.json +++ b/e2etests/testdata/txtar/cycle-diagram/dagre/board.exp.json @@ -864,8 +864,8 @@ "y": -37.47600173950195 }, { - "x": 196.5590057373047, - "y": -37.141998291015625 + "x": 196.5500030517578, + "y": -37.19599914550781 }, { "x": 197.2519989013672, @@ -1228,8 +1228,8 @@ "y": 197.53700256347656 }, { - "x": 30.66200065612793, - "y": 197.67300415039062 + "x": 30.716999053955078, + "y": 197.66600036621094 }, { "x": 26.5, @@ -1592,8 +1592,8 @@ "y": 37.47600173950195 }, { - "x": -196.5590057373047, - "y": 37.141998291015625 + "x": -196.5500030517578, + "y": 37.19599914550781 }, { "x": -197.2519989013672, @@ -1972,8 +1972,8 @@ "y": 111.8030014038086 }, { - "x": 702.8400268554688, - "y": 113.04199981689453 + "x": 702.8590087890625, + "y": 112.98999786376953 }, { "x": 701.4329833984375, @@ -2336,8 +2336,8 @@ "y": 186.90899658203125 }, { - "x": 366.43499755859375, - "y": 186.13600158691406 + "x": 366.47198486328125, + "y": 186.177001953125 }, { "x": 363.6419982910156, diff --git a/e2etests/testdata/txtar/cycle-diagram/dagre/sketch.exp.svg b/e2etests/testdata/txtar/cycle-diagram/dagre/sketch.exp.svg index 39fc6f10a4..88a40d4eb5 100644 --- a/e2etests/testdata/txtar/cycle-diagram/dagre/sketch.exp.svg +++ b/e2etests/testdata/txtar/cycle-diagram/dagre/sketch.exp.svg @@ -1,9 +1,9 @@ -abcdabcab + .d2-2471463271 .fill-N1{fill:#0A0F25;} + .d2-2471463271 .fill-N2{fill:#676C7E;} + .d2-2471463271 .fill-N3{fill:#9499AB;} + .d2-2471463271 .fill-N4{fill:#CFD2DD;} + .d2-2471463271 .fill-N5{fill:#DEE1EB;} + .d2-2471463271 .fill-N6{fill:#EEF1F8;} + .d2-2471463271 .fill-N7{fill:#FFFFFF;} + .d2-2471463271 .fill-B1{fill:#0D32B2;} + .d2-2471463271 .fill-B2{fill:#0D32B2;} + .d2-2471463271 .fill-B3{fill:#E3E9FD;} + .d2-2471463271 .fill-B4{fill:#E3E9FD;} + .d2-2471463271 .fill-B5{fill:#EDF0FD;} + .d2-2471463271 .fill-B6{fill:#F7F8FE;} + .d2-2471463271 .fill-AA2{fill:#4A6FF3;} + .d2-2471463271 .fill-AA4{fill:#EDF0FD;} + .d2-2471463271 .fill-AA5{fill:#F7F8FE;} + .d2-2471463271 .fill-AB4{fill:#EDF0FD;} + .d2-2471463271 .fill-AB5{fill:#F7F8FE;} + .d2-2471463271 .stroke-N1{stroke:#0A0F25;} + .d2-2471463271 .stroke-N2{stroke:#676C7E;} + .d2-2471463271 .stroke-N3{stroke:#9499AB;} + .d2-2471463271 .stroke-N4{stroke:#CFD2DD;} + .d2-2471463271 .stroke-N5{stroke:#DEE1EB;} + .d2-2471463271 .stroke-N6{stroke:#EEF1F8;} + .d2-2471463271 .stroke-N7{stroke:#FFFFFF;} + .d2-2471463271 .stroke-B1{stroke:#0D32B2;} + .d2-2471463271 .stroke-B2{stroke:#0D32B2;} + .d2-2471463271 .stroke-B3{stroke:#E3E9FD;} + .d2-2471463271 .stroke-B4{stroke:#E3E9FD;} + .d2-2471463271 .stroke-B5{stroke:#EDF0FD;} + .d2-2471463271 .stroke-B6{stroke:#F7F8FE;} + .d2-2471463271 .stroke-AA2{stroke:#4A6FF3;} + .d2-2471463271 .stroke-AA4{stroke:#EDF0FD;} + .d2-2471463271 .stroke-AA5{stroke:#F7F8FE;} + .d2-2471463271 .stroke-AB4{stroke:#EDF0FD;} + .d2-2471463271 .stroke-AB5{stroke:#F7F8FE;} + .d2-2471463271 .background-color-N1{background-color:#0A0F25;} + .d2-2471463271 .background-color-N2{background-color:#676C7E;} + .d2-2471463271 .background-color-N3{background-color:#9499AB;} + .d2-2471463271 .background-color-N4{background-color:#CFD2DD;} + .d2-2471463271 .background-color-N5{background-color:#DEE1EB;} + .d2-2471463271 .background-color-N6{background-color:#EEF1F8;} + .d2-2471463271 .background-color-N7{background-color:#FFFFFF;} + .d2-2471463271 .background-color-B1{background-color:#0D32B2;} + .d2-2471463271 .background-color-B2{background-color:#0D32B2;} + .d2-2471463271 .background-color-B3{background-color:#E3E9FD;} + .d2-2471463271 .background-color-B4{background-color:#E3E9FD;} + .d2-2471463271 .background-color-B5{background-color:#EDF0FD;} + .d2-2471463271 .background-color-B6{background-color:#F7F8FE;} + .d2-2471463271 .background-color-AA2{background-color:#4A6FF3;} + .d2-2471463271 .background-color-AA4{background-color:#EDF0FD;} + .d2-2471463271 .background-color-AA5{background-color:#F7F8FE;} + .d2-2471463271 .background-color-AB4{background-color:#EDF0FD;} + .d2-2471463271 .background-color-AB5{background-color:#F7F8FE;} + .d2-2471463271 .color-N1{color:#0A0F25;} + .d2-2471463271 .color-N2{color:#676C7E;} + .d2-2471463271 .color-N3{color:#9499AB;} + .d2-2471463271 .color-N4{color:#CFD2DD;} + .d2-2471463271 .color-N5{color:#DEE1EB;} + .d2-2471463271 .color-N6{color:#EEF1F8;} + .d2-2471463271 .color-N7{color:#FFFFFF;} + .d2-2471463271 .color-B1{color:#0D32B2;} + .d2-2471463271 .color-B2{color:#0D32B2;} + .d2-2471463271 .color-B3{color:#E3E9FD;} + .d2-2471463271 .color-B4{color:#E3E9FD;} + .d2-2471463271 .color-B5{color:#EDF0FD;} + .d2-2471463271 .color-B6{color:#F7F8FE;} + .d2-2471463271 .color-AA2{color:#4A6FF3;} + .d2-2471463271 .color-AA4{color:#EDF0FD;} + .d2-2471463271 .color-AA5{color:#F7F8FE;} + .d2-2471463271 .color-AB4{color:#EDF0FD;} + .d2-2471463271 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker-d2-2471463271);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker-d2-2471463271);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright-d2-2471463271);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright-d2-2471463271);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright-d2-2471463271);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright-d2-2471463271);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark-d2-2471463271);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright-d2-2471463271);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright-d2-2471463271);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright-d2-2471463271);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright-d2-2471463271);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker-d2-2471463271);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark-d2-2471463271);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal-d2-2471463271);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal-d2-2471463271);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright-d2-2471463271);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright-d2-2471463271);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright-d2-2471463271);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>abcdabcab diff --git a/e2etests/testdata/txtar/cycle-diagram/elk/board.exp.json b/e2etests/testdata/txtar/cycle-diagram/elk/board.exp.json index cdd83c7106..f05462190e 100644 --- a/e2etests/testdata/txtar/cycle-diagram/elk/board.exp.json +++ b/e2etests/testdata/txtar/cycle-diagram/elk/board.exp.json @@ -864,8 +864,8 @@ "y": -25.47599983215332 }, { - "x": 208.5590057373047, - "y": -25.142000198364258 + "x": 208.5500030517578, + "y": -25.195999145507812 }, { "x": 209.2519989013672, @@ -1228,8 +1228,8 @@ "y": 209.53700256347656 }, { - "x": 42.6619987487793, - "y": 209.67300415039062 + "x": 42.71699905395508, + "y": 209.66600036621094 }, { "x": 38.5, @@ -1592,8 +1592,8 @@ "y": 49.47600173950195 }, { - "x": -184.5590057373047, - "y": 49.141998291015625 + "x": -184.5500030517578, + "y": 49.19599914550781 }, { "x": -185.2519989013672, @@ -1972,8 +1972,8 @@ "y": 123.8030014038086 }, { - "x": 675.3400268554688, - "y": 125.04199981689453 + "x": 675.3590087890625, + "y": 124.98999786376953 }, { "x": 673.9329833984375, @@ -2336,8 +2336,8 @@ "y": 198.90899658203125 }, { - "x": 338.93499755859375, - "y": 198.13600158691406 + "x": 338.97198486328125, + "y": 198.177001953125 }, { "x": 336.1419982910156, diff --git a/e2etests/testdata/txtar/cycle-diagram/elk/sketch.exp.svg b/e2etests/testdata/txtar/cycle-diagram/elk/sketch.exp.svg index 998c1c749c..144dbb7340 100644 --- a/e2etests/testdata/txtar/cycle-diagram/elk/sketch.exp.svg +++ b/e2etests/testdata/txtar/cycle-diagram/elk/sketch.exp.svg @@ -1,9 +1,9 @@ -abcdabcab + .d2-2514768154 .fill-N1{fill:#0A0F25;} + .d2-2514768154 .fill-N2{fill:#676C7E;} + .d2-2514768154 .fill-N3{fill:#9499AB;} + .d2-2514768154 .fill-N4{fill:#CFD2DD;} + .d2-2514768154 .fill-N5{fill:#DEE1EB;} + .d2-2514768154 .fill-N6{fill:#EEF1F8;} + .d2-2514768154 .fill-N7{fill:#FFFFFF;} + .d2-2514768154 .fill-B1{fill:#0D32B2;} + .d2-2514768154 .fill-B2{fill:#0D32B2;} + .d2-2514768154 .fill-B3{fill:#E3E9FD;} + .d2-2514768154 .fill-B4{fill:#E3E9FD;} + .d2-2514768154 .fill-B5{fill:#EDF0FD;} + .d2-2514768154 .fill-B6{fill:#F7F8FE;} + .d2-2514768154 .fill-AA2{fill:#4A6FF3;} + .d2-2514768154 .fill-AA4{fill:#EDF0FD;} + .d2-2514768154 .fill-AA5{fill:#F7F8FE;} + .d2-2514768154 .fill-AB4{fill:#EDF0FD;} + .d2-2514768154 .fill-AB5{fill:#F7F8FE;} + .d2-2514768154 .stroke-N1{stroke:#0A0F25;} + .d2-2514768154 .stroke-N2{stroke:#676C7E;} + .d2-2514768154 .stroke-N3{stroke:#9499AB;} + .d2-2514768154 .stroke-N4{stroke:#CFD2DD;} + .d2-2514768154 .stroke-N5{stroke:#DEE1EB;} + .d2-2514768154 .stroke-N6{stroke:#EEF1F8;} + .d2-2514768154 .stroke-N7{stroke:#FFFFFF;} + .d2-2514768154 .stroke-B1{stroke:#0D32B2;} + .d2-2514768154 .stroke-B2{stroke:#0D32B2;} + .d2-2514768154 .stroke-B3{stroke:#E3E9FD;} + .d2-2514768154 .stroke-B4{stroke:#E3E9FD;} + .d2-2514768154 .stroke-B5{stroke:#EDF0FD;} + .d2-2514768154 .stroke-B6{stroke:#F7F8FE;} + .d2-2514768154 .stroke-AA2{stroke:#4A6FF3;} + .d2-2514768154 .stroke-AA4{stroke:#EDF0FD;} + .d2-2514768154 .stroke-AA5{stroke:#F7F8FE;} + .d2-2514768154 .stroke-AB4{stroke:#EDF0FD;} + .d2-2514768154 .stroke-AB5{stroke:#F7F8FE;} + .d2-2514768154 .background-color-N1{background-color:#0A0F25;} + .d2-2514768154 .background-color-N2{background-color:#676C7E;} + .d2-2514768154 .background-color-N3{background-color:#9499AB;} + .d2-2514768154 .background-color-N4{background-color:#CFD2DD;} + .d2-2514768154 .background-color-N5{background-color:#DEE1EB;} + .d2-2514768154 .background-color-N6{background-color:#EEF1F8;} + .d2-2514768154 .background-color-N7{background-color:#FFFFFF;} + .d2-2514768154 .background-color-B1{background-color:#0D32B2;} + .d2-2514768154 .background-color-B2{background-color:#0D32B2;} + .d2-2514768154 .background-color-B3{background-color:#E3E9FD;} + .d2-2514768154 .background-color-B4{background-color:#E3E9FD;} + .d2-2514768154 .background-color-B5{background-color:#EDF0FD;} + .d2-2514768154 .background-color-B6{background-color:#F7F8FE;} + .d2-2514768154 .background-color-AA2{background-color:#4A6FF3;} + .d2-2514768154 .background-color-AA4{background-color:#EDF0FD;} + .d2-2514768154 .background-color-AA5{background-color:#F7F8FE;} + .d2-2514768154 .background-color-AB4{background-color:#EDF0FD;} + .d2-2514768154 .background-color-AB5{background-color:#F7F8FE;} + .d2-2514768154 .color-N1{color:#0A0F25;} + .d2-2514768154 .color-N2{color:#676C7E;} + .d2-2514768154 .color-N3{color:#9499AB;} + .d2-2514768154 .color-N4{color:#CFD2DD;} + .d2-2514768154 .color-N5{color:#DEE1EB;} + .d2-2514768154 .color-N6{color:#EEF1F8;} + .d2-2514768154 .color-N7{color:#FFFFFF;} + .d2-2514768154 .color-B1{color:#0D32B2;} + .d2-2514768154 .color-B2{color:#0D32B2;} + .d2-2514768154 .color-B3{color:#E3E9FD;} + .d2-2514768154 .color-B4{color:#E3E9FD;} + .d2-2514768154 .color-B5{color:#EDF0FD;} + .d2-2514768154 .color-B6{color:#F7F8FE;} + .d2-2514768154 .color-AA2{color:#4A6FF3;} + .d2-2514768154 .color-AA4{color:#EDF0FD;} + .d2-2514768154 .color-AA5{color:#F7F8FE;} + .d2-2514768154 .color-AB4{color:#EDF0FD;} + .d2-2514768154 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker-d2-2514768154);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker-d2-2514768154);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright-d2-2514768154);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright-d2-2514768154);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright-d2-2514768154);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright-d2-2514768154);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark-d2-2514768154);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright-d2-2514768154);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright-d2-2514768154);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright-d2-2514768154);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright-d2-2514768154);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker-d2-2514768154);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark-d2-2514768154);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal-d2-2514768154);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal-d2-2514768154);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright-d2-2514768154);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright-d2-2514768154);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright-d2-2514768154);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>abcdabcab From 314844c6d1387110a7e7ad06024d677b878aa28c Mon Sep 17 00:00:00 2001 From: Mayank Mohapatra <125661248+Mayank77maruti@users.noreply.github.com> Date: Sun, 23 Feb 2025 16:59:07 +0000 Subject: [PATCH 54/73] try --- d2layouts/d2cycle/layout.go | 2 +- .../txtar/cycle-diagram/dagre/board.exp.json | 2078 +++++++---------- .../txtar/cycle-diagram/dagre/sketch.exp.svg | 172 +- .../txtar/cycle-diagram/elk/board.exp.json | 2078 +++++++---------- .../txtar/cycle-diagram/elk/sketch.exp.svg | 172 +- 5 files changed, 1843 insertions(+), 2659 deletions(-) diff --git a/d2layouts/d2cycle/layout.go b/d2layouts/d2cycle/layout.go index 8c276786d8..49b39ad397 100644 --- a/d2layouts/d2cycle/layout.go +++ b/d2layouts/d2cycle/layout.go @@ -12,7 +12,7 @@ import ( ) const ( - MIN_RADIUS = 200 + MIN_RADIUS = 100 PADDING = 20 MIN_SEGMENT_LEN = 10 ARC_STEPS = 100 diff --git a/e2etests/testdata/txtar/cycle-diagram/dagre/board.exp.json b/e2etests/testdata/txtar/cycle-diagram/dagre/board.exp.json index 22305b18dc..b0032c70e5 100644 --- a/e2etests/testdata/txtar/cycle-diagram/dagre/board.exp.json +++ b/e2etests/testdata/txtar/cycle-diagram/dagre/board.exp.json @@ -18,8 +18,8 @@ "x": 0, "y": 0 }, - "width": 453, - "height": 466, + "width": 253, + "height": 266, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -57,7 +57,7 @@ "type": "rectangle", "pos": { "x": -26, - "y": -233 + "y": -133 }, "width": 53, "height": 66, @@ -98,7 +98,7 @@ "id": "1.b", "type": "rectangle", "pos": { - "x": 173, + "x": 73, "y": -33 }, "width": 53, @@ -141,7 +141,7 @@ "type": "rectangle", "pos": { "x": -26, - "y": 167 + "y": 67 }, "width": 53, "height": 66, @@ -182,7 +182,7 @@ "id": "1.d", "type": "rectangle", "pos": { - "x": -227, + "x": -127, "y": -32 }, "width": 54, @@ -224,11 +224,11 @@ "id": "2", "type": "cycle", "pos": { - "x": 513, - "y": 50 + "x": 313, + "y": 25 }, - "width": 399, - "height": 366, + "width": 226, + "height": 216, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -265,8 +265,8 @@ "id": "2.a", "type": "rectangle", "pos": { - "x": 486, - "y": -183 + "x": 286, + "y": -108 }, "width": 53, "height": 66, @@ -307,8 +307,8 @@ "id": "2.b", "type": "rectangle", "pos": { - "x": 659, - "y": 116 + "x": 373, + "y": 41 }, "width": 53, "height": 66, @@ -349,8 +349,8 @@ "id": "2.c", "type": "rectangle", "pos": { - "x": 313, - "y": 117 + "x": 199, + "y": 42 }, "width": 53, "height": 66, @@ -391,11 +391,11 @@ "id": "3", "type": "cycle", "pos": { - "x": 972, + "x": 599, "y": 0 }, "width": 53, - "height": 466, + "height": 266, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -432,8 +432,8 @@ "id": "3.a", "type": "rectangle", "pos": { - "x": 945, - "y": -233 + "x": 572, + "y": -133 }, "width": 53, "height": 66, @@ -474,8 +474,8 @@ "id": "3.b", "type": "rectangle", "pos": { - "x": 945, - "y": 167 + "x": 572, + "y": 67 }, "width": 53, "height": 66, @@ -541,334 +541,254 @@ "route": [ { "x": 26.5, - "y": -198.22999572753906 - }, - { - "x": 28.18000030517578, - "y": -198.00399780273438 - }, - { - "x": 31.285999298095703, - "y": -197.53700256347656 - }, - { - "x": 34.3849983215332, - "y": -197.02099609375 - }, - { - "x": 37.47600173950195, - "y": -196.45700073242188 - }, - { - "x": 40.55699920654297, - "y": -195.843994140625 - }, - { - "x": 43.62799835205078, - "y": -195.18299865722656 - }, - { - "x": 46.68899917602539, - "y": -194.47300720214844 - }, - { - "x": 49.73699951171875, - "y": -193.71600341796875 - }, - { - "x": 52.77399826049805, - "y": -192.91099548339844 - }, - { - "x": 55.79800033569336, - "y": -192.05799865722656 - }, - { - "x": 58.80799865722656, - "y": -191.1580047607422 - }, - { - "x": 61.803001403808594, - "y": -190.21099853515625 + "y": -96.4229965209961 }, { - "x": 64.78299713134766, - "y": -189.2169952392578 + "x": 27.89900016784668, + "y": -96.02899932861328 }, { - "x": 67.74700164794922, - "y": -188.17599487304688 + "x": 29.40399932861328, + "y": -95.5790023803711 }, { - "x": 70.69400024414062, - "y": -187.08799743652344 + "x": 30.900999069213867, + "y": -95.1050033569336 }, { - "x": 73.6240005493164, - "y": -185.9550018310547 + "x": 32.39099884033203, + "y": -94.60800170898438 }, { - "x": 76.53600311279297, - "y": -184.77499389648438 + "x": 33.87300109863281, + "y": -94.08799743652344 }, { - "x": 79.42900085449219, - "y": -183.5500030517578 + "x": 35.34700012207031, + "y": -93.54399871826172 }, { - "x": 82.302001953125, - "y": -182.27999877929688 + "x": 36.8120002746582, + "y": -92.97699737548828 }, { - "x": 85.15499877929688, - "y": -180.96499633789062 + "x": 38.268001556396484, + "y": -92.38700103759766 }, { - "x": 87.98699951171875, - "y": -179.60499572753906 + "x": 39.7140007019043, + "y": -91.7750015258789 }, { - "x": 90.7979965209961, - "y": -178.2010040283203 + "x": 41.1510009765625, + "y": -91.13999938964844 }, { - "x": 93.58499908447266, - "y": -176.7530059814453 + "x": 42.57699966430664, + "y": -90.48200225830078 }, { - "x": 96.3499984741211, - "y": -175.26100158691406 + "x": 43.99300003051758, + "y": -89.802001953125 }, { - "x": 99.09100341796875, - "y": -173.7259979248047 + "x": 45.39899826049805, + "y": -89.0999984741211 }, { - "x": 101.80799865722656, - "y": -172.1479949951172 + "x": 46.79199981689453, + "y": -88.3759994506836 }, { - "x": 104.4990005493164, - "y": -170.5279998779297 + "x": 48.17499923706055, + "y": -87.62999725341797 }, { - "x": 107.16500091552734, - "y": -168.86500549316406 + "x": 49.54499816894531, + "y": -86.86299896240234 }, { - "x": 109.80400085449219, - "y": -167.16099548339844 + "x": 50.90399932861328, + "y": -86.0739974975586 }, { - "x": 112.41600036621094, - "y": -165.41600036621094 + "x": 52.249000549316406, + "y": -85.26399993896484 }, { - "x": 115.0009994506836, - "y": -163.62899780273438 + "x": 53.582000732421875, + "y": -84.43199920654297 }, { - "x": 117.55699920654297, - "y": -161.80299377441406 + "x": 54.902000427246094, + "y": -83.58000183105469 }, { - "x": 120.08399963378906, - "y": -159.93600463867188 + "x": 56.20800018310547, + "y": -82.70800018310547 }, { - "x": 122.58100128173828, - "y": -158.031005859375 + "x": 57.5, + "y": -81.81400299072266 }, { - "x": 125.0479965209961, - "y": -156.08599853515625 + "x": 58.77799987792969, + "y": -80.9010009765625 }, { - "x": 127.48400115966797, - "y": -154.1020050048828 + "x": 60.04199981689453, + "y": -79.96800231933594 }, { - "x": 129.88900756835938, - "y": -152.08099365234375 + "x": 61.290000915527344, + "y": -79.01499938964844 }, { - "x": 132.26199340820312, - "y": -150.02200317382812 + "x": 62.52399826049805, + "y": -78.04299926757812 }, { - "x": 134.6020050048828, - "y": -147.92599487304688 + "x": 63.742000579833984, + "y": -77.0510025024414 }, { - "x": 136.90899658203125, - "y": -145.79299926757812 + "x": 64.94400024414062, + "y": -76.04000091552734 }, { - "x": 139.1820068359375, - "y": -143.625 + "x": 66.13099670410156, + "y": -75.01100158691406 }, { - "x": 141.42100524902344, - "y": -141.42100524902344 + "x": 67.3010025024414, + "y": -73.96299743652344 }, { - "x": 143.625, - "y": -139.1820068359375 + "x": 68.4540023803711, + "y": -72.89600372314453 }, { - "x": 145.79299926757812, - "y": -136.90899658203125 + "x": 69.59100341796875, + "y": -71.81199645996094 }, { - "x": 147.92599487304688, - "y": -134.6020050048828 + "x": 70.70999908447266, + "y": -70.70999908447266 }, { - "x": 150.02200317382812, - "y": -132.26199340820312 + "x": 71.81199645996094, + "y": -69.59100341796875 }, { - "x": 152.08099365234375, - "y": -129.88900756835938 + "x": 72.89600372314453, + "y": -68.4540023803711 }, { - "x": 154.1020050048828, - "y": -127.48400115966797 + "x": 73.96299743652344, + "y": -67.3010025024414 }, { - "x": 156.08599853515625, - "y": -125.0479965209961 + "x": 75.01100158691406, + "y": -66.13099670410156 }, { - "x": 158.031005859375, - "y": -122.58100128173828 + "x": 76.04000091552734, + "y": -64.94400024414062 }, { - "x": 159.93600463867188, - "y": -120.08399963378906 + "x": 77.0510025024414, + "y": -63.742000579833984 }, { - "x": 161.80299377441406, - "y": -117.55699920654297 + "x": 78.04299926757812, + "y": -62.52399826049805 }, { - "x": 163.62899780273438, - "y": -115.0009994506836 + "x": 79.01499938964844, + "y": -61.290000915527344 }, { - "x": 165.41600036621094, - "y": -112.41600036621094 + "x": 79.96800231933594, + "y": -60.04199981689453 }, { - "x": 167.16099548339844, - "y": -109.80400085449219 + "x": 80.9010009765625, + "y": -58.77799987792969 }, { - "x": 168.86500549316406, - "y": -107.16500091552734 + "x": 81.81400299072266, + "y": -57.5 }, { - "x": 170.5279998779297, - "y": -104.4990005493164 + "x": 82.70800018310547, + "y": -56.20800018310547 }, { - "x": 172.1479949951172, - "y": -101.80799865722656 + "x": 83.58000183105469, + "y": -54.902000427246094 }, { - "x": 173.7259979248047, - "y": -99.09100341796875 + "x": 84.43199920654297, + "y": -53.582000732421875 }, { - "x": 175.26100158691406, - "y": -96.3499984741211 + "x": 85.26399993896484, + "y": -52.249000549316406 }, { - "x": 176.7530059814453, - "y": -93.58499908447266 + "x": 86.0739974975586, + "y": -50.90399932861328 }, { - "x": 178.2010040283203, - "y": -90.7979965209961 + "x": 86.86299896240234, + "y": -49.54499816894531 }, { - "x": 179.60499572753906, - "y": -87.98699951171875 + "x": 87.62999725341797, + "y": -48.17499923706055 }, { - "x": 180.96499633789062, - "y": -85.15499877929688 + "x": 88.3759994506836, + "y": -46.79199981689453 }, { - "x": 182.27999877929688, - "y": -82.302001953125 + "x": 89.0999984741211, + "y": -45.39899826049805 }, { - "x": 183.5500030517578, - "y": -79.42900085449219 + "x": 89.802001953125, + "y": -43.99300003051758 }, { - "x": 184.77499389648438, - "y": -76.53600311279297 + "x": 90.48200225830078, + "y": -42.57699966430664 }, { - "x": 185.9550018310547, - "y": -73.6240005493164 + "x": 91.13999938964844, + "y": -41.1510009765625 }, { - "x": 187.08799743652344, - "y": -70.69400024414062 + "x": 91.7750015258789, + "y": -39.7140007019043 }, { - "x": 188.17599487304688, - "y": -67.74700164794922 + "x": 92.38700103759766, + "y": -38.268001556396484 }, { - "x": 189.2169952392578, - "y": -64.78299713134766 + "x": 92.97699737548828, + "y": -36.8120002746582 }, { - "x": 190.21099853515625, - "y": -61.803001403808594 + "x": 93.54399871826172, + "y": -35.34700012207031 }, { - "x": 191.1580047607422, - "y": -58.80799865722656 + "x": 92.98999786376953, + "y": -37.01599884033203 }, { - "x": 192.05799865722656, - "y": -55.79800033569336 - }, - { - "x": 192.91099548339844, - "y": -52.77399826049805 - }, - { - "x": 193.71600341796875, - "y": -49.73699951171875 - }, - { - "x": 194.47300720214844, - "y": -46.68899917602539 - }, - { - "x": 195.18299865722656, - "y": -43.62799835205078 - }, - { - "x": 195.843994140625, - "y": -40.55699920654297 - }, - { - "x": 196.45700073242188, - "y": -37.47600173950195 - }, - { - "x": 196.5500030517578, - "y": -37.19599914550781 - }, - { - "x": 197.2519989013672, + "x": 94.39399719238281, "y": -33 } ], @@ -904,336 +824,256 @@ "link": "", "route": [ { - "x": 197.2519989013672, + "x": 94.39399719238281, "y": 33 }, { - "x": 197.02099609375, - "y": 34.3849983215332 - }, - { - "x": 196.45700073242188, - "y": 37.47600173950195 - }, - { - "x": 195.843994140625, - "y": 40.55699920654297 - }, - { - "x": 195.18299865722656, - "y": 43.62799835205078 - }, - { - "x": 194.47300720214844, - "y": 46.68899917602539 - }, - { - "x": 193.71600341796875, - "y": 49.73699951171875 + "x": 94.08799743652344, + "y": 33.87300109863281 }, { - "x": 192.91099548339844, - "y": 52.77399826049805 + "x": 93.54399871826172, + "y": 35.34700012207031 }, { - "x": 192.05799865722656, - "y": 55.79800033569336 + "x": 92.97699737548828, + "y": 36.8120002746582 }, { - "x": 191.1580047607422, - "y": 58.80799865722656 + "x": 92.38700103759766, + "y": 38.268001556396484 }, { - "x": 190.21099853515625, - "y": 61.803001403808594 + "x": 91.7750015258789, + "y": 39.7140007019043 }, { - "x": 189.2169952392578, - "y": 64.78299713134766 + "x": 91.13999938964844, + "y": 41.1510009765625 }, { - "x": 188.17599487304688, - "y": 67.74700164794922 + "x": 90.48200225830078, + "y": 42.57699966430664 }, { - "x": 187.08799743652344, - "y": 70.69400024414062 + "x": 89.802001953125, + "y": 43.99300003051758 }, { - "x": 185.9550018310547, - "y": 73.6240005493164 + "x": 89.0999984741211, + "y": 45.39899826049805 }, { - "x": 184.77499389648438, - "y": 76.53600311279297 + "x": 88.3759994506836, + "y": 46.79199981689453 }, { - "x": 183.5500030517578, - "y": 79.42900085449219 + "x": 87.62999725341797, + "y": 48.17499923706055 }, { - "x": 182.27999877929688, - "y": 82.302001953125 + "x": 86.86299896240234, + "y": 49.54499816894531 }, { - "x": 180.96499633789062, - "y": 85.15499877929688 + "x": 86.0739974975586, + "y": 50.90399932861328 }, { - "x": 179.60499572753906, - "y": 87.98699951171875 + "x": 85.26399993896484, + "y": 52.249000549316406 }, { - "x": 178.2010040283203, - "y": 90.7979965209961 + "x": 84.43199920654297, + "y": 53.582000732421875 }, { - "x": 176.7530059814453, - "y": 93.58499908447266 + "x": 83.58000183105469, + "y": 54.902000427246094 }, { - "x": 175.26100158691406, - "y": 96.3499984741211 + "x": 82.70800018310547, + "y": 56.20800018310547 }, { - "x": 173.7259979248047, - "y": 99.09100341796875 + "x": 81.81400299072266, + "y": 57.5 }, { - "x": 172.1479949951172, - "y": 101.80799865722656 + "x": 80.9010009765625, + "y": 58.77799987792969 }, { - "x": 170.5279998779297, - "y": 104.4990005493164 + "x": 79.96800231933594, + "y": 60.04199981689453 }, { - "x": 168.86500549316406, - "y": 107.16500091552734 + "x": 79.01499938964844, + "y": 61.290000915527344 }, { - "x": 167.16099548339844, - "y": 109.80400085449219 + "x": 78.04299926757812, + "y": 62.52399826049805 }, { - "x": 165.41600036621094, - "y": 112.41600036621094 + "x": 77.0510025024414, + "y": 63.742000579833984 }, { - "x": 163.62899780273438, - "y": 115.0009994506836 + "x": 76.04000091552734, + "y": 64.94400024414062 }, { - "x": 161.80299377441406, - "y": 117.55699920654297 + "x": 75.01100158691406, + "y": 66.13099670410156 }, { - "x": 159.93600463867188, - "y": 120.08399963378906 + "x": 73.96299743652344, + "y": 67.3010025024414 }, { - "x": 158.031005859375, - "y": 122.58100128173828 + "x": 72.89600372314453, + "y": 68.4540023803711 }, { - "x": 156.08599853515625, - "y": 125.0479965209961 + "x": 71.81199645996094, + "y": 69.59100341796875 }, { - "x": 154.1020050048828, - "y": 127.48400115966797 + "x": 70.70999908447266, + "y": 70.70999908447266 }, { - "x": 152.08099365234375, - "y": 129.88900756835938 + "x": 69.59100341796875, + "y": 71.81199645996094 }, { - "x": 150.02200317382812, - "y": 132.26199340820312 + "x": 68.4540023803711, + "y": 72.89600372314453 }, { - "x": 147.92599487304688, - "y": 134.6020050048828 + "x": 67.3010025024414, + "y": 73.96299743652344 }, { - "x": 145.79299926757812, - "y": 136.90899658203125 + "x": 66.13099670410156, + "y": 75.01100158691406 }, { - "x": 143.625, - "y": 139.1820068359375 + "x": 64.94400024414062, + "y": 76.04000091552734 }, { - "x": 141.42100524902344, - "y": 141.42100524902344 + "x": 63.742000579833984, + "y": 77.0510025024414 }, { - "x": 139.1820068359375, - "y": 143.625 + "x": 62.52399826049805, + "y": 78.04299926757812 }, { - "x": 136.90899658203125, - "y": 145.79299926757812 + "x": 61.290000915527344, + "y": 79.01499938964844 }, { - "x": 134.6020050048828, - "y": 147.92599487304688 + "x": 60.04199981689453, + "y": 79.96800231933594 }, { - "x": 132.26199340820312, - "y": 150.02200317382812 + "x": 58.77799987792969, + "y": 80.9010009765625 }, { - "x": 129.88900756835938, - "y": 152.08099365234375 + "x": 57.5, + "y": 81.81400299072266 }, { - "x": 127.48400115966797, - "y": 154.1020050048828 + "x": 56.20800018310547, + "y": 82.70800018310547 }, { - "x": 125.0479965209961, - "y": 156.08599853515625 + "x": 54.902000427246094, + "y": 83.58000183105469 }, { - "x": 122.58100128173828, - "y": 158.031005859375 + "x": 53.582000732421875, + "y": 84.43199920654297 }, { - "x": 120.08399963378906, - "y": 159.93600463867188 + "x": 52.249000549316406, + "y": 85.26399993896484 }, { - "x": 117.55699920654297, - "y": 161.80299377441406 + "x": 50.90399932861328, + "y": 86.0739974975586 }, { - "x": 115.0009994506836, - "y": 163.62899780273438 + "x": 49.54499816894531, + "y": 86.86299896240234 }, { - "x": 112.41600036621094, - "y": 165.41600036621094 + "x": 48.17499923706055, + "y": 87.62999725341797 }, { - "x": 109.80400085449219, - "y": 167.16099548339844 + "x": 46.79199981689453, + "y": 88.3759994506836 }, { - "x": 107.16500091552734, - "y": 168.86500549316406 + "x": 45.39899826049805, + "y": 89.0999984741211 }, { - "x": 104.4990005493164, - "y": 170.5279998779297 + "x": 43.99300003051758, + "y": 89.802001953125 }, { - "x": 101.80799865722656, - "y": 172.1479949951172 + "x": 42.57699966430664, + "y": 90.48200225830078 }, { - "x": 99.09100341796875, - "y": 173.7259979248047 + "x": 41.1510009765625, + "y": 91.13999938964844 }, { - "x": 96.3499984741211, - "y": 175.26100158691406 + "x": 39.7140007019043, + "y": 91.7750015258789 }, { - "x": 93.58499908447266, - "y": 176.7530059814453 + "x": 38.268001556396484, + "y": 92.38700103759766 }, { - "x": 90.7979965209961, - "y": 178.2010040283203 + "x": 36.8120002746582, + "y": 92.97699737548828 }, { - "x": 87.98699951171875, - "y": 179.60499572753906 + "x": 35.34700012207031, + "y": 93.54399871826172 }, { - "x": 85.15499877929688, - "y": 180.96499633789062 + "x": 33.87300109863281, + "y": 94.08799743652344 }, { - "x": 82.302001953125, - "y": 182.27999877929688 + "x": 32.39099884033203, + "y": 94.60800170898438 }, { - "x": 79.42900085449219, - "y": 183.5500030517578 + "x": 30.900999069213867, + "y": 95.1050033569336 }, { - "x": 76.53600311279297, - "y": 184.77499389648438 + "x": 29.40399932861328, + "y": 95.5790023803711 }, { - "x": 73.6240005493164, - "y": 185.9550018310547 - }, - { - "x": 70.69400024414062, - "y": 187.08799743652344 - }, - { - "x": 67.74700164794922, - "y": 188.17599487304688 - }, - { - "x": 64.78299713134766, - "y": 189.2169952392578 - }, - { - "x": 61.803001403808594, - "y": 190.21099853515625 - }, - { - "x": 58.80799865722656, - "y": 191.1580047607422 - }, - { - "x": 55.79800033569336, - "y": 192.05799865722656 - }, - { - "x": 52.77399826049805, - "y": 192.91099548339844 - }, - { - "x": 49.73699951171875, - "y": 193.71600341796875 - }, - { - "x": 46.68899917602539, - "y": 194.47300720214844 - }, - { - "x": 43.62799835205078, - "y": 195.18299865722656 - }, - { - "x": 40.55699920654297, - "y": 195.843994140625 - }, - { - "x": 37.47600173950195, - "y": 196.45700073242188 - }, - { - "x": 34.3849983215332, - "y": 197.02099609375 - }, - { - "x": 31.285999298095703, - "y": 197.53700256347656 - }, - { - "x": 30.716999053955078, - "y": 197.66600036621094 + "x": 30.601999282836914, + "y": 95.2959976196289 }, { "x": 26.5, - "y": 198.22999572753906 + "y": 96.4229965209961 } ], "isCurve": true, @@ -1269,334 +1109,254 @@ "route": [ { "x": -26.499000549316406, - "y": 198.22999572753906 - }, - { - "x": -28.18000030517578, - "y": 198.00399780273438 - }, - { - "x": -31.285999298095703, - "y": 197.53700256347656 - }, - { - "x": -34.3849983215332, - "y": 197.02099609375 - }, - { - "x": -37.47600173950195, - "y": 196.45700073242188 - }, - { - "x": -40.55699920654297, - "y": 195.843994140625 - }, - { - "x": -43.62799835205078, - "y": 195.18299865722656 - }, - { - "x": -46.68899917602539, - "y": 194.47300720214844 - }, - { - "x": -49.73699951171875, - "y": 193.71600341796875 - }, - { - "x": -52.77399826049805, - "y": 192.91099548339844 - }, - { - "x": -55.79800033569336, - "y": 192.05799865722656 - }, - { - "x": -58.80799865722656, - "y": 191.1580047607422 + "y": 96.4229965209961 }, { - "x": -61.803001403808594, - "y": 190.21099853515625 + "x": -27.89900016784668, + "y": 96.02899932861328 }, { - "x": -64.78299713134766, - "y": 189.2169952392578 + "x": -29.40399932861328, + "y": 95.5790023803711 }, { - "x": -67.74700164794922, - "y": 188.17599487304688 + "x": -30.900999069213867, + "y": 95.1050033569336 }, { - "x": -70.69400024414062, - "y": 187.08799743652344 + "x": -32.39099884033203, + "y": 94.60800170898438 }, { - "x": -73.6240005493164, - "y": 185.9550018310547 + "x": -33.87300109863281, + "y": 94.08799743652344 }, { - "x": -76.53600311279297, - "y": 184.77499389648438 + "x": -35.34700012207031, + "y": 93.54399871826172 }, { - "x": -79.42900085449219, - "y": 183.5500030517578 + "x": -36.8120002746582, + "y": 92.97699737548828 }, { - "x": -82.302001953125, - "y": 182.27999877929688 + "x": -38.268001556396484, + "y": 92.38700103759766 }, { - "x": -85.15499877929688, - "y": 180.96499633789062 + "x": -39.7140007019043, + "y": 91.7750015258789 }, { - "x": -87.98699951171875, - "y": 179.60499572753906 + "x": -41.1510009765625, + "y": 91.13999938964844 }, { - "x": -90.7979965209961, - "y": 178.2010040283203 + "x": -42.57699966430664, + "y": 90.48200225830078 }, { - "x": -93.58499908447266, - "y": 176.7530059814453 + "x": -43.99300003051758, + "y": 89.802001953125 }, { - "x": -96.3499984741211, - "y": 175.26100158691406 + "x": -45.39899826049805, + "y": 89.0999984741211 }, { - "x": -99.09100341796875, - "y": 173.7259979248047 + "x": -46.79199981689453, + "y": 88.3759994506836 }, { - "x": -101.80799865722656, - "y": 172.1479949951172 + "x": -48.17499923706055, + "y": 87.62999725341797 }, { - "x": -104.4990005493164, - "y": 170.5279998779297 + "x": -49.54499816894531, + "y": 86.86299896240234 }, { - "x": -107.16500091552734, - "y": 168.86500549316406 + "x": -50.90399932861328, + "y": 86.0739974975586 }, { - "x": -109.80400085449219, - "y": 167.16099548339844 + "x": -52.249000549316406, + "y": 85.26399993896484 }, { - "x": -112.41600036621094, - "y": 165.41600036621094 + "x": -53.582000732421875, + "y": 84.43199920654297 }, { - "x": -115.0009994506836, - "y": 163.62899780273438 + "x": -54.902000427246094, + "y": 83.58000183105469 }, { - "x": -117.55699920654297, - "y": 161.80299377441406 + "x": -56.20800018310547, + "y": 82.70800018310547 }, { - "x": -120.08399963378906, - "y": 159.93600463867188 + "x": -57.5, + "y": 81.81400299072266 }, { - "x": -122.58100128173828, - "y": 158.031005859375 + "x": -58.77799987792969, + "y": 80.9010009765625 }, { - "x": -125.0479965209961, - "y": 156.08599853515625 + "x": -60.04199981689453, + "y": 79.96800231933594 }, { - "x": -127.48400115966797, - "y": 154.1020050048828 + "x": -61.290000915527344, + "y": 79.01499938964844 }, { - "x": -129.88900756835938, - "y": 152.08099365234375 + "x": -62.52399826049805, + "y": 78.04299926757812 }, { - "x": -132.26199340820312, - "y": 150.02200317382812 + "x": -63.742000579833984, + "y": 77.0510025024414 }, { - "x": -134.6020050048828, - "y": 147.92599487304688 + "x": -64.94400024414062, + "y": 76.04000091552734 }, { - "x": -136.90899658203125, - "y": 145.79299926757812 + "x": -66.13099670410156, + "y": 75.01100158691406 }, { - "x": -139.1820068359375, - "y": 143.625 + "x": -67.3010025024414, + "y": 73.96299743652344 }, { - "x": -141.42100524902344, - "y": 141.42100524902344 + "x": -68.4540023803711, + "y": 72.89600372314453 }, { - "x": -143.625, - "y": 139.1820068359375 + "x": -69.59100341796875, + "y": 71.81199645996094 }, { - "x": -145.79299926757812, - "y": 136.90899658203125 + "x": -70.70999908447266, + "y": 70.70999908447266 }, { - "x": -147.92599487304688, - "y": 134.6020050048828 + "x": -71.81199645996094, + "y": 69.59100341796875 }, { - "x": -150.02200317382812, - "y": 132.26199340820312 + "x": -72.89600372314453, + "y": 68.4540023803711 }, { - "x": -152.08099365234375, - "y": 129.88900756835938 + "x": -73.96299743652344, + "y": 67.3010025024414 }, { - "x": -154.1020050048828, - "y": 127.48400115966797 + "x": -75.01100158691406, + "y": 66.13099670410156 }, { - "x": -156.08599853515625, - "y": 125.0479965209961 + "x": -76.04000091552734, + "y": 64.94400024414062 }, { - "x": -158.031005859375, - "y": 122.58100128173828 + "x": -77.0510025024414, + "y": 63.742000579833984 }, { - "x": -159.93600463867188, - "y": 120.08399963378906 + "x": -78.04299926757812, + "y": 62.52399826049805 }, { - "x": -161.80299377441406, - "y": 117.55699920654297 + "x": -79.01499938964844, + "y": 61.290000915527344 }, { - "x": -163.62899780273438, - "y": 115.0009994506836 + "x": -79.96800231933594, + "y": 60.04199981689453 }, { - "x": -165.41600036621094, - "y": 112.41600036621094 + "x": -80.9010009765625, + "y": 58.77799987792969 }, { - "x": -167.16099548339844, - "y": 109.80400085449219 + "x": -81.81400299072266, + "y": 57.5 }, { - "x": -168.86500549316406, - "y": 107.16500091552734 + "x": -82.70800018310547, + "y": 56.20800018310547 }, { - "x": -170.5279998779297, - "y": 104.4990005493164 + "x": -83.58000183105469, + "y": 54.902000427246094 }, { - "x": -172.1479949951172, - "y": 101.80799865722656 + "x": -84.43199920654297, + "y": 53.582000732421875 }, { - "x": -173.7259979248047, - "y": 99.09100341796875 + "x": -85.26399993896484, + "y": 52.249000549316406 }, { - "x": -175.26100158691406, - "y": 96.3499984741211 + "x": -86.0739974975586, + "y": 50.90399932861328 }, { - "x": -176.7530059814453, - "y": 93.58499908447266 + "x": -86.86299896240234, + "y": 49.54499816894531 }, { - "x": -178.2010040283203, - "y": 90.7979965209961 + "x": -87.62999725341797, + "y": 48.17499923706055 }, { - "x": -179.60499572753906, - "y": 87.98699951171875 + "x": -88.3759994506836, + "y": 46.79199981689453 }, { - "x": -180.96499633789062, - "y": 85.15499877929688 + "x": -89.0999984741211, + "y": 45.39899826049805 }, { - "x": -182.27999877929688, - "y": 82.302001953125 + "x": -89.802001953125, + "y": 43.99300003051758 }, { - "x": -183.5500030517578, - "y": 79.42900085449219 + "x": -90.48200225830078, + "y": 42.57699966430664 }, { - "x": -184.77499389648438, - "y": 76.53600311279297 + "x": -91.13999938964844, + "y": 41.1510009765625 }, { - "x": -185.9550018310547, - "y": 73.6240005493164 + "x": -91.7750015258789, + "y": 39.7140007019043 }, { - "x": -187.08799743652344, - "y": 70.69400024414062 + "x": -92.38700103759766, + "y": 38.268001556396484 }, { - "x": -188.17599487304688, - "y": 67.74700164794922 + "x": -92.97699737548828, + "y": 36.8120002746582 }, { - "x": -189.2169952392578, - "y": 64.78299713134766 + "x": -93.54399871826172, + "y": 35.34700012207031 }, { - "x": -190.21099853515625, - "y": 61.803001403808594 + "x": -92.98999786376953, + "y": 37.01599884033203 }, { - "x": -191.1580047607422, - "y": 58.80799865722656 - }, - { - "x": -192.05799865722656, - "y": 55.79800033569336 - }, - { - "x": -192.91099548339844, - "y": 52.77399826049805 - }, - { - "x": -193.71600341796875, - "y": 49.73699951171875 - }, - { - "x": -194.47300720214844, - "y": 46.68899917602539 - }, - { - "x": -195.18299865722656, - "y": 43.62799835205078 - }, - { - "x": -195.843994140625, - "y": 40.55699920654297 - }, - { - "x": -196.45700073242188, - "y": 37.47600173950195 - }, - { - "x": -196.5500030517578, - "y": 37.19599914550781 - }, - { - "x": -197.2519989013672, + "x": -94.39399719238281, "y": 33 } ], @@ -1632,352 +1392,296 @@ "link": "", "route": [ { - "x": 539.5, - "y": -148.2259979248047 - }, - { - "x": 542.2160034179688, - "y": -147.85400390625 - }, - { - "x": 546.35302734375, - "y": -147.19900512695312 - }, - { - "x": 550.4760131835938, - "y": -146.45700073242188 - }, - { - "x": 554.5819702148438, - "y": -145.62899780273438 + "x": 339.5, + "y": -71.4209976196289 }, { - "x": 558.6699829101562, - "y": -144.71499633789062 + "x": 339.8909912109375, + "y": -71.31600189208984 }, { - "x": 562.7369995117188, - "y": -143.71600341796875 + "x": 341.90301513671875, + "y": -70.73100280761719 }, { - "x": 566.7830200195312, - "y": -142.6320037841797 + "x": 343.9010009765625, + "y": -70.1050033569336 }, { - "x": 570.8060302734375, - "y": -141.46299743652344 + "x": 345.885986328125, + "y": -69.43699645996094 }, { - "x": 574.802978515625, - "y": -140.21099853515625 + "x": 347.85699462890625, + "y": -68.72799682617188 }, { - "x": 578.7730102539062, - "y": -138.875 + "x": 349.81201171875, + "y": -67.97699737548828 }, { - "x": 582.7139892578125, - "y": -137.45599365234375 + "x": 351.7510070800781, + "y": -67.18599700927734 }, { - "x": 586.6240234375, - "y": -135.9550018310547 + "x": 353.6730041503906, + "y": -66.35399627685547 }, { - "x": 590.5029907226562, - "y": -134.3719940185547 + "x": 355.5769958496094, + "y": -65.48200225830078 }, { - "x": 594.3469848632812, - "y": -132.70899963378906 + "x": 357.4630126953125, + "y": -64.57099914550781 }, { - "x": 598.155029296875, - "y": -130.96499633789062 + "x": 359.3290100097656, + "y": -63.619998931884766 }, { - "x": 601.927001953125, - "y": -129.14199829101562 + "x": 361.17498779296875, + "y": -62.630001068115234 }, { - "x": 605.6589965820312, - "y": -127.23999786376953 + "x": 363, + "y": -61.60200119018555 }, { - "x": 609.3499755859375, - "y": -125.26100158691406 + "x": 364.802001953125, + "y": -60.5359992980957 }, { - "x": 613, - "y": -123.20500183105469 + "x": 366.5820007324219, + "y": -59.43199920654297 }, { - "x": 616.60498046875, - "y": -121.0719985961914 + "x": 368.3389892578125, + "y": -58.29199981689453 }, { - "x": 620.1649780273438, - "y": -118.86499786376953 + "x": 370.0710144042969, + "y": -57.11399841308594 }, { - "x": 623.677978515625, - "y": -116.58399963378906 + "x": 371.77801513671875, + "y": -55.9010009765625 }, { - "x": 627.1420288085938, - "y": -114.22899627685547 + "x": 373.4590148925781, + "y": -54.652000427246094 }, { - "x": 630.5570068359375, - "y": -111.8030014038086 + "x": 375.114013671875, + "y": -53.36899948120117 }, { - "x": 633.9190063476562, - "y": -109.30500030517578 + "x": 376.74200439453125, + "y": -52.05099868774414 }, { - "x": 637.22900390625, - "y": -106.73799896240234 + "x": 378.3420104980469, + "y": -50.69900131225586 }, { - "x": 640.4840087890625, - "y": -104.10199737548828 + "x": 379.9129943847656, + "y": -49.31399917602539 }, { - "x": 643.6840209960938, - "y": -101.39900207519531 + "x": 381.4540100097656, + "y": -47.895999908447266 }, { - "x": 646.8259887695312, - "y": -98.62799835205078 + "x": 382.96600341796875, + "y": -46.446998596191406 }, { - "x": 649.9089965820312, - "y": -95.79299926757812 + "x": 384.4469909667969, + "y": -44.965999603271484 }, { - "x": 652.9320068359375, - "y": -92.89399719238281 + "x": 385.89599609375, + "y": -43.45399856567383 }, { - "x": 655.8939819335938, - "y": -89.93199920654297 + "x": 387.3139953613281, + "y": -41.91299819946289 }, { - "x": 658.7930297851562, - "y": -86.90899658203125 + "x": 388.6990051269531, + "y": -40.34199905395508 }, { - "x": 661.6279907226562, - "y": -83.82599639892578 + "x": 390.0509948730469, + "y": -38.742000579833984 }, { - "x": 664.3989868164062, - "y": -80.68399810791016 + "x": 391.3689880371094, + "y": -37.11399841308594 }, { - "x": 667.1019897460938, - "y": -77.48400115966797 + "x": 392.6520080566406, + "y": -35.45899963378906 }, { - "x": 669.7379760742188, - "y": -74.22899627685547 + "x": 393.9010009765625, + "y": -33.77799987792969 }, { - "x": 672.3049926757812, - "y": -70.91899871826172 + "x": 395.114013671875, + "y": -32.07099914550781 }, { - "x": 674.802978515625, - "y": -67.55699920654297 + "x": 396.2919921875, + "y": -30.339000701904297 }, { - "x": 677.22900390625, - "y": -64.14199829101562 + "x": 397.4320068359375, + "y": -28.582000732421875 }, { - "x": 679.583984375, - "y": -60.678001403808594 + "x": 398.5360107421875, + "y": -26.802000045776367 }, { - "x": 681.864990234375, - "y": -57.165000915527344 + "x": 399.60198974609375, + "y": -25 }, { - "x": 684.072021484375, - "y": -53.60499954223633 + "x": 400.6300048828125, + "y": -23.174999237060547 }, { - "x": 686.2050170898438, - "y": -50 + "x": 401.6199951171875, + "y": -21.32900047302246 }, { - "x": 688.260986328125, - "y": -46.349998474121094 + "x": 402.5710144042969, + "y": -19.46299934387207 }, { - "x": 690.239990234375, - "y": -42.659000396728516 + "x": 403.48199462890625, + "y": -17.57699966430664 }, { - "x": 692.1420288085938, - "y": -38.926998138427734 + "x": 404.35400390625, + "y": -15.67300033569336 }, { - "x": 693.9650268554688, - "y": -35.154998779296875 + "x": 405.1860046386719, + "y": -13.75100040435791 }, { - "x": 695.708984375, - "y": -31.347000122070312 + "x": 405.97698974609375, + "y": -11.812000274658203 }, { - "x": 697.3720092773438, - "y": -27.503000259399414 + "x": 406.7279968261719, + "y": -9.857000350952148 }, { - "x": 698.9550170898438, - "y": -23.624000549316406 + "x": 407.43701171875, + "y": -7.886000156402588 }, { - "x": 700.4559936523438, - "y": -19.714000701904297 + "x": 408.1050109863281, + "y": -5.901000022888184 }, { - "x": 701.875, - "y": -15.77299976348877 + "x": 408.7309875488281, + "y": -3.9030001163482666 }, { - "x": 703.2109985351562, - "y": -11.803000450134277 + "x": 409.3160095214844, + "y": -1.8910000324249268 }, { - "x": 704.4630126953125, - "y": -7.806000232696533 + "x": 409.8580017089844, + "y": 0.13099999725818634 }, { - "x": 705.6320190429688, - "y": -3.7829999923706055 + "x": 410.35699462890625, + "y": 2.1640000343322754 }, { - "x": 706.7160034179688, - "y": 0.2619999945163727 + "x": 410.8139953613281, + "y": 4.208000183105469 }, { - "x": 707.7150268554688, - "y": 4.328999996185303 + "x": 411.2279968261719, + "y": 6.261000156402588 }, { - "x": 708.6290283203125, - "y": 8.416999816894531 + "x": 411.5989990234375, + "y": 8.322999954223633 }, { - "x": 709.4569702148438, - "y": 12.52299976348877 + "x": 411.927001953125, + "y": 10.390999794006348 }, { - "x": 710.198974609375, - "y": 16.645999908447266 + "x": 412.21099853515625, + "y": 12.465999603271484 }, { - "x": 710.85400390625, - "y": 20.783000946044922 + "x": 412.4519958496094, + "y": 14.54699993133545 }, { - "x": 711.4219970703125, - "y": 24.933000564575195 + "x": 412.64898681640625, + "y": 16.631999969482422 }, { - "x": 711.9039916992188, - "y": 29.0939998626709 + "x": 412.802001953125, + "y": 18.719999313354492 }, { - "x": 712.2979736328125, - "y": 33.263999938964844 + "x": 412.9119873046875, + "y": 20.812000274658203 }, { - "x": 712.60498046875, - "y": 37.441001892089844 + "x": 412.9779968261719, + "y": 22.905000686645508 }, { - "x": 712.823974609375, - "y": 41.624000549316406 - }, - { - "x": 712.9559936523438, - "y": 45.81100082397461 - }, - { - "x": 713, - "y": 50 - }, - { - "x": 712.9559936523438, - "y": 54.1879997253418 - }, - { - "x": 712.823974609375, - "y": 58.375 - }, - { - "x": 712.60498046875, - "y": 62.55799865722656 - }, - { - "x": 712.2979736328125, - "y": 66.73500061035156 - }, - { - "x": 711.9039916992188, - "y": 70.90499877929688 - }, - { - "x": 711.4219970703125, - "y": 75.06600189208984 - }, - { - "x": 710.85400390625, - "y": 79.21600341796875 - }, - { - "x": 710.198974609375, - "y": 83.35299682617188 + "x": 413, + "y": 25 }, { - "x": 709.4569702148438, - "y": 87.47599792480469 + "x": 412.9779968261719, + "y": 27.0939998626709 }, { - "x": 708.6290283203125, - "y": 91.58200073242188 + "x": 412.9119873046875, + "y": 29.187000274658203 }, { - "x": 707.7150268554688, - "y": 95.66999816894531 + "x": 412.802001953125, + "y": 31.27899932861328 }, { - "x": 706.7160034179688, - "y": 99.73699951171875 + "x": 412.64898681640625, + "y": 33.367000579833984 }, { - "x": 705.6320190429688, - "y": 103.78299713134766 + "x": 412.4519958496094, + "y": 35.45199966430664 }, { - "x": 704.4630126953125, - "y": 107.80599975585938 + "x": 412.21099853515625, + "y": 37.53300094604492 }, { - "x": 703.2109985351562, - "y": 111.8030014038086 + "x": 411.927001953125, + "y": 39.608001708984375 }, { - "x": 702.8590087890625, - "y": 112.98999786376953 + "x": 412.2640075683594, + "y": 37.805999755859375 }, { - "x": 701.4329833984375, - "y": 116.9990005493164 + "x": 411.5409851074219, + "y": 41.999000549316406 } ], "isCurve": true, @@ -2012,336 +1716,256 @@ "link": "", "route": [ { - "x": 662.3569946289062, - "y": 182.99899291992188 - }, - { - "x": 661.6279907226562, - "y": 183.8260040283203 - }, - { - "x": 658.7930297851562, - "y": 186.90899658203125 - }, - { - "x": 655.8939819335938, - "y": 189.9320068359375 - }, - { - "x": 652.9320068359375, - "y": 192.8939971923828 - }, - { - "x": 649.9089965820312, - "y": 195.79299926757812 - }, - { - "x": 646.8259887695312, - "y": 198.6280059814453 - }, - { - "x": 643.6840209960938, - "y": 201.3990020751953 - }, - { - "x": 640.4840087890625, - "y": 204.1020050048828 - }, - { - "x": 637.22900390625, - "y": 206.73800659179688 - }, - { - "x": 633.9190063476562, - "y": 209.30499267578125 - }, - { - "x": 630.5570068359375, - "y": 211.80299377441406 - }, - { - "x": 627.1420288085938, - "y": 214.22900390625 - }, - { - "x": 623.677978515625, - "y": 216.58399963378906 - }, - { - "x": 620.1649780273438, - "y": 218.86500549316406 - }, - { - "x": 616.60498046875, - "y": 221.07200622558594 - }, - { - "x": 613, - "y": 223.2050018310547 - }, - { - "x": 609.3499755859375, - "y": 225.26100158691406 + "x": 373.10198974609375, + "y": 104.91799926757812 }, { - "x": 605.6589965820312, - "y": 227.24000549316406 + "x": 371.77801513671875, + "y": 105.9010009765625 }, { - "x": 601.927001953125, - "y": 229.14199829101562 + "x": 370.0710144042969, + "y": 107.11399841308594 }, { - "x": 598.155029296875, - "y": 230.96499633789062 + "x": 368.3389892578125, + "y": 108.29199981689453 }, { - "x": 594.3469848632812, - "y": 232.70899963378906 + "x": 366.5820007324219, + "y": 109.43199920654297 }, { - "x": 590.5029907226562, - "y": 234.3719940185547 + "x": 364.802001953125, + "y": 110.53600311279297 }, { - "x": 586.6240234375, - "y": 235.9550018310547 + "x": 363, + "y": 111.60199737548828 }, { - "x": 582.7139892578125, - "y": 237.45599365234375 + "x": 361.17498779296875, + "y": 112.62999725341797 }, { - "x": 578.7730102539062, - "y": 238.875 + "x": 359.3290100097656, + "y": 113.62000274658203 }, { - "x": 574.802978515625, - "y": 240.21099853515625 + "x": 357.4630126953125, + "y": 114.57099914550781 }, { - "x": 570.8060302734375, - "y": 241.46299743652344 + "x": 355.5769958496094, + "y": 115.48200225830078 }, { - "x": 566.7830200195312, - "y": 242.6320037841797 + "x": 353.6730041503906, + "y": 116.35399627685547 }, { - "x": 562.7369995117188, - "y": 243.71600341796875 + "x": 351.7510070800781, + "y": 117.18599700927734 }, { - "x": 558.6699829101562, - "y": 244.71499633789062 + "x": 349.81201171875, + "y": 117.97699737548828 }, { - "x": 554.5819702148438, - "y": 245.62899780273438 + "x": 347.85699462890625, + "y": 118.72799682617188 }, { - "x": 550.4760131835938, - "y": 246.45700073242188 + "x": 345.885986328125, + "y": 119.43699645996094 }, { - "x": 546.35302734375, - "y": 247.19900512695312 + "x": 343.9010009765625, + "y": 120.1050033569336 }, { - "x": 542.2160034179688, - "y": 247.85400390625 + "x": 341.90301513671875, + "y": 120.73100280761719 }, { - "x": 538.0659790039062, - "y": 248.4219970703125 + "x": 339.8909912109375, + "y": 121.31600189208984 }, { - "x": 533.905029296875, - "y": 248.9040069580078 + "x": 337.8680114746094, + "y": 121.85800170898438 }, { - "x": 529.7349853515625, - "y": 249.29800415039062 + "x": 335.8349914550781, + "y": 122.35700225830078 }, { - "x": 525.5579833984375, - "y": 249.60499572753906 + "x": 333.7909851074219, + "y": 122.81400299072266 }, { - "x": 521.375, - "y": 249.82400512695312 + "x": 331.7380065917969, + "y": 123.22799682617188 }, { - "x": 517.18798828125, - "y": 249.95599365234375 + "x": 329.6759948730469, + "y": 123.5989990234375 }, { - "x": 513, - "y": 250 + "x": 327.6080017089844, + "y": 123.927001953125 }, { - "x": 508.8110046386719, - "y": 249.95599365234375 + "x": 325.5329895019531, + "y": 124.21099853515625 }, { - "x": 504.6239929199219, - "y": 249.82400512695312 + "x": 323.4519958496094, + "y": 124.4520034790039 }, { - "x": 500.4410095214844, - "y": 249.60499572753906 + "x": 321.36700439453125, + "y": 124.64900207519531 }, { - "x": 496.2640075683594, - "y": 249.29800415039062 + "x": 319.27899169921875, + "y": 124.802001953125 }, { - "x": 492.093994140625, - "y": 248.9040069580078 + "x": 317.18701171875, + "y": 124.91200256347656 }, { - "x": 487.9330139160156, - "y": 248.4219970703125 + "x": 315.093994140625, + "y": 124.97799682617188 }, { - "x": 483.7829895019531, - "y": 247.85400390625 + "x": 313, + "y": 125 }, { - "x": 479.64599609375, - "y": 247.19900512695312 + "x": 310.9049987792969, + "y": 124.97799682617188 }, { - "x": 475.52301025390625, - "y": 246.45700073242188 + "x": 308.81201171875, + "y": 124.91200256347656 }, { - "x": 471.4169921875, - "y": 245.62899780273438 + "x": 306.7200012207031, + "y": 124.802001953125 }, { - "x": 467.3290100097656, - "y": 244.71499633789062 + "x": 304.6319885253906, + "y": 124.64900207519531 }, { - "x": 463.2619934082031, - "y": 243.71600341796875 + "x": 302.5469970703125, + "y": 124.4520034790039 }, { - "x": 459.21600341796875, - "y": 242.6320037841797 + "x": 300.46600341796875, + "y": 124.21099853515625 }, { - "x": 455.1929931640625, - "y": 241.46299743652344 + "x": 298.3909912109375, + "y": 123.927001953125 }, { - "x": 451.1960144042969, - "y": 240.21099853515625 + "x": 296.322998046875, + "y": 123.5989990234375 }, { - "x": 447.22601318359375, - "y": 238.875 + "x": 294.260986328125, + "y": 123.22799682617188 }, { - "x": 443.2850036621094, - "y": 237.45599365234375 + "x": 292.2080078125, + "y": 122.81400299072266 }, { - "x": 439.375, - "y": 235.9550018310547 + "x": 290.16400146484375, + "y": 122.35700225830078 }, { - "x": 435.4960021972656, - "y": 234.3719940185547 + "x": 288.1310119628906, + "y": 121.85800170898438 }, { - "x": 431.6520080566406, - "y": 232.70899963378906 + "x": 286.1080017089844, + "y": 121.31600189208984 }, { - "x": 427.843994140625, - "y": 230.96499633789062 + "x": 284.09600830078125, + "y": 120.73100280761719 }, { - "x": 424.0719909667969, - "y": 229.14199829101562 + "x": 282.0979919433594, + "y": 120.1050033569336 }, { - "x": 420.3399963378906, - "y": 227.24000549316406 + "x": 280.1130065917969, + "y": 119.43699645996094 }, { - "x": 416.64898681640625, - "y": 225.26100158691406 + "x": 278.1419982910156, + "y": 118.72799682617188 }, { - "x": 413, - "y": 223.2050018310547 + "x": 276.18701171875, + "y": 117.97699737548828 }, { - "x": 409.3940124511719, - "y": 221.07200622558594 + "x": 274.24798583984375, + "y": 117.18599700927734 }, { - "x": 405.8340148925781, - "y": 218.86500549316406 + "x": 272.32598876953125, + "y": 116.35399627685547 }, { - "x": 402.3210144042969, - "y": 216.58399963378906 + "x": 270.4219970703125, + "y": 115.48200225830078 }, { - "x": 398.85699462890625, - "y": 214.22900390625 + "x": 268.5360107421875, + "y": 114.57099914550781 }, { - "x": 395.4419860839844, - "y": 211.80299377441406 + "x": 266.6700134277344, + "y": 113.62000274658203 }, { - "x": 392.0799865722656, - "y": 209.30499267578125 + "x": 264.8240051269531, + "y": 112.62999725341797 }, { - "x": 388.7699890136719, - "y": 206.73800659179688 + "x": 263, + "y": 111.60199737548828 }, { - "x": 385.5150146484375, - "y": 204.1020050048828 + "x": 261.1969909667969, + "y": 110.53600311279297 }, { - "x": 382.31500244140625, - "y": 201.3990020751953 + "x": 259.4169921875, + "y": 109.43199920654297 }, { - "x": 379.1730041503906, - "y": 198.6280059814453 + "x": 257.6600036621094, + "y": 108.29199981689453 }, { - "x": 376.0899963378906, - "y": 195.79299926757812 + "x": 255.92799377441406, + "y": 107.11399841308594 }, { - "x": 373.0669860839844, - "y": 192.8939971923828 + "x": 256.2980041503906, + "y": 107.4749984741211 }, { - "x": 370.1050109863281, - "y": 189.9320068359375 - }, - { - "x": 367.20599365234375, - "y": 186.90899658203125 - }, - { - "x": 366.47198486328125, - "y": 186.177001953125 - }, - { - "x": 363.6419982910156, - "y": 183 + "x": 252.89700317382812, + "y": 104.91799926757812 } ], "isCurve": true, @@ -2376,376 +2000,344 @@ "link": "", "route": [ { - "x": 998.5, - "y": -198.21800231933594 - }, - { - "x": 1003.2860107421875, - "y": -197.53700256347656 - }, - { - "x": 1009.4760131835938, - "y": -196.45700073242188 - }, - { - "x": 1015.6279907226562, - "y": -195.18299865722656 + "x": 625.5, + "y": -96.41200256347656 }, { - "x": 1021.7369995117188, - "y": -193.71600341796875 + "x": 626.8989868164062, + "y": -96.02899932861328 }, { - "x": 1027.7979736328125, - "y": -192.05799865722656 + "x": 629.9010009765625, + "y": -95.1050033569336 }, { - "x": 1033.802978515625, - "y": -190.21099853515625 + "x": 632.8729858398438, + "y": -94.08799743652344 }, { - "x": 1039.7469482421875, - "y": -188.17599487304688 + "x": 635.81201171875, + "y": -92.97699737548828 }, { - "x": 1045.6240234375, - "y": -185.9550018310547 + "x": 638.7139892578125, + "y": -91.7750015258789 }, { - "x": 1051.428955078125, - "y": -183.5500030517578 + "x": 641.5770263671875, + "y": -90.48200225830078 }, { - "x": 1057.155029296875, - "y": -180.96499633789062 + "x": 644.3989868164062, + "y": -89.0999984741211 }, { - "x": 1062.7979736328125, - "y": -178.2010040283203 + "x": 647.1749877929688, + "y": -87.62999725341797 }, { - "x": 1068.3499755859375, - "y": -175.26100158691406 + "x": 649.9039916992188, + "y": -86.0739974975586 }, { - "x": 1073.8079833984375, - "y": -172.1479949951172 + "x": 652.5819702148438, + "y": -84.43199920654297 }, { - "x": 1079.1650390625, - "y": -168.86500549316406 + "x": 655.2080078125, + "y": -82.70800018310547 }, { - "x": 1084.416015625, - "y": -165.41600036621094 + "x": 657.7780151367188, + "y": -80.9010009765625 }, { - "x": 1089.5570068359375, - "y": -161.80299377441406 + "x": 660.2899780273438, + "y": -79.01499938964844 }, { - "x": 1094.5810546875, - "y": -158.031005859375 + "x": 662.7420043945312, + "y": -77.0510025024414 }, { - "x": 1099.4840087890625, - "y": -154.1020050048828 + "x": 665.1309814453125, + "y": -75.01100158691406 }, { - "x": 1104.261962890625, - "y": -150.02200317382812 + "x": 667.4539794921875, + "y": -72.89600372314453 }, { - "x": 1108.9090576171875, - "y": -145.79299926757812 + "x": 669.7100219726562, + "y": -70.70999908447266 }, { - "x": 1113.4210205078125, - "y": -141.42100524902344 + "x": 671.89599609375, + "y": -68.4540023803711 }, { - "x": 1117.79296875, - "y": -136.90899658203125 + "x": 674.010986328125, + "y": -66.13099670410156 }, { - "x": 1122.02197265625, - "y": -132.26199340820312 + "x": 676.051025390625, + "y": -63.742000579833984 }, { - "x": 1126.10205078125, - "y": -127.48400115966797 + "x": 678.0150146484375, + "y": -61.290000915527344 }, { - "x": 1130.031005859375, - "y": -122.58100128173828 + "x": 679.9010009765625, + "y": -58.77799987792969 }, { - "x": 1133.802978515625, - "y": -117.55699920654297 + "x": 681.7080078125, + "y": -56.20800018310547 }, { - "x": 1137.416015625, - "y": -112.41600036621094 + "x": 683.4320068359375, + "y": -53.582000732421875 }, { - "x": 1140.864990234375, - "y": -107.16500091552734 + "x": 685.073974609375, + "y": -50.90399932861328 }, { - "x": 1144.14794921875, - "y": -101.80799865722656 + "x": 686.6300048828125, + "y": -48.17499923706055 }, { - "x": 1147.260986328125, - "y": -96.3499984741211 + "x": 688.0999755859375, + "y": -45.39899826049805 }, { - "x": 1150.2010498046875, - "y": -90.7979965209961 + "x": 689.4819946289062, + "y": -42.57699966430664 }, { - "x": 1152.9649658203125, - "y": -85.15499877929688 + "x": 690.7750244140625, + "y": -39.7140007019043 }, { - "x": 1155.550048828125, - "y": -79.42900085449219 + "x": 691.9769897460938, + "y": -36.8120002746582 }, { - "x": 1157.9549560546875, - "y": -73.6240005493164 + "x": 693.0880126953125, + "y": -33.87300109863281 }, { - "x": 1160.176025390625, - "y": -67.74700164794922 + "x": 694.10498046875, + "y": -30.900999069213867 }, { - "x": 1162.2110595703125, - "y": -61.803001403808594 + "x": 695.0289916992188, + "y": -27.89900016784668 }, { - "x": 1164.0579833984375, - "y": -55.79800033569336 + "x": 695.8579711914062, + "y": -24.868000030517578 }, { - "x": 1165.7159423828125, - "y": -49.73699951171875 + "x": 696.5910034179688, + "y": -21.81399917602539 }, { - "x": 1167.1829833984375, - "y": -43.62799835205078 + "x": 697.22802734375, + "y": -18.738000869750977 }, { - "x": 1168.45703125, - "y": -37.47600173950195 + "x": 697.7680053710938, + "y": -15.642999649047852 }, { - "x": 1169.5369873046875, - "y": -31.285999298095703 + "x": 698.2109985351562, + "y": -12.532999992370605 }, { - "x": 1170.4219970703125, - "y": -25.06599998474121 + "x": 698.5560302734375, + "y": -9.40999984741211 }, { - "x": 1171.112060546875, - "y": -18.820999145507812 + "x": 698.802001953125, + "y": -6.2789998054504395 }, { - "x": 1171.60498046875, - "y": -12.557999610900879 + "x": 698.9500122070312, + "y": -3.1410000324249268 }, { - "x": 1171.9010009765625, - "y": -6.2820000648498535 - }, - { - "x": 1172, + "x": 699, "y": 0 }, { - "x": 1171.9010009765625, - "y": 6.2820000648498535 - }, - { - "x": 1171.60498046875, - "y": 12.557999610900879 - }, - { - "x": 1171.112060546875, - "y": 18.820999145507812 - }, - { - "x": 1170.4219970703125, - "y": 25.06599998474121 - }, - { - "x": 1169.5369873046875, - "y": 31.285999298095703 + "x": 698.9500122070312, + "y": 3.1410000324249268 }, { - "x": 1168.45703125, - "y": 37.47600173950195 + "x": 698.802001953125, + "y": 6.2789998054504395 }, { - "x": 1167.1829833984375, - "y": 43.62799835205078 + "x": 698.5560302734375, + "y": 9.40999984741211 }, { - "x": 1165.7159423828125, - "y": 49.73699951171875 + "x": 698.2109985351562, + "y": 12.532999992370605 }, { - "x": 1164.0579833984375, - "y": 55.79800033569336 + "x": 697.7680053710938, + "y": 15.642999649047852 }, { - "x": 1162.2110595703125, - "y": 61.803001403808594 + "x": 697.22802734375, + "y": 18.738000869750977 }, { - "x": 1160.176025390625, - "y": 67.74700164794922 + "x": 696.5910034179688, + "y": 21.81399917602539 }, { - "x": 1157.9549560546875, - "y": 73.6240005493164 + "x": 695.8579711914062, + "y": 24.868000030517578 }, { - "x": 1155.550048828125, - "y": 79.42900085449219 + "x": 695.0289916992188, + "y": 27.89900016784668 }, { - "x": 1152.9649658203125, - "y": 85.15499877929688 + "x": 694.10498046875, + "y": 30.900999069213867 }, { - "x": 1150.2010498046875, - "y": 90.7979965209961 + "x": 693.0880126953125, + "y": 33.87300109863281 }, { - "x": 1147.260986328125, - "y": 96.3499984741211 + "x": 691.9769897460938, + "y": 36.8120002746582 }, { - "x": 1144.14794921875, - "y": 101.80799865722656 + "x": 690.7750244140625, + "y": 39.7140007019043 }, { - "x": 1140.864990234375, - "y": 107.16500091552734 + "x": 689.4819946289062, + "y": 42.57699966430664 }, { - "x": 1137.416015625, - "y": 112.41600036621094 + "x": 688.0999755859375, + "y": 45.39899826049805 }, { - "x": 1133.802978515625, - "y": 117.55699920654297 + "x": 686.6300048828125, + "y": 48.17499923706055 }, { - "x": 1130.031005859375, - "y": 122.58100128173828 + "x": 685.073974609375, + "y": 50.90399932861328 }, { - "x": 1126.10205078125, - "y": 127.48400115966797 + "x": 683.4320068359375, + "y": 53.582000732421875 }, { - "x": 1122.02197265625, - "y": 132.26199340820312 + "x": 681.7080078125, + "y": 56.20800018310547 }, { - "x": 1117.79296875, - "y": 136.90899658203125 + "x": 679.9010009765625, + "y": 58.77799987792969 }, { - "x": 1113.4210205078125, - "y": 141.42100524902344 + "x": 678.0150146484375, + "y": 61.290000915527344 }, { - "x": 1108.9090576171875, - "y": 145.79299926757812 + "x": 676.051025390625, + "y": 63.742000579833984 }, { - "x": 1104.261962890625, - "y": 150.02200317382812 + "x": 674.010986328125, + "y": 66.13099670410156 }, { - "x": 1099.4840087890625, - "y": 154.1020050048828 + "x": 671.89599609375, + "y": 68.4540023803711 }, { - "x": 1094.5810546875, - "y": 158.031005859375 + "x": 669.7100219726562, + "y": 70.70999908447266 }, { - "x": 1089.5570068359375, - "y": 161.80299377441406 + "x": 667.4539794921875, + "y": 72.89600372314453 }, { - "x": 1084.416015625, - "y": 165.41600036621094 + "x": 665.1309814453125, + "y": 75.01100158691406 }, { - "x": 1079.1650390625, - "y": 168.86500549316406 + "x": 662.7420043945312, + "y": 77.0510025024414 }, { - "x": 1073.8079833984375, - "y": 172.1479949951172 + "x": 660.2899780273438, + "y": 79.01499938964844 }, { - "x": 1068.3499755859375, - "y": 175.26100158691406 + "x": 657.7780151367188, + "y": 80.9010009765625 }, { - "x": 1062.7979736328125, - "y": 178.2010040283203 + "x": 655.2080078125, + "y": 82.70800018310547 }, { - "x": 1057.155029296875, - "y": 180.96499633789062 + "x": 652.5819702148438, + "y": 84.43199920654297 }, { - "x": 1051.428955078125, - "y": 183.5500030517578 + "x": 649.9039916992188, + "y": 86.0739974975586 }, { - "x": 1045.6240234375, - "y": 185.9550018310547 + "x": 647.1749877929688, + "y": 87.62999725341797 }, { - "x": 1039.7469482421875, - "y": 188.17599487304688 + "x": 644.3989868164062, + "y": 89.0999984741211 }, { - "x": 1033.802978515625, - "y": 190.21099853515625 + "x": 641.5770263671875, + "y": 90.48200225830078 }, { - "x": 1027.7979736328125, - "y": 192.05799865722656 + "x": 638.7139892578125, + "y": 91.7750015258789 }, { - "x": 1021.7369995117188, - "y": 193.71600341796875 + "x": 635.81201171875, + "y": 92.97699737548828 }, { - "x": 1015.6279907226562, - "y": 195.18299865722656 + "x": 632.8729858398438, + "y": 94.08799743652344 }, { - "x": 1009.4760131835938, - "y": 196.45700073242188 + "x": 629.9010009765625, + "y": 95.1050033569336 }, { - "x": 1003.2860107421875, - "y": 197.53700256347656 + "x": 629.6019897460938, + "y": 95.28399658203125 }, { - "x": 998.5, - "y": 198.21800231933594 + "x": 625.5, + "y": 96.41200256347656 } ], "isCurve": true, diff --git a/e2etests/testdata/txtar/cycle-diagram/dagre/sketch.exp.svg b/e2etests/testdata/txtar/cycle-diagram/dagre/sketch.exp.svg index 88a40d4eb5..23ae56b6ca 100644 --- a/e2etests/testdata/txtar/cycle-diagram/dagre/sketch.exp.svg +++ b/e2etests/testdata/txtar/cycle-diagram/dagre/sketch.exp.svg @@ -1,9 +1,9 @@ -abcdabcab - - - - - - - - - - + .d2-2975717624 .fill-N1{fill:#0A0F25;} + .d2-2975717624 .fill-N2{fill:#676C7E;} + .d2-2975717624 .fill-N3{fill:#9499AB;} + .d2-2975717624 .fill-N4{fill:#CFD2DD;} + .d2-2975717624 .fill-N5{fill:#DEE1EB;} + .d2-2975717624 .fill-N6{fill:#EEF1F8;} + .d2-2975717624 .fill-N7{fill:#FFFFFF;} + .d2-2975717624 .fill-B1{fill:#0D32B2;} + .d2-2975717624 .fill-B2{fill:#0D32B2;} + .d2-2975717624 .fill-B3{fill:#E3E9FD;} + .d2-2975717624 .fill-B4{fill:#E3E9FD;} + .d2-2975717624 .fill-B5{fill:#EDF0FD;} + .d2-2975717624 .fill-B6{fill:#F7F8FE;} + .d2-2975717624 .fill-AA2{fill:#4A6FF3;} + .d2-2975717624 .fill-AA4{fill:#EDF0FD;} + .d2-2975717624 .fill-AA5{fill:#F7F8FE;} + .d2-2975717624 .fill-AB4{fill:#EDF0FD;} + .d2-2975717624 .fill-AB5{fill:#F7F8FE;} + .d2-2975717624 .stroke-N1{stroke:#0A0F25;} + .d2-2975717624 .stroke-N2{stroke:#676C7E;} + .d2-2975717624 .stroke-N3{stroke:#9499AB;} + .d2-2975717624 .stroke-N4{stroke:#CFD2DD;} + .d2-2975717624 .stroke-N5{stroke:#DEE1EB;} + .d2-2975717624 .stroke-N6{stroke:#EEF1F8;} + .d2-2975717624 .stroke-N7{stroke:#FFFFFF;} + .d2-2975717624 .stroke-B1{stroke:#0D32B2;} + .d2-2975717624 .stroke-B2{stroke:#0D32B2;} + .d2-2975717624 .stroke-B3{stroke:#E3E9FD;} + .d2-2975717624 .stroke-B4{stroke:#E3E9FD;} + .d2-2975717624 .stroke-B5{stroke:#EDF0FD;} + .d2-2975717624 .stroke-B6{stroke:#F7F8FE;} + .d2-2975717624 .stroke-AA2{stroke:#4A6FF3;} + .d2-2975717624 .stroke-AA4{stroke:#EDF0FD;} + .d2-2975717624 .stroke-AA5{stroke:#F7F8FE;} + .d2-2975717624 .stroke-AB4{stroke:#EDF0FD;} + .d2-2975717624 .stroke-AB5{stroke:#F7F8FE;} + .d2-2975717624 .background-color-N1{background-color:#0A0F25;} + .d2-2975717624 .background-color-N2{background-color:#676C7E;} + .d2-2975717624 .background-color-N3{background-color:#9499AB;} + .d2-2975717624 .background-color-N4{background-color:#CFD2DD;} + .d2-2975717624 .background-color-N5{background-color:#DEE1EB;} + .d2-2975717624 .background-color-N6{background-color:#EEF1F8;} + .d2-2975717624 .background-color-N7{background-color:#FFFFFF;} + .d2-2975717624 .background-color-B1{background-color:#0D32B2;} + .d2-2975717624 .background-color-B2{background-color:#0D32B2;} + .d2-2975717624 .background-color-B3{background-color:#E3E9FD;} + .d2-2975717624 .background-color-B4{background-color:#E3E9FD;} + .d2-2975717624 .background-color-B5{background-color:#EDF0FD;} + .d2-2975717624 .background-color-B6{background-color:#F7F8FE;} + .d2-2975717624 .background-color-AA2{background-color:#4A6FF3;} + .d2-2975717624 .background-color-AA4{background-color:#EDF0FD;} + .d2-2975717624 .background-color-AA5{background-color:#F7F8FE;} + .d2-2975717624 .background-color-AB4{background-color:#EDF0FD;} + .d2-2975717624 .background-color-AB5{background-color:#F7F8FE;} + .d2-2975717624 .color-N1{color:#0A0F25;} + .d2-2975717624 .color-N2{color:#676C7E;} + .d2-2975717624 .color-N3{color:#9499AB;} + .d2-2975717624 .color-N4{color:#CFD2DD;} + .d2-2975717624 .color-N5{color:#DEE1EB;} + .d2-2975717624 .color-N6{color:#EEF1F8;} + .d2-2975717624 .color-N7{color:#FFFFFF;} + .d2-2975717624 .color-B1{color:#0D32B2;} + .d2-2975717624 .color-B2{color:#0D32B2;} + .d2-2975717624 .color-B3{color:#E3E9FD;} + .d2-2975717624 .color-B4{color:#E3E9FD;} + .d2-2975717624 .color-B5{color:#EDF0FD;} + .d2-2975717624 .color-B6{color:#F7F8FE;} + .d2-2975717624 .color-AA2{color:#4A6FF3;} + .d2-2975717624 .color-AA4{color:#EDF0FD;} + .d2-2975717624 .color-AA5{color:#F7F8FE;} + .d2-2975717624 .color-AB4{color:#EDF0FD;} + .d2-2975717624 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker-d2-2975717624);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker-d2-2975717624);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright-d2-2975717624);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright-d2-2975717624);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright-d2-2975717624);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright-d2-2975717624);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark-d2-2975717624);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright-d2-2975717624);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright-d2-2975717624);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright-d2-2975717624);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright-d2-2975717624);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker-d2-2975717624);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark-d2-2975717624);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal-d2-2975717624);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal-d2-2975717624);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright-d2-2975717624);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright-d2-2975717624);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright-d2-2975717624);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>abcdabcab + + + + + + + + + + \ No newline at end of file diff --git a/e2etests/testdata/txtar/cycle-diagram/elk/board.exp.json b/e2etests/testdata/txtar/cycle-diagram/elk/board.exp.json index f05462190e..17b8eb8c62 100644 --- a/e2etests/testdata/txtar/cycle-diagram/elk/board.exp.json +++ b/e2etests/testdata/txtar/cycle-diagram/elk/board.exp.json @@ -18,8 +18,8 @@ "x": 12, "y": 12 }, - "width": 454, - "height": 466, + "width": 254, + "height": 266, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -57,7 +57,7 @@ "type": "rectangle", "pos": { "x": -14, - "y": -221 + "y": -121 }, "width": 53, "height": 66, @@ -98,7 +98,7 @@ "id": "1.b", "type": "rectangle", "pos": { - "x": 185, + "x": 85, "y": -21 }, "width": 53, @@ -141,7 +141,7 @@ "type": "rectangle", "pos": { "x": -14, - "y": 179 + "y": 79 }, "width": 53, "height": 66, @@ -182,7 +182,7 @@ "id": "1.d", "type": "rectangle", "pos": { - "x": -215, + "x": -115, "y": -20 }, "width": 54, @@ -224,11 +224,11 @@ "id": "2", "type": "cycle", "pos": { - "x": 485, - "y": 61 + "x": 285, + "y": 36 }, - "width": 400, - "height": 367, + "width": 227, + "height": 217, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -265,8 +265,8 @@ "id": "2.a", "type": "rectangle", "pos": { - "x": 459, - "y": -171 + "x": 259, + "y": -96 }, "width": 53, "height": 66, @@ -307,8 +307,8 @@ "id": "2.b", "type": "rectangle", "pos": { - "x": 632, - "y": 128 + "x": 345, + "y": 53 }, "width": 53, "height": 66, @@ -349,8 +349,8 @@ "id": "2.c", "type": "rectangle", "pos": { - "x": 285, - "y": 129 + "x": 172, + "y": 54 }, "width": 53, "height": 66, @@ -391,11 +391,11 @@ "id": "3", "type": "cycle", "pos": { - "x": 904, + "x": 531, "y": 12 }, "width": 53, - "height": 466, + "height": 266, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -432,8 +432,8 @@ "id": "3.a", "type": "rectangle", "pos": { - "x": 878, - "y": -221 + "x": 505, + "y": -121 }, "width": 53, "height": 66, @@ -474,8 +474,8 @@ "id": "3.b", "type": "rectangle", "pos": { - "x": 878, - "y": 179 + "x": 505, + "y": 79 }, "width": 53, "height": 66, @@ -541,334 +541,254 @@ "route": [ { "x": 38.5, - "y": -186.22999572753906 - }, - { - "x": 40.18000030517578, - "y": -186.00399780273438 - }, - { - "x": 43.2859992980957, - "y": -185.53700256347656 - }, - { - "x": 46.3849983215332, - "y": -185.02099609375 - }, - { - "x": 49.47600173950195, - "y": -184.45700073242188 - }, - { - "x": 52.55699920654297, - "y": -183.843994140625 - }, - { - "x": 55.62799835205078, - "y": -183.18299865722656 - }, - { - "x": 58.68899917602539, - "y": -182.47300720214844 - }, - { - "x": 61.73699951171875, - "y": -181.71600341796875 - }, - { - "x": 64.77400207519531, - "y": -180.91099548339844 - }, - { - "x": 67.7979965209961, - "y": -180.05799865722656 - }, - { - "x": 70.80799865722656, - "y": -179.1580047607422 - }, - { - "x": 73.8030014038086, - "y": -178.21099853515625 + "y": -84.4229965209961 }, { - "x": 76.78299713134766, - "y": -177.2169952392578 + "x": 39.89899826049805, + "y": -84.02899932861328 }, { - "x": 79.74700164794922, - "y": -176.17599487304688 + "x": 41.40399932861328, + "y": -83.5790023803711 }, { - "x": 82.69400024414062, - "y": -175.08799743652344 + "x": 42.9010009765625, + "y": -83.1050033569336 }, { - "x": 85.6240005493164, - "y": -173.9550018310547 + "x": 44.39099884033203, + "y": -82.60800170898438 }, { - "x": 88.53600311279297, - "y": -172.77499389648438 + "x": 45.87300109863281, + "y": -82.08799743652344 }, { - "x": 91.42900085449219, - "y": -171.5500030517578 + "x": 47.34700012207031, + "y": -81.54399871826172 }, { - "x": 94.302001953125, - "y": -170.27999877929688 + "x": 48.8120002746582, + "y": -80.97699737548828 }, { - "x": 97.15499877929688, - "y": -168.96499633789062 + "x": 50.268001556396484, + "y": -80.38700103759766 }, { - "x": 99.98699951171875, - "y": -167.60499572753906 + "x": 51.7140007019043, + "y": -79.7750015258789 }, { - "x": 102.7979965209961, - "y": -166.2010040283203 + "x": 53.1510009765625, + "y": -79.13999938964844 }, { - "x": 105.58499908447266, - "y": -164.7530059814453 + "x": 54.57699966430664, + "y": -78.48200225830078 }, { - "x": 108.3499984741211, - "y": -163.26100158691406 + "x": 55.99300003051758, + "y": -77.802001953125 }, { - "x": 111.09100341796875, - "y": -161.7259979248047 + "x": 57.39899826049805, + "y": -77.0999984741211 }, { - "x": 113.80799865722656, - "y": -160.1479949951172 + "x": 58.79199981689453, + "y": -76.3759994506836 }, { - "x": 116.4990005493164, - "y": -158.5279998779297 + "x": 60.17499923706055, + "y": -75.62999725341797 }, { - "x": 119.16500091552734, - "y": -156.86500549316406 + "x": 61.54499816894531, + "y": -74.86299896240234 }, { - "x": 121.80400085449219, - "y": -155.16099548339844 + "x": 62.90399932861328, + "y": -74.0739974975586 }, { - "x": 124.41600036621094, - "y": -153.41600036621094 + "x": 64.2490005493164, + "y": -73.26399993896484 }, { - "x": 127.0009994506836, - "y": -151.62899780273438 + "x": 65.58200073242188, + "y": -72.43199920654297 }, { - "x": 129.5570068359375, - "y": -149.80299377441406 + "x": 66.9020004272461, + "y": -71.58000183105469 }, { - "x": 132.08399963378906, - "y": -147.93600463867188 + "x": 68.20800018310547, + "y": -70.70800018310547 }, { - "x": 134.58099365234375, - "y": -146.031005859375 + "x": 69.5, + "y": -69.81400299072266 }, { - "x": 137.04800415039062, - "y": -144.08599853515625 + "x": 70.77799987792969, + "y": -68.9010009765625 }, { - "x": 139.48399353027344, - "y": -142.1020050048828 + "x": 72.04199981689453, + "y": -67.96800231933594 }, { - "x": 141.88900756835938, - "y": -140.08099365234375 + "x": 73.29000091552734, + "y": -67.01499938964844 }, { - "x": 144.26199340820312, - "y": -138.02200317382812 + "x": 74.52400207519531, + "y": -66.04299926757812 }, { - "x": 146.6020050048828, - "y": -135.92599487304688 + "x": 75.74199676513672, + "y": -65.0510025024414 }, { - "x": 148.90899658203125, - "y": -133.79299926757812 + "x": 76.94400024414062, + "y": -64.04000091552734 }, { - "x": 151.1820068359375, - "y": -131.625 + "x": 78.13099670410156, + "y": -63.01100158691406 }, { - "x": 153.42100524902344, - "y": -129.42100524902344 + "x": 79.3010025024414, + "y": -61.9630012512207 }, { - "x": 155.625, - "y": -127.18199920654297 + "x": 80.4540023803711, + "y": -60.895999908447266 }, { - "x": 157.79299926757812, - "y": -124.90899658203125 + "x": 81.59100341796875, + "y": -59.8120002746582 }, { - "x": 159.92599487304688, - "y": -122.60199737548828 + "x": 82.70999908447266, + "y": -58.709999084472656 }, { - "x": 162.02200317382812, - "y": -120.26200103759766 + "x": 83.81199645996094, + "y": -57.590999603271484 }, { - "x": 164.08099365234375, - "y": -117.88899993896484 + "x": 84.89600372314453, + "y": -56.45399856567383 }, { - "x": 166.1020050048828, - "y": -115.48400115966797 + "x": 85.96299743652344, + "y": -55.30099868774414 }, { - "x": 168.08599853515625, - "y": -113.0479965209961 + "x": 87.01100158691406, + "y": -54.13100051879883 }, { - "x": 170.031005859375, - "y": -110.58100128173828 + "x": 88.04000091552734, + "y": -52.944000244140625 }, { - "x": 171.93600463867188, - "y": -108.08399963378906 + "x": 89.0510025024414, + "y": -51.742000579833984 }, { - "x": 173.80299377441406, - "y": -105.55699920654297 + "x": 90.04299926757812, + "y": -50.52399826049805 }, { - "x": 175.62899780273438, - "y": -103.0009994506836 + "x": 91.01499938964844, + "y": -49.290000915527344 }, { - "x": 177.41600036621094, - "y": -100.41600036621094 + "x": 91.96800231933594, + "y": -48.04199981689453 }, { - "x": 179.16099548339844, - "y": -97.80400085449219 + "x": 92.9010009765625, + "y": -46.77799987792969 }, { - "x": 180.86500549316406, - "y": -95.16500091552734 + "x": 93.81400299072266, + "y": -45.5 }, { - "x": 182.5279998779297, - "y": -92.4990005493164 + "x": 94.70800018310547, + "y": -44.20800018310547 }, { - "x": 184.1479949951172, - "y": -89.80799865722656 + "x": 95.58000183105469, + "y": -42.902000427246094 }, { - "x": 185.7259979248047, - "y": -87.09100341796875 + "x": 96.43199920654297, + "y": -41.582000732421875 }, { - "x": 187.26100158691406, - "y": -84.3499984741211 + "x": 97.26399993896484, + "y": -40.249000549316406 }, { - "x": 188.7530059814453, - "y": -81.58499908447266 + "x": 98.0739974975586, + "y": -38.90399932861328 }, { - "x": 190.2010040283203, - "y": -78.7979965209961 + "x": 98.86299896240234, + "y": -37.54499816894531 }, { - "x": 191.60499572753906, - "y": -75.98699951171875 + "x": 99.62999725341797, + "y": -36.17499923706055 }, { - "x": 192.96499633789062, - "y": -73.15499877929688 + "x": 100.3759994506836, + "y": -34.79199981689453 }, { - "x": 194.27999877929688, - "y": -70.302001953125 + "x": 101.0999984741211, + "y": -33.39899826049805 }, { - "x": 195.5500030517578, - "y": -67.42900085449219 + "x": 101.802001953125, + "y": -31.993000030517578 }, { - "x": 196.77499389648438, - "y": -64.53600311279297 + "x": 102.48200225830078, + "y": -30.57699966430664 }, { - "x": 197.9550018310547, - "y": -61.624000549316406 + "x": 103.13999938964844, + "y": -29.150999069213867 }, { - "x": 199.08799743652344, - "y": -58.694000244140625 + "x": 103.7750015258789, + "y": -27.714000701904297 }, { - "x": 200.17599487304688, - "y": -55.74700164794922 + "x": 104.38700103759766, + "y": -26.26799964904785 }, { - "x": 201.2169952392578, - "y": -52.78300094604492 + "x": 104.97699737548828, + "y": -24.812000274658203 }, { - "x": 202.21099853515625, - "y": -49.803001403808594 + "x": 105.54399871826172, + "y": -23.347000122070312 }, { - "x": 203.1580047607422, - "y": -46.80799865722656 + "x": 104.98999786376953, + "y": -25.016000747680664 }, { - "x": 204.05799865722656, - "y": -43.79800033569336 - }, - { - "x": 204.91099548339844, - "y": -40.77399826049805 - }, - { - "x": 205.71600341796875, - "y": -37.73699951171875 - }, - { - "x": 206.47300720214844, - "y": -34.68899917602539 - }, - { - "x": 207.18299865722656, - "y": -31.628000259399414 - }, - { - "x": 207.843994140625, - "y": -28.55699920654297 - }, - { - "x": 208.45700073242188, - "y": -25.47599983215332 - }, - { - "x": 208.5500030517578, - "y": -25.195999145507812 - }, - { - "x": 209.2519989013672, + "x": 106.39399719238281, "y": -21 } ], @@ -904,336 +824,256 @@ "link": "", "route": [ { - "x": 209.2519989013672, + "x": 106.39399719238281, "y": 45 }, { - "x": 209.02099609375, - "y": 46.3849983215332 - }, - { - "x": 208.45700073242188, - "y": 49.47600173950195 - }, - { - "x": 207.843994140625, - "y": 52.55699920654297 - }, - { - "x": 207.18299865722656, - "y": 55.62799835205078 - }, - { - "x": 206.47300720214844, - "y": 58.68899917602539 - }, - { - "x": 205.71600341796875, - "y": 61.73699951171875 + "x": 106.08799743652344, + "y": 45.87300109863281 }, { - "x": 204.91099548339844, - "y": 64.77400207519531 + "x": 105.54399871826172, + "y": 47.34700012207031 }, { - "x": 204.05799865722656, - "y": 67.7979965209961 + "x": 104.97699737548828, + "y": 48.8120002746582 }, { - "x": 203.1580047607422, - "y": 70.80799865722656 + "x": 104.38700103759766, + "y": 50.268001556396484 }, { - "x": 202.21099853515625, - "y": 73.8030014038086 + "x": 103.7750015258789, + "y": 51.7140007019043 }, { - "x": 201.2169952392578, - "y": 76.78299713134766 + "x": 103.13999938964844, + "y": 53.1510009765625 }, { - "x": 200.17599487304688, - "y": 79.74700164794922 + "x": 102.48200225830078, + "y": 54.57699966430664 }, { - "x": 199.08799743652344, - "y": 82.69400024414062 + "x": 101.802001953125, + "y": 55.99300003051758 }, { - "x": 197.9550018310547, - "y": 85.6240005493164 + "x": 101.0999984741211, + "y": 57.39899826049805 }, { - "x": 196.77499389648438, - "y": 88.53600311279297 + "x": 100.3759994506836, + "y": 58.79199981689453 }, { - "x": 195.5500030517578, - "y": 91.42900085449219 + "x": 99.62999725341797, + "y": 60.17499923706055 }, { - "x": 194.27999877929688, - "y": 94.302001953125 + "x": 98.86299896240234, + "y": 61.54499816894531 }, { - "x": 192.96499633789062, - "y": 97.15499877929688 + "x": 98.0739974975586, + "y": 62.90399932861328 }, { - "x": 191.60499572753906, - "y": 99.98699951171875 + "x": 97.26399993896484, + "y": 64.2490005493164 }, { - "x": 190.2010040283203, - "y": 102.7979965209961 + "x": 96.43199920654297, + "y": 65.58200073242188 }, { - "x": 188.7530059814453, - "y": 105.58499908447266 + "x": 95.58000183105469, + "y": 66.9020004272461 }, { - "x": 187.26100158691406, - "y": 108.3499984741211 + "x": 94.70800018310547, + "y": 68.20800018310547 }, { - "x": 185.7259979248047, - "y": 111.09100341796875 + "x": 93.81400299072266, + "y": 69.5 }, { - "x": 184.1479949951172, - "y": 113.80799865722656 + "x": 92.9010009765625, + "y": 70.77799987792969 }, { - "x": 182.5279998779297, - "y": 116.4990005493164 + "x": 91.96800231933594, + "y": 72.04199981689453 }, { - "x": 180.86500549316406, - "y": 119.16500091552734 + "x": 91.01499938964844, + "y": 73.29000091552734 }, { - "x": 179.16099548339844, - "y": 121.80400085449219 + "x": 90.04299926757812, + "y": 74.52400207519531 }, { - "x": 177.41600036621094, - "y": 124.41600036621094 + "x": 89.0510025024414, + "y": 75.74199676513672 }, { - "x": 175.62899780273438, - "y": 127.0009994506836 + "x": 88.04000091552734, + "y": 76.94400024414062 }, { - "x": 173.80299377441406, - "y": 129.5570068359375 + "x": 87.01100158691406, + "y": 78.13099670410156 }, { - "x": 171.93600463867188, - "y": 132.08399963378906 + "x": 85.96299743652344, + "y": 79.3010025024414 }, { - "x": 170.031005859375, - "y": 134.58099365234375 + "x": 84.89600372314453, + "y": 80.4540023803711 }, { - "x": 168.08599853515625, - "y": 137.04800415039062 + "x": 83.81199645996094, + "y": 81.59100341796875 }, { - "x": 166.1020050048828, - "y": 139.48399353027344 + "x": 82.70999908447266, + "y": 82.70999908447266 }, { - "x": 164.08099365234375, - "y": 141.88900756835938 + "x": 81.59100341796875, + "y": 83.81199645996094 }, { - "x": 162.02200317382812, - "y": 144.26199340820312 + "x": 80.4540023803711, + "y": 84.89600372314453 }, { - "x": 159.92599487304688, - "y": 146.6020050048828 + "x": 79.3010025024414, + "y": 85.96299743652344 }, { - "x": 157.79299926757812, - "y": 148.90899658203125 + "x": 78.13099670410156, + "y": 87.01100158691406 }, { - "x": 155.625, - "y": 151.1820068359375 + "x": 76.94400024414062, + "y": 88.04000091552734 }, { - "x": 153.42100524902344, - "y": 153.42100524902344 + "x": 75.74199676513672, + "y": 89.0510025024414 }, { - "x": 151.1820068359375, - "y": 155.625 + "x": 74.52400207519531, + "y": 90.04299926757812 }, { - "x": 148.90899658203125, - "y": 157.79299926757812 + "x": 73.29000091552734, + "y": 91.01499938964844 }, { - "x": 146.6020050048828, - "y": 159.92599487304688 + "x": 72.04199981689453, + "y": 91.96800231933594 }, { - "x": 144.26199340820312, - "y": 162.02200317382812 + "x": 70.77799987792969, + "y": 92.9010009765625 }, { - "x": 141.88900756835938, - "y": 164.08099365234375 + "x": 69.5, + "y": 93.81400299072266 }, { - "x": 139.48399353027344, - "y": 166.1020050048828 + "x": 68.20800018310547, + "y": 94.70800018310547 }, { - "x": 137.04800415039062, - "y": 168.08599853515625 + "x": 66.9020004272461, + "y": 95.58000183105469 }, { - "x": 134.58099365234375, - "y": 170.031005859375 + "x": 65.58200073242188, + "y": 96.43199920654297 }, { - "x": 132.08399963378906, - "y": 171.93600463867188 + "x": 64.2490005493164, + "y": 97.26399993896484 }, { - "x": 129.5570068359375, - "y": 173.80299377441406 + "x": 62.90399932861328, + "y": 98.0739974975586 }, { - "x": 127.0009994506836, - "y": 175.62899780273438 + "x": 61.54499816894531, + "y": 98.86299896240234 }, { - "x": 124.41600036621094, - "y": 177.41600036621094 + "x": 60.17499923706055, + "y": 99.62999725341797 }, { - "x": 121.80400085449219, - "y": 179.16099548339844 + "x": 58.79199981689453, + "y": 100.3759994506836 }, { - "x": 119.16500091552734, - "y": 180.86500549316406 + "x": 57.39899826049805, + "y": 101.0999984741211 }, { - "x": 116.4990005493164, - "y": 182.5279998779297 + "x": 55.99300003051758, + "y": 101.802001953125 }, { - "x": 113.80799865722656, - "y": 184.1479949951172 + "x": 54.57699966430664, + "y": 102.48200225830078 }, { - "x": 111.09100341796875, - "y": 185.7259979248047 + "x": 53.1510009765625, + "y": 103.13999938964844 }, { - "x": 108.3499984741211, - "y": 187.26100158691406 + "x": 51.7140007019043, + "y": 103.7750015258789 }, { - "x": 105.58499908447266, - "y": 188.7530059814453 + "x": 50.268001556396484, + "y": 104.38700103759766 }, { - "x": 102.7979965209961, - "y": 190.2010040283203 + "x": 48.8120002746582, + "y": 104.97699737548828 }, { - "x": 99.98699951171875, - "y": 191.60499572753906 + "x": 47.34700012207031, + "y": 105.54399871826172 }, { - "x": 97.15499877929688, - "y": 192.96499633789062 + "x": 45.87300109863281, + "y": 106.08799743652344 }, { - "x": 94.302001953125, - "y": 194.27999877929688 + "x": 44.39099884033203, + "y": 106.60800170898438 }, { - "x": 91.42900085449219, - "y": 195.5500030517578 + "x": 42.9010009765625, + "y": 107.1050033569336 }, { - "x": 88.53600311279297, - "y": 196.77499389648438 + "x": 41.40399932861328, + "y": 107.5790023803711 }, { - "x": 85.6240005493164, - "y": 197.9550018310547 - }, - { - "x": 82.69400024414062, - "y": 199.08799743652344 - }, - { - "x": 79.74700164794922, - "y": 200.17599487304688 - }, - { - "x": 76.78299713134766, - "y": 201.2169952392578 - }, - { - "x": 73.8030014038086, - "y": 202.21099853515625 - }, - { - "x": 70.80799865722656, - "y": 203.1580047607422 - }, - { - "x": 67.7979965209961, - "y": 204.05799865722656 - }, - { - "x": 64.77400207519531, - "y": 204.91099548339844 - }, - { - "x": 61.73699951171875, - "y": 205.71600341796875 - }, - { - "x": 58.68899917602539, - "y": 206.47300720214844 - }, - { - "x": 55.62799835205078, - "y": 207.18299865722656 - }, - { - "x": 52.55699920654297, - "y": 207.843994140625 - }, - { - "x": 49.47600173950195, - "y": 208.45700073242188 - }, - { - "x": 46.3849983215332, - "y": 209.02099609375 - }, - { - "x": 43.2859992980957, - "y": 209.53700256347656 - }, - { - "x": 42.71699905395508, - "y": 209.66600036621094 + "x": 42.60200119018555, + "y": 107.2959976196289 }, { "x": 38.5, - "y": 210.22999572753906 + "y": 108.4229965209961 } ], "isCurve": true, @@ -1269,334 +1109,254 @@ "route": [ { "x": -14.49899959564209, - "y": 210.22999572753906 - }, - { - "x": -16.18000030517578, - "y": 210.00399780273438 - }, - { - "x": -19.285999298095703, - "y": 209.53700256347656 - }, - { - "x": -22.385000228881836, - "y": 209.02099609375 - }, - { - "x": -25.47599983215332, - "y": 208.45700073242188 - }, - { - "x": -28.55699920654297, - "y": 207.843994140625 - }, - { - "x": -31.628000259399414, - "y": 207.18299865722656 - }, - { - "x": -34.68899917602539, - "y": 206.47300720214844 - }, - { - "x": -37.73699951171875, - "y": 205.71600341796875 - }, - { - "x": -40.77399826049805, - "y": 204.91099548339844 - }, - { - "x": -43.79800033569336, - "y": 204.05799865722656 - }, - { - "x": -46.80799865722656, - "y": 203.1580047607422 + "y": 108.4229965209961 }, { - "x": -49.803001403808594, - "y": 202.21099853515625 + "x": -15.89900016784668, + "y": 108.02899932861328 }, { - "x": -52.78300094604492, - "y": 201.2169952392578 + "x": -17.40399932861328, + "y": 107.5790023803711 }, { - "x": -55.74700164794922, - "y": 200.17599487304688 + "x": -18.900999069213867, + "y": 107.1050033569336 }, { - "x": -58.694000244140625, - "y": 199.08799743652344 + "x": -20.391000747680664, + "y": 106.60800170898438 }, { - "x": -61.624000549316406, - "y": 197.9550018310547 + "x": -21.87299919128418, + "y": 106.08799743652344 }, { - "x": -64.53600311279297, - "y": 196.77499389648438 + "x": -23.347000122070312, + "y": 105.54399871826172 }, { - "x": -67.42900085449219, - "y": 195.5500030517578 + "x": -24.812000274658203, + "y": 104.97699737548828 }, { - "x": -70.302001953125, - "y": 194.27999877929688 + "x": -26.26799964904785, + "y": 104.38700103759766 }, { - "x": -73.15499877929688, - "y": 192.96499633789062 + "x": -27.714000701904297, + "y": 103.7750015258789 }, { - "x": -75.98699951171875, - "y": 191.60499572753906 + "x": -29.150999069213867, + "y": 103.13999938964844 }, { - "x": -78.7979965209961, - "y": 190.2010040283203 + "x": -30.57699966430664, + "y": 102.48200225830078 }, { - "x": -81.58499908447266, - "y": 188.7530059814453 + "x": -31.993000030517578, + "y": 101.802001953125 }, { - "x": -84.3499984741211, - "y": 187.26100158691406 + "x": -33.39899826049805, + "y": 101.0999984741211 }, { - "x": -87.09100341796875, - "y": 185.7259979248047 + "x": -34.79199981689453, + "y": 100.3759994506836 }, { - "x": -89.80799865722656, - "y": 184.1479949951172 + "x": -36.17499923706055, + "y": 99.62999725341797 }, { - "x": -92.4990005493164, - "y": 182.5279998779297 + "x": -37.54499816894531, + "y": 98.86299896240234 }, { - "x": -95.16500091552734, - "y": 180.86500549316406 + "x": -38.90399932861328, + "y": 98.0739974975586 }, { - "x": -97.80400085449219, - "y": 179.16099548339844 + "x": -40.249000549316406, + "y": 97.26399993896484 }, { - "x": -100.41600036621094, - "y": 177.41600036621094 + "x": -41.582000732421875, + "y": 96.43199920654297 }, { - "x": -103.0009994506836, - "y": 175.62899780273438 + "x": -42.902000427246094, + "y": 95.58000183105469 }, { - "x": -105.55699920654297, - "y": 173.80299377441406 + "x": -44.20800018310547, + "y": 94.70800018310547 }, { - "x": -108.08399963378906, - "y": 171.93600463867188 + "x": -45.5, + "y": 93.81400299072266 }, { - "x": -110.58100128173828, - "y": 170.031005859375 + "x": -46.77799987792969, + "y": 92.9010009765625 }, { - "x": -113.0479965209961, - "y": 168.08599853515625 + "x": -48.04199981689453, + "y": 91.96800231933594 }, { - "x": -115.48400115966797, - "y": 166.1020050048828 + "x": -49.290000915527344, + "y": 91.01499938964844 }, { - "x": -117.88899993896484, - "y": 164.08099365234375 + "x": -50.52399826049805, + "y": 90.04299926757812 }, { - "x": -120.26200103759766, - "y": 162.02200317382812 + "x": -51.742000579833984, + "y": 89.0510025024414 }, { - "x": -122.60199737548828, - "y": 159.92599487304688 + "x": -52.944000244140625, + "y": 88.04000091552734 }, { - "x": -124.90899658203125, - "y": 157.79299926757812 + "x": -54.13100051879883, + "y": 87.01100158691406 }, { - "x": -127.18199920654297, - "y": 155.625 + "x": -55.30099868774414, + "y": 85.96299743652344 }, { - "x": -129.42100524902344, - "y": 153.42100524902344 + "x": -56.45399856567383, + "y": 84.89600372314453 }, { - "x": -131.625, - "y": 151.1820068359375 + "x": -57.590999603271484, + "y": 83.81199645996094 }, { - "x": -133.79299926757812, - "y": 148.90899658203125 + "x": -58.709999084472656, + "y": 82.70999908447266 }, { - "x": -135.92599487304688, - "y": 146.6020050048828 + "x": -59.8120002746582, + "y": 81.59100341796875 }, { - "x": -138.02200317382812, - "y": 144.26199340820312 + "x": -60.895999908447266, + "y": 80.4540023803711 }, { - "x": -140.08099365234375, - "y": 141.88900756835938 + "x": -61.9630012512207, + "y": 79.3010025024414 }, { - "x": -142.1020050048828, - "y": 139.48399353027344 + "x": -63.01100158691406, + "y": 78.13099670410156 }, { - "x": -144.08599853515625, - "y": 137.04800415039062 + "x": -64.04000091552734, + "y": 76.94400024414062 }, { - "x": -146.031005859375, - "y": 134.58099365234375 + "x": -65.0510025024414, + "y": 75.74199676513672 }, { - "x": -147.93600463867188, - "y": 132.08399963378906 + "x": -66.04299926757812, + "y": 74.52400207519531 }, { - "x": -149.80299377441406, - "y": 129.5570068359375 + "x": -67.01499938964844, + "y": 73.29000091552734 }, { - "x": -151.62899780273438, - "y": 127.0009994506836 + "x": -67.96800231933594, + "y": 72.04199981689453 }, { - "x": -153.41600036621094, - "y": 124.41600036621094 + "x": -68.9010009765625, + "y": 70.77799987792969 }, { - "x": -155.16099548339844, - "y": 121.80400085449219 + "x": -69.81400299072266, + "y": 69.5 }, { - "x": -156.86500549316406, - "y": 119.16500091552734 + "x": -70.70800018310547, + "y": 68.20800018310547 }, { - "x": -158.5279998779297, - "y": 116.4990005493164 + "x": -71.58000183105469, + "y": 66.9020004272461 }, { - "x": -160.1479949951172, - "y": 113.80799865722656 + "x": -72.43199920654297, + "y": 65.58200073242188 }, { - "x": -161.7259979248047, - "y": 111.09100341796875 + "x": -73.26399993896484, + "y": 64.2490005493164 }, { - "x": -163.26100158691406, - "y": 108.3499984741211 + "x": -74.0739974975586, + "y": 62.90399932861328 }, { - "x": -164.7530059814453, - "y": 105.58499908447266 + "x": -74.86299896240234, + "y": 61.54499816894531 }, { - "x": -166.2010040283203, - "y": 102.7979965209961 + "x": -75.62999725341797, + "y": 60.17499923706055 }, { - "x": -167.60499572753906, - "y": 99.98699951171875 + "x": -76.3759994506836, + "y": 58.79199981689453 }, { - "x": -168.96499633789062, - "y": 97.15499877929688 + "x": -77.0999984741211, + "y": 57.39899826049805 }, { - "x": -170.27999877929688, - "y": 94.302001953125 + "x": -77.802001953125, + "y": 55.99300003051758 }, { - "x": -171.5500030517578, - "y": 91.42900085449219 + "x": -78.48200225830078, + "y": 54.57699966430664 }, { - "x": -172.77499389648438, - "y": 88.53600311279297 + "x": -79.13999938964844, + "y": 53.1510009765625 }, { - "x": -173.9550018310547, - "y": 85.6240005493164 + "x": -79.7750015258789, + "y": 51.7140007019043 }, { - "x": -175.08799743652344, - "y": 82.69400024414062 + "x": -80.38700103759766, + "y": 50.268001556396484 }, { - "x": -176.17599487304688, - "y": 79.74700164794922 + "x": -80.97699737548828, + "y": 48.8120002746582 }, { - "x": -177.2169952392578, - "y": 76.78299713134766 + "x": -81.54399871826172, + "y": 47.34700012207031 }, { - "x": -178.21099853515625, - "y": 73.8030014038086 + "x": -80.98999786376953, + "y": 49.01599884033203 }, { - "x": -179.1580047607422, - "y": 70.80799865722656 - }, - { - "x": -180.05799865722656, - "y": 67.7979965209961 - }, - { - "x": -180.91099548339844, - "y": 64.77400207519531 - }, - { - "x": -181.71600341796875, - "y": 61.73699951171875 - }, - { - "x": -182.47300720214844, - "y": 58.68899917602539 - }, - { - "x": -183.18299865722656, - "y": 55.62799835205078 - }, - { - "x": -183.843994140625, - "y": 52.55699920654297 - }, - { - "x": -184.45700073242188, - "y": 49.47600173950195 - }, - { - "x": -184.5500030517578, - "y": 49.19599914550781 - }, - { - "x": -185.2519989013672, + "x": -82.39399719238281, "y": 45 } ], @@ -1632,352 +1392,296 @@ "link": "", "route": [ { - "x": 512, - "y": -136.2259979248047 - }, - { - "x": 514.7160034179688, - "y": -135.85400390625 - }, - { - "x": 518.85302734375, - "y": -135.19900512695312 - }, - { - "x": 522.9760131835938, - "y": -134.45700073242188 - }, - { - "x": 527.0819702148438, - "y": -133.62899780273438 + "x": 312, + "y": -59.42100143432617 }, { - "x": 531.1699829101562, - "y": -132.71499633789062 + "x": 312.3909912109375, + "y": -59.316001892089844 }, { - "x": 535.2369995117188, - "y": -131.71600341796875 + "x": 314.40301513671875, + "y": -58.73099899291992 }, { - "x": 539.2830200195312, - "y": -130.6320037841797 + "x": 316.4010009765625, + "y": -58.10499954223633 }, { - "x": 543.3060302734375, - "y": -129.46299743652344 + "x": 318.385986328125, + "y": -57.4370002746582 }, { - "x": 547.302978515625, - "y": -128.21099853515625 + "x": 320.35699462890625, + "y": -56.72800064086914 }, { - "x": 551.2730102539062, - "y": -126.875 + "x": 322.31201171875, + "y": -55.97700119018555 }, { - "x": 555.2139892578125, - "y": -125.45600128173828 + "x": 324.2510070800781, + "y": -55.18600082397461 }, { - "x": 559.1240234375, - "y": -123.95500183105469 + "x": 326.1730041503906, + "y": -54.354000091552734 }, { - "x": 563.0029907226562, - "y": -122.37200164794922 + "x": 328.0769958496094, + "y": -53.481998443603516 }, { - "x": 566.8469848632812, - "y": -120.70899963378906 + "x": 329.9630126953125, + "y": -52.57099914550781 }, { - "x": 570.655029296875, - "y": -118.96499633789062 + "x": 331.8290100097656, + "y": -51.619998931884766 }, { - "x": 574.427001953125, - "y": -117.14199829101562 + "x": 333.67498779296875, + "y": -50.630001068115234 }, { - "x": 578.1589965820312, - "y": -115.23999786376953 + "x": 335.5, + "y": -49.60200119018555 }, { - "x": 581.8499755859375, - "y": -113.26100158691406 + "x": 337.302001953125, + "y": -48.5359992980957 }, { - "x": 585.5, - "y": -111.20500183105469 + "x": 339.0820007324219, + "y": -47.43199920654297 }, { - "x": 589.10498046875, - "y": -109.0719985961914 + "x": 340.8389892578125, + "y": -46.29199981689453 }, { - "x": 592.6649780273438, - "y": -106.86499786376953 + "x": 342.5710144042969, + "y": -45.11399841308594 }, { - "x": 596.177978515625, - "y": -104.58399963378906 + "x": 344.27801513671875, + "y": -43.9010009765625 }, { - "x": 599.6420288085938, - "y": -102.22899627685547 + "x": 345.9590148925781, + "y": -42.652000427246094 }, { - "x": 603.0570068359375, - "y": -99.8030014038086 + "x": 347.614013671875, + "y": -41.36899948120117 }, { - "x": 606.4190063476562, - "y": -97.30500030517578 + "x": 349.24200439453125, + "y": -40.05099868774414 }, { - "x": 609.72900390625, - "y": -94.73799896240234 + "x": 350.8420104980469, + "y": -38.69900131225586 }, { - "x": 612.9840087890625, - "y": -92.10199737548828 + "x": 352.4129943847656, + "y": -37.31399917602539 }, { - "x": 616.1840209960938, - "y": -89.39900207519531 + "x": 353.9540100097656, + "y": -35.895999908447266 }, { - "x": 619.3259887695312, - "y": -86.62799835205078 + "x": 355.46600341796875, + "y": -34.446998596191406 }, { - "x": 622.4089965820312, - "y": -83.79299926757812 + "x": 356.9469909667969, + "y": -32.965999603271484 }, { - "x": 625.4320068359375, - "y": -80.89399719238281 + "x": 358.39599609375, + "y": -31.45400047302246 }, { - "x": 628.3939819335938, - "y": -77.93199920654297 + "x": 359.8139953613281, + "y": -29.913000106811523 }, { - "x": 631.2930297851562, - "y": -74.90899658203125 + "x": 361.1990051269531, + "y": -28.341999053955078 }, { - "x": 634.1279907226562, - "y": -71.82599639892578 + "x": 362.5509948730469, + "y": -26.742000579833984 }, { - "x": 636.8989868164062, - "y": -68.68399810791016 + "x": 363.8689880371094, + "y": -25.11400032043457 }, { - "x": 639.6019897460938, - "y": -65.48400115966797 + "x": 365.1520080566406, + "y": -23.458999633789062 }, { - "x": 642.2379760742188, - "y": -62.229000091552734 + "x": 366.4010009765625, + "y": -21.777999877929688 }, { - "x": 644.8049926757812, - "y": -58.91899871826172 + "x": 367.614013671875, + "y": -20.070999145507812 }, { - "x": 647.302978515625, - "y": -55.55699920654297 + "x": 368.7919921875, + "y": -18.339000701904297 }, { - "x": 649.72900390625, - "y": -52.141998291015625 + "x": 369.9320068359375, + "y": -16.582000732421875 }, { - "x": 652.083984375, - "y": -48.678001403808594 + "x": 371.0360107421875, + "y": -14.802000045776367 }, { - "x": 654.364990234375, - "y": -45.165000915527344 + "x": 372.10198974609375, + "y": -13 }, { - "x": 656.572021484375, - "y": -41.60499954223633 + "x": 373.1300048828125, + "y": -11.175000190734863 }, { - "x": 658.7050170898438, - "y": -38 + "x": 374.1199951171875, + "y": -9.329000473022461 }, { - "x": 660.760986328125, - "y": -34.349998474121094 + "x": 375.0710144042969, + "y": -7.4629998207092285 }, { - "x": 662.739990234375, - "y": -30.659000396728516 + "x": 375.98199462890625, + "y": -5.577000141143799 }, { - "x": 664.6420288085938, - "y": -26.927000045776367 + "x": 376.85400390625, + "y": -3.6730000972747803 }, { - "x": 666.4650268554688, - "y": -23.155000686645508 + "x": 377.6860046386719, + "y": -1.7510000467300415 }, { - "x": 668.208984375, - "y": -19.347000122070312 + "x": 378.47698974609375, + "y": 0.18700000643730164 }, { - "x": 669.8720092773438, - "y": -15.503000259399414 + "x": 379.2279968261719, + "y": 2.1419999599456787 }, { - "x": 671.4550170898438, - "y": -11.62399959564209 + "x": 379.93701171875, + "y": 4.11299991607666 }, { - "x": 672.9559936523438, - "y": -7.714000225067139 + "x": 380.6050109863281, + "y": 6.0980000495910645 }, { - "x": 674.375, - "y": -3.7730000019073486 + "x": 381.2309875488281, + "y": 8.095999717712402 }, { - "x": 675.7109985351562, - "y": 0.19599999487400055 + "x": 381.8160095214844, + "y": 10.107999801635742 }, { - "x": 676.9630126953125, - "y": 4.192999839782715 + "x": 382.3580017089844, + "y": 12.130999565124512 }, { - "x": 678.1320190429688, - "y": 8.215999603271484 + "x": 382.85699462890625, + "y": 14.163999557495117 }, { - "x": 679.2160034179688, - "y": 12.26200008392334 + "x": 383.3139953613281, + "y": 16.20800018310547 }, { - "x": 680.2150268554688, - "y": 16.32900047302246 + "x": 383.7279968261719, + "y": 18.26099967956543 }, { - "x": 681.1290283203125, - "y": 20.41699981689453 + "x": 384.0989990234375, + "y": 20.322999954223633 }, { - "x": 681.9569702148438, - "y": 24.523000717163086 + "x": 384.427001953125, + "y": 22.391000747680664 }, { - "x": 682.698974609375, - "y": 28.645999908447266 + "x": 384.71099853515625, + "y": 24.465999603271484 }, { - "x": 683.35400390625, - "y": 32.78300094604492 + "x": 384.9519958496094, + "y": 26.547000885009766 }, { - "x": 683.9219970703125, - "y": 36.93299865722656 + "x": 385.14898681640625, + "y": 28.631999969482422 }, { - "x": 684.4039916992188, - "y": 41.09400177001953 + "x": 385.302001953125, + "y": 30.719999313354492 }, { - "x": 684.7979736328125, - "y": 45.263999938964844 + "x": 385.4119873046875, + "y": 32.8120002746582 }, { - "x": 685.10498046875, - "y": 49.441001892089844 + "x": 385.4779968261719, + "y": 34.904998779296875 }, { - "x": 685.323974609375, - "y": 53.624000549316406 - }, - { - "x": 685.4559936523438, - "y": 57.81100082397461 - }, - { - "x": 685.5, - "y": 61.999000549316406 - }, - { - "x": 685.4559936523438, - "y": 66.18800354003906 - }, - { - "x": 685.323974609375, - "y": 70.375 - }, - { - "x": 685.10498046875, - "y": 74.55799865722656 - }, - { - "x": 684.7979736328125, - "y": 78.73500061035156 - }, - { - "x": 684.4039916992188, - "y": 82.90499877929688 - }, - { - "x": 683.9219970703125, - "y": 87.06600189208984 - }, - { - "x": 683.35400390625, - "y": 91.21600341796875 - }, - { - "x": 682.698974609375, - "y": 95.35299682617188 + "x": 385.5, + "y": 36.999000549316406 }, { - "x": 681.9569702148438, - "y": 99.47599792480469 + "x": 385.4779968261719, + "y": 39.09400177001953 }, { - "x": 681.1290283203125, - "y": 103.58200073242188 + "x": 385.4119873046875, + "y": 41.1870002746582 }, { - "x": 680.2150268554688, - "y": 107.66999816894531 + "x": 385.302001953125, + "y": 43.27899932861328 }, { - "x": 679.2160034179688, - "y": 111.73699951171875 + "x": 385.14898681640625, + "y": 45.367000579833984 }, { - "x": 678.1320190429688, - "y": 115.78299713134766 + "x": 384.9519958496094, + "y": 47.45199966430664 }, { - "x": 676.9630126953125, - "y": 119.80599975585938 + "x": 384.71099853515625, + "y": 49.53300094604492 }, { - "x": 675.7109985351562, - "y": 123.8030014038086 + "x": 384.427001953125, + "y": 51.608001708984375 }, { - "x": 675.3590087890625, - "y": 124.98999786376953 + "x": 384.7640075683594, + "y": 49.805999755859375 }, { - "x": 673.9329833984375, - "y": 128.99899291992188 + "x": 384.0409851074219, + "y": 53.999000549316406 } ], "isCurve": true, @@ -2012,336 +1716,256 @@ "link": "", "route": [ { - "x": 634.8569946289062, - "y": 194.99899291992188 - }, - { - "x": 634.1279907226562, - "y": 195.8260040283203 - }, - { - "x": 631.2930297851562, - "y": 198.90899658203125 - }, - { - "x": 628.3939819335938, - "y": 201.9320068359375 - }, - { - "x": 625.4320068359375, - "y": 204.8939971923828 - }, - { - "x": 622.4089965820312, - "y": 207.79299926757812 - }, - { - "x": 619.3259887695312, - "y": 210.6280059814453 - }, - { - "x": 616.1840209960938, - "y": 213.3990020751953 - }, - { - "x": 612.9840087890625, - "y": 216.1020050048828 - }, - { - "x": 609.72900390625, - "y": 218.73800659179688 - }, - { - "x": 606.4190063476562, - "y": 221.30499267578125 - }, - { - "x": 603.0570068359375, - "y": 223.80299377441406 - }, - { - "x": 599.6420288085938, - "y": 226.22900390625 - }, - { - "x": 596.177978515625, - "y": 228.58399963378906 - }, - { - "x": 592.6649780273438, - "y": 230.86500549316406 - }, - { - "x": 589.10498046875, - "y": 233.07200622558594 - }, - { - "x": 585.5, - "y": 235.2050018310547 - }, - { - "x": 581.8499755859375, - "y": 237.26100158691406 + "x": 345.60198974609375, + "y": 116.91799926757812 }, { - "x": 578.1589965820312, - "y": 239.24000549316406 + "x": 344.27801513671875, + "y": 117.9010009765625 }, { - "x": 574.427001953125, - "y": 241.14199829101562 + "x": 342.5710144042969, + "y": 119.11399841308594 }, { - "x": 570.655029296875, - "y": 242.96499633789062 + "x": 340.8389892578125, + "y": 120.29199981689453 }, { - "x": 566.8469848632812, - "y": 244.70899963378906 + "x": 339.0820007324219, + "y": 121.43199920654297 }, { - "x": 563.0029907226562, - "y": 246.3719940185547 + "x": 337.302001953125, + "y": 122.53600311279297 }, { - "x": 559.1240234375, - "y": 247.9550018310547 + "x": 335.5, + "y": 123.60199737548828 }, { - "x": 555.2139892578125, - "y": 249.45599365234375 + "x": 333.67498779296875, + "y": 124.62999725341797 }, { - "x": 551.2730102539062, - "y": 250.875 + "x": 331.8290100097656, + "y": 125.62000274658203 }, { - "x": 547.302978515625, - "y": 252.21099853515625 + "x": 329.9630126953125, + "y": 126.57099914550781 }, { - "x": 543.3060302734375, - "y": 253.46299743652344 + "x": 328.0769958496094, + "y": 127.48200225830078 }, { - "x": 539.2830200195312, - "y": 254.6320037841797 + "x": 326.1730041503906, + "y": 128.35400390625 }, { - "x": 535.2369995117188, - "y": 255.71600341796875 + "x": 324.2510070800781, + "y": 129.18600463867188 }, { - "x": 531.1699829101562, - "y": 256.7149963378906 + "x": 322.31201171875, + "y": 129.9770050048828 }, { - "x": 527.0819702148438, - "y": 257.6289978027344 + "x": 320.35699462890625, + "y": 130.72799682617188 }, { - "x": 522.9760131835938, - "y": 258.4570007324219 + "x": 318.385986328125, + "y": 131.43699645996094 }, { - "x": 518.85302734375, - "y": 259.1990051269531 + "x": 316.4010009765625, + "y": 132.10499572753906 }, { - "x": 514.7160034179688, - "y": 259.85400390625 + "x": 314.40301513671875, + "y": 132.7310028076172 }, { - "x": 510.5660095214844, - "y": 260.4219970703125 + "x": 312.3909912109375, + "y": 133.3159942626953 }, { - "x": 506.4049987792969, - "y": 260.90399169921875 + "x": 310.3680114746094, + "y": 133.85800170898438 }, { - "x": 502.2349853515625, - "y": 261.2980041503906 + "x": 308.3349914550781, + "y": 134.35699462890625 }, { - "x": 498.0580139160156, - "y": 261.6050109863281 + "x": 306.2909851074219, + "y": 134.81399536132812 }, { - "x": 493.875, - "y": 261.8240051269531 + "x": 304.2380065917969, + "y": 135.22799682617188 }, { - "x": 489.68798828125, - "y": 261.95599365234375 + "x": 302.1759948730469, + "y": 135.5989990234375 }, { - "x": 485.5, - "y": 262 + "x": 300.1080017089844, + "y": 135.927001953125 }, { - "x": 481.3110046386719, - "y": 261.95599365234375 + "x": 298.0329895019531, + "y": 136.21099853515625 }, { - "x": 477.1239929199219, - "y": 261.8240051269531 + "x": 295.9519958496094, + "y": 136.45199584960938 }, { - "x": 472.9410095214844, - "y": 261.6050109863281 + "x": 293.86700439453125, + "y": 136.6490020751953 }, { - "x": 468.7640075683594, - "y": 261.2980041503906 + "x": 291.77899169921875, + "y": 136.802001953125 }, { - "x": 464.593994140625, - "y": 260.90399169921875 + "x": 289.68701171875, + "y": 136.91200256347656 }, { - "x": 460.4330139160156, - "y": 260.4219970703125 + "x": 287.593994140625, + "y": 136.97799682617188 }, { - "x": 456.2829895019531, - "y": 259.85400390625 + "x": 285.5, + "y": 137 }, { - "x": 452.14599609375, - "y": 259.1990051269531 + "x": 283.4049987792969, + "y": 136.97799682617188 }, { - "x": 448.02301025390625, - "y": 258.4570007324219 + "x": 281.31201171875, + "y": 136.91200256347656 }, { - "x": 443.9169921875, - "y": 257.6289978027344 + "x": 279.2200012207031, + "y": 136.802001953125 }, { - "x": 439.8290100097656, - "y": 256.7149963378906 + "x": 277.1319885253906, + "y": 136.6490020751953 }, { - "x": 435.7619934082031, - "y": 255.71600341796875 + "x": 275.0469970703125, + "y": 136.45199584960938 }, { - "x": 431.71600341796875, - "y": 254.6320037841797 + "x": 272.96600341796875, + "y": 136.21099853515625 }, { - "x": 427.6929931640625, - "y": 253.46299743652344 + "x": 270.8909912109375, + "y": 135.927001953125 }, { - "x": 423.6960144042969, - "y": 252.21099853515625 + "x": 268.822998046875, + "y": 135.5989990234375 }, { - "x": 419.72601318359375, - "y": 250.875 + "x": 266.760986328125, + "y": 135.22799682617188 }, { - "x": 415.7850036621094, - "y": 249.45599365234375 + "x": 264.7080078125, + "y": 134.81399536132812 }, { - "x": 411.875, - "y": 247.9550018310547 + "x": 262.66400146484375, + "y": 134.35699462890625 }, { - "x": 407.9960021972656, - "y": 246.3719940185547 + "x": 260.6310119628906, + "y": 133.85800170898438 }, { - "x": 404.1520080566406, - "y": 244.70899963378906 + "x": 258.6080017089844, + "y": 133.3159942626953 }, { - "x": 400.343994140625, - "y": 242.96499633789062 + "x": 256.59600830078125, + "y": 132.7310028076172 }, { - "x": 396.5719909667969, - "y": 241.14199829101562 + "x": 254.59800720214844, + "y": 132.10499572753906 }, { - "x": 392.8399963378906, - "y": 239.24000549316406 + "x": 252.61300659179688, + "y": 131.43699645996094 }, { - "x": 389.14898681640625, - "y": 237.26100158691406 + "x": 250.64199829101562, + "y": 130.72799682617188 }, { - "x": 385.5, - "y": 235.2050018310547 + "x": 248.68699645996094, + "y": 129.9770050048828 }, { - "x": 381.8940124511719, - "y": 233.07200622558594 + "x": 246.7480010986328, + "y": 129.18600463867188 }, { - "x": 378.3340148925781, - "y": 230.86500549316406 + "x": 244.8260040283203, + "y": 128.35400390625 }, { - "x": 374.8210144042969, - "y": 228.58399963378906 + "x": 242.9219970703125, + "y": 127.48200225830078 }, { - "x": 371.35699462890625, - "y": 226.22900390625 + "x": 241.03599548339844, + "y": 126.57099914550781 }, { - "x": 367.9419860839844, - "y": 223.80299377441406 + "x": 239.1699981689453, + "y": 125.62000274658203 }, { - "x": 364.5799865722656, - "y": 221.30499267578125 + "x": 237.32400512695312, + "y": 124.62999725341797 }, { - "x": 361.2699890136719, - "y": 218.73800659179688 + "x": 235.5, + "y": 123.60199737548828 }, { - "x": 358.0150146484375, - "y": 216.1020050048828 + "x": 233.69700622558594, + "y": 122.53600311279297 }, { - "x": 354.81500244140625, - "y": 213.3990020751953 + "x": 231.91700744628906, + "y": 121.43199920654297 }, { - "x": 351.6730041503906, - "y": 210.6280059814453 + "x": 230.16000366210938, + "y": 120.29199981689453 }, { - "x": 348.5899963378906, - "y": 207.79299926757812 + "x": 228.42799377441406, + "y": 119.11399841308594 }, { - "x": 345.5669860839844, - "y": 204.8939971923828 + "x": 228.79800415039062, + "y": 119.4749984741211 }, { - "x": 342.6050109863281, - "y": 201.9320068359375 - }, - { - "x": 339.70599365234375, - "y": 198.90899658203125 - }, - { - "x": 338.97198486328125, - "y": 198.177001953125 - }, - { - "x": 336.1419982910156, - "y": 195 + "x": 225.39700317382812, + "y": 116.91799926757812 } ], "isCurve": true, @@ -2376,376 +2000,344 @@ "link": "", "route": [ { - "x": 931.4099731445312, - "y": -186.21800231933594 - }, - { - "x": 936.197021484375, - "y": -185.53700256347656 - }, - { - "x": 942.385986328125, - "y": -184.45700073242188 - }, - { - "x": 948.5380249023438, - "y": -183.18299865722656 + "x": 558.2050170898438, + "y": -84.41200256347656 }, { - "x": 954.6480102539062, - "y": -181.71600341796875 + "x": 559.60400390625, + "y": -84.02899932861328 }, { - "x": 960.7080078125, - "y": -180.05799865722656 + "x": 562.6060180664062, + "y": -83.1050033569336 }, { - "x": 966.7130126953125, - "y": -178.21099853515625 + "x": 565.5780029296875, + "y": -82.08799743652344 }, { - "x": 972.656982421875, - "y": -176.17599487304688 + "x": 568.5170288085938, + "y": -80.97699737548828 }, { - "x": 978.5349731445312, - "y": -173.9550018310547 + "x": 571.4190063476562, + "y": -79.7750015258789 }, { - "x": 984.3389892578125, - "y": -171.5500030517578 + "x": 574.2830200195312, + "y": -78.48200225830078 }, { - "x": 990.0659790039062, - "y": -168.96499633789062 + "x": 577.10400390625, + "y": -77.0999984741211 }, { - "x": 995.7080078125, - "y": -166.2010040283203 + "x": 579.8800048828125, + "y": -75.62999725341797 }, { - "x": 1001.260009765625, - "y": -163.26100158691406 + "x": 582.6090087890625, + "y": -74.0739974975586 }, { - "x": 1006.718017578125, - "y": -160.1479949951172 + "x": 585.2869873046875, + "y": -72.43199920654297 }, { - "x": 1012.0750122070312, - "y": -156.86500549316406 + "x": 587.9130249023438, + "y": -70.70800018310547 }, { - "x": 1017.3259887695312, - "y": -153.41600036621094 + "x": 590.4829711914062, + "y": -68.9010009765625 }, { - "x": 1022.4669799804688, - "y": -149.80299377441406 + "x": 592.9949951171875, + "y": -67.01499938964844 }, { - "x": 1027.490966796875, - "y": -146.031005859375 + "x": 595.447021484375, + "y": -65.0510025024414 }, { - "x": 1032.39404296875, - "y": -142.1020050048828 + "x": 597.8359985351562, + "y": -63.01100158691406 }, { - "x": 1037.1719970703125, - "y": -138.02200317382812 + "x": 600.1589965820312, + "y": -60.895999908447266 }, { - "x": 1041.8189697265625, - "y": -133.79299926757812 + "x": 602.4149780273438, + "y": -58.709999084472656 }, { - "x": 1046.3310546875, - "y": -129.42100524902344 + "x": 604.6010131835938, + "y": -56.45399856567383 }, { - "x": 1050.7030029296875, - "y": -124.90899658203125 + "x": 606.7160034179688, + "y": -54.13100051879883 }, { - "x": 1054.9320068359375, - "y": -120.26200103759766 + "x": 608.7559814453125, + "y": -51.742000579833984 }, { - "x": 1059.011962890625, - "y": -115.48400115966797 + "x": 610.719970703125, + "y": -49.290000915527344 }, { - "x": 1062.9410400390625, - "y": -110.58100128173828 + "x": 612.6060180664062, + "y": -46.77799987792969 }, { - "x": 1066.7130126953125, - "y": -105.55699920654297 + "x": 614.4130249023438, + "y": -44.20800018310547 }, { - "x": 1070.3260498046875, - "y": -100.41600036621094 + "x": 616.1370239257812, + "y": -41.582000732421875 }, { - "x": 1073.7750244140625, - "y": -95.16500091552734 + "x": 617.7789916992188, + "y": -38.90399932861328 }, { - "x": 1077.0579833984375, - "y": -89.80799865722656 + "x": 619.3350219726562, + "y": -36.17499923706055 }, { - "x": 1080.1710205078125, - "y": -84.3499984741211 + "x": 620.8049926757812, + "y": -33.39899826049805 }, { - "x": 1083.1109619140625, - "y": -78.7979965209961 + "x": 622.18701171875, + "y": -30.57699966430664 }, { - "x": 1085.875, - "y": -73.15499877929688 + "x": 623.47998046875, + "y": -27.714000701904297 }, { - "x": 1088.4610595703125, - "y": -67.42900085449219 + "x": 624.6820068359375, + "y": -24.812000274658203 }, { - "x": 1090.864990234375, - "y": -61.624000549316406 + "x": 625.7930297851562, + "y": -21.87299919128418 }, { - "x": 1093.0860595703125, - "y": -55.74700164794922 + "x": 626.8099975585938, + "y": -18.900999069213867 }, { - "x": 1095.1209716796875, - "y": -49.803001403808594 + "x": 627.7340087890625, + "y": -15.89900016784668 }, { - "x": 1096.968017578125, - "y": -43.79800033569336 + "x": 628.56298828125, + "y": -12.868000030517578 }, { - "x": 1098.6259765625, - "y": -37.73699951171875 + "x": 629.2960205078125, + "y": -9.814000129699707 }, { - "x": 1100.093017578125, - "y": -31.628000259399414 + "x": 629.9329833984375, + "y": -6.73799991607666 }, { - "x": 1101.366943359375, - "y": -25.47599983215332 + "x": 630.4730224609375, + "y": -3.6429998874664307 }, { - "x": 1102.447021484375, - "y": -19.285999298095703 + "x": 630.916015625, + "y": -0.5329999923706055 }, { - "x": 1103.3330078125, - "y": -13.065999984741211 + "x": 631.260986328125, + "y": 2.5889999866485596 }, { - "x": 1104.02197265625, - "y": -6.821000099182129 + "x": 631.5070190429688, + "y": 5.71999979019165 }, { - "x": 1104.5150146484375, - "y": -0.5580000281333923 + "x": 631.655029296875, + "y": 8.857999801635742 }, { - "x": 1104.81103515625, - "y": 5.7170000076293945 - }, - { - "x": 1104.9100341796875, + "x": 631.7050170898438, "y": 12 }, { - "x": 1104.81103515625, - "y": 18.281999588012695 - }, - { - "x": 1104.5150146484375, - "y": 24.558000564575195 - }, - { - "x": 1104.02197265625, - "y": 30.820999145507812 - }, - { - "x": 1103.3330078125, - "y": 37.066001892089844 - }, - { - "x": 1102.447021484375, - "y": 43.2859992980957 + "x": 631.655029296875, + "y": 15.140999794006348 }, { - "x": 1101.366943359375, - "y": 49.47600173950195 + "x": 631.5070190429688, + "y": 18.27899932861328 }, { - "x": 1100.093017578125, - "y": 55.62799835205078 + "x": 631.260986328125, + "y": 21.40999984741211 }, { - "x": 1098.6259765625, - "y": 61.73699951171875 + "x": 630.916015625, + "y": 24.533000946044922 }, { - "x": 1096.968017578125, - "y": 67.7979965209961 + "x": 630.4730224609375, + "y": 27.64299964904785 }, { - "x": 1095.1209716796875, - "y": 73.8030014038086 + "x": 629.9329833984375, + "y": 30.738000869750977 }, { - "x": 1093.0860595703125, - "y": 79.74700164794922 + "x": 629.2960205078125, + "y": 33.81399917602539 }, { - "x": 1090.864990234375, - "y": 85.6240005493164 + "x": 628.56298828125, + "y": 36.86800003051758 }, { - "x": 1088.4610595703125, - "y": 91.42900085449219 + "x": 627.7340087890625, + "y": 39.89899826049805 }, { - "x": 1085.875, - "y": 97.15499877929688 + "x": 626.8099975585938, + "y": 42.9010009765625 }, { - "x": 1083.1109619140625, - "y": 102.7979965209961 + "x": 625.7930297851562, + "y": 45.87300109863281 }, { - "x": 1080.1710205078125, - "y": 108.3499984741211 + "x": 624.6820068359375, + "y": 48.8120002746582 }, { - "x": 1077.0579833984375, - "y": 113.80799865722656 + "x": 623.47998046875, + "y": 51.7140007019043 }, { - "x": 1073.7750244140625, - "y": 119.16500091552734 + "x": 622.18701171875, + "y": 54.57699966430664 }, { - "x": 1070.3260498046875, - "y": 124.41600036621094 + "x": 620.8049926757812, + "y": 57.39899826049805 }, { - "x": 1066.7130126953125, - "y": 129.5570068359375 + "x": 619.3350219726562, + "y": 60.17499923706055 }, { - "x": 1062.9410400390625, - "y": 134.58099365234375 + "x": 617.7789916992188, + "y": 62.90399932861328 }, { - "x": 1059.011962890625, - "y": 139.48399353027344 + "x": 616.1370239257812, + "y": 65.58200073242188 }, { - "x": 1054.9320068359375, - "y": 144.26199340820312 + "x": 614.4130249023438, + "y": 68.20800018310547 }, { - "x": 1050.7030029296875, - "y": 148.90899658203125 + "x": 612.6060180664062, + "y": 70.77799987792969 }, { - "x": 1046.3310546875, - "y": 153.42100524902344 + "x": 610.719970703125, + "y": 73.29000091552734 }, { - "x": 1041.8189697265625, - "y": 157.79299926757812 + "x": 608.7559814453125, + "y": 75.74199676513672 }, { - "x": 1037.1719970703125, - "y": 162.02200317382812 + "x": 606.7160034179688, + "y": 78.13099670410156 }, { - "x": 1032.39404296875, - "y": 166.1020050048828 + "x": 604.6010131835938, + "y": 80.4540023803711 }, { - "x": 1027.490966796875, - "y": 170.031005859375 + "x": 602.4149780273438, + "y": 82.70999908447266 }, { - "x": 1022.4669799804688, - "y": 173.80299377441406 + "x": 600.1589965820312, + "y": 84.89600372314453 }, { - "x": 1017.3259887695312, - "y": 177.41600036621094 + "x": 597.8359985351562, + "y": 87.01100158691406 }, { - "x": 1012.0750122070312, - "y": 180.86500549316406 + "x": 595.447021484375, + "y": 89.0510025024414 }, { - "x": 1006.718017578125, - "y": 184.1479949951172 + "x": 592.9949951171875, + "y": 91.01499938964844 }, { - "x": 1001.260009765625, - "y": 187.26100158691406 + "x": 590.4829711914062, + "y": 92.9010009765625 }, { - "x": 995.7080078125, - "y": 190.2010040283203 + "x": 587.9130249023438, + "y": 94.70800018310547 }, { - "x": 990.0659790039062, - "y": 192.96499633789062 + "x": 585.2869873046875, + "y": 96.43199920654297 }, { - "x": 984.3389892578125, - "y": 195.5500030517578 + "x": 582.6090087890625, + "y": 98.0739974975586 }, { - "x": 978.5349731445312, - "y": 197.9550018310547 + "x": 579.8800048828125, + "y": 99.62999725341797 }, { - "x": 972.656982421875, - "y": 200.17599487304688 + "x": 577.10400390625, + "y": 101.0999984741211 }, { - "x": 966.7130126953125, - "y": 202.21099853515625 + "x": 574.2830200195312, + "y": 102.48200225830078 }, { - "x": 960.7080078125, - "y": 204.05799865722656 + "x": 571.4190063476562, + "y": 103.7750015258789 }, { - "x": 954.6480102539062, - "y": 205.71600341796875 + "x": 568.5170288085938, + "y": 104.97699737548828 }, { - "x": 948.5380249023438, - "y": 207.18299865722656 + "x": 565.5780029296875, + "y": 106.08799743652344 }, { - "x": 942.385986328125, - "y": 208.45700073242188 + "x": 562.6060180664062, + "y": 107.1050033569336 }, { - "x": 936.197021484375, - "y": 209.53700256347656 + "x": 562.3070068359375, + "y": 107.28399658203125 }, { - "x": 931.4099731445312, - "y": 210.21800231933594 + "x": 558.2050170898438, + "y": 108.41200256347656 } ], "isCurve": true, diff --git a/e2etests/testdata/txtar/cycle-diagram/elk/sketch.exp.svg b/e2etests/testdata/txtar/cycle-diagram/elk/sketch.exp.svg index 144dbb7340..ec0748594a 100644 --- a/e2etests/testdata/txtar/cycle-diagram/elk/sketch.exp.svg +++ b/e2etests/testdata/txtar/cycle-diagram/elk/sketch.exp.svg @@ -1,9 +1,9 @@ -abcdabcab - - - - - - - - - - + .d2-2790969120 .fill-N1{fill:#0A0F25;} + .d2-2790969120 .fill-N2{fill:#676C7E;} + .d2-2790969120 .fill-N3{fill:#9499AB;} + .d2-2790969120 .fill-N4{fill:#CFD2DD;} + .d2-2790969120 .fill-N5{fill:#DEE1EB;} + .d2-2790969120 .fill-N6{fill:#EEF1F8;} + .d2-2790969120 .fill-N7{fill:#FFFFFF;} + .d2-2790969120 .fill-B1{fill:#0D32B2;} + .d2-2790969120 .fill-B2{fill:#0D32B2;} + .d2-2790969120 .fill-B3{fill:#E3E9FD;} + .d2-2790969120 .fill-B4{fill:#E3E9FD;} + .d2-2790969120 .fill-B5{fill:#EDF0FD;} + .d2-2790969120 .fill-B6{fill:#F7F8FE;} + .d2-2790969120 .fill-AA2{fill:#4A6FF3;} + .d2-2790969120 .fill-AA4{fill:#EDF0FD;} + .d2-2790969120 .fill-AA5{fill:#F7F8FE;} + .d2-2790969120 .fill-AB4{fill:#EDF0FD;} + .d2-2790969120 .fill-AB5{fill:#F7F8FE;} + .d2-2790969120 .stroke-N1{stroke:#0A0F25;} + .d2-2790969120 .stroke-N2{stroke:#676C7E;} + .d2-2790969120 .stroke-N3{stroke:#9499AB;} + .d2-2790969120 .stroke-N4{stroke:#CFD2DD;} + .d2-2790969120 .stroke-N5{stroke:#DEE1EB;} + .d2-2790969120 .stroke-N6{stroke:#EEF1F8;} + .d2-2790969120 .stroke-N7{stroke:#FFFFFF;} + .d2-2790969120 .stroke-B1{stroke:#0D32B2;} + .d2-2790969120 .stroke-B2{stroke:#0D32B2;} + .d2-2790969120 .stroke-B3{stroke:#E3E9FD;} + .d2-2790969120 .stroke-B4{stroke:#E3E9FD;} + .d2-2790969120 .stroke-B5{stroke:#EDF0FD;} + .d2-2790969120 .stroke-B6{stroke:#F7F8FE;} + .d2-2790969120 .stroke-AA2{stroke:#4A6FF3;} + .d2-2790969120 .stroke-AA4{stroke:#EDF0FD;} + .d2-2790969120 .stroke-AA5{stroke:#F7F8FE;} + .d2-2790969120 .stroke-AB4{stroke:#EDF0FD;} + .d2-2790969120 .stroke-AB5{stroke:#F7F8FE;} + .d2-2790969120 .background-color-N1{background-color:#0A0F25;} + .d2-2790969120 .background-color-N2{background-color:#676C7E;} + .d2-2790969120 .background-color-N3{background-color:#9499AB;} + .d2-2790969120 .background-color-N4{background-color:#CFD2DD;} + .d2-2790969120 .background-color-N5{background-color:#DEE1EB;} + .d2-2790969120 .background-color-N6{background-color:#EEF1F8;} + .d2-2790969120 .background-color-N7{background-color:#FFFFFF;} + .d2-2790969120 .background-color-B1{background-color:#0D32B2;} + .d2-2790969120 .background-color-B2{background-color:#0D32B2;} + .d2-2790969120 .background-color-B3{background-color:#E3E9FD;} + .d2-2790969120 .background-color-B4{background-color:#E3E9FD;} + .d2-2790969120 .background-color-B5{background-color:#EDF0FD;} + .d2-2790969120 .background-color-B6{background-color:#F7F8FE;} + .d2-2790969120 .background-color-AA2{background-color:#4A6FF3;} + .d2-2790969120 .background-color-AA4{background-color:#EDF0FD;} + .d2-2790969120 .background-color-AA5{background-color:#F7F8FE;} + .d2-2790969120 .background-color-AB4{background-color:#EDF0FD;} + .d2-2790969120 .background-color-AB5{background-color:#F7F8FE;} + .d2-2790969120 .color-N1{color:#0A0F25;} + .d2-2790969120 .color-N2{color:#676C7E;} + .d2-2790969120 .color-N3{color:#9499AB;} + .d2-2790969120 .color-N4{color:#CFD2DD;} + .d2-2790969120 .color-N5{color:#DEE1EB;} + .d2-2790969120 .color-N6{color:#EEF1F8;} + .d2-2790969120 .color-N7{color:#FFFFFF;} + .d2-2790969120 .color-B1{color:#0D32B2;} + .d2-2790969120 .color-B2{color:#0D32B2;} + .d2-2790969120 .color-B3{color:#E3E9FD;} + .d2-2790969120 .color-B4{color:#E3E9FD;} + .d2-2790969120 .color-B5{color:#EDF0FD;} + .d2-2790969120 .color-B6{color:#F7F8FE;} + .d2-2790969120 .color-AA2{color:#4A6FF3;} + .d2-2790969120 .color-AA4{color:#EDF0FD;} + .d2-2790969120 .color-AA5{color:#F7F8FE;} + .d2-2790969120 .color-AB4{color:#EDF0FD;} + .d2-2790969120 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker-d2-2790969120);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker-d2-2790969120);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright-d2-2790969120);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright-d2-2790969120);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright-d2-2790969120);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright-d2-2790969120);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark-d2-2790969120);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright-d2-2790969120);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright-d2-2790969120);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright-d2-2790969120);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright-d2-2790969120);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker-d2-2790969120);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark-d2-2790969120);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal-d2-2790969120);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal-d2-2790969120);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright-d2-2790969120);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright-d2-2790969120);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright-d2-2790969120);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>abcdabcab + + + + + + + + + + \ No newline at end of file From 357befa3131028ccd7d475e4247b708435d8a2f2 Mon Sep 17 00:00:00 2001 From: Mayank Mohapatra <125661248+Mayank77maruti@users.noreply.github.com> Date: Sun, 23 Feb 2025 17:00:22 +0000 Subject: [PATCH 55/73] try --- d2layouts/d2cycle/layout.go | 6 +- .../txtar/cycle-diagram/dagre/board.exp.json | 2078 ++++++++++------- .../txtar/cycle-diagram/dagre/sketch.exp.svg | 172 +- .../txtar/cycle-diagram/elk/board.exp.json | 2078 ++++++++++------- .../txtar/cycle-diagram/elk/sketch.exp.svg | 172 +- 5 files changed, 2660 insertions(+), 1846 deletions(-) diff --git a/d2layouts/d2cycle/layout.go b/d2layouts/d2cycle/layout.go index 49b39ad397..c2573b1d44 100644 --- a/d2layouts/d2cycle/layout.go +++ b/d2layouts/d2cycle/layout.go @@ -12,7 +12,7 @@ import ( ) const ( - MIN_RADIUS = 100 + MIN_RADIUS = 200 PADDING = 20 MIN_SEGMENT_LEN = 10 ARC_STEPS = 100 @@ -105,13 +105,11 @@ func createCircularArc(edge *d2graph.Edge) { edge.Route = path edge.IsCurve = true - // Adjust the last segment to ensure proper arrowhead direction if len(edge.Route) >= 2 { lastIndex := len(edge.Route) - 1 lastPoint := edge.Route[lastIndex] secondLastPoint := edge.Route[lastIndex-1] - // Calculate tangent direction (perpendicular to radius vector) tangentX := -lastPoint.Y tangentY := lastPoint.X mag := math.Hypot(tangentX, tangentY) @@ -120,7 +118,7 @@ func createCircularArc(edge *d2graph.Edge) { tangentY /= mag } const MIN_SEGMENT_LEN = 4.255 - // Calculate current segment direction + dx := lastPoint.X - secondLastPoint.X dy := lastPoint.Y - secondLastPoint.Y segLength := math.Hypot(dx, dy) diff --git a/e2etests/testdata/txtar/cycle-diagram/dagre/board.exp.json b/e2etests/testdata/txtar/cycle-diagram/dagre/board.exp.json index b0032c70e5..22305b18dc 100644 --- a/e2etests/testdata/txtar/cycle-diagram/dagre/board.exp.json +++ b/e2etests/testdata/txtar/cycle-diagram/dagre/board.exp.json @@ -18,8 +18,8 @@ "x": 0, "y": 0 }, - "width": 253, - "height": 266, + "width": 453, + "height": 466, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -57,7 +57,7 @@ "type": "rectangle", "pos": { "x": -26, - "y": -133 + "y": -233 }, "width": 53, "height": 66, @@ -98,7 +98,7 @@ "id": "1.b", "type": "rectangle", "pos": { - "x": 73, + "x": 173, "y": -33 }, "width": 53, @@ -141,7 +141,7 @@ "type": "rectangle", "pos": { "x": -26, - "y": 67 + "y": 167 }, "width": 53, "height": 66, @@ -182,7 +182,7 @@ "id": "1.d", "type": "rectangle", "pos": { - "x": -127, + "x": -227, "y": -32 }, "width": 54, @@ -224,11 +224,11 @@ "id": "2", "type": "cycle", "pos": { - "x": 313, - "y": 25 + "x": 513, + "y": 50 }, - "width": 226, - "height": 216, + "width": 399, + "height": 366, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -265,8 +265,8 @@ "id": "2.a", "type": "rectangle", "pos": { - "x": 286, - "y": -108 + "x": 486, + "y": -183 }, "width": 53, "height": 66, @@ -307,8 +307,8 @@ "id": "2.b", "type": "rectangle", "pos": { - "x": 373, - "y": 41 + "x": 659, + "y": 116 }, "width": 53, "height": 66, @@ -349,8 +349,8 @@ "id": "2.c", "type": "rectangle", "pos": { - "x": 199, - "y": 42 + "x": 313, + "y": 117 }, "width": 53, "height": 66, @@ -391,11 +391,11 @@ "id": "3", "type": "cycle", "pos": { - "x": 599, + "x": 972, "y": 0 }, "width": 53, - "height": 266, + "height": 466, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -432,8 +432,8 @@ "id": "3.a", "type": "rectangle", "pos": { - "x": 572, - "y": -133 + "x": 945, + "y": -233 }, "width": 53, "height": 66, @@ -474,8 +474,8 @@ "id": "3.b", "type": "rectangle", "pos": { - "x": 572, - "y": 67 + "x": 945, + "y": 167 }, "width": 53, "height": 66, @@ -541,254 +541,334 @@ "route": [ { "x": 26.5, - "y": -96.4229965209961 + "y": -198.22999572753906 + }, + { + "x": 28.18000030517578, + "y": -198.00399780273438 + }, + { + "x": 31.285999298095703, + "y": -197.53700256347656 + }, + { + "x": 34.3849983215332, + "y": -197.02099609375 + }, + { + "x": 37.47600173950195, + "y": -196.45700073242188 + }, + { + "x": 40.55699920654297, + "y": -195.843994140625 + }, + { + "x": 43.62799835205078, + "y": -195.18299865722656 + }, + { + "x": 46.68899917602539, + "y": -194.47300720214844 + }, + { + "x": 49.73699951171875, + "y": -193.71600341796875 + }, + { + "x": 52.77399826049805, + "y": -192.91099548339844 + }, + { + "x": 55.79800033569336, + "y": -192.05799865722656 + }, + { + "x": 58.80799865722656, + "y": -191.1580047607422 + }, + { + "x": 61.803001403808594, + "y": -190.21099853515625 }, { - "x": 27.89900016784668, - "y": -96.02899932861328 + "x": 64.78299713134766, + "y": -189.2169952392578 }, { - "x": 29.40399932861328, - "y": -95.5790023803711 + "x": 67.74700164794922, + "y": -188.17599487304688 }, { - "x": 30.900999069213867, - "y": -95.1050033569336 + "x": 70.69400024414062, + "y": -187.08799743652344 }, { - "x": 32.39099884033203, - "y": -94.60800170898438 + "x": 73.6240005493164, + "y": -185.9550018310547 }, { - "x": 33.87300109863281, - "y": -94.08799743652344 + "x": 76.53600311279297, + "y": -184.77499389648438 }, { - "x": 35.34700012207031, - "y": -93.54399871826172 + "x": 79.42900085449219, + "y": -183.5500030517578 }, { - "x": 36.8120002746582, - "y": -92.97699737548828 + "x": 82.302001953125, + "y": -182.27999877929688 }, { - "x": 38.268001556396484, - "y": -92.38700103759766 + "x": 85.15499877929688, + "y": -180.96499633789062 }, { - "x": 39.7140007019043, - "y": -91.7750015258789 + "x": 87.98699951171875, + "y": -179.60499572753906 }, { - "x": 41.1510009765625, - "y": -91.13999938964844 + "x": 90.7979965209961, + "y": -178.2010040283203 }, { - "x": 42.57699966430664, - "y": -90.48200225830078 + "x": 93.58499908447266, + "y": -176.7530059814453 }, { - "x": 43.99300003051758, - "y": -89.802001953125 + "x": 96.3499984741211, + "y": -175.26100158691406 }, { - "x": 45.39899826049805, - "y": -89.0999984741211 + "x": 99.09100341796875, + "y": -173.7259979248047 }, { - "x": 46.79199981689453, - "y": -88.3759994506836 + "x": 101.80799865722656, + "y": -172.1479949951172 }, { - "x": 48.17499923706055, - "y": -87.62999725341797 + "x": 104.4990005493164, + "y": -170.5279998779297 }, { - "x": 49.54499816894531, - "y": -86.86299896240234 + "x": 107.16500091552734, + "y": -168.86500549316406 }, { - "x": 50.90399932861328, - "y": -86.0739974975586 + "x": 109.80400085449219, + "y": -167.16099548339844 }, { - "x": 52.249000549316406, - "y": -85.26399993896484 + "x": 112.41600036621094, + "y": -165.41600036621094 }, { - "x": 53.582000732421875, - "y": -84.43199920654297 + "x": 115.0009994506836, + "y": -163.62899780273438 }, { - "x": 54.902000427246094, - "y": -83.58000183105469 + "x": 117.55699920654297, + "y": -161.80299377441406 }, { - "x": 56.20800018310547, - "y": -82.70800018310547 + "x": 120.08399963378906, + "y": -159.93600463867188 }, { - "x": 57.5, - "y": -81.81400299072266 + "x": 122.58100128173828, + "y": -158.031005859375 }, { - "x": 58.77799987792969, - "y": -80.9010009765625 + "x": 125.0479965209961, + "y": -156.08599853515625 }, { - "x": 60.04199981689453, - "y": -79.96800231933594 + "x": 127.48400115966797, + "y": -154.1020050048828 }, { - "x": 61.290000915527344, - "y": -79.01499938964844 + "x": 129.88900756835938, + "y": -152.08099365234375 }, { - "x": 62.52399826049805, - "y": -78.04299926757812 + "x": 132.26199340820312, + "y": -150.02200317382812 }, { - "x": 63.742000579833984, - "y": -77.0510025024414 + "x": 134.6020050048828, + "y": -147.92599487304688 }, { - "x": 64.94400024414062, - "y": -76.04000091552734 + "x": 136.90899658203125, + "y": -145.79299926757812 }, { - "x": 66.13099670410156, - "y": -75.01100158691406 + "x": 139.1820068359375, + "y": -143.625 }, { - "x": 67.3010025024414, - "y": -73.96299743652344 + "x": 141.42100524902344, + "y": -141.42100524902344 }, { - "x": 68.4540023803711, - "y": -72.89600372314453 + "x": 143.625, + "y": -139.1820068359375 }, { - "x": 69.59100341796875, - "y": -71.81199645996094 + "x": 145.79299926757812, + "y": -136.90899658203125 }, { - "x": 70.70999908447266, - "y": -70.70999908447266 + "x": 147.92599487304688, + "y": -134.6020050048828 }, { - "x": 71.81199645996094, - "y": -69.59100341796875 + "x": 150.02200317382812, + "y": -132.26199340820312 }, { - "x": 72.89600372314453, - "y": -68.4540023803711 + "x": 152.08099365234375, + "y": -129.88900756835938 }, { - "x": 73.96299743652344, - "y": -67.3010025024414 + "x": 154.1020050048828, + "y": -127.48400115966797 }, { - "x": 75.01100158691406, - "y": -66.13099670410156 + "x": 156.08599853515625, + "y": -125.0479965209961 }, { - "x": 76.04000091552734, - "y": -64.94400024414062 + "x": 158.031005859375, + "y": -122.58100128173828 }, { - "x": 77.0510025024414, - "y": -63.742000579833984 + "x": 159.93600463867188, + "y": -120.08399963378906 }, { - "x": 78.04299926757812, - "y": -62.52399826049805 + "x": 161.80299377441406, + "y": -117.55699920654297 }, { - "x": 79.01499938964844, - "y": -61.290000915527344 + "x": 163.62899780273438, + "y": -115.0009994506836 }, { - "x": 79.96800231933594, - "y": -60.04199981689453 + "x": 165.41600036621094, + "y": -112.41600036621094 }, { - "x": 80.9010009765625, - "y": -58.77799987792969 + "x": 167.16099548339844, + "y": -109.80400085449219 }, { - "x": 81.81400299072266, - "y": -57.5 + "x": 168.86500549316406, + "y": -107.16500091552734 }, { - "x": 82.70800018310547, - "y": -56.20800018310547 + "x": 170.5279998779297, + "y": -104.4990005493164 }, { - "x": 83.58000183105469, - "y": -54.902000427246094 + "x": 172.1479949951172, + "y": -101.80799865722656 }, { - "x": 84.43199920654297, - "y": -53.582000732421875 + "x": 173.7259979248047, + "y": -99.09100341796875 }, { - "x": 85.26399993896484, - "y": -52.249000549316406 + "x": 175.26100158691406, + "y": -96.3499984741211 }, { - "x": 86.0739974975586, - "y": -50.90399932861328 + "x": 176.7530059814453, + "y": -93.58499908447266 }, { - "x": 86.86299896240234, - "y": -49.54499816894531 + "x": 178.2010040283203, + "y": -90.7979965209961 }, { - "x": 87.62999725341797, - "y": -48.17499923706055 + "x": 179.60499572753906, + "y": -87.98699951171875 }, { - "x": 88.3759994506836, - "y": -46.79199981689453 + "x": 180.96499633789062, + "y": -85.15499877929688 }, { - "x": 89.0999984741211, - "y": -45.39899826049805 + "x": 182.27999877929688, + "y": -82.302001953125 }, { - "x": 89.802001953125, - "y": -43.99300003051758 + "x": 183.5500030517578, + "y": -79.42900085449219 }, { - "x": 90.48200225830078, - "y": -42.57699966430664 + "x": 184.77499389648438, + "y": -76.53600311279297 }, { - "x": 91.13999938964844, - "y": -41.1510009765625 + "x": 185.9550018310547, + "y": -73.6240005493164 }, { - "x": 91.7750015258789, - "y": -39.7140007019043 + "x": 187.08799743652344, + "y": -70.69400024414062 }, { - "x": 92.38700103759766, - "y": -38.268001556396484 + "x": 188.17599487304688, + "y": -67.74700164794922 }, { - "x": 92.97699737548828, - "y": -36.8120002746582 + "x": 189.2169952392578, + "y": -64.78299713134766 }, { - "x": 93.54399871826172, - "y": -35.34700012207031 + "x": 190.21099853515625, + "y": -61.803001403808594 }, { - "x": 92.98999786376953, - "y": -37.01599884033203 + "x": 191.1580047607422, + "y": -58.80799865722656 }, { - "x": 94.39399719238281, + "x": 192.05799865722656, + "y": -55.79800033569336 + }, + { + "x": 192.91099548339844, + "y": -52.77399826049805 + }, + { + "x": 193.71600341796875, + "y": -49.73699951171875 + }, + { + "x": 194.47300720214844, + "y": -46.68899917602539 + }, + { + "x": 195.18299865722656, + "y": -43.62799835205078 + }, + { + "x": 195.843994140625, + "y": -40.55699920654297 + }, + { + "x": 196.45700073242188, + "y": -37.47600173950195 + }, + { + "x": 196.5500030517578, + "y": -37.19599914550781 + }, + { + "x": 197.2519989013672, "y": -33 } ], @@ -824,256 +904,336 @@ "link": "", "route": [ { - "x": 94.39399719238281, + "x": 197.2519989013672, "y": 33 }, { - "x": 94.08799743652344, - "y": 33.87300109863281 + "x": 197.02099609375, + "y": 34.3849983215332 + }, + { + "x": 196.45700073242188, + "y": 37.47600173950195 + }, + { + "x": 195.843994140625, + "y": 40.55699920654297 + }, + { + "x": 195.18299865722656, + "y": 43.62799835205078 + }, + { + "x": 194.47300720214844, + "y": 46.68899917602539 + }, + { + "x": 193.71600341796875, + "y": 49.73699951171875 }, { - "x": 93.54399871826172, - "y": 35.34700012207031 + "x": 192.91099548339844, + "y": 52.77399826049805 }, { - "x": 92.97699737548828, - "y": 36.8120002746582 + "x": 192.05799865722656, + "y": 55.79800033569336 }, { - "x": 92.38700103759766, - "y": 38.268001556396484 + "x": 191.1580047607422, + "y": 58.80799865722656 }, { - "x": 91.7750015258789, - "y": 39.7140007019043 + "x": 190.21099853515625, + "y": 61.803001403808594 }, { - "x": 91.13999938964844, - "y": 41.1510009765625 + "x": 189.2169952392578, + "y": 64.78299713134766 }, { - "x": 90.48200225830078, - "y": 42.57699966430664 + "x": 188.17599487304688, + "y": 67.74700164794922 }, { - "x": 89.802001953125, - "y": 43.99300003051758 + "x": 187.08799743652344, + "y": 70.69400024414062 }, { - "x": 89.0999984741211, - "y": 45.39899826049805 + "x": 185.9550018310547, + "y": 73.6240005493164 }, { - "x": 88.3759994506836, - "y": 46.79199981689453 + "x": 184.77499389648438, + "y": 76.53600311279297 }, { - "x": 87.62999725341797, - "y": 48.17499923706055 + "x": 183.5500030517578, + "y": 79.42900085449219 }, { - "x": 86.86299896240234, - "y": 49.54499816894531 + "x": 182.27999877929688, + "y": 82.302001953125 }, { - "x": 86.0739974975586, - "y": 50.90399932861328 + "x": 180.96499633789062, + "y": 85.15499877929688 }, { - "x": 85.26399993896484, - "y": 52.249000549316406 + "x": 179.60499572753906, + "y": 87.98699951171875 }, { - "x": 84.43199920654297, - "y": 53.582000732421875 + "x": 178.2010040283203, + "y": 90.7979965209961 }, { - "x": 83.58000183105469, - "y": 54.902000427246094 + "x": 176.7530059814453, + "y": 93.58499908447266 }, { - "x": 82.70800018310547, - "y": 56.20800018310547 + "x": 175.26100158691406, + "y": 96.3499984741211 }, { - "x": 81.81400299072266, - "y": 57.5 + "x": 173.7259979248047, + "y": 99.09100341796875 }, { - "x": 80.9010009765625, - "y": 58.77799987792969 + "x": 172.1479949951172, + "y": 101.80799865722656 }, { - "x": 79.96800231933594, - "y": 60.04199981689453 + "x": 170.5279998779297, + "y": 104.4990005493164 }, { - "x": 79.01499938964844, - "y": 61.290000915527344 + "x": 168.86500549316406, + "y": 107.16500091552734 }, { - "x": 78.04299926757812, - "y": 62.52399826049805 + "x": 167.16099548339844, + "y": 109.80400085449219 }, { - "x": 77.0510025024414, - "y": 63.742000579833984 + "x": 165.41600036621094, + "y": 112.41600036621094 }, { - "x": 76.04000091552734, - "y": 64.94400024414062 + "x": 163.62899780273438, + "y": 115.0009994506836 }, { - "x": 75.01100158691406, - "y": 66.13099670410156 + "x": 161.80299377441406, + "y": 117.55699920654297 }, { - "x": 73.96299743652344, - "y": 67.3010025024414 + "x": 159.93600463867188, + "y": 120.08399963378906 }, { - "x": 72.89600372314453, - "y": 68.4540023803711 + "x": 158.031005859375, + "y": 122.58100128173828 }, { - "x": 71.81199645996094, - "y": 69.59100341796875 + "x": 156.08599853515625, + "y": 125.0479965209961 }, { - "x": 70.70999908447266, - "y": 70.70999908447266 + "x": 154.1020050048828, + "y": 127.48400115966797 }, { - "x": 69.59100341796875, - "y": 71.81199645996094 + "x": 152.08099365234375, + "y": 129.88900756835938 }, { - "x": 68.4540023803711, - "y": 72.89600372314453 + "x": 150.02200317382812, + "y": 132.26199340820312 }, { - "x": 67.3010025024414, - "y": 73.96299743652344 + "x": 147.92599487304688, + "y": 134.6020050048828 }, { - "x": 66.13099670410156, - "y": 75.01100158691406 + "x": 145.79299926757812, + "y": 136.90899658203125 }, { - "x": 64.94400024414062, - "y": 76.04000091552734 + "x": 143.625, + "y": 139.1820068359375 }, { - "x": 63.742000579833984, - "y": 77.0510025024414 + "x": 141.42100524902344, + "y": 141.42100524902344 }, { - "x": 62.52399826049805, - "y": 78.04299926757812 + "x": 139.1820068359375, + "y": 143.625 }, { - "x": 61.290000915527344, - "y": 79.01499938964844 + "x": 136.90899658203125, + "y": 145.79299926757812 }, { - "x": 60.04199981689453, - "y": 79.96800231933594 + "x": 134.6020050048828, + "y": 147.92599487304688 }, { - "x": 58.77799987792969, - "y": 80.9010009765625 + "x": 132.26199340820312, + "y": 150.02200317382812 }, { - "x": 57.5, - "y": 81.81400299072266 + "x": 129.88900756835938, + "y": 152.08099365234375 }, { - "x": 56.20800018310547, - "y": 82.70800018310547 + "x": 127.48400115966797, + "y": 154.1020050048828 }, { - "x": 54.902000427246094, - "y": 83.58000183105469 + "x": 125.0479965209961, + "y": 156.08599853515625 }, { - "x": 53.582000732421875, - "y": 84.43199920654297 + "x": 122.58100128173828, + "y": 158.031005859375 }, { - "x": 52.249000549316406, - "y": 85.26399993896484 + "x": 120.08399963378906, + "y": 159.93600463867188 }, { - "x": 50.90399932861328, - "y": 86.0739974975586 + "x": 117.55699920654297, + "y": 161.80299377441406 }, { - "x": 49.54499816894531, - "y": 86.86299896240234 + "x": 115.0009994506836, + "y": 163.62899780273438 }, { - "x": 48.17499923706055, - "y": 87.62999725341797 + "x": 112.41600036621094, + "y": 165.41600036621094 }, { - "x": 46.79199981689453, - "y": 88.3759994506836 + "x": 109.80400085449219, + "y": 167.16099548339844 }, { - "x": 45.39899826049805, - "y": 89.0999984741211 + "x": 107.16500091552734, + "y": 168.86500549316406 }, { - "x": 43.99300003051758, - "y": 89.802001953125 + "x": 104.4990005493164, + "y": 170.5279998779297 }, { - "x": 42.57699966430664, - "y": 90.48200225830078 + "x": 101.80799865722656, + "y": 172.1479949951172 }, { - "x": 41.1510009765625, - "y": 91.13999938964844 + "x": 99.09100341796875, + "y": 173.7259979248047 }, { - "x": 39.7140007019043, - "y": 91.7750015258789 + "x": 96.3499984741211, + "y": 175.26100158691406 }, { - "x": 38.268001556396484, - "y": 92.38700103759766 + "x": 93.58499908447266, + "y": 176.7530059814453 }, { - "x": 36.8120002746582, - "y": 92.97699737548828 + "x": 90.7979965209961, + "y": 178.2010040283203 }, { - "x": 35.34700012207031, - "y": 93.54399871826172 + "x": 87.98699951171875, + "y": 179.60499572753906 }, { - "x": 33.87300109863281, - "y": 94.08799743652344 + "x": 85.15499877929688, + "y": 180.96499633789062 }, { - "x": 32.39099884033203, - "y": 94.60800170898438 + "x": 82.302001953125, + "y": 182.27999877929688 }, { - "x": 30.900999069213867, - "y": 95.1050033569336 + "x": 79.42900085449219, + "y": 183.5500030517578 }, { - "x": 29.40399932861328, - "y": 95.5790023803711 + "x": 76.53600311279297, + "y": 184.77499389648438 }, { - "x": 30.601999282836914, - "y": 95.2959976196289 + "x": 73.6240005493164, + "y": 185.9550018310547 + }, + { + "x": 70.69400024414062, + "y": 187.08799743652344 + }, + { + "x": 67.74700164794922, + "y": 188.17599487304688 + }, + { + "x": 64.78299713134766, + "y": 189.2169952392578 + }, + { + "x": 61.803001403808594, + "y": 190.21099853515625 + }, + { + "x": 58.80799865722656, + "y": 191.1580047607422 + }, + { + "x": 55.79800033569336, + "y": 192.05799865722656 + }, + { + "x": 52.77399826049805, + "y": 192.91099548339844 + }, + { + "x": 49.73699951171875, + "y": 193.71600341796875 + }, + { + "x": 46.68899917602539, + "y": 194.47300720214844 + }, + { + "x": 43.62799835205078, + "y": 195.18299865722656 + }, + { + "x": 40.55699920654297, + "y": 195.843994140625 + }, + { + "x": 37.47600173950195, + "y": 196.45700073242188 + }, + { + "x": 34.3849983215332, + "y": 197.02099609375 + }, + { + "x": 31.285999298095703, + "y": 197.53700256347656 + }, + { + "x": 30.716999053955078, + "y": 197.66600036621094 }, { "x": 26.5, - "y": 96.4229965209961 + "y": 198.22999572753906 } ], "isCurve": true, @@ -1109,254 +1269,334 @@ "route": [ { "x": -26.499000549316406, - "y": 96.4229965209961 + "y": 198.22999572753906 + }, + { + "x": -28.18000030517578, + "y": 198.00399780273438 + }, + { + "x": -31.285999298095703, + "y": 197.53700256347656 + }, + { + "x": -34.3849983215332, + "y": 197.02099609375 + }, + { + "x": -37.47600173950195, + "y": 196.45700073242188 + }, + { + "x": -40.55699920654297, + "y": 195.843994140625 + }, + { + "x": -43.62799835205078, + "y": 195.18299865722656 + }, + { + "x": -46.68899917602539, + "y": 194.47300720214844 + }, + { + "x": -49.73699951171875, + "y": 193.71600341796875 + }, + { + "x": -52.77399826049805, + "y": 192.91099548339844 + }, + { + "x": -55.79800033569336, + "y": 192.05799865722656 + }, + { + "x": -58.80799865722656, + "y": 191.1580047607422 }, { - "x": -27.89900016784668, - "y": 96.02899932861328 + "x": -61.803001403808594, + "y": 190.21099853515625 }, { - "x": -29.40399932861328, - "y": 95.5790023803711 + "x": -64.78299713134766, + "y": 189.2169952392578 }, { - "x": -30.900999069213867, - "y": 95.1050033569336 + "x": -67.74700164794922, + "y": 188.17599487304688 }, { - "x": -32.39099884033203, - "y": 94.60800170898438 + "x": -70.69400024414062, + "y": 187.08799743652344 }, { - "x": -33.87300109863281, - "y": 94.08799743652344 + "x": -73.6240005493164, + "y": 185.9550018310547 }, { - "x": -35.34700012207031, - "y": 93.54399871826172 + "x": -76.53600311279297, + "y": 184.77499389648438 }, { - "x": -36.8120002746582, - "y": 92.97699737548828 + "x": -79.42900085449219, + "y": 183.5500030517578 }, { - "x": -38.268001556396484, - "y": 92.38700103759766 + "x": -82.302001953125, + "y": 182.27999877929688 }, { - "x": -39.7140007019043, - "y": 91.7750015258789 + "x": -85.15499877929688, + "y": 180.96499633789062 }, { - "x": -41.1510009765625, - "y": 91.13999938964844 + "x": -87.98699951171875, + "y": 179.60499572753906 }, { - "x": -42.57699966430664, - "y": 90.48200225830078 + "x": -90.7979965209961, + "y": 178.2010040283203 }, { - "x": -43.99300003051758, - "y": 89.802001953125 + "x": -93.58499908447266, + "y": 176.7530059814453 }, { - "x": -45.39899826049805, - "y": 89.0999984741211 + "x": -96.3499984741211, + "y": 175.26100158691406 }, { - "x": -46.79199981689453, - "y": 88.3759994506836 + "x": -99.09100341796875, + "y": 173.7259979248047 }, { - "x": -48.17499923706055, - "y": 87.62999725341797 + "x": -101.80799865722656, + "y": 172.1479949951172 }, { - "x": -49.54499816894531, - "y": 86.86299896240234 + "x": -104.4990005493164, + "y": 170.5279998779297 }, { - "x": -50.90399932861328, - "y": 86.0739974975586 + "x": -107.16500091552734, + "y": 168.86500549316406 }, { - "x": -52.249000549316406, - "y": 85.26399993896484 + "x": -109.80400085449219, + "y": 167.16099548339844 }, { - "x": -53.582000732421875, - "y": 84.43199920654297 + "x": -112.41600036621094, + "y": 165.41600036621094 }, { - "x": -54.902000427246094, - "y": 83.58000183105469 + "x": -115.0009994506836, + "y": 163.62899780273438 }, { - "x": -56.20800018310547, - "y": 82.70800018310547 + "x": -117.55699920654297, + "y": 161.80299377441406 }, { - "x": -57.5, - "y": 81.81400299072266 + "x": -120.08399963378906, + "y": 159.93600463867188 }, { - "x": -58.77799987792969, - "y": 80.9010009765625 + "x": -122.58100128173828, + "y": 158.031005859375 }, { - "x": -60.04199981689453, - "y": 79.96800231933594 + "x": -125.0479965209961, + "y": 156.08599853515625 }, { - "x": -61.290000915527344, - "y": 79.01499938964844 + "x": -127.48400115966797, + "y": 154.1020050048828 }, { - "x": -62.52399826049805, - "y": 78.04299926757812 + "x": -129.88900756835938, + "y": 152.08099365234375 }, { - "x": -63.742000579833984, - "y": 77.0510025024414 + "x": -132.26199340820312, + "y": 150.02200317382812 }, { - "x": -64.94400024414062, - "y": 76.04000091552734 + "x": -134.6020050048828, + "y": 147.92599487304688 }, { - "x": -66.13099670410156, - "y": 75.01100158691406 + "x": -136.90899658203125, + "y": 145.79299926757812 }, { - "x": -67.3010025024414, - "y": 73.96299743652344 + "x": -139.1820068359375, + "y": 143.625 }, { - "x": -68.4540023803711, - "y": 72.89600372314453 + "x": -141.42100524902344, + "y": 141.42100524902344 }, { - "x": -69.59100341796875, - "y": 71.81199645996094 + "x": -143.625, + "y": 139.1820068359375 }, { - "x": -70.70999908447266, - "y": 70.70999908447266 + "x": -145.79299926757812, + "y": 136.90899658203125 }, { - "x": -71.81199645996094, - "y": 69.59100341796875 + "x": -147.92599487304688, + "y": 134.6020050048828 }, { - "x": -72.89600372314453, - "y": 68.4540023803711 + "x": -150.02200317382812, + "y": 132.26199340820312 }, { - "x": -73.96299743652344, - "y": 67.3010025024414 + "x": -152.08099365234375, + "y": 129.88900756835938 }, { - "x": -75.01100158691406, - "y": 66.13099670410156 + "x": -154.1020050048828, + "y": 127.48400115966797 }, { - "x": -76.04000091552734, - "y": 64.94400024414062 + "x": -156.08599853515625, + "y": 125.0479965209961 }, { - "x": -77.0510025024414, - "y": 63.742000579833984 + "x": -158.031005859375, + "y": 122.58100128173828 }, { - "x": -78.04299926757812, - "y": 62.52399826049805 + "x": -159.93600463867188, + "y": 120.08399963378906 }, { - "x": -79.01499938964844, - "y": 61.290000915527344 + "x": -161.80299377441406, + "y": 117.55699920654297 }, { - "x": -79.96800231933594, - "y": 60.04199981689453 + "x": -163.62899780273438, + "y": 115.0009994506836 }, { - "x": -80.9010009765625, - "y": 58.77799987792969 + "x": -165.41600036621094, + "y": 112.41600036621094 }, { - "x": -81.81400299072266, - "y": 57.5 + "x": -167.16099548339844, + "y": 109.80400085449219 }, { - "x": -82.70800018310547, - "y": 56.20800018310547 + "x": -168.86500549316406, + "y": 107.16500091552734 }, { - "x": -83.58000183105469, - "y": 54.902000427246094 + "x": -170.5279998779297, + "y": 104.4990005493164 }, { - "x": -84.43199920654297, - "y": 53.582000732421875 + "x": -172.1479949951172, + "y": 101.80799865722656 }, { - "x": -85.26399993896484, - "y": 52.249000549316406 + "x": -173.7259979248047, + "y": 99.09100341796875 }, { - "x": -86.0739974975586, - "y": 50.90399932861328 + "x": -175.26100158691406, + "y": 96.3499984741211 }, { - "x": -86.86299896240234, - "y": 49.54499816894531 + "x": -176.7530059814453, + "y": 93.58499908447266 }, { - "x": -87.62999725341797, - "y": 48.17499923706055 + "x": -178.2010040283203, + "y": 90.7979965209961 }, { - "x": -88.3759994506836, - "y": 46.79199981689453 + "x": -179.60499572753906, + "y": 87.98699951171875 }, { - "x": -89.0999984741211, - "y": 45.39899826049805 + "x": -180.96499633789062, + "y": 85.15499877929688 }, { - "x": -89.802001953125, - "y": 43.99300003051758 + "x": -182.27999877929688, + "y": 82.302001953125 }, { - "x": -90.48200225830078, - "y": 42.57699966430664 + "x": -183.5500030517578, + "y": 79.42900085449219 }, { - "x": -91.13999938964844, - "y": 41.1510009765625 + "x": -184.77499389648438, + "y": 76.53600311279297 }, { - "x": -91.7750015258789, - "y": 39.7140007019043 + "x": -185.9550018310547, + "y": 73.6240005493164 }, { - "x": -92.38700103759766, - "y": 38.268001556396484 + "x": -187.08799743652344, + "y": 70.69400024414062 }, { - "x": -92.97699737548828, - "y": 36.8120002746582 + "x": -188.17599487304688, + "y": 67.74700164794922 }, { - "x": -93.54399871826172, - "y": 35.34700012207031 + "x": -189.2169952392578, + "y": 64.78299713134766 }, { - "x": -92.98999786376953, - "y": 37.01599884033203 + "x": -190.21099853515625, + "y": 61.803001403808594 }, { - "x": -94.39399719238281, + "x": -191.1580047607422, + "y": 58.80799865722656 + }, + { + "x": -192.05799865722656, + "y": 55.79800033569336 + }, + { + "x": -192.91099548339844, + "y": 52.77399826049805 + }, + { + "x": -193.71600341796875, + "y": 49.73699951171875 + }, + { + "x": -194.47300720214844, + "y": 46.68899917602539 + }, + { + "x": -195.18299865722656, + "y": 43.62799835205078 + }, + { + "x": -195.843994140625, + "y": 40.55699920654297 + }, + { + "x": -196.45700073242188, + "y": 37.47600173950195 + }, + { + "x": -196.5500030517578, + "y": 37.19599914550781 + }, + { + "x": -197.2519989013672, "y": 33 } ], @@ -1392,296 +1632,352 @@ "link": "", "route": [ { - "x": 339.5, - "y": -71.4209976196289 + "x": 539.5, + "y": -148.2259979248047 }, { - "x": 339.8909912109375, - "y": -71.31600189208984 + "x": 542.2160034179688, + "y": -147.85400390625 }, { - "x": 341.90301513671875, - "y": -70.73100280761719 + "x": 546.35302734375, + "y": -147.19900512695312 }, { - "x": 343.9010009765625, - "y": -70.1050033569336 + "x": 550.4760131835938, + "y": -146.45700073242188 }, { - "x": 345.885986328125, - "y": -69.43699645996094 + "x": 554.5819702148438, + "y": -145.62899780273438 }, { - "x": 347.85699462890625, - "y": -68.72799682617188 + "x": 558.6699829101562, + "y": -144.71499633789062 }, { - "x": 349.81201171875, - "y": -67.97699737548828 + "x": 562.7369995117188, + "y": -143.71600341796875 }, { - "x": 351.7510070800781, - "y": -67.18599700927734 + "x": 566.7830200195312, + "y": -142.6320037841797 }, { - "x": 353.6730041503906, - "y": -66.35399627685547 + "x": 570.8060302734375, + "y": -141.46299743652344 }, { - "x": 355.5769958496094, - "y": -65.48200225830078 + "x": 574.802978515625, + "y": -140.21099853515625 }, { - "x": 357.4630126953125, - "y": -64.57099914550781 + "x": 578.7730102539062, + "y": -138.875 }, { - "x": 359.3290100097656, - "y": -63.619998931884766 + "x": 582.7139892578125, + "y": -137.45599365234375 }, { - "x": 361.17498779296875, - "y": -62.630001068115234 + "x": 586.6240234375, + "y": -135.9550018310547 }, { - "x": 363, - "y": -61.60200119018555 + "x": 590.5029907226562, + "y": -134.3719940185547 }, { - "x": 364.802001953125, - "y": -60.5359992980957 + "x": 594.3469848632812, + "y": -132.70899963378906 }, { - "x": 366.5820007324219, - "y": -59.43199920654297 + "x": 598.155029296875, + "y": -130.96499633789062 }, { - "x": 368.3389892578125, - "y": -58.29199981689453 + "x": 601.927001953125, + "y": -129.14199829101562 }, { - "x": 370.0710144042969, - "y": -57.11399841308594 + "x": 605.6589965820312, + "y": -127.23999786376953 }, { - "x": 371.77801513671875, - "y": -55.9010009765625 + "x": 609.3499755859375, + "y": -125.26100158691406 }, { - "x": 373.4590148925781, - "y": -54.652000427246094 + "x": 613, + "y": -123.20500183105469 }, { - "x": 375.114013671875, - "y": -53.36899948120117 + "x": 616.60498046875, + "y": -121.0719985961914 }, { - "x": 376.74200439453125, - "y": -52.05099868774414 + "x": 620.1649780273438, + "y": -118.86499786376953 }, { - "x": 378.3420104980469, - "y": -50.69900131225586 + "x": 623.677978515625, + "y": -116.58399963378906 }, { - "x": 379.9129943847656, - "y": -49.31399917602539 + "x": 627.1420288085938, + "y": -114.22899627685547 }, { - "x": 381.4540100097656, - "y": -47.895999908447266 + "x": 630.5570068359375, + "y": -111.8030014038086 }, { - "x": 382.96600341796875, - "y": -46.446998596191406 + "x": 633.9190063476562, + "y": -109.30500030517578 }, { - "x": 384.4469909667969, - "y": -44.965999603271484 + "x": 637.22900390625, + "y": -106.73799896240234 }, { - "x": 385.89599609375, - "y": -43.45399856567383 + "x": 640.4840087890625, + "y": -104.10199737548828 }, { - "x": 387.3139953613281, - "y": -41.91299819946289 + "x": 643.6840209960938, + "y": -101.39900207519531 }, { - "x": 388.6990051269531, - "y": -40.34199905395508 + "x": 646.8259887695312, + "y": -98.62799835205078 }, { - "x": 390.0509948730469, - "y": -38.742000579833984 + "x": 649.9089965820312, + "y": -95.79299926757812 }, { - "x": 391.3689880371094, - "y": -37.11399841308594 + "x": 652.9320068359375, + "y": -92.89399719238281 }, { - "x": 392.6520080566406, - "y": -35.45899963378906 + "x": 655.8939819335938, + "y": -89.93199920654297 }, { - "x": 393.9010009765625, - "y": -33.77799987792969 + "x": 658.7930297851562, + "y": -86.90899658203125 }, { - "x": 395.114013671875, - "y": -32.07099914550781 + "x": 661.6279907226562, + "y": -83.82599639892578 }, { - "x": 396.2919921875, - "y": -30.339000701904297 + "x": 664.3989868164062, + "y": -80.68399810791016 }, { - "x": 397.4320068359375, - "y": -28.582000732421875 + "x": 667.1019897460938, + "y": -77.48400115966797 }, { - "x": 398.5360107421875, - "y": -26.802000045776367 + "x": 669.7379760742188, + "y": -74.22899627685547 }, { - "x": 399.60198974609375, - "y": -25 + "x": 672.3049926757812, + "y": -70.91899871826172 }, { - "x": 400.6300048828125, - "y": -23.174999237060547 + "x": 674.802978515625, + "y": -67.55699920654297 }, { - "x": 401.6199951171875, - "y": -21.32900047302246 + "x": 677.22900390625, + "y": -64.14199829101562 }, { - "x": 402.5710144042969, - "y": -19.46299934387207 + "x": 679.583984375, + "y": -60.678001403808594 }, { - "x": 403.48199462890625, - "y": -17.57699966430664 + "x": 681.864990234375, + "y": -57.165000915527344 }, { - "x": 404.35400390625, - "y": -15.67300033569336 + "x": 684.072021484375, + "y": -53.60499954223633 }, { - "x": 405.1860046386719, - "y": -13.75100040435791 + "x": 686.2050170898438, + "y": -50 }, { - "x": 405.97698974609375, - "y": -11.812000274658203 + "x": 688.260986328125, + "y": -46.349998474121094 }, { - "x": 406.7279968261719, - "y": -9.857000350952148 + "x": 690.239990234375, + "y": -42.659000396728516 }, { - "x": 407.43701171875, - "y": -7.886000156402588 + "x": 692.1420288085938, + "y": -38.926998138427734 }, { - "x": 408.1050109863281, - "y": -5.901000022888184 + "x": 693.9650268554688, + "y": -35.154998779296875 }, { - "x": 408.7309875488281, - "y": -3.9030001163482666 + "x": 695.708984375, + "y": -31.347000122070312 }, { - "x": 409.3160095214844, - "y": -1.8910000324249268 + "x": 697.3720092773438, + "y": -27.503000259399414 }, { - "x": 409.8580017089844, - "y": 0.13099999725818634 + "x": 698.9550170898438, + "y": -23.624000549316406 }, { - "x": 410.35699462890625, - "y": 2.1640000343322754 + "x": 700.4559936523438, + "y": -19.714000701904297 }, { - "x": 410.8139953613281, - "y": 4.208000183105469 + "x": 701.875, + "y": -15.77299976348877 }, { - "x": 411.2279968261719, - "y": 6.261000156402588 + "x": 703.2109985351562, + "y": -11.803000450134277 }, { - "x": 411.5989990234375, - "y": 8.322999954223633 + "x": 704.4630126953125, + "y": -7.806000232696533 }, { - "x": 411.927001953125, - "y": 10.390999794006348 + "x": 705.6320190429688, + "y": -3.7829999923706055 }, { - "x": 412.21099853515625, - "y": 12.465999603271484 + "x": 706.7160034179688, + "y": 0.2619999945163727 }, { - "x": 412.4519958496094, - "y": 14.54699993133545 + "x": 707.7150268554688, + "y": 4.328999996185303 }, { - "x": 412.64898681640625, - "y": 16.631999969482422 + "x": 708.6290283203125, + "y": 8.416999816894531 }, { - "x": 412.802001953125, - "y": 18.719999313354492 + "x": 709.4569702148438, + "y": 12.52299976348877 }, { - "x": 412.9119873046875, - "y": 20.812000274658203 + "x": 710.198974609375, + "y": 16.645999908447266 }, { - "x": 412.9779968261719, - "y": 22.905000686645508 + "x": 710.85400390625, + "y": 20.783000946044922 }, { - "x": 413, - "y": 25 + "x": 711.4219970703125, + "y": 24.933000564575195 + }, + { + "x": 711.9039916992188, + "y": 29.0939998626709 + }, + { + "x": 712.2979736328125, + "y": 33.263999938964844 + }, + { + "x": 712.60498046875, + "y": 37.441001892089844 + }, + { + "x": 712.823974609375, + "y": 41.624000549316406 + }, + { + "x": 712.9559936523438, + "y": 45.81100082397461 + }, + { + "x": 713, + "y": 50 + }, + { + "x": 712.9559936523438, + "y": 54.1879997253418 + }, + { + "x": 712.823974609375, + "y": 58.375 + }, + { + "x": 712.60498046875, + "y": 62.55799865722656 + }, + { + "x": 712.2979736328125, + "y": 66.73500061035156 }, { - "x": 412.9779968261719, - "y": 27.0939998626709 + "x": 711.9039916992188, + "y": 70.90499877929688 }, { - "x": 412.9119873046875, - "y": 29.187000274658203 + "x": 711.4219970703125, + "y": 75.06600189208984 }, { - "x": 412.802001953125, - "y": 31.27899932861328 + "x": 710.85400390625, + "y": 79.21600341796875 }, { - "x": 412.64898681640625, - "y": 33.367000579833984 + "x": 710.198974609375, + "y": 83.35299682617188 }, { - "x": 412.4519958496094, - "y": 35.45199966430664 + "x": 709.4569702148438, + "y": 87.47599792480469 }, { - "x": 412.21099853515625, - "y": 37.53300094604492 + "x": 708.6290283203125, + "y": 91.58200073242188 }, { - "x": 411.927001953125, - "y": 39.608001708984375 + "x": 707.7150268554688, + "y": 95.66999816894531 }, { - "x": 412.2640075683594, - "y": 37.805999755859375 + "x": 706.7160034179688, + "y": 99.73699951171875 }, { - "x": 411.5409851074219, - "y": 41.999000549316406 + "x": 705.6320190429688, + "y": 103.78299713134766 + }, + { + "x": 704.4630126953125, + "y": 107.80599975585938 + }, + { + "x": 703.2109985351562, + "y": 111.8030014038086 + }, + { + "x": 702.8590087890625, + "y": 112.98999786376953 + }, + { + "x": 701.4329833984375, + "y": 116.9990005493164 } ], "isCurve": true, @@ -1716,256 +2012,336 @@ "link": "", "route": [ { - "x": 373.10198974609375, - "y": 104.91799926757812 + "x": 662.3569946289062, + "y": 182.99899291992188 + }, + { + "x": 661.6279907226562, + "y": 183.8260040283203 + }, + { + "x": 658.7930297851562, + "y": 186.90899658203125 + }, + { + "x": 655.8939819335938, + "y": 189.9320068359375 + }, + { + "x": 652.9320068359375, + "y": 192.8939971923828 + }, + { + "x": 649.9089965820312, + "y": 195.79299926757812 + }, + { + "x": 646.8259887695312, + "y": 198.6280059814453 + }, + { + "x": 643.6840209960938, + "y": 201.3990020751953 + }, + { + "x": 640.4840087890625, + "y": 204.1020050048828 + }, + { + "x": 637.22900390625, + "y": 206.73800659179688 + }, + { + "x": 633.9190063476562, + "y": 209.30499267578125 + }, + { + "x": 630.5570068359375, + "y": 211.80299377441406 + }, + { + "x": 627.1420288085938, + "y": 214.22900390625 + }, + { + "x": 623.677978515625, + "y": 216.58399963378906 + }, + { + "x": 620.1649780273438, + "y": 218.86500549316406 + }, + { + "x": 616.60498046875, + "y": 221.07200622558594 + }, + { + "x": 613, + "y": 223.2050018310547 + }, + { + "x": 609.3499755859375, + "y": 225.26100158691406 }, { - "x": 371.77801513671875, - "y": 105.9010009765625 + "x": 605.6589965820312, + "y": 227.24000549316406 }, { - "x": 370.0710144042969, - "y": 107.11399841308594 + "x": 601.927001953125, + "y": 229.14199829101562 }, { - "x": 368.3389892578125, - "y": 108.29199981689453 + "x": 598.155029296875, + "y": 230.96499633789062 }, { - "x": 366.5820007324219, - "y": 109.43199920654297 + "x": 594.3469848632812, + "y": 232.70899963378906 }, { - "x": 364.802001953125, - "y": 110.53600311279297 + "x": 590.5029907226562, + "y": 234.3719940185547 }, { - "x": 363, - "y": 111.60199737548828 + "x": 586.6240234375, + "y": 235.9550018310547 }, { - "x": 361.17498779296875, - "y": 112.62999725341797 + "x": 582.7139892578125, + "y": 237.45599365234375 }, { - "x": 359.3290100097656, - "y": 113.62000274658203 + "x": 578.7730102539062, + "y": 238.875 }, { - "x": 357.4630126953125, - "y": 114.57099914550781 + "x": 574.802978515625, + "y": 240.21099853515625 }, { - "x": 355.5769958496094, - "y": 115.48200225830078 + "x": 570.8060302734375, + "y": 241.46299743652344 }, { - "x": 353.6730041503906, - "y": 116.35399627685547 + "x": 566.7830200195312, + "y": 242.6320037841797 }, { - "x": 351.7510070800781, - "y": 117.18599700927734 + "x": 562.7369995117188, + "y": 243.71600341796875 }, { - "x": 349.81201171875, - "y": 117.97699737548828 + "x": 558.6699829101562, + "y": 244.71499633789062 }, { - "x": 347.85699462890625, - "y": 118.72799682617188 + "x": 554.5819702148438, + "y": 245.62899780273438 }, { - "x": 345.885986328125, - "y": 119.43699645996094 + "x": 550.4760131835938, + "y": 246.45700073242188 }, { - "x": 343.9010009765625, - "y": 120.1050033569336 + "x": 546.35302734375, + "y": 247.19900512695312 }, { - "x": 341.90301513671875, - "y": 120.73100280761719 + "x": 542.2160034179688, + "y": 247.85400390625 }, { - "x": 339.8909912109375, - "y": 121.31600189208984 + "x": 538.0659790039062, + "y": 248.4219970703125 }, { - "x": 337.8680114746094, - "y": 121.85800170898438 + "x": 533.905029296875, + "y": 248.9040069580078 }, { - "x": 335.8349914550781, - "y": 122.35700225830078 + "x": 529.7349853515625, + "y": 249.29800415039062 }, { - "x": 333.7909851074219, - "y": 122.81400299072266 + "x": 525.5579833984375, + "y": 249.60499572753906 }, { - "x": 331.7380065917969, - "y": 123.22799682617188 + "x": 521.375, + "y": 249.82400512695312 }, { - "x": 329.6759948730469, - "y": 123.5989990234375 + "x": 517.18798828125, + "y": 249.95599365234375 }, { - "x": 327.6080017089844, - "y": 123.927001953125 + "x": 513, + "y": 250 }, { - "x": 325.5329895019531, - "y": 124.21099853515625 + "x": 508.8110046386719, + "y": 249.95599365234375 }, { - "x": 323.4519958496094, - "y": 124.4520034790039 + "x": 504.6239929199219, + "y": 249.82400512695312 }, { - "x": 321.36700439453125, - "y": 124.64900207519531 + "x": 500.4410095214844, + "y": 249.60499572753906 }, { - "x": 319.27899169921875, - "y": 124.802001953125 + "x": 496.2640075683594, + "y": 249.29800415039062 }, { - "x": 317.18701171875, - "y": 124.91200256347656 + "x": 492.093994140625, + "y": 248.9040069580078 }, { - "x": 315.093994140625, - "y": 124.97799682617188 + "x": 487.9330139160156, + "y": 248.4219970703125 }, { - "x": 313, - "y": 125 + "x": 483.7829895019531, + "y": 247.85400390625 }, { - "x": 310.9049987792969, - "y": 124.97799682617188 + "x": 479.64599609375, + "y": 247.19900512695312 }, { - "x": 308.81201171875, - "y": 124.91200256347656 + "x": 475.52301025390625, + "y": 246.45700073242188 }, { - "x": 306.7200012207031, - "y": 124.802001953125 + "x": 471.4169921875, + "y": 245.62899780273438 }, { - "x": 304.6319885253906, - "y": 124.64900207519531 + "x": 467.3290100097656, + "y": 244.71499633789062 }, { - "x": 302.5469970703125, - "y": 124.4520034790039 + "x": 463.2619934082031, + "y": 243.71600341796875 }, { - "x": 300.46600341796875, - "y": 124.21099853515625 + "x": 459.21600341796875, + "y": 242.6320037841797 }, { - "x": 298.3909912109375, - "y": 123.927001953125 + "x": 455.1929931640625, + "y": 241.46299743652344 }, { - "x": 296.322998046875, - "y": 123.5989990234375 + "x": 451.1960144042969, + "y": 240.21099853515625 }, { - "x": 294.260986328125, - "y": 123.22799682617188 + "x": 447.22601318359375, + "y": 238.875 }, { - "x": 292.2080078125, - "y": 122.81400299072266 + "x": 443.2850036621094, + "y": 237.45599365234375 }, { - "x": 290.16400146484375, - "y": 122.35700225830078 + "x": 439.375, + "y": 235.9550018310547 }, { - "x": 288.1310119628906, - "y": 121.85800170898438 + "x": 435.4960021972656, + "y": 234.3719940185547 }, { - "x": 286.1080017089844, - "y": 121.31600189208984 + "x": 431.6520080566406, + "y": 232.70899963378906 }, { - "x": 284.09600830078125, - "y": 120.73100280761719 + "x": 427.843994140625, + "y": 230.96499633789062 }, { - "x": 282.0979919433594, - "y": 120.1050033569336 + "x": 424.0719909667969, + "y": 229.14199829101562 }, { - "x": 280.1130065917969, - "y": 119.43699645996094 + "x": 420.3399963378906, + "y": 227.24000549316406 }, { - "x": 278.1419982910156, - "y": 118.72799682617188 + "x": 416.64898681640625, + "y": 225.26100158691406 }, { - "x": 276.18701171875, - "y": 117.97699737548828 + "x": 413, + "y": 223.2050018310547 }, { - "x": 274.24798583984375, - "y": 117.18599700927734 + "x": 409.3940124511719, + "y": 221.07200622558594 }, { - "x": 272.32598876953125, - "y": 116.35399627685547 + "x": 405.8340148925781, + "y": 218.86500549316406 }, { - "x": 270.4219970703125, - "y": 115.48200225830078 + "x": 402.3210144042969, + "y": 216.58399963378906 }, { - "x": 268.5360107421875, - "y": 114.57099914550781 + "x": 398.85699462890625, + "y": 214.22900390625 }, { - "x": 266.6700134277344, - "y": 113.62000274658203 + "x": 395.4419860839844, + "y": 211.80299377441406 }, { - "x": 264.8240051269531, - "y": 112.62999725341797 + "x": 392.0799865722656, + "y": 209.30499267578125 }, { - "x": 263, - "y": 111.60199737548828 + "x": 388.7699890136719, + "y": 206.73800659179688 }, { - "x": 261.1969909667969, - "y": 110.53600311279297 + "x": 385.5150146484375, + "y": 204.1020050048828 }, { - "x": 259.4169921875, - "y": 109.43199920654297 + "x": 382.31500244140625, + "y": 201.3990020751953 }, { - "x": 257.6600036621094, - "y": 108.29199981689453 + "x": 379.1730041503906, + "y": 198.6280059814453 }, { - "x": 255.92799377441406, - "y": 107.11399841308594 + "x": 376.0899963378906, + "y": 195.79299926757812 }, { - "x": 256.2980041503906, - "y": 107.4749984741211 + "x": 373.0669860839844, + "y": 192.8939971923828 }, { - "x": 252.89700317382812, - "y": 104.91799926757812 + "x": 370.1050109863281, + "y": 189.9320068359375 + }, + { + "x": 367.20599365234375, + "y": 186.90899658203125 + }, + { + "x": 366.47198486328125, + "y": 186.177001953125 + }, + { + "x": 363.6419982910156, + "y": 183 } ], "isCurve": true, @@ -2000,344 +2376,376 @@ "link": "", "route": [ { - "x": 625.5, - "y": -96.41200256347656 + "x": 998.5, + "y": -198.21800231933594 + }, + { + "x": 1003.2860107421875, + "y": -197.53700256347656 + }, + { + "x": 1009.4760131835938, + "y": -196.45700073242188 + }, + { + "x": 1015.6279907226562, + "y": -195.18299865722656 }, { - "x": 626.8989868164062, - "y": -96.02899932861328 + "x": 1021.7369995117188, + "y": -193.71600341796875 }, { - "x": 629.9010009765625, - "y": -95.1050033569336 + "x": 1027.7979736328125, + "y": -192.05799865722656 }, { - "x": 632.8729858398438, - "y": -94.08799743652344 + "x": 1033.802978515625, + "y": -190.21099853515625 }, { - "x": 635.81201171875, - "y": -92.97699737548828 + "x": 1039.7469482421875, + "y": -188.17599487304688 }, { - "x": 638.7139892578125, - "y": -91.7750015258789 + "x": 1045.6240234375, + "y": -185.9550018310547 }, { - "x": 641.5770263671875, - "y": -90.48200225830078 + "x": 1051.428955078125, + "y": -183.5500030517578 }, { - "x": 644.3989868164062, - "y": -89.0999984741211 + "x": 1057.155029296875, + "y": -180.96499633789062 }, { - "x": 647.1749877929688, - "y": -87.62999725341797 + "x": 1062.7979736328125, + "y": -178.2010040283203 }, { - "x": 649.9039916992188, - "y": -86.0739974975586 + "x": 1068.3499755859375, + "y": -175.26100158691406 }, { - "x": 652.5819702148438, - "y": -84.43199920654297 + "x": 1073.8079833984375, + "y": -172.1479949951172 }, { - "x": 655.2080078125, - "y": -82.70800018310547 + "x": 1079.1650390625, + "y": -168.86500549316406 }, { - "x": 657.7780151367188, - "y": -80.9010009765625 + "x": 1084.416015625, + "y": -165.41600036621094 }, { - "x": 660.2899780273438, - "y": -79.01499938964844 + "x": 1089.5570068359375, + "y": -161.80299377441406 }, { - "x": 662.7420043945312, - "y": -77.0510025024414 + "x": 1094.5810546875, + "y": -158.031005859375 }, { - "x": 665.1309814453125, - "y": -75.01100158691406 + "x": 1099.4840087890625, + "y": -154.1020050048828 }, { - "x": 667.4539794921875, - "y": -72.89600372314453 + "x": 1104.261962890625, + "y": -150.02200317382812 }, { - "x": 669.7100219726562, - "y": -70.70999908447266 + "x": 1108.9090576171875, + "y": -145.79299926757812 }, { - "x": 671.89599609375, - "y": -68.4540023803711 + "x": 1113.4210205078125, + "y": -141.42100524902344 }, { - "x": 674.010986328125, - "y": -66.13099670410156 + "x": 1117.79296875, + "y": -136.90899658203125 }, { - "x": 676.051025390625, - "y": -63.742000579833984 + "x": 1122.02197265625, + "y": -132.26199340820312 }, { - "x": 678.0150146484375, - "y": -61.290000915527344 + "x": 1126.10205078125, + "y": -127.48400115966797 }, { - "x": 679.9010009765625, - "y": -58.77799987792969 + "x": 1130.031005859375, + "y": -122.58100128173828 }, { - "x": 681.7080078125, - "y": -56.20800018310547 + "x": 1133.802978515625, + "y": -117.55699920654297 }, { - "x": 683.4320068359375, - "y": -53.582000732421875 + "x": 1137.416015625, + "y": -112.41600036621094 }, { - "x": 685.073974609375, - "y": -50.90399932861328 + "x": 1140.864990234375, + "y": -107.16500091552734 }, { - "x": 686.6300048828125, - "y": -48.17499923706055 + "x": 1144.14794921875, + "y": -101.80799865722656 }, { - "x": 688.0999755859375, - "y": -45.39899826049805 + "x": 1147.260986328125, + "y": -96.3499984741211 }, { - "x": 689.4819946289062, - "y": -42.57699966430664 + "x": 1150.2010498046875, + "y": -90.7979965209961 }, { - "x": 690.7750244140625, - "y": -39.7140007019043 + "x": 1152.9649658203125, + "y": -85.15499877929688 }, { - "x": 691.9769897460938, - "y": -36.8120002746582 + "x": 1155.550048828125, + "y": -79.42900085449219 }, { - "x": 693.0880126953125, - "y": -33.87300109863281 + "x": 1157.9549560546875, + "y": -73.6240005493164 }, { - "x": 694.10498046875, - "y": -30.900999069213867 + "x": 1160.176025390625, + "y": -67.74700164794922 }, { - "x": 695.0289916992188, - "y": -27.89900016784668 + "x": 1162.2110595703125, + "y": -61.803001403808594 }, { - "x": 695.8579711914062, - "y": -24.868000030517578 + "x": 1164.0579833984375, + "y": -55.79800033569336 }, { - "x": 696.5910034179688, - "y": -21.81399917602539 + "x": 1165.7159423828125, + "y": -49.73699951171875 }, { - "x": 697.22802734375, - "y": -18.738000869750977 + "x": 1167.1829833984375, + "y": -43.62799835205078 }, { - "x": 697.7680053710938, - "y": -15.642999649047852 + "x": 1168.45703125, + "y": -37.47600173950195 }, { - "x": 698.2109985351562, - "y": -12.532999992370605 + "x": 1169.5369873046875, + "y": -31.285999298095703 }, { - "x": 698.5560302734375, - "y": -9.40999984741211 + "x": 1170.4219970703125, + "y": -25.06599998474121 }, { - "x": 698.802001953125, - "y": -6.2789998054504395 + "x": 1171.112060546875, + "y": -18.820999145507812 }, { - "x": 698.9500122070312, - "y": -3.1410000324249268 + "x": 1171.60498046875, + "y": -12.557999610900879 }, { - "x": 699, + "x": 1171.9010009765625, + "y": -6.2820000648498535 + }, + { + "x": 1172, "y": 0 }, { - "x": 698.9500122070312, - "y": 3.1410000324249268 + "x": 1171.9010009765625, + "y": 6.2820000648498535 + }, + { + "x": 1171.60498046875, + "y": 12.557999610900879 + }, + { + "x": 1171.112060546875, + "y": 18.820999145507812 + }, + { + "x": 1170.4219970703125, + "y": 25.06599998474121 + }, + { + "x": 1169.5369873046875, + "y": 31.285999298095703 }, { - "x": 698.802001953125, - "y": 6.2789998054504395 + "x": 1168.45703125, + "y": 37.47600173950195 }, { - "x": 698.5560302734375, - "y": 9.40999984741211 + "x": 1167.1829833984375, + "y": 43.62799835205078 }, { - "x": 698.2109985351562, - "y": 12.532999992370605 + "x": 1165.7159423828125, + "y": 49.73699951171875 }, { - "x": 697.7680053710938, - "y": 15.642999649047852 + "x": 1164.0579833984375, + "y": 55.79800033569336 }, { - "x": 697.22802734375, - "y": 18.738000869750977 + "x": 1162.2110595703125, + "y": 61.803001403808594 }, { - "x": 696.5910034179688, - "y": 21.81399917602539 + "x": 1160.176025390625, + "y": 67.74700164794922 }, { - "x": 695.8579711914062, - "y": 24.868000030517578 + "x": 1157.9549560546875, + "y": 73.6240005493164 }, { - "x": 695.0289916992188, - "y": 27.89900016784668 + "x": 1155.550048828125, + "y": 79.42900085449219 }, { - "x": 694.10498046875, - "y": 30.900999069213867 + "x": 1152.9649658203125, + "y": 85.15499877929688 }, { - "x": 693.0880126953125, - "y": 33.87300109863281 + "x": 1150.2010498046875, + "y": 90.7979965209961 }, { - "x": 691.9769897460938, - "y": 36.8120002746582 + "x": 1147.260986328125, + "y": 96.3499984741211 }, { - "x": 690.7750244140625, - "y": 39.7140007019043 + "x": 1144.14794921875, + "y": 101.80799865722656 }, { - "x": 689.4819946289062, - "y": 42.57699966430664 + "x": 1140.864990234375, + "y": 107.16500091552734 }, { - "x": 688.0999755859375, - "y": 45.39899826049805 + "x": 1137.416015625, + "y": 112.41600036621094 }, { - "x": 686.6300048828125, - "y": 48.17499923706055 + "x": 1133.802978515625, + "y": 117.55699920654297 }, { - "x": 685.073974609375, - "y": 50.90399932861328 + "x": 1130.031005859375, + "y": 122.58100128173828 }, { - "x": 683.4320068359375, - "y": 53.582000732421875 + "x": 1126.10205078125, + "y": 127.48400115966797 }, { - "x": 681.7080078125, - "y": 56.20800018310547 + "x": 1122.02197265625, + "y": 132.26199340820312 }, { - "x": 679.9010009765625, - "y": 58.77799987792969 + "x": 1117.79296875, + "y": 136.90899658203125 }, { - "x": 678.0150146484375, - "y": 61.290000915527344 + "x": 1113.4210205078125, + "y": 141.42100524902344 }, { - "x": 676.051025390625, - "y": 63.742000579833984 + "x": 1108.9090576171875, + "y": 145.79299926757812 }, { - "x": 674.010986328125, - "y": 66.13099670410156 + "x": 1104.261962890625, + "y": 150.02200317382812 }, { - "x": 671.89599609375, - "y": 68.4540023803711 + "x": 1099.4840087890625, + "y": 154.1020050048828 }, { - "x": 669.7100219726562, - "y": 70.70999908447266 + "x": 1094.5810546875, + "y": 158.031005859375 }, { - "x": 667.4539794921875, - "y": 72.89600372314453 + "x": 1089.5570068359375, + "y": 161.80299377441406 }, { - "x": 665.1309814453125, - "y": 75.01100158691406 + "x": 1084.416015625, + "y": 165.41600036621094 }, { - "x": 662.7420043945312, - "y": 77.0510025024414 + "x": 1079.1650390625, + "y": 168.86500549316406 }, { - "x": 660.2899780273438, - "y": 79.01499938964844 + "x": 1073.8079833984375, + "y": 172.1479949951172 }, { - "x": 657.7780151367188, - "y": 80.9010009765625 + "x": 1068.3499755859375, + "y": 175.26100158691406 }, { - "x": 655.2080078125, - "y": 82.70800018310547 + "x": 1062.7979736328125, + "y": 178.2010040283203 }, { - "x": 652.5819702148438, - "y": 84.43199920654297 + "x": 1057.155029296875, + "y": 180.96499633789062 }, { - "x": 649.9039916992188, - "y": 86.0739974975586 + "x": 1051.428955078125, + "y": 183.5500030517578 }, { - "x": 647.1749877929688, - "y": 87.62999725341797 + "x": 1045.6240234375, + "y": 185.9550018310547 }, { - "x": 644.3989868164062, - "y": 89.0999984741211 + "x": 1039.7469482421875, + "y": 188.17599487304688 }, { - "x": 641.5770263671875, - "y": 90.48200225830078 + "x": 1033.802978515625, + "y": 190.21099853515625 }, { - "x": 638.7139892578125, - "y": 91.7750015258789 + "x": 1027.7979736328125, + "y": 192.05799865722656 }, { - "x": 635.81201171875, - "y": 92.97699737548828 + "x": 1021.7369995117188, + "y": 193.71600341796875 }, { - "x": 632.8729858398438, - "y": 94.08799743652344 + "x": 1015.6279907226562, + "y": 195.18299865722656 }, { - "x": 629.9010009765625, - "y": 95.1050033569336 + "x": 1009.4760131835938, + "y": 196.45700073242188 }, { - "x": 629.6019897460938, - "y": 95.28399658203125 + "x": 1003.2860107421875, + "y": 197.53700256347656 }, { - "x": 625.5, - "y": 96.41200256347656 + "x": 998.5, + "y": 198.21800231933594 } ], "isCurve": true, diff --git a/e2etests/testdata/txtar/cycle-diagram/dagre/sketch.exp.svg b/e2etests/testdata/txtar/cycle-diagram/dagre/sketch.exp.svg index 23ae56b6ca..88a40d4eb5 100644 --- a/e2etests/testdata/txtar/cycle-diagram/dagre/sketch.exp.svg +++ b/e2etests/testdata/txtar/cycle-diagram/dagre/sketch.exp.svg @@ -1,9 +1,9 @@ -abcdabcab - - - - - - - - - - + .d2-2471463271 .fill-N1{fill:#0A0F25;} + .d2-2471463271 .fill-N2{fill:#676C7E;} + .d2-2471463271 .fill-N3{fill:#9499AB;} + .d2-2471463271 .fill-N4{fill:#CFD2DD;} + .d2-2471463271 .fill-N5{fill:#DEE1EB;} + .d2-2471463271 .fill-N6{fill:#EEF1F8;} + .d2-2471463271 .fill-N7{fill:#FFFFFF;} + .d2-2471463271 .fill-B1{fill:#0D32B2;} + .d2-2471463271 .fill-B2{fill:#0D32B2;} + .d2-2471463271 .fill-B3{fill:#E3E9FD;} + .d2-2471463271 .fill-B4{fill:#E3E9FD;} + .d2-2471463271 .fill-B5{fill:#EDF0FD;} + .d2-2471463271 .fill-B6{fill:#F7F8FE;} + .d2-2471463271 .fill-AA2{fill:#4A6FF3;} + .d2-2471463271 .fill-AA4{fill:#EDF0FD;} + .d2-2471463271 .fill-AA5{fill:#F7F8FE;} + .d2-2471463271 .fill-AB4{fill:#EDF0FD;} + .d2-2471463271 .fill-AB5{fill:#F7F8FE;} + .d2-2471463271 .stroke-N1{stroke:#0A0F25;} + .d2-2471463271 .stroke-N2{stroke:#676C7E;} + .d2-2471463271 .stroke-N3{stroke:#9499AB;} + .d2-2471463271 .stroke-N4{stroke:#CFD2DD;} + .d2-2471463271 .stroke-N5{stroke:#DEE1EB;} + .d2-2471463271 .stroke-N6{stroke:#EEF1F8;} + .d2-2471463271 .stroke-N7{stroke:#FFFFFF;} + .d2-2471463271 .stroke-B1{stroke:#0D32B2;} + .d2-2471463271 .stroke-B2{stroke:#0D32B2;} + .d2-2471463271 .stroke-B3{stroke:#E3E9FD;} + .d2-2471463271 .stroke-B4{stroke:#E3E9FD;} + .d2-2471463271 .stroke-B5{stroke:#EDF0FD;} + .d2-2471463271 .stroke-B6{stroke:#F7F8FE;} + .d2-2471463271 .stroke-AA2{stroke:#4A6FF3;} + .d2-2471463271 .stroke-AA4{stroke:#EDF0FD;} + .d2-2471463271 .stroke-AA5{stroke:#F7F8FE;} + .d2-2471463271 .stroke-AB4{stroke:#EDF0FD;} + .d2-2471463271 .stroke-AB5{stroke:#F7F8FE;} + .d2-2471463271 .background-color-N1{background-color:#0A0F25;} + .d2-2471463271 .background-color-N2{background-color:#676C7E;} + .d2-2471463271 .background-color-N3{background-color:#9499AB;} + .d2-2471463271 .background-color-N4{background-color:#CFD2DD;} + .d2-2471463271 .background-color-N5{background-color:#DEE1EB;} + .d2-2471463271 .background-color-N6{background-color:#EEF1F8;} + .d2-2471463271 .background-color-N7{background-color:#FFFFFF;} + .d2-2471463271 .background-color-B1{background-color:#0D32B2;} + .d2-2471463271 .background-color-B2{background-color:#0D32B2;} + .d2-2471463271 .background-color-B3{background-color:#E3E9FD;} + .d2-2471463271 .background-color-B4{background-color:#E3E9FD;} + .d2-2471463271 .background-color-B5{background-color:#EDF0FD;} + .d2-2471463271 .background-color-B6{background-color:#F7F8FE;} + .d2-2471463271 .background-color-AA2{background-color:#4A6FF3;} + .d2-2471463271 .background-color-AA4{background-color:#EDF0FD;} + .d2-2471463271 .background-color-AA5{background-color:#F7F8FE;} + .d2-2471463271 .background-color-AB4{background-color:#EDF0FD;} + .d2-2471463271 .background-color-AB5{background-color:#F7F8FE;} + .d2-2471463271 .color-N1{color:#0A0F25;} + .d2-2471463271 .color-N2{color:#676C7E;} + .d2-2471463271 .color-N3{color:#9499AB;} + .d2-2471463271 .color-N4{color:#CFD2DD;} + .d2-2471463271 .color-N5{color:#DEE1EB;} + .d2-2471463271 .color-N6{color:#EEF1F8;} + .d2-2471463271 .color-N7{color:#FFFFFF;} + .d2-2471463271 .color-B1{color:#0D32B2;} + .d2-2471463271 .color-B2{color:#0D32B2;} + .d2-2471463271 .color-B3{color:#E3E9FD;} + .d2-2471463271 .color-B4{color:#E3E9FD;} + .d2-2471463271 .color-B5{color:#EDF0FD;} + .d2-2471463271 .color-B6{color:#F7F8FE;} + .d2-2471463271 .color-AA2{color:#4A6FF3;} + .d2-2471463271 .color-AA4{color:#EDF0FD;} + .d2-2471463271 .color-AA5{color:#F7F8FE;} + .d2-2471463271 .color-AB4{color:#EDF0FD;} + .d2-2471463271 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker-d2-2471463271);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker-d2-2471463271);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright-d2-2471463271);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright-d2-2471463271);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright-d2-2471463271);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright-d2-2471463271);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark-d2-2471463271);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright-d2-2471463271);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright-d2-2471463271);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright-d2-2471463271);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright-d2-2471463271);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker-d2-2471463271);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark-d2-2471463271);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal-d2-2471463271);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal-d2-2471463271);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright-d2-2471463271);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright-d2-2471463271);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright-d2-2471463271);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>abcdabcab + + + + + + + + + + \ No newline at end of file diff --git a/e2etests/testdata/txtar/cycle-diagram/elk/board.exp.json b/e2etests/testdata/txtar/cycle-diagram/elk/board.exp.json index 17b8eb8c62..f05462190e 100644 --- a/e2etests/testdata/txtar/cycle-diagram/elk/board.exp.json +++ b/e2etests/testdata/txtar/cycle-diagram/elk/board.exp.json @@ -18,8 +18,8 @@ "x": 12, "y": 12 }, - "width": 254, - "height": 266, + "width": 454, + "height": 466, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -57,7 +57,7 @@ "type": "rectangle", "pos": { "x": -14, - "y": -121 + "y": -221 }, "width": 53, "height": 66, @@ -98,7 +98,7 @@ "id": "1.b", "type": "rectangle", "pos": { - "x": 85, + "x": 185, "y": -21 }, "width": 53, @@ -141,7 +141,7 @@ "type": "rectangle", "pos": { "x": -14, - "y": 79 + "y": 179 }, "width": 53, "height": 66, @@ -182,7 +182,7 @@ "id": "1.d", "type": "rectangle", "pos": { - "x": -115, + "x": -215, "y": -20 }, "width": 54, @@ -224,11 +224,11 @@ "id": "2", "type": "cycle", "pos": { - "x": 285, - "y": 36 + "x": 485, + "y": 61 }, - "width": 227, - "height": 217, + "width": 400, + "height": 367, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -265,8 +265,8 @@ "id": "2.a", "type": "rectangle", "pos": { - "x": 259, - "y": -96 + "x": 459, + "y": -171 }, "width": 53, "height": 66, @@ -307,8 +307,8 @@ "id": "2.b", "type": "rectangle", "pos": { - "x": 345, - "y": 53 + "x": 632, + "y": 128 }, "width": 53, "height": 66, @@ -349,8 +349,8 @@ "id": "2.c", "type": "rectangle", "pos": { - "x": 172, - "y": 54 + "x": 285, + "y": 129 }, "width": 53, "height": 66, @@ -391,11 +391,11 @@ "id": "3", "type": "cycle", "pos": { - "x": 531, + "x": 904, "y": 12 }, "width": 53, - "height": 266, + "height": 466, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -432,8 +432,8 @@ "id": "3.a", "type": "rectangle", "pos": { - "x": 505, - "y": -121 + "x": 878, + "y": -221 }, "width": 53, "height": 66, @@ -474,8 +474,8 @@ "id": "3.b", "type": "rectangle", "pos": { - "x": 505, - "y": 79 + "x": 878, + "y": 179 }, "width": 53, "height": 66, @@ -541,254 +541,334 @@ "route": [ { "x": 38.5, - "y": -84.4229965209961 + "y": -186.22999572753906 + }, + { + "x": 40.18000030517578, + "y": -186.00399780273438 + }, + { + "x": 43.2859992980957, + "y": -185.53700256347656 + }, + { + "x": 46.3849983215332, + "y": -185.02099609375 + }, + { + "x": 49.47600173950195, + "y": -184.45700073242188 + }, + { + "x": 52.55699920654297, + "y": -183.843994140625 + }, + { + "x": 55.62799835205078, + "y": -183.18299865722656 + }, + { + "x": 58.68899917602539, + "y": -182.47300720214844 + }, + { + "x": 61.73699951171875, + "y": -181.71600341796875 + }, + { + "x": 64.77400207519531, + "y": -180.91099548339844 + }, + { + "x": 67.7979965209961, + "y": -180.05799865722656 + }, + { + "x": 70.80799865722656, + "y": -179.1580047607422 + }, + { + "x": 73.8030014038086, + "y": -178.21099853515625 }, { - "x": 39.89899826049805, - "y": -84.02899932861328 + "x": 76.78299713134766, + "y": -177.2169952392578 }, { - "x": 41.40399932861328, - "y": -83.5790023803711 + "x": 79.74700164794922, + "y": -176.17599487304688 }, { - "x": 42.9010009765625, - "y": -83.1050033569336 + "x": 82.69400024414062, + "y": -175.08799743652344 }, { - "x": 44.39099884033203, - "y": -82.60800170898438 + "x": 85.6240005493164, + "y": -173.9550018310547 }, { - "x": 45.87300109863281, - "y": -82.08799743652344 + "x": 88.53600311279297, + "y": -172.77499389648438 }, { - "x": 47.34700012207031, - "y": -81.54399871826172 + "x": 91.42900085449219, + "y": -171.5500030517578 }, { - "x": 48.8120002746582, - "y": -80.97699737548828 + "x": 94.302001953125, + "y": -170.27999877929688 }, { - "x": 50.268001556396484, - "y": -80.38700103759766 + "x": 97.15499877929688, + "y": -168.96499633789062 }, { - "x": 51.7140007019043, - "y": -79.7750015258789 + "x": 99.98699951171875, + "y": -167.60499572753906 }, { - "x": 53.1510009765625, - "y": -79.13999938964844 + "x": 102.7979965209961, + "y": -166.2010040283203 }, { - "x": 54.57699966430664, - "y": -78.48200225830078 + "x": 105.58499908447266, + "y": -164.7530059814453 }, { - "x": 55.99300003051758, - "y": -77.802001953125 + "x": 108.3499984741211, + "y": -163.26100158691406 }, { - "x": 57.39899826049805, - "y": -77.0999984741211 + "x": 111.09100341796875, + "y": -161.7259979248047 }, { - "x": 58.79199981689453, - "y": -76.3759994506836 + "x": 113.80799865722656, + "y": -160.1479949951172 }, { - "x": 60.17499923706055, - "y": -75.62999725341797 + "x": 116.4990005493164, + "y": -158.5279998779297 }, { - "x": 61.54499816894531, - "y": -74.86299896240234 + "x": 119.16500091552734, + "y": -156.86500549316406 }, { - "x": 62.90399932861328, - "y": -74.0739974975586 + "x": 121.80400085449219, + "y": -155.16099548339844 }, { - "x": 64.2490005493164, - "y": -73.26399993896484 + "x": 124.41600036621094, + "y": -153.41600036621094 }, { - "x": 65.58200073242188, - "y": -72.43199920654297 + "x": 127.0009994506836, + "y": -151.62899780273438 }, { - "x": 66.9020004272461, - "y": -71.58000183105469 + "x": 129.5570068359375, + "y": -149.80299377441406 }, { - "x": 68.20800018310547, - "y": -70.70800018310547 + "x": 132.08399963378906, + "y": -147.93600463867188 }, { - "x": 69.5, - "y": -69.81400299072266 + "x": 134.58099365234375, + "y": -146.031005859375 }, { - "x": 70.77799987792969, - "y": -68.9010009765625 + "x": 137.04800415039062, + "y": -144.08599853515625 }, { - "x": 72.04199981689453, - "y": -67.96800231933594 + "x": 139.48399353027344, + "y": -142.1020050048828 }, { - "x": 73.29000091552734, - "y": -67.01499938964844 + "x": 141.88900756835938, + "y": -140.08099365234375 }, { - "x": 74.52400207519531, - "y": -66.04299926757812 + "x": 144.26199340820312, + "y": -138.02200317382812 }, { - "x": 75.74199676513672, - "y": -65.0510025024414 + "x": 146.6020050048828, + "y": -135.92599487304688 }, { - "x": 76.94400024414062, - "y": -64.04000091552734 + "x": 148.90899658203125, + "y": -133.79299926757812 }, { - "x": 78.13099670410156, - "y": -63.01100158691406 + "x": 151.1820068359375, + "y": -131.625 }, { - "x": 79.3010025024414, - "y": -61.9630012512207 + "x": 153.42100524902344, + "y": -129.42100524902344 }, { - "x": 80.4540023803711, - "y": -60.895999908447266 + "x": 155.625, + "y": -127.18199920654297 }, { - "x": 81.59100341796875, - "y": -59.8120002746582 + "x": 157.79299926757812, + "y": -124.90899658203125 }, { - "x": 82.70999908447266, - "y": -58.709999084472656 + "x": 159.92599487304688, + "y": -122.60199737548828 }, { - "x": 83.81199645996094, - "y": -57.590999603271484 + "x": 162.02200317382812, + "y": -120.26200103759766 }, { - "x": 84.89600372314453, - "y": -56.45399856567383 + "x": 164.08099365234375, + "y": -117.88899993896484 }, { - "x": 85.96299743652344, - "y": -55.30099868774414 + "x": 166.1020050048828, + "y": -115.48400115966797 }, { - "x": 87.01100158691406, - "y": -54.13100051879883 + "x": 168.08599853515625, + "y": -113.0479965209961 }, { - "x": 88.04000091552734, - "y": -52.944000244140625 + "x": 170.031005859375, + "y": -110.58100128173828 }, { - "x": 89.0510025024414, - "y": -51.742000579833984 + "x": 171.93600463867188, + "y": -108.08399963378906 }, { - "x": 90.04299926757812, - "y": -50.52399826049805 + "x": 173.80299377441406, + "y": -105.55699920654297 }, { - "x": 91.01499938964844, - "y": -49.290000915527344 + "x": 175.62899780273438, + "y": -103.0009994506836 }, { - "x": 91.96800231933594, - "y": -48.04199981689453 + "x": 177.41600036621094, + "y": -100.41600036621094 }, { - "x": 92.9010009765625, - "y": -46.77799987792969 + "x": 179.16099548339844, + "y": -97.80400085449219 }, { - "x": 93.81400299072266, - "y": -45.5 + "x": 180.86500549316406, + "y": -95.16500091552734 }, { - "x": 94.70800018310547, - "y": -44.20800018310547 + "x": 182.5279998779297, + "y": -92.4990005493164 }, { - "x": 95.58000183105469, - "y": -42.902000427246094 + "x": 184.1479949951172, + "y": -89.80799865722656 }, { - "x": 96.43199920654297, - "y": -41.582000732421875 + "x": 185.7259979248047, + "y": -87.09100341796875 }, { - "x": 97.26399993896484, - "y": -40.249000549316406 + "x": 187.26100158691406, + "y": -84.3499984741211 }, { - "x": 98.0739974975586, - "y": -38.90399932861328 + "x": 188.7530059814453, + "y": -81.58499908447266 }, { - "x": 98.86299896240234, - "y": -37.54499816894531 + "x": 190.2010040283203, + "y": -78.7979965209961 }, { - "x": 99.62999725341797, - "y": -36.17499923706055 + "x": 191.60499572753906, + "y": -75.98699951171875 }, { - "x": 100.3759994506836, - "y": -34.79199981689453 + "x": 192.96499633789062, + "y": -73.15499877929688 }, { - "x": 101.0999984741211, - "y": -33.39899826049805 + "x": 194.27999877929688, + "y": -70.302001953125 }, { - "x": 101.802001953125, - "y": -31.993000030517578 + "x": 195.5500030517578, + "y": -67.42900085449219 }, { - "x": 102.48200225830078, - "y": -30.57699966430664 + "x": 196.77499389648438, + "y": -64.53600311279297 }, { - "x": 103.13999938964844, - "y": -29.150999069213867 + "x": 197.9550018310547, + "y": -61.624000549316406 }, { - "x": 103.7750015258789, - "y": -27.714000701904297 + "x": 199.08799743652344, + "y": -58.694000244140625 }, { - "x": 104.38700103759766, - "y": -26.26799964904785 + "x": 200.17599487304688, + "y": -55.74700164794922 }, { - "x": 104.97699737548828, - "y": -24.812000274658203 + "x": 201.2169952392578, + "y": -52.78300094604492 }, { - "x": 105.54399871826172, - "y": -23.347000122070312 + "x": 202.21099853515625, + "y": -49.803001403808594 }, { - "x": 104.98999786376953, - "y": -25.016000747680664 + "x": 203.1580047607422, + "y": -46.80799865722656 }, { - "x": 106.39399719238281, + "x": 204.05799865722656, + "y": -43.79800033569336 + }, + { + "x": 204.91099548339844, + "y": -40.77399826049805 + }, + { + "x": 205.71600341796875, + "y": -37.73699951171875 + }, + { + "x": 206.47300720214844, + "y": -34.68899917602539 + }, + { + "x": 207.18299865722656, + "y": -31.628000259399414 + }, + { + "x": 207.843994140625, + "y": -28.55699920654297 + }, + { + "x": 208.45700073242188, + "y": -25.47599983215332 + }, + { + "x": 208.5500030517578, + "y": -25.195999145507812 + }, + { + "x": 209.2519989013672, "y": -21 } ], @@ -824,256 +904,336 @@ "link": "", "route": [ { - "x": 106.39399719238281, + "x": 209.2519989013672, "y": 45 }, { - "x": 106.08799743652344, - "y": 45.87300109863281 + "x": 209.02099609375, + "y": 46.3849983215332 + }, + { + "x": 208.45700073242188, + "y": 49.47600173950195 + }, + { + "x": 207.843994140625, + "y": 52.55699920654297 + }, + { + "x": 207.18299865722656, + "y": 55.62799835205078 + }, + { + "x": 206.47300720214844, + "y": 58.68899917602539 + }, + { + "x": 205.71600341796875, + "y": 61.73699951171875 }, { - "x": 105.54399871826172, - "y": 47.34700012207031 + "x": 204.91099548339844, + "y": 64.77400207519531 }, { - "x": 104.97699737548828, - "y": 48.8120002746582 + "x": 204.05799865722656, + "y": 67.7979965209961 }, { - "x": 104.38700103759766, - "y": 50.268001556396484 + "x": 203.1580047607422, + "y": 70.80799865722656 }, { - "x": 103.7750015258789, - "y": 51.7140007019043 + "x": 202.21099853515625, + "y": 73.8030014038086 }, { - "x": 103.13999938964844, - "y": 53.1510009765625 + "x": 201.2169952392578, + "y": 76.78299713134766 }, { - "x": 102.48200225830078, - "y": 54.57699966430664 + "x": 200.17599487304688, + "y": 79.74700164794922 }, { - "x": 101.802001953125, - "y": 55.99300003051758 + "x": 199.08799743652344, + "y": 82.69400024414062 }, { - "x": 101.0999984741211, - "y": 57.39899826049805 + "x": 197.9550018310547, + "y": 85.6240005493164 }, { - "x": 100.3759994506836, - "y": 58.79199981689453 + "x": 196.77499389648438, + "y": 88.53600311279297 }, { - "x": 99.62999725341797, - "y": 60.17499923706055 + "x": 195.5500030517578, + "y": 91.42900085449219 }, { - "x": 98.86299896240234, - "y": 61.54499816894531 + "x": 194.27999877929688, + "y": 94.302001953125 }, { - "x": 98.0739974975586, - "y": 62.90399932861328 + "x": 192.96499633789062, + "y": 97.15499877929688 }, { - "x": 97.26399993896484, - "y": 64.2490005493164 + "x": 191.60499572753906, + "y": 99.98699951171875 }, { - "x": 96.43199920654297, - "y": 65.58200073242188 + "x": 190.2010040283203, + "y": 102.7979965209961 }, { - "x": 95.58000183105469, - "y": 66.9020004272461 + "x": 188.7530059814453, + "y": 105.58499908447266 }, { - "x": 94.70800018310547, - "y": 68.20800018310547 + "x": 187.26100158691406, + "y": 108.3499984741211 }, { - "x": 93.81400299072266, - "y": 69.5 + "x": 185.7259979248047, + "y": 111.09100341796875 }, { - "x": 92.9010009765625, - "y": 70.77799987792969 + "x": 184.1479949951172, + "y": 113.80799865722656 }, { - "x": 91.96800231933594, - "y": 72.04199981689453 + "x": 182.5279998779297, + "y": 116.4990005493164 }, { - "x": 91.01499938964844, - "y": 73.29000091552734 + "x": 180.86500549316406, + "y": 119.16500091552734 }, { - "x": 90.04299926757812, - "y": 74.52400207519531 + "x": 179.16099548339844, + "y": 121.80400085449219 }, { - "x": 89.0510025024414, - "y": 75.74199676513672 + "x": 177.41600036621094, + "y": 124.41600036621094 }, { - "x": 88.04000091552734, - "y": 76.94400024414062 + "x": 175.62899780273438, + "y": 127.0009994506836 }, { - "x": 87.01100158691406, - "y": 78.13099670410156 + "x": 173.80299377441406, + "y": 129.5570068359375 }, { - "x": 85.96299743652344, - "y": 79.3010025024414 + "x": 171.93600463867188, + "y": 132.08399963378906 }, { - "x": 84.89600372314453, - "y": 80.4540023803711 + "x": 170.031005859375, + "y": 134.58099365234375 }, { - "x": 83.81199645996094, - "y": 81.59100341796875 + "x": 168.08599853515625, + "y": 137.04800415039062 }, { - "x": 82.70999908447266, - "y": 82.70999908447266 + "x": 166.1020050048828, + "y": 139.48399353027344 }, { - "x": 81.59100341796875, - "y": 83.81199645996094 + "x": 164.08099365234375, + "y": 141.88900756835938 }, { - "x": 80.4540023803711, - "y": 84.89600372314453 + "x": 162.02200317382812, + "y": 144.26199340820312 }, { - "x": 79.3010025024414, - "y": 85.96299743652344 + "x": 159.92599487304688, + "y": 146.6020050048828 }, { - "x": 78.13099670410156, - "y": 87.01100158691406 + "x": 157.79299926757812, + "y": 148.90899658203125 }, { - "x": 76.94400024414062, - "y": 88.04000091552734 + "x": 155.625, + "y": 151.1820068359375 }, { - "x": 75.74199676513672, - "y": 89.0510025024414 + "x": 153.42100524902344, + "y": 153.42100524902344 }, { - "x": 74.52400207519531, - "y": 90.04299926757812 + "x": 151.1820068359375, + "y": 155.625 }, { - "x": 73.29000091552734, - "y": 91.01499938964844 + "x": 148.90899658203125, + "y": 157.79299926757812 }, { - "x": 72.04199981689453, - "y": 91.96800231933594 + "x": 146.6020050048828, + "y": 159.92599487304688 }, { - "x": 70.77799987792969, - "y": 92.9010009765625 + "x": 144.26199340820312, + "y": 162.02200317382812 }, { - "x": 69.5, - "y": 93.81400299072266 + "x": 141.88900756835938, + "y": 164.08099365234375 }, { - "x": 68.20800018310547, - "y": 94.70800018310547 + "x": 139.48399353027344, + "y": 166.1020050048828 }, { - "x": 66.9020004272461, - "y": 95.58000183105469 + "x": 137.04800415039062, + "y": 168.08599853515625 }, { - "x": 65.58200073242188, - "y": 96.43199920654297 + "x": 134.58099365234375, + "y": 170.031005859375 }, { - "x": 64.2490005493164, - "y": 97.26399993896484 + "x": 132.08399963378906, + "y": 171.93600463867188 }, { - "x": 62.90399932861328, - "y": 98.0739974975586 + "x": 129.5570068359375, + "y": 173.80299377441406 }, { - "x": 61.54499816894531, - "y": 98.86299896240234 + "x": 127.0009994506836, + "y": 175.62899780273438 }, { - "x": 60.17499923706055, - "y": 99.62999725341797 + "x": 124.41600036621094, + "y": 177.41600036621094 }, { - "x": 58.79199981689453, - "y": 100.3759994506836 + "x": 121.80400085449219, + "y": 179.16099548339844 }, { - "x": 57.39899826049805, - "y": 101.0999984741211 + "x": 119.16500091552734, + "y": 180.86500549316406 }, { - "x": 55.99300003051758, - "y": 101.802001953125 + "x": 116.4990005493164, + "y": 182.5279998779297 }, { - "x": 54.57699966430664, - "y": 102.48200225830078 + "x": 113.80799865722656, + "y": 184.1479949951172 }, { - "x": 53.1510009765625, - "y": 103.13999938964844 + "x": 111.09100341796875, + "y": 185.7259979248047 }, { - "x": 51.7140007019043, - "y": 103.7750015258789 + "x": 108.3499984741211, + "y": 187.26100158691406 }, { - "x": 50.268001556396484, - "y": 104.38700103759766 + "x": 105.58499908447266, + "y": 188.7530059814453 }, { - "x": 48.8120002746582, - "y": 104.97699737548828 + "x": 102.7979965209961, + "y": 190.2010040283203 }, { - "x": 47.34700012207031, - "y": 105.54399871826172 + "x": 99.98699951171875, + "y": 191.60499572753906 }, { - "x": 45.87300109863281, - "y": 106.08799743652344 + "x": 97.15499877929688, + "y": 192.96499633789062 }, { - "x": 44.39099884033203, - "y": 106.60800170898438 + "x": 94.302001953125, + "y": 194.27999877929688 }, { - "x": 42.9010009765625, - "y": 107.1050033569336 + "x": 91.42900085449219, + "y": 195.5500030517578 }, { - "x": 41.40399932861328, - "y": 107.5790023803711 + "x": 88.53600311279297, + "y": 196.77499389648438 }, { - "x": 42.60200119018555, - "y": 107.2959976196289 + "x": 85.6240005493164, + "y": 197.9550018310547 + }, + { + "x": 82.69400024414062, + "y": 199.08799743652344 + }, + { + "x": 79.74700164794922, + "y": 200.17599487304688 + }, + { + "x": 76.78299713134766, + "y": 201.2169952392578 + }, + { + "x": 73.8030014038086, + "y": 202.21099853515625 + }, + { + "x": 70.80799865722656, + "y": 203.1580047607422 + }, + { + "x": 67.7979965209961, + "y": 204.05799865722656 + }, + { + "x": 64.77400207519531, + "y": 204.91099548339844 + }, + { + "x": 61.73699951171875, + "y": 205.71600341796875 + }, + { + "x": 58.68899917602539, + "y": 206.47300720214844 + }, + { + "x": 55.62799835205078, + "y": 207.18299865722656 + }, + { + "x": 52.55699920654297, + "y": 207.843994140625 + }, + { + "x": 49.47600173950195, + "y": 208.45700073242188 + }, + { + "x": 46.3849983215332, + "y": 209.02099609375 + }, + { + "x": 43.2859992980957, + "y": 209.53700256347656 + }, + { + "x": 42.71699905395508, + "y": 209.66600036621094 }, { "x": 38.5, - "y": 108.4229965209961 + "y": 210.22999572753906 } ], "isCurve": true, @@ -1109,254 +1269,334 @@ "route": [ { "x": -14.49899959564209, - "y": 108.4229965209961 + "y": 210.22999572753906 + }, + { + "x": -16.18000030517578, + "y": 210.00399780273438 + }, + { + "x": -19.285999298095703, + "y": 209.53700256347656 + }, + { + "x": -22.385000228881836, + "y": 209.02099609375 + }, + { + "x": -25.47599983215332, + "y": 208.45700073242188 + }, + { + "x": -28.55699920654297, + "y": 207.843994140625 + }, + { + "x": -31.628000259399414, + "y": 207.18299865722656 + }, + { + "x": -34.68899917602539, + "y": 206.47300720214844 + }, + { + "x": -37.73699951171875, + "y": 205.71600341796875 + }, + { + "x": -40.77399826049805, + "y": 204.91099548339844 + }, + { + "x": -43.79800033569336, + "y": 204.05799865722656 + }, + { + "x": -46.80799865722656, + "y": 203.1580047607422 }, { - "x": -15.89900016784668, - "y": 108.02899932861328 + "x": -49.803001403808594, + "y": 202.21099853515625 }, { - "x": -17.40399932861328, - "y": 107.5790023803711 + "x": -52.78300094604492, + "y": 201.2169952392578 }, { - "x": -18.900999069213867, - "y": 107.1050033569336 + "x": -55.74700164794922, + "y": 200.17599487304688 }, { - "x": -20.391000747680664, - "y": 106.60800170898438 + "x": -58.694000244140625, + "y": 199.08799743652344 }, { - "x": -21.87299919128418, - "y": 106.08799743652344 + "x": -61.624000549316406, + "y": 197.9550018310547 }, { - "x": -23.347000122070312, - "y": 105.54399871826172 + "x": -64.53600311279297, + "y": 196.77499389648438 }, { - "x": -24.812000274658203, - "y": 104.97699737548828 + "x": -67.42900085449219, + "y": 195.5500030517578 }, { - "x": -26.26799964904785, - "y": 104.38700103759766 + "x": -70.302001953125, + "y": 194.27999877929688 }, { - "x": -27.714000701904297, - "y": 103.7750015258789 + "x": -73.15499877929688, + "y": 192.96499633789062 }, { - "x": -29.150999069213867, - "y": 103.13999938964844 + "x": -75.98699951171875, + "y": 191.60499572753906 }, { - "x": -30.57699966430664, - "y": 102.48200225830078 + "x": -78.7979965209961, + "y": 190.2010040283203 }, { - "x": -31.993000030517578, - "y": 101.802001953125 + "x": -81.58499908447266, + "y": 188.7530059814453 }, { - "x": -33.39899826049805, - "y": 101.0999984741211 + "x": -84.3499984741211, + "y": 187.26100158691406 }, { - "x": -34.79199981689453, - "y": 100.3759994506836 + "x": -87.09100341796875, + "y": 185.7259979248047 }, { - "x": -36.17499923706055, - "y": 99.62999725341797 + "x": -89.80799865722656, + "y": 184.1479949951172 }, { - "x": -37.54499816894531, - "y": 98.86299896240234 + "x": -92.4990005493164, + "y": 182.5279998779297 }, { - "x": -38.90399932861328, - "y": 98.0739974975586 + "x": -95.16500091552734, + "y": 180.86500549316406 }, { - "x": -40.249000549316406, - "y": 97.26399993896484 + "x": -97.80400085449219, + "y": 179.16099548339844 }, { - "x": -41.582000732421875, - "y": 96.43199920654297 + "x": -100.41600036621094, + "y": 177.41600036621094 }, { - "x": -42.902000427246094, - "y": 95.58000183105469 + "x": -103.0009994506836, + "y": 175.62899780273438 }, { - "x": -44.20800018310547, - "y": 94.70800018310547 + "x": -105.55699920654297, + "y": 173.80299377441406 }, { - "x": -45.5, - "y": 93.81400299072266 + "x": -108.08399963378906, + "y": 171.93600463867188 }, { - "x": -46.77799987792969, - "y": 92.9010009765625 + "x": -110.58100128173828, + "y": 170.031005859375 }, { - "x": -48.04199981689453, - "y": 91.96800231933594 + "x": -113.0479965209961, + "y": 168.08599853515625 }, { - "x": -49.290000915527344, - "y": 91.01499938964844 + "x": -115.48400115966797, + "y": 166.1020050048828 }, { - "x": -50.52399826049805, - "y": 90.04299926757812 + "x": -117.88899993896484, + "y": 164.08099365234375 }, { - "x": -51.742000579833984, - "y": 89.0510025024414 + "x": -120.26200103759766, + "y": 162.02200317382812 }, { - "x": -52.944000244140625, - "y": 88.04000091552734 + "x": -122.60199737548828, + "y": 159.92599487304688 }, { - "x": -54.13100051879883, - "y": 87.01100158691406 + "x": -124.90899658203125, + "y": 157.79299926757812 }, { - "x": -55.30099868774414, - "y": 85.96299743652344 + "x": -127.18199920654297, + "y": 155.625 }, { - "x": -56.45399856567383, - "y": 84.89600372314453 + "x": -129.42100524902344, + "y": 153.42100524902344 }, { - "x": -57.590999603271484, - "y": 83.81199645996094 + "x": -131.625, + "y": 151.1820068359375 }, { - "x": -58.709999084472656, - "y": 82.70999908447266 + "x": -133.79299926757812, + "y": 148.90899658203125 }, { - "x": -59.8120002746582, - "y": 81.59100341796875 + "x": -135.92599487304688, + "y": 146.6020050048828 }, { - "x": -60.895999908447266, - "y": 80.4540023803711 + "x": -138.02200317382812, + "y": 144.26199340820312 }, { - "x": -61.9630012512207, - "y": 79.3010025024414 + "x": -140.08099365234375, + "y": 141.88900756835938 }, { - "x": -63.01100158691406, - "y": 78.13099670410156 + "x": -142.1020050048828, + "y": 139.48399353027344 }, { - "x": -64.04000091552734, - "y": 76.94400024414062 + "x": -144.08599853515625, + "y": 137.04800415039062 }, { - "x": -65.0510025024414, - "y": 75.74199676513672 + "x": -146.031005859375, + "y": 134.58099365234375 }, { - "x": -66.04299926757812, - "y": 74.52400207519531 + "x": -147.93600463867188, + "y": 132.08399963378906 }, { - "x": -67.01499938964844, - "y": 73.29000091552734 + "x": -149.80299377441406, + "y": 129.5570068359375 }, { - "x": -67.96800231933594, - "y": 72.04199981689453 + "x": -151.62899780273438, + "y": 127.0009994506836 }, { - "x": -68.9010009765625, - "y": 70.77799987792969 + "x": -153.41600036621094, + "y": 124.41600036621094 }, { - "x": -69.81400299072266, - "y": 69.5 + "x": -155.16099548339844, + "y": 121.80400085449219 }, { - "x": -70.70800018310547, - "y": 68.20800018310547 + "x": -156.86500549316406, + "y": 119.16500091552734 }, { - "x": -71.58000183105469, - "y": 66.9020004272461 + "x": -158.5279998779297, + "y": 116.4990005493164 }, { - "x": -72.43199920654297, - "y": 65.58200073242188 + "x": -160.1479949951172, + "y": 113.80799865722656 }, { - "x": -73.26399993896484, - "y": 64.2490005493164 + "x": -161.7259979248047, + "y": 111.09100341796875 }, { - "x": -74.0739974975586, - "y": 62.90399932861328 + "x": -163.26100158691406, + "y": 108.3499984741211 }, { - "x": -74.86299896240234, - "y": 61.54499816894531 + "x": -164.7530059814453, + "y": 105.58499908447266 }, { - "x": -75.62999725341797, - "y": 60.17499923706055 + "x": -166.2010040283203, + "y": 102.7979965209961 }, { - "x": -76.3759994506836, - "y": 58.79199981689453 + "x": -167.60499572753906, + "y": 99.98699951171875 }, { - "x": -77.0999984741211, - "y": 57.39899826049805 + "x": -168.96499633789062, + "y": 97.15499877929688 }, { - "x": -77.802001953125, - "y": 55.99300003051758 + "x": -170.27999877929688, + "y": 94.302001953125 }, { - "x": -78.48200225830078, - "y": 54.57699966430664 + "x": -171.5500030517578, + "y": 91.42900085449219 }, { - "x": -79.13999938964844, - "y": 53.1510009765625 + "x": -172.77499389648438, + "y": 88.53600311279297 }, { - "x": -79.7750015258789, - "y": 51.7140007019043 + "x": -173.9550018310547, + "y": 85.6240005493164 }, { - "x": -80.38700103759766, - "y": 50.268001556396484 + "x": -175.08799743652344, + "y": 82.69400024414062 }, { - "x": -80.97699737548828, - "y": 48.8120002746582 + "x": -176.17599487304688, + "y": 79.74700164794922 }, { - "x": -81.54399871826172, - "y": 47.34700012207031 + "x": -177.2169952392578, + "y": 76.78299713134766 }, { - "x": -80.98999786376953, - "y": 49.01599884033203 + "x": -178.21099853515625, + "y": 73.8030014038086 }, { - "x": -82.39399719238281, + "x": -179.1580047607422, + "y": 70.80799865722656 + }, + { + "x": -180.05799865722656, + "y": 67.7979965209961 + }, + { + "x": -180.91099548339844, + "y": 64.77400207519531 + }, + { + "x": -181.71600341796875, + "y": 61.73699951171875 + }, + { + "x": -182.47300720214844, + "y": 58.68899917602539 + }, + { + "x": -183.18299865722656, + "y": 55.62799835205078 + }, + { + "x": -183.843994140625, + "y": 52.55699920654297 + }, + { + "x": -184.45700073242188, + "y": 49.47600173950195 + }, + { + "x": -184.5500030517578, + "y": 49.19599914550781 + }, + { + "x": -185.2519989013672, "y": 45 } ], @@ -1392,296 +1632,352 @@ "link": "", "route": [ { - "x": 312, - "y": -59.42100143432617 + "x": 512, + "y": -136.2259979248047 }, { - "x": 312.3909912109375, - "y": -59.316001892089844 + "x": 514.7160034179688, + "y": -135.85400390625 }, { - "x": 314.40301513671875, - "y": -58.73099899291992 + "x": 518.85302734375, + "y": -135.19900512695312 }, { - "x": 316.4010009765625, - "y": -58.10499954223633 + "x": 522.9760131835938, + "y": -134.45700073242188 }, { - "x": 318.385986328125, - "y": -57.4370002746582 + "x": 527.0819702148438, + "y": -133.62899780273438 }, { - "x": 320.35699462890625, - "y": -56.72800064086914 + "x": 531.1699829101562, + "y": -132.71499633789062 }, { - "x": 322.31201171875, - "y": -55.97700119018555 + "x": 535.2369995117188, + "y": -131.71600341796875 }, { - "x": 324.2510070800781, - "y": -55.18600082397461 + "x": 539.2830200195312, + "y": -130.6320037841797 }, { - "x": 326.1730041503906, - "y": -54.354000091552734 + "x": 543.3060302734375, + "y": -129.46299743652344 }, { - "x": 328.0769958496094, - "y": -53.481998443603516 + "x": 547.302978515625, + "y": -128.21099853515625 }, { - "x": 329.9630126953125, - "y": -52.57099914550781 + "x": 551.2730102539062, + "y": -126.875 }, { - "x": 331.8290100097656, - "y": -51.619998931884766 + "x": 555.2139892578125, + "y": -125.45600128173828 }, { - "x": 333.67498779296875, - "y": -50.630001068115234 + "x": 559.1240234375, + "y": -123.95500183105469 }, { - "x": 335.5, - "y": -49.60200119018555 + "x": 563.0029907226562, + "y": -122.37200164794922 }, { - "x": 337.302001953125, - "y": -48.5359992980957 + "x": 566.8469848632812, + "y": -120.70899963378906 }, { - "x": 339.0820007324219, - "y": -47.43199920654297 + "x": 570.655029296875, + "y": -118.96499633789062 }, { - "x": 340.8389892578125, - "y": -46.29199981689453 + "x": 574.427001953125, + "y": -117.14199829101562 }, { - "x": 342.5710144042969, - "y": -45.11399841308594 + "x": 578.1589965820312, + "y": -115.23999786376953 }, { - "x": 344.27801513671875, - "y": -43.9010009765625 + "x": 581.8499755859375, + "y": -113.26100158691406 }, { - "x": 345.9590148925781, - "y": -42.652000427246094 + "x": 585.5, + "y": -111.20500183105469 }, { - "x": 347.614013671875, - "y": -41.36899948120117 + "x": 589.10498046875, + "y": -109.0719985961914 }, { - "x": 349.24200439453125, - "y": -40.05099868774414 + "x": 592.6649780273438, + "y": -106.86499786376953 }, { - "x": 350.8420104980469, - "y": -38.69900131225586 + "x": 596.177978515625, + "y": -104.58399963378906 }, { - "x": 352.4129943847656, - "y": -37.31399917602539 + "x": 599.6420288085938, + "y": -102.22899627685547 }, { - "x": 353.9540100097656, - "y": -35.895999908447266 + "x": 603.0570068359375, + "y": -99.8030014038086 }, { - "x": 355.46600341796875, - "y": -34.446998596191406 + "x": 606.4190063476562, + "y": -97.30500030517578 }, { - "x": 356.9469909667969, - "y": -32.965999603271484 + "x": 609.72900390625, + "y": -94.73799896240234 }, { - "x": 358.39599609375, - "y": -31.45400047302246 + "x": 612.9840087890625, + "y": -92.10199737548828 }, { - "x": 359.8139953613281, - "y": -29.913000106811523 + "x": 616.1840209960938, + "y": -89.39900207519531 }, { - "x": 361.1990051269531, - "y": -28.341999053955078 + "x": 619.3259887695312, + "y": -86.62799835205078 }, { - "x": 362.5509948730469, - "y": -26.742000579833984 + "x": 622.4089965820312, + "y": -83.79299926757812 }, { - "x": 363.8689880371094, - "y": -25.11400032043457 + "x": 625.4320068359375, + "y": -80.89399719238281 }, { - "x": 365.1520080566406, - "y": -23.458999633789062 + "x": 628.3939819335938, + "y": -77.93199920654297 }, { - "x": 366.4010009765625, - "y": -21.777999877929688 + "x": 631.2930297851562, + "y": -74.90899658203125 }, { - "x": 367.614013671875, - "y": -20.070999145507812 + "x": 634.1279907226562, + "y": -71.82599639892578 }, { - "x": 368.7919921875, - "y": -18.339000701904297 + "x": 636.8989868164062, + "y": -68.68399810791016 }, { - "x": 369.9320068359375, - "y": -16.582000732421875 + "x": 639.6019897460938, + "y": -65.48400115966797 }, { - "x": 371.0360107421875, - "y": -14.802000045776367 + "x": 642.2379760742188, + "y": -62.229000091552734 }, { - "x": 372.10198974609375, - "y": -13 + "x": 644.8049926757812, + "y": -58.91899871826172 }, { - "x": 373.1300048828125, - "y": -11.175000190734863 + "x": 647.302978515625, + "y": -55.55699920654297 }, { - "x": 374.1199951171875, - "y": -9.329000473022461 + "x": 649.72900390625, + "y": -52.141998291015625 }, { - "x": 375.0710144042969, - "y": -7.4629998207092285 + "x": 652.083984375, + "y": -48.678001403808594 }, { - "x": 375.98199462890625, - "y": -5.577000141143799 + "x": 654.364990234375, + "y": -45.165000915527344 }, { - "x": 376.85400390625, - "y": -3.6730000972747803 + "x": 656.572021484375, + "y": -41.60499954223633 }, { - "x": 377.6860046386719, - "y": -1.7510000467300415 + "x": 658.7050170898438, + "y": -38 }, { - "x": 378.47698974609375, - "y": 0.18700000643730164 + "x": 660.760986328125, + "y": -34.349998474121094 }, { - "x": 379.2279968261719, - "y": 2.1419999599456787 + "x": 662.739990234375, + "y": -30.659000396728516 }, { - "x": 379.93701171875, - "y": 4.11299991607666 + "x": 664.6420288085938, + "y": -26.927000045776367 }, { - "x": 380.6050109863281, - "y": 6.0980000495910645 + "x": 666.4650268554688, + "y": -23.155000686645508 }, { - "x": 381.2309875488281, - "y": 8.095999717712402 + "x": 668.208984375, + "y": -19.347000122070312 }, { - "x": 381.8160095214844, - "y": 10.107999801635742 + "x": 669.8720092773438, + "y": -15.503000259399414 }, { - "x": 382.3580017089844, - "y": 12.130999565124512 + "x": 671.4550170898438, + "y": -11.62399959564209 }, { - "x": 382.85699462890625, - "y": 14.163999557495117 + "x": 672.9559936523438, + "y": -7.714000225067139 }, { - "x": 383.3139953613281, - "y": 16.20800018310547 + "x": 674.375, + "y": -3.7730000019073486 }, { - "x": 383.7279968261719, - "y": 18.26099967956543 + "x": 675.7109985351562, + "y": 0.19599999487400055 }, { - "x": 384.0989990234375, - "y": 20.322999954223633 + "x": 676.9630126953125, + "y": 4.192999839782715 }, { - "x": 384.427001953125, - "y": 22.391000747680664 + "x": 678.1320190429688, + "y": 8.215999603271484 }, { - "x": 384.71099853515625, - "y": 24.465999603271484 + "x": 679.2160034179688, + "y": 12.26200008392334 }, { - "x": 384.9519958496094, - "y": 26.547000885009766 + "x": 680.2150268554688, + "y": 16.32900047302246 }, { - "x": 385.14898681640625, - "y": 28.631999969482422 + "x": 681.1290283203125, + "y": 20.41699981689453 }, { - "x": 385.302001953125, - "y": 30.719999313354492 + "x": 681.9569702148438, + "y": 24.523000717163086 }, { - "x": 385.4119873046875, - "y": 32.8120002746582 + "x": 682.698974609375, + "y": 28.645999908447266 }, { - "x": 385.4779968261719, - "y": 34.904998779296875 + "x": 683.35400390625, + "y": 32.78300094604492 }, { - "x": 385.5, - "y": 36.999000549316406 + "x": 683.9219970703125, + "y": 36.93299865722656 + }, + { + "x": 684.4039916992188, + "y": 41.09400177001953 + }, + { + "x": 684.7979736328125, + "y": 45.263999938964844 + }, + { + "x": 685.10498046875, + "y": 49.441001892089844 + }, + { + "x": 685.323974609375, + "y": 53.624000549316406 + }, + { + "x": 685.4559936523438, + "y": 57.81100082397461 + }, + { + "x": 685.5, + "y": 61.999000549316406 + }, + { + "x": 685.4559936523438, + "y": 66.18800354003906 + }, + { + "x": 685.323974609375, + "y": 70.375 + }, + { + "x": 685.10498046875, + "y": 74.55799865722656 + }, + { + "x": 684.7979736328125, + "y": 78.73500061035156 }, { - "x": 385.4779968261719, - "y": 39.09400177001953 + "x": 684.4039916992188, + "y": 82.90499877929688 }, { - "x": 385.4119873046875, - "y": 41.1870002746582 + "x": 683.9219970703125, + "y": 87.06600189208984 }, { - "x": 385.302001953125, - "y": 43.27899932861328 + "x": 683.35400390625, + "y": 91.21600341796875 }, { - "x": 385.14898681640625, - "y": 45.367000579833984 + "x": 682.698974609375, + "y": 95.35299682617188 }, { - "x": 384.9519958496094, - "y": 47.45199966430664 + "x": 681.9569702148438, + "y": 99.47599792480469 }, { - "x": 384.71099853515625, - "y": 49.53300094604492 + "x": 681.1290283203125, + "y": 103.58200073242188 }, { - "x": 384.427001953125, - "y": 51.608001708984375 + "x": 680.2150268554688, + "y": 107.66999816894531 }, { - "x": 384.7640075683594, - "y": 49.805999755859375 + "x": 679.2160034179688, + "y": 111.73699951171875 }, { - "x": 384.0409851074219, - "y": 53.999000549316406 + "x": 678.1320190429688, + "y": 115.78299713134766 + }, + { + "x": 676.9630126953125, + "y": 119.80599975585938 + }, + { + "x": 675.7109985351562, + "y": 123.8030014038086 + }, + { + "x": 675.3590087890625, + "y": 124.98999786376953 + }, + { + "x": 673.9329833984375, + "y": 128.99899291992188 } ], "isCurve": true, @@ -1716,256 +2012,336 @@ "link": "", "route": [ { - "x": 345.60198974609375, - "y": 116.91799926757812 + "x": 634.8569946289062, + "y": 194.99899291992188 + }, + { + "x": 634.1279907226562, + "y": 195.8260040283203 + }, + { + "x": 631.2930297851562, + "y": 198.90899658203125 + }, + { + "x": 628.3939819335938, + "y": 201.9320068359375 + }, + { + "x": 625.4320068359375, + "y": 204.8939971923828 + }, + { + "x": 622.4089965820312, + "y": 207.79299926757812 + }, + { + "x": 619.3259887695312, + "y": 210.6280059814453 + }, + { + "x": 616.1840209960938, + "y": 213.3990020751953 + }, + { + "x": 612.9840087890625, + "y": 216.1020050048828 + }, + { + "x": 609.72900390625, + "y": 218.73800659179688 + }, + { + "x": 606.4190063476562, + "y": 221.30499267578125 + }, + { + "x": 603.0570068359375, + "y": 223.80299377441406 + }, + { + "x": 599.6420288085938, + "y": 226.22900390625 + }, + { + "x": 596.177978515625, + "y": 228.58399963378906 + }, + { + "x": 592.6649780273438, + "y": 230.86500549316406 + }, + { + "x": 589.10498046875, + "y": 233.07200622558594 + }, + { + "x": 585.5, + "y": 235.2050018310547 + }, + { + "x": 581.8499755859375, + "y": 237.26100158691406 }, { - "x": 344.27801513671875, - "y": 117.9010009765625 + "x": 578.1589965820312, + "y": 239.24000549316406 }, { - "x": 342.5710144042969, - "y": 119.11399841308594 + "x": 574.427001953125, + "y": 241.14199829101562 }, { - "x": 340.8389892578125, - "y": 120.29199981689453 + "x": 570.655029296875, + "y": 242.96499633789062 }, { - "x": 339.0820007324219, - "y": 121.43199920654297 + "x": 566.8469848632812, + "y": 244.70899963378906 }, { - "x": 337.302001953125, - "y": 122.53600311279297 + "x": 563.0029907226562, + "y": 246.3719940185547 }, { - "x": 335.5, - "y": 123.60199737548828 + "x": 559.1240234375, + "y": 247.9550018310547 }, { - "x": 333.67498779296875, - "y": 124.62999725341797 + "x": 555.2139892578125, + "y": 249.45599365234375 }, { - "x": 331.8290100097656, - "y": 125.62000274658203 + "x": 551.2730102539062, + "y": 250.875 }, { - "x": 329.9630126953125, - "y": 126.57099914550781 + "x": 547.302978515625, + "y": 252.21099853515625 }, { - "x": 328.0769958496094, - "y": 127.48200225830078 + "x": 543.3060302734375, + "y": 253.46299743652344 }, { - "x": 326.1730041503906, - "y": 128.35400390625 + "x": 539.2830200195312, + "y": 254.6320037841797 }, { - "x": 324.2510070800781, - "y": 129.18600463867188 + "x": 535.2369995117188, + "y": 255.71600341796875 }, { - "x": 322.31201171875, - "y": 129.9770050048828 + "x": 531.1699829101562, + "y": 256.7149963378906 }, { - "x": 320.35699462890625, - "y": 130.72799682617188 + "x": 527.0819702148438, + "y": 257.6289978027344 }, { - "x": 318.385986328125, - "y": 131.43699645996094 + "x": 522.9760131835938, + "y": 258.4570007324219 }, { - "x": 316.4010009765625, - "y": 132.10499572753906 + "x": 518.85302734375, + "y": 259.1990051269531 }, { - "x": 314.40301513671875, - "y": 132.7310028076172 + "x": 514.7160034179688, + "y": 259.85400390625 }, { - "x": 312.3909912109375, - "y": 133.3159942626953 + "x": 510.5660095214844, + "y": 260.4219970703125 }, { - "x": 310.3680114746094, - "y": 133.85800170898438 + "x": 506.4049987792969, + "y": 260.90399169921875 }, { - "x": 308.3349914550781, - "y": 134.35699462890625 + "x": 502.2349853515625, + "y": 261.2980041503906 }, { - "x": 306.2909851074219, - "y": 134.81399536132812 + "x": 498.0580139160156, + "y": 261.6050109863281 }, { - "x": 304.2380065917969, - "y": 135.22799682617188 + "x": 493.875, + "y": 261.8240051269531 }, { - "x": 302.1759948730469, - "y": 135.5989990234375 + "x": 489.68798828125, + "y": 261.95599365234375 }, { - "x": 300.1080017089844, - "y": 135.927001953125 + "x": 485.5, + "y": 262 }, { - "x": 298.0329895019531, - "y": 136.21099853515625 + "x": 481.3110046386719, + "y": 261.95599365234375 }, { - "x": 295.9519958496094, - "y": 136.45199584960938 + "x": 477.1239929199219, + "y": 261.8240051269531 }, { - "x": 293.86700439453125, - "y": 136.6490020751953 + "x": 472.9410095214844, + "y": 261.6050109863281 }, { - "x": 291.77899169921875, - "y": 136.802001953125 + "x": 468.7640075683594, + "y": 261.2980041503906 }, { - "x": 289.68701171875, - "y": 136.91200256347656 + "x": 464.593994140625, + "y": 260.90399169921875 }, { - "x": 287.593994140625, - "y": 136.97799682617188 + "x": 460.4330139160156, + "y": 260.4219970703125 }, { - "x": 285.5, - "y": 137 + "x": 456.2829895019531, + "y": 259.85400390625 }, { - "x": 283.4049987792969, - "y": 136.97799682617188 + "x": 452.14599609375, + "y": 259.1990051269531 }, { - "x": 281.31201171875, - "y": 136.91200256347656 + "x": 448.02301025390625, + "y": 258.4570007324219 }, { - "x": 279.2200012207031, - "y": 136.802001953125 + "x": 443.9169921875, + "y": 257.6289978027344 }, { - "x": 277.1319885253906, - "y": 136.6490020751953 + "x": 439.8290100097656, + "y": 256.7149963378906 }, { - "x": 275.0469970703125, - "y": 136.45199584960938 + "x": 435.7619934082031, + "y": 255.71600341796875 }, { - "x": 272.96600341796875, - "y": 136.21099853515625 + "x": 431.71600341796875, + "y": 254.6320037841797 }, { - "x": 270.8909912109375, - "y": 135.927001953125 + "x": 427.6929931640625, + "y": 253.46299743652344 }, { - "x": 268.822998046875, - "y": 135.5989990234375 + "x": 423.6960144042969, + "y": 252.21099853515625 }, { - "x": 266.760986328125, - "y": 135.22799682617188 + "x": 419.72601318359375, + "y": 250.875 }, { - "x": 264.7080078125, - "y": 134.81399536132812 + "x": 415.7850036621094, + "y": 249.45599365234375 }, { - "x": 262.66400146484375, - "y": 134.35699462890625 + "x": 411.875, + "y": 247.9550018310547 }, { - "x": 260.6310119628906, - "y": 133.85800170898438 + "x": 407.9960021972656, + "y": 246.3719940185547 }, { - "x": 258.6080017089844, - "y": 133.3159942626953 + "x": 404.1520080566406, + "y": 244.70899963378906 }, { - "x": 256.59600830078125, - "y": 132.7310028076172 + "x": 400.343994140625, + "y": 242.96499633789062 }, { - "x": 254.59800720214844, - "y": 132.10499572753906 + "x": 396.5719909667969, + "y": 241.14199829101562 }, { - "x": 252.61300659179688, - "y": 131.43699645996094 + "x": 392.8399963378906, + "y": 239.24000549316406 }, { - "x": 250.64199829101562, - "y": 130.72799682617188 + "x": 389.14898681640625, + "y": 237.26100158691406 }, { - "x": 248.68699645996094, - "y": 129.9770050048828 + "x": 385.5, + "y": 235.2050018310547 }, { - "x": 246.7480010986328, - "y": 129.18600463867188 + "x": 381.8940124511719, + "y": 233.07200622558594 }, { - "x": 244.8260040283203, - "y": 128.35400390625 + "x": 378.3340148925781, + "y": 230.86500549316406 }, { - "x": 242.9219970703125, - "y": 127.48200225830078 + "x": 374.8210144042969, + "y": 228.58399963378906 }, { - "x": 241.03599548339844, - "y": 126.57099914550781 + "x": 371.35699462890625, + "y": 226.22900390625 }, { - "x": 239.1699981689453, - "y": 125.62000274658203 + "x": 367.9419860839844, + "y": 223.80299377441406 }, { - "x": 237.32400512695312, - "y": 124.62999725341797 + "x": 364.5799865722656, + "y": 221.30499267578125 }, { - "x": 235.5, - "y": 123.60199737548828 + "x": 361.2699890136719, + "y": 218.73800659179688 }, { - "x": 233.69700622558594, - "y": 122.53600311279297 + "x": 358.0150146484375, + "y": 216.1020050048828 }, { - "x": 231.91700744628906, - "y": 121.43199920654297 + "x": 354.81500244140625, + "y": 213.3990020751953 }, { - "x": 230.16000366210938, - "y": 120.29199981689453 + "x": 351.6730041503906, + "y": 210.6280059814453 }, { - "x": 228.42799377441406, - "y": 119.11399841308594 + "x": 348.5899963378906, + "y": 207.79299926757812 }, { - "x": 228.79800415039062, - "y": 119.4749984741211 + "x": 345.5669860839844, + "y": 204.8939971923828 }, { - "x": 225.39700317382812, - "y": 116.91799926757812 + "x": 342.6050109863281, + "y": 201.9320068359375 + }, + { + "x": 339.70599365234375, + "y": 198.90899658203125 + }, + { + "x": 338.97198486328125, + "y": 198.177001953125 + }, + { + "x": 336.1419982910156, + "y": 195 } ], "isCurve": true, @@ -2000,344 +2376,376 @@ "link": "", "route": [ { - "x": 558.2050170898438, - "y": -84.41200256347656 + "x": 931.4099731445312, + "y": -186.21800231933594 + }, + { + "x": 936.197021484375, + "y": -185.53700256347656 + }, + { + "x": 942.385986328125, + "y": -184.45700073242188 + }, + { + "x": 948.5380249023438, + "y": -183.18299865722656 }, { - "x": 559.60400390625, - "y": -84.02899932861328 + "x": 954.6480102539062, + "y": -181.71600341796875 }, { - "x": 562.6060180664062, - "y": -83.1050033569336 + "x": 960.7080078125, + "y": -180.05799865722656 }, { - "x": 565.5780029296875, - "y": -82.08799743652344 + "x": 966.7130126953125, + "y": -178.21099853515625 }, { - "x": 568.5170288085938, - "y": -80.97699737548828 + "x": 972.656982421875, + "y": -176.17599487304688 }, { - "x": 571.4190063476562, - "y": -79.7750015258789 + "x": 978.5349731445312, + "y": -173.9550018310547 }, { - "x": 574.2830200195312, - "y": -78.48200225830078 + "x": 984.3389892578125, + "y": -171.5500030517578 }, { - "x": 577.10400390625, - "y": -77.0999984741211 + "x": 990.0659790039062, + "y": -168.96499633789062 }, { - "x": 579.8800048828125, - "y": -75.62999725341797 + "x": 995.7080078125, + "y": -166.2010040283203 }, { - "x": 582.6090087890625, - "y": -74.0739974975586 + "x": 1001.260009765625, + "y": -163.26100158691406 }, { - "x": 585.2869873046875, - "y": -72.43199920654297 + "x": 1006.718017578125, + "y": -160.1479949951172 }, { - "x": 587.9130249023438, - "y": -70.70800018310547 + "x": 1012.0750122070312, + "y": -156.86500549316406 }, { - "x": 590.4829711914062, - "y": -68.9010009765625 + "x": 1017.3259887695312, + "y": -153.41600036621094 }, { - "x": 592.9949951171875, - "y": -67.01499938964844 + "x": 1022.4669799804688, + "y": -149.80299377441406 }, { - "x": 595.447021484375, - "y": -65.0510025024414 + "x": 1027.490966796875, + "y": -146.031005859375 }, { - "x": 597.8359985351562, - "y": -63.01100158691406 + "x": 1032.39404296875, + "y": -142.1020050048828 }, { - "x": 600.1589965820312, - "y": -60.895999908447266 + "x": 1037.1719970703125, + "y": -138.02200317382812 }, { - "x": 602.4149780273438, - "y": -58.709999084472656 + "x": 1041.8189697265625, + "y": -133.79299926757812 }, { - "x": 604.6010131835938, - "y": -56.45399856567383 + "x": 1046.3310546875, + "y": -129.42100524902344 }, { - "x": 606.7160034179688, - "y": -54.13100051879883 + "x": 1050.7030029296875, + "y": -124.90899658203125 }, { - "x": 608.7559814453125, - "y": -51.742000579833984 + "x": 1054.9320068359375, + "y": -120.26200103759766 }, { - "x": 610.719970703125, - "y": -49.290000915527344 + "x": 1059.011962890625, + "y": -115.48400115966797 }, { - "x": 612.6060180664062, - "y": -46.77799987792969 + "x": 1062.9410400390625, + "y": -110.58100128173828 }, { - "x": 614.4130249023438, - "y": -44.20800018310547 + "x": 1066.7130126953125, + "y": -105.55699920654297 }, { - "x": 616.1370239257812, - "y": -41.582000732421875 + "x": 1070.3260498046875, + "y": -100.41600036621094 }, { - "x": 617.7789916992188, - "y": -38.90399932861328 + "x": 1073.7750244140625, + "y": -95.16500091552734 }, { - "x": 619.3350219726562, - "y": -36.17499923706055 + "x": 1077.0579833984375, + "y": -89.80799865722656 }, { - "x": 620.8049926757812, - "y": -33.39899826049805 + "x": 1080.1710205078125, + "y": -84.3499984741211 }, { - "x": 622.18701171875, - "y": -30.57699966430664 + "x": 1083.1109619140625, + "y": -78.7979965209961 }, { - "x": 623.47998046875, - "y": -27.714000701904297 + "x": 1085.875, + "y": -73.15499877929688 }, { - "x": 624.6820068359375, - "y": -24.812000274658203 + "x": 1088.4610595703125, + "y": -67.42900085449219 }, { - "x": 625.7930297851562, - "y": -21.87299919128418 + "x": 1090.864990234375, + "y": -61.624000549316406 }, { - "x": 626.8099975585938, - "y": -18.900999069213867 + "x": 1093.0860595703125, + "y": -55.74700164794922 }, { - "x": 627.7340087890625, - "y": -15.89900016784668 + "x": 1095.1209716796875, + "y": -49.803001403808594 }, { - "x": 628.56298828125, - "y": -12.868000030517578 + "x": 1096.968017578125, + "y": -43.79800033569336 }, { - "x": 629.2960205078125, - "y": -9.814000129699707 + "x": 1098.6259765625, + "y": -37.73699951171875 }, { - "x": 629.9329833984375, - "y": -6.73799991607666 + "x": 1100.093017578125, + "y": -31.628000259399414 }, { - "x": 630.4730224609375, - "y": -3.6429998874664307 + "x": 1101.366943359375, + "y": -25.47599983215332 }, { - "x": 630.916015625, - "y": -0.5329999923706055 + "x": 1102.447021484375, + "y": -19.285999298095703 }, { - "x": 631.260986328125, - "y": 2.5889999866485596 + "x": 1103.3330078125, + "y": -13.065999984741211 }, { - "x": 631.5070190429688, - "y": 5.71999979019165 + "x": 1104.02197265625, + "y": -6.821000099182129 }, { - "x": 631.655029296875, - "y": 8.857999801635742 + "x": 1104.5150146484375, + "y": -0.5580000281333923 }, { - "x": 631.7050170898438, + "x": 1104.81103515625, + "y": 5.7170000076293945 + }, + { + "x": 1104.9100341796875, "y": 12 }, { - "x": 631.655029296875, - "y": 15.140999794006348 + "x": 1104.81103515625, + "y": 18.281999588012695 + }, + { + "x": 1104.5150146484375, + "y": 24.558000564575195 + }, + { + "x": 1104.02197265625, + "y": 30.820999145507812 + }, + { + "x": 1103.3330078125, + "y": 37.066001892089844 + }, + { + "x": 1102.447021484375, + "y": 43.2859992980957 }, { - "x": 631.5070190429688, - "y": 18.27899932861328 + "x": 1101.366943359375, + "y": 49.47600173950195 }, { - "x": 631.260986328125, - "y": 21.40999984741211 + "x": 1100.093017578125, + "y": 55.62799835205078 }, { - "x": 630.916015625, - "y": 24.533000946044922 + "x": 1098.6259765625, + "y": 61.73699951171875 }, { - "x": 630.4730224609375, - "y": 27.64299964904785 + "x": 1096.968017578125, + "y": 67.7979965209961 }, { - "x": 629.9329833984375, - "y": 30.738000869750977 + "x": 1095.1209716796875, + "y": 73.8030014038086 }, { - "x": 629.2960205078125, - "y": 33.81399917602539 + "x": 1093.0860595703125, + "y": 79.74700164794922 }, { - "x": 628.56298828125, - "y": 36.86800003051758 + "x": 1090.864990234375, + "y": 85.6240005493164 }, { - "x": 627.7340087890625, - "y": 39.89899826049805 + "x": 1088.4610595703125, + "y": 91.42900085449219 }, { - "x": 626.8099975585938, - "y": 42.9010009765625 + "x": 1085.875, + "y": 97.15499877929688 }, { - "x": 625.7930297851562, - "y": 45.87300109863281 + "x": 1083.1109619140625, + "y": 102.7979965209961 }, { - "x": 624.6820068359375, - "y": 48.8120002746582 + "x": 1080.1710205078125, + "y": 108.3499984741211 }, { - "x": 623.47998046875, - "y": 51.7140007019043 + "x": 1077.0579833984375, + "y": 113.80799865722656 }, { - "x": 622.18701171875, - "y": 54.57699966430664 + "x": 1073.7750244140625, + "y": 119.16500091552734 }, { - "x": 620.8049926757812, - "y": 57.39899826049805 + "x": 1070.3260498046875, + "y": 124.41600036621094 }, { - "x": 619.3350219726562, - "y": 60.17499923706055 + "x": 1066.7130126953125, + "y": 129.5570068359375 }, { - "x": 617.7789916992188, - "y": 62.90399932861328 + "x": 1062.9410400390625, + "y": 134.58099365234375 }, { - "x": 616.1370239257812, - "y": 65.58200073242188 + "x": 1059.011962890625, + "y": 139.48399353027344 }, { - "x": 614.4130249023438, - "y": 68.20800018310547 + "x": 1054.9320068359375, + "y": 144.26199340820312 }, { - "x": 612.6060180664062, - "y": 70.77799987792969 + "x": 1050.7030029296875, + "y": 148.90899658203125 }, { - "x": 610.719970703125, - "y": 73.29000091552734 + "x": 1046.3310546875, + "y": 153.42100524902344 }, { - "x": 608.7559814453125, - "y": 75.74199676513672 + "x": 1041.8189697265625, + "y": 157.79299926757812 }, { - "x": 606.7160034179688, - "y": 78.13099670410156 + "x": 1037.1719970703125, + "y": 162.02200317382812 }, { - "x": 604.6010131835938, - "y": 80.4540023803711 + "x": 1032.39404296875, + "y": 166.1020050048828 }, { - "x": 602.4149780273438, - "y": 82.70999908447266 + "x": 1027.490966796875, + "y": 170.031005859375 }, { - "x": 600.1589965820312, - "y": 84.89600372314453 + "x": 1022.4669799804688, + "y": 173.80299377441406 }, { - "x": 597.8359985351562, - "y": 87.01100158691406 + "x": 1017.3259887695312, + "y": 177.41600036621094 }, { - "x": 595.447021484375, - "y": 89.0510025024414 + "x": 1012.0750122070312, + "y": 180.86500549316406 }, { - "x": 592.9949951171875, - "y": 91.01499938964844 + "x": 1006.718017578125, + "y": 184.1479949951172 }, { - "x": 590.4829711914062, - "y": 92.9010009765625 + "x": 1001.260009765625, + "y": 187.26100158691406 }, { - "x": 587.9130249023438, - "y": 94.70800018310547 + "x": 995.7080078125, + "y": 190.2010040283203 }, { - "x": 585.2869873046875, - "y": 96.43199920654297 + "x": 990.0659790039062, + "y": 192.96499633789062 }, { - "x": 582.6090087890625, - "y": 98.0739974975586 + "x": 984.3389892578125, + "y": 195.5500030517578 }, { - "x": 579.8800048828125, - "y": 99.62999725341797 + "x": 978.5349731445312, + "y": 197.9550018310547 }, { - "x": 577.10400390625, - "y": 101.0999984741211 + "x": 972.656982421875, + "y": 200.17599487304688 }, { - "x": 574.2830200195312, - "y": 102.48200225830078 + "x": 966.7130126953125, + "y": 202.21099853515625 }, { - "x": 571.4190063476562, - "y": 103.7750015258789 + "x": 960.7080078125, + "y": 204.05799865722656 }, { - "x": 568.5170288085938, - "y": 104.97699737548828 + "x": 954.6480102539062, + "y": 205.71600341796875 }, { - "x": 565.5780029296875, - "y": 106.08799743652344 + "x": 948.5380249023438, + "y": 207.18299865722656 }, { - "x": 562.6060180664062, - "y": 107.1050033569336 + "x": 942.385986328125, + "y": 208.45700073242188 }, { - "x": 562.3070068359375, - "y": 107.28399658203125 + "x": 936.197021484375, + "y": 209.53700256347656 }, { - "x": 558.2050170898438, - "y": 108.41200256347656 + "x": 931.4099731445312, + "y": 210.21800231933594 } ], "isCurve": true, diff --git a/e2etests/testdata/txtar/cycle-diagram/elk/sketch.exp.svg b/e2etests/testdata/txtar/cycle-diagram/elk/sketch.exp.svg index ec0748594a..144dbb7340 100644 --- a/e2etests/testdata/txtar/cycle-diagram/elk/sketch.exp.svg +++ b/e2etests/testdata/txtar/cycle-diagram/elk/sketch.exp.svg @@ -1,9 +1,9 @@ -abcdabcab - - - - - - - - - - + .d2-2514768154 .fill-N1{fill:#0A0F25;} + .d2-2514768154 .fill-N2{fill:#676C7E;} + .d2-2514768154 .fill-N3{fill:#9499AB;} + .d2-2514768154 .fill-N4{fill:#CFD2DD;} + .d2-2514768154 .fill-N5{fill:#DEE1EB;} + .d2-2514768154 .fill-N6{fill:#EEF1F8;} + .d2-2514768154 .fill-N7{fill:#FFFFFF;} + .d2-2514768154 .fill-B1{fill:#0D32B2;} + .d2-2514768154 .fill-B2{fill:#0D32B2;} + .d2-2514768154 .fill-B3{fill:#E3E9FD;} + .d2-2514768154 .fill-B4{fill:#E3E9FD;} + .d2-2514768154 .fill-B5{fill:#EDF0FD;} + .d2-2514768154 .fill-B6{fill:#F7F8FE;} + .d2-2514768154 .fill-AA2{fill:#4A6FF3;} + .d2-2514768154 .fill-AA4{fill:#EDF0FD;} + .d2-2514768154 .fill-AA5{fill:#F7F8FE;} + .d2-2514768154 .fill-AB4{fill:#EDF0FD;} + .d2-2514768154 .fill-AB5{fill:#F7F8FE;} + .d2-2514768154 .stroke-N1{stroke:#0A0F25;} + .d2-2514768154 .stroke-N2{stroke:#676C7E;} + .d2-2514768154 .stroke-N3{stroke:#9499AB;} + .d2-2514768154 .stroke-N4{stroke:#CFD2DD;} + .d2-2514768154 .stroke-N5{stroke:#DEE1EB;} + .d2-2514768154 .stroke-N6{stroke:#EEF1F8;} + .d2-2514768154 .stroke-N7{stroke:#FFFFFF;} + .d2-2514768154 .stroke-B1{stroke:#0D32B2;} + .d2-2514768154 .stroke-B2{stroke:#0D32B2;} + .d2-2514768154 .stroke-B3{stroke:#E3E9FD;} + .d2-2514768154 .stroke-B4{stroke:#E3E9FD;} + .d2-2514768154 .stroke-B5{stroke:#EDF0FD;} + .d2-2514768154 .stroke-B6{stroke:#F7F8FE;} + .d2-2514768154 .stroke-AA2{stroke:#4A6FF3;} + .d2-2514768154 .stroke-AA4{stroke:#EDF0FD;} + .d2-2514768154 .stroke-AA5{stroke:#F7F8FE;} + .d2-2514768154 .stroke-AB4{stroke:#EDF0FD;} + .d2-2514768154 .stroke-AB5{stroke:#F7F8FE;} + .d2-2514768154 .background-color-N1{background-color:#0A0F25;} + .d2-2514768154 .background-color-N2{background-color:#676C7E;} + .d2-2514768154 .background-color-N3{background-color:#9499AB;} + .d2-2514768154 .background-color-N4{background-color:#CFD2DD;} + .d2-2514768154 .background-color-N5{background-color:#DEE1EB;} + .d2-2514768154 .background-color-N6{background-color:#EEF1F8;} + .d2-2514768154 .background-color-N7{background-color:#FFFFFF;} + .d2-2514768154 .background-color-B1{background-color:#0D32B2;} + .d2-2514768154 .background-color-B2{background-color:#0D32B2;} + .d2-2514768154 .background-color-B3{background-color:#E3E9FD;} + .d2-2514768154 .background-color-B4{background-color:#E3E9FD;} + .d2-2514768154 .background-color-B5{background-color:#EDF0FD;} + .d2-2514768154 .background-color-B6{background-color:#F7F8FE;} + .d2-2514768154 .background-color-AA2{background-color:#4A6FF3;} + .d2-2514768154 .background-color-AA4{background-color:#EDF0FD;} + .d2-2514768154 .background-color-AA5{background-color:#F7F8FE;} + .d2-2514768154 .background-color-AB4{background-color:#EDF0FD;} + .d2-2514768154 .background-color-AB5{background-color:#F7F8FE;} + .d2-2514768154 .color-N1{color:#0A0F25;} + .d2-2514768154 .color-N2{color:#676C7E;} + .d2-2514768154 .color-N3{color:#9499AB;} + .d2-2514768154 .color-N4{color:#CFD2DD;} + .d2-2514768154 .color-N5{color:#DEE1EB;} + .d2-2514768154 .color-N6{color:#EEF1F8;} + .d2-2514768154 .color-N7{color:#FFFFFF;} + .d2-2514768154 .color-B1{color:#0D32B2;} + .d2-2514768154 .color-B2{color:#0D32B2;} + .d2-2514768154 .color-B3{color:#E3E9FD;} + .d2-2514768154 .color-B4{color:#E3E9FD;} + .d2-2514768154 .color-B5{color:#EDF0FD;} + .d2-2514768154 .color-B6{color:#F7F8FE;} + .d2-2514768154 .color-AA2{color:#4A6FF3;} + .d2-2514768154 .color-AA4{color:#EDF0FD;} + .d2-2514768154 .color-AA5{color:#F7F8FE;} + .d2-2514768154 .color-AB4{color:#EDF0FD;} + .d2-2514768154 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker-d2-2514768154);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker-d2-2514768154);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright-d2-2514768154);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright-d2-2514768154);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright-d2-2514768154);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright-d2-2514768154);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark-d2-2514768154);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright-d2-2514768154);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright-d2-2514768154);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright-d2-2514768154);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright-d2-2514768154);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker-d2-2514768154);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark-d2-2514768154);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal-d2-2514768154);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal-d2-2514768154);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright-d2-2514768154);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright-d2-2514768154);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright-d2-2514768154);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>abcdabcab + + + + + + + + + + \ No newline at end of file From ee52378e444a5b990d9e0c63e046fab710f8097b Mon Sep 17 00:00:00 2001 From: Mayank Mohapatra <125661248+Mayank77maruti@users.noreply.github.com> Date: Sun, 23 Feb 2025 17:02:04 +0000 Subject: [PATCH 56/73] try --- d2layouts/d2cycle/layout.go | 2 +- .../txtar/cycle-diagram/dagre/board.exp.json | 20 +-- .../txtar/cycle-diagram/dagre/sketch.exp.svg | 152 +++++++++--------- .../txtar/cycle-diagram/elk/board.exp.json | 20 +-- .../txtar/cycle-diagram/elk/sketch.exp.svg | 152 +++++++++--------- 5 files changed, 173 insertions(+), 173 deletions(-) diff --git a/d2layouts/d2cycle/layout.go b/d2layouts/d2cycle/layout.go index c2573b1d44..663ef7687b 100644 --- a/d2layouts/d2cycle/layout.go +++ b/d2layouts/d2cycle/layout.go @@ -117,7 +117,7 @@ func createCircularArc(edge *d2graph.Edge) { tangentX /= mag tangentY /= mag } - const MIN_SEGMENT_LEN = 4.255 + const MIN_SEGMENT_LEN = 4.1 dx := lastPoint.X - secondLastPoint.X dy := lastPoint.Y - secondLastPoint.Y diff --git a/e2etests/testdata/txtar/cycle-diagram/dagre/board.exp.json b/e2etests/testdata/txtar/cycle-diagram/dagre/board.exp.json index 22305b18dc..68b1440d2c 100644 --- a/e2etests/testdata/txtar/cycle-diagram/dagre/board.exp.json +++ b/e2etests/testdata/txtar/cycle-diagram/dagre/board.exp.json @@ -864,8 +864,8 @@ "y": -37.47600173950195 }, { - "x": 196.5500030517578, - "y": -37.19599914550781 + "x": 196.5760040283203, + "y": -37.042999267578125 }, { "x": 197.2519989013672, @@ -1228,8 +1228,8 @@ "y": 197.53700256347656 }, { - "x": 30.716999053955078, - "y": 197.66600036621094 + "x": 30.562999725341797, + "y": 197.68699645996094 }, { "x": 26.5, @@ -1592,8 +1592,8 @@ "y": 37.47600173950195 }, { - "x": -196.5500030517578, - "y": 37.19599914550781 + "x": -196.5760040283203, + "y": 37.042999267578125 }, { "x": -197.2519989013672, @@ -1972,8 +1972,8 @@ "y": 111.8030014038086 }, { - "x": 702.8590087890625, - "y": 112.98999786376953 + "x": 702.8070068359375, + "y": 113.13600158691406 }, { "x": 701.4329833984375, @@ -2336,8 +2336,8 @@ "y": 186.90899658203125 }, { - "x": 366.47198486328125, - "y": 186.177001953125 + "x": 366.3689880371094, + "y": 186.06100463867188 }, { "x": 363.6419982910156, diff --git a/e2etests/testdata/txtar/cycle-diagram/dagre/sketch.exp.svg b/e2etests/testdata/txtar/cycle-diagram/dagre/sketch.exp.svg index 88a40d4eb5..29008bab0c 100644 --- a/e2etests/testdata/txtar/cycle-diagram/dagre/sketch.exp.svg +++ b/e2etests/testdata/txtar/cycle-diagram/dagre/sketch.exp.svg @@ -1,9 +1,9 @@ -abcdabcab + .d2-3351427828 .fill-N1{fill:#0A0F25;} + .d2-3351427828 .fill-N2{fill:#676C7E;} + .d2-3351427828 .fill-N3{fill:#9499AB;} + .d2-3351427828 .fill-N4{fill:#CFD2DD;} + .d2-3351427828 .fill-N5{fill:#DEE1EB;} + .d2-3351427828 .fill-N6{fill:#EEF1F8;} + .d2-3351427828 .fill-N7{fill:#FFFFFF;} + .d2-3351427828 .fill-B1{fill:#0D32B2;} + .d2-3351427828 .fill-B2{fill:#0D32B2;} + .d2-3351427828 .fill-B3{fill:#E3E9FD;} + .d2-3351427828 .fill-B4{fill:#E3E9FD;} + .d2-3351427828 .fill-B5{fill:#EDF0FD;} + .d2-3351427828 .fill-B6{fill:#F7F8FE;} + .d2-3351427828 .fill-AA2{fill:#4A6FF3;} + .d2-3351427828 .fill-AA4{fill:#EDF0FD;} + .d2-3351427828 .fill-AA5{fill:#F7F8FE;} + .d2-3351427828 .fill-AB4{fill:#EDF0FD;} + .d2-3351427828 .fill-AB5{fill:#F7F8FE;} + .d2-3351427828 .stroke-N1{stroke:#0A0F25;} + .d2-3351427828 .stroke-N2{stroke:#676C7E;} + .d2-3351427828 .stroke-N3{stroke:#9499AB;} + .d2-3351427828 .stroke-N4{stroke:#CFD2DD;} + .d2-3351427828 .stroke-N5{stroke:#DEE1EB;} + .d2-3351427828 .stroke-N6{stroke:#EEF1F8;} + .d2-3351427828 .stroke-N7{stroke:#FFFFFF;} + .d2-3351427828 .stroke-B1{stroke:#0D32B2;} + .d2-3351427828 .stroke-B2{stroke:#0D32B2;} + .d2-3351427828 .stroke-B3{stroke:#E3E9FD;} + .d2-3351427828 .stroke-B4{stroke:#E3E9FD;} + .d2-3351427828 .stroke-B5{stroke:#EDF0FD;} + .d2-3351427828 .stroke-B6{stroke:#F7F8FE;} + .d2-3351427828 .stroke-AA2{stroke:#4A6FF3;} + .d2-3351427828 .stroke-AA4{stroke:#EDF0FD;} + .d2-3351427828 .stroke-AA5{stroke:#F7F8FE;} + .d2-3351427828 .stroke-AB4{stroke:#EDF0FD;} + .d2-3351427828 .stroke-AB5{stroke:#F7F8FE;} + .d2-3351427828 .background-color-N1{background-color:#0A0F25;} + .d2-3351427828 .background-color-N2{background-color:#676C7E;} + .d2-3351427828 .background-color-N3{background-color:#9499AB;} + .d2-3351427828 .background-color-N4{background-color:#CFD2DD;} + .d2-3351427828 .background-color-N5{background-color:#DEE1EB;} + .d2-3351427828 .background-color-N6{background-color:#EEF1F8;} + .d2-3351427828 .background-color-N7{background-color:#FFFFFF;} + .d2-3351427828 .background-color-B1{background-color:#0D32B2;} + .d2-3351427828 .background-color-B2{background-color:#0D32B2;} + .d2-3351427828 .background-color-B3{background-color:#E3E9FD;} + .d2-3351427828 .background-color-B4{background-color:#E3E9FD;} + .d2-3351427828 .background-color-B5{background-color:#EDF0FD;} + .d2-3351427828 .background-color-B6{background-color:#F7F8FE;} + .d2-3351427828 .background-color-AA2{background-color:#4A6FF3;} + .d2-3351427828 .background-color-AA4{background-color:#EDF0FD;} + .d2-3351427828 .background-color-AA5{background-color:#F7F8FE;} + .d2-3351427828 .background-color-AB4{background-color:#EDF0FD;} + .d2-3351427828 .background-color-AB5{background-color:#F7F8FE;} + .d2-3351427828 .color-N1{color:#0A0F25;} + .d2-3351427828 .color-N2{color:#676C7E;} + .d2-3351427828 .color-N3{color:#9499AB;} + .d2-3351427828 .color-N4{color:#CFD2DD;} + .d2-3351427828 .color-N5{color:#DEE1EB;} + .d2-3351427828 .color-N6{color:#EEF1F8;} + .d2-3351427828 .color-N7{color:#FFFFFF;} + .d2-3351427828 .color-B1{color:#0D32B2;} + .d2-3351427828 .color-B2{color:#0D32B2;} + .d2-3351427828 .color-B3{color:#E3E9FD;} + .d2-3351427828 .color-B4{color:#E3E9FD;} + .d2-3351427828 .color-B5{color:#EDF0FD;} + .d2-3351427828 .color-B6{color:#F7F8FE;} + .d2-3351427828 .color-AA2{color:#4A6FF3;} + .d2-3351427828 .color-AA4{color:#EDF0FD;} + .d2-3351427828 .color-AA5{color:#F7F8FE;} + .d2-3351427828 .color-AB4{color:#EDF0FD;} + .d2-3351427828 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker-d2-3351427828);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker-d2-3351427828);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright-d2-3351427828);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright-d2-3351427828);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright-d2-3351427828);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright-d2-3351427828);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark-d2-3351427828);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright-d2-3351427828);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright-d2-3351427828);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright-d2-3351427828);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright-d2-3351427828);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker-d2-3351427828);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark-d2-3351427828);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal-d2-3351427828);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal-d2-3351427828);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright-d2-3351427828);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright-d2-3351427828);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright-d2-3351427828);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>abcdabcab diff --git a/e2etests/testdata/txtar/cycle-diagram/elk/board.exp.json b/e2etests/testdata/txtar/cycle-diagram/elk/board.exp.json index f05462190e..4de7352c64 100644 --- a/e2etests/testdata/txtar/cycle-diagram/elk/board.exp.json +++ b/e2etests/testdata/txtar/cycle-diagram/elk/board.exp.json @@ -864,8 +864,8 @@ "y": -25.47599983215332 }, { - "x": 208.5500030517578, - "y": -25.195999145507812 + "x": 208.5760040283203, + "y": -25.042999267578125 }, { "x": 209.2519989013672, @@ -1228,8 +1228,8 @@ "y": 209.53700256347656 }, { - "x": 42.71699905395508, - "y": 209.66600036621094 + "x": 42.5629997253418, + "y": 209.68699645996094 }, { "x": 38.5, @@ -1592,8 +1592,8 @@ "y": 49.47600173950195 }, { - "x": -184.5500030517578, - "y": 49.19599914550781 + "x": -184.5760040283203, + "y": 49.042999267578125 }, { "x": -185.2519989013672, @@ -1972,8 +1972,8 @@ "y": 123.8030014038086 }, { - "x": 675.3590087890625, - "y": 124.98999786376953 + "x": 675.3070068359375, + "y": 125.13600158691406 }, { "x": 673.9329833984375, @@ -2336,8 +2336,8 @@ "y": 198.90899658203125 }, { - "x": 338.97198486328125, - "y": 198.177001953125 + "x": 338.8689880371094, + "y": 198.06100463867188 }, { "x": 336.1419982910156, diff --git a/e2etests/testdata/txtar/cycle-diagram/elk/sketch.exp.svg b/e2etests/testdata/txtar/cycle-diagram/elk/sketch.exp.svg index 144dbb7340..6af5df9629 100644 --- a/e2etests/testdata/txtar/cycle-diagram/elk/sketch.exp.svg +++ b/e2etests/testdata/txtar/cycle-diagram/elk/sketch.exp.svg @@ -1,9 +1,9 @@ -abcdabcab + .d2-3353223673 .fill-N1{fill:#0A0F25;} + .d2-3353223673 .fill-N2{fill:#676C7E;} + .d2-3353223673 .fill-N3{fill:#9499AB;} + .d2-3353223673 .fill-N4{fill:#CFD2DD;} + .d2-3353223673 .fill-N5{fill:#DEE1EB;} + .d2-3353223673 .fill-N6{fill:#EEF1F8;} + .d2-3353223673 .fill-N7{fill:#FFFFFF;} + .d2-3353223673 .fill-B1{fill:#0D32B2;} + .d2-3353223673 .fill-B2{fill:#0D32B2;} + .d2-3353223673 .fill-B3{fill:#E3E9FD;} + .d2-3353223673 .fill-B4{fill:#E3E9FD;} + .d2-3353223673 .fill-B5{fill:#EDF0FD;} + .d2-3353223673 .fill-B6{fill:#F7F8FE;} + .d2-3353223673 .fill-AA2{fill:#4A6FF3;} + .d2-3353223673 .fill-AA4{fill:#EDF0FD;} + .d2-3353223673 .fill-AA5{fill:#F7F8FE;} + .d2-3353223673 .fill-AB4{fill:#EDF0FD;} + .d2-3353223673 .fill-AB5{fill:#F7F8FE;} + .d2-3353223673 .stroke-N1{stroke:#0A0F25;} + .d2-3353223673 .stroke-N2{stroke:#676C7E;} + .d2-3353223673 .stroke-N3{stroke:#9499AB;} + .d2-3353223673 .stroke-N4{stroke:#CFD2DD;} + .d2-3353223673 .stroke-N5{stroke:#DEE1EB;} + .d2-3353223673 .stroke-N6{stroke:#EEF1F8;} + .d2-3353223673 .stroke-N7{stroke:#FFFFFF;} + .d2-3353223673 .stroke-B1{stroke:#0D32B2;} + .d2-3353223673 .stroke-B2{stroke:#0D32B2;} + .d2-3353223673 .stroke-B3{stroke:#E3E9FD;} + .d2-3353223673 .stroke-B4{stroke:#E3E9FD;} + .d2-3353223673 .stroke-B5{stroke:#EDF0FD;} + .d2-3353223673 .stroke-B6{stroke:#F7F8FE;} + .d2-3353223673 .stroke-AA2{stroke:#4A6FF3;} + .d2-3353223673 .stroke-AA4{stroke:#EDF0FD;} + .d2-3353223673 .stroke-AA5{stroke:#F7F8FE;} + .d2-3353223673 .stroke-AB4{stroke:#EDF0FD;} + .d2-3353223673 .stroke-AB5{stroke:#F7F8FE;} + .d2-3353223673 .background-color-N1{background-color:#0A0F25;} + .d2-3353223673 .background-color-N2{background-color:#676C7E;} + .d2-3353223673 .background-color-N3{background-color:#9499AB;} + .d2-3353223673 .background-color-N4{background-color:#CFD2DD;} + .d2-3353223673 .background-color-N5{background-color:#DEE1EB;} + .d2-3353223673 .background-color-N6{background-color:#EEF1F8;} + .d2-3353223673 .background-color-N7{background-color:#FFFFFF;} + .d2-3353223673 .background-color-B1{background-color:#0D32B2;} + .d2-3353223673 .background-color-B2{background-color:#0D32B2;} + .d2-3353223673 .background-color-B3{background-color:#E3E9FD;} + .d2-3353223673 .background-color-B4{background-color:#E3E9FD;} + .d2-3353223673 .background-color-B5{background-color:#EDF0FD;} + .d2-3353223673 .background-color-B6{background-color:#F7F8FE;} + .d2-3353223673 .background-color-AA2{background-color:#4A6FF3;} + .d2-3353223673 .background-color-AA4{background-color:#EDF0FD;} + .d2-3353223673 .background-color-AA5{background-color:#F7F8FE;} + .d2-3353223673 .background-color-AB4{background-color:#EDF0FD;} + .d2-3353223673 .background-color-AB5{background-color:#F7F8FE;} + .d2-3353223673 .color-N1{color:#0A0F25;} + .d2-3353223673 .color-N2{color:#676C7E;} + .d2-3353223673 .color-N3{color:#9499AB;} + .d2-3353223673 .color-N4{color:#CFD2DD;} + .d2-3353223673 .color-N5{color:#DEE1EB;} + .d2-3353223673 .color-N6{color:#EEF1F8;} + .d2-3353223673 .color-N7{color:#FFFFFF;} + .d2-3353223673 .color-B1{color:#0D32B2;} + .d2-3353223673 .color-B2{color:#0D32B2;} + .d2-3353223673 .color-B3{color:#E3E9FD;} + .d2-3353223673 .color-B4{color:#E3E9FD;} + .d2-3353223673 .color-B5{color:#EDF0FD;} + .d2-3353223673 .color-B6{color:#F7F8FE;} + .d2-3353223673 .color-AA2{color:#4A6FF3;} + .d2-3353223673 .color-AA4{color:#EDF0FD;} + .d2-3353223673 .color-AA5{color:#F7F8FE;} + .d2-3353223673 .color-AB4{color:#EDF0FD;} + .d2-3353223673 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker-d2-3353223673);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker-d2-3353223673);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright-d2-3353223673);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright-d2-3353223673);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright-d2-3353223673);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright-d2-3353223673);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark-d2-3353223673);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright-d2-3353223673);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright-d2-3353223673);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright-d2-3353223673);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright-d2-3353223673);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker-d2-3353223673);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark-d2-3353223673);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal-d2-3353223673);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal-d2-3353223673);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright-d2-3353223673);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright-d2-3353223673);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright-d2-3353223673);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>abcdabcab From e541734331eba30e2cf456e2bd4a0570f1187a5d Mon Sep 17 00:00:00 2001 From: Mayank Mohapatra <125661248+Mayank77maruti@users.noreply.github.com> Date: Sun, 23 Feb 2025 17:03:06 +0000 Subject: [PATCH 57/73] try --- d2layouts/d2cycle/layout.go | 2 +- .../txtar/cycle-diagram/dagre/board.exp.json | 20 +-- .../txtar/cycle-diagram/dagre/sketch.exp.svg | 152 +++++++++--------- .../txtar/cycle-diagram/elk/board.exp.json | 20 +-- .../txtar/cycle-diagram/elk/sketch.exp.svg | 152 +++++++++--------- 5 files changed, 173 insertions(+), 173 deletions(-) diff --git a/d2layouts/d2cycle/layout.go b/d2layouts/d2cycle/layout.go index 663ef7687b..1cb151738d 100644 --- a/d2layouts/d2cycle/layout.go +++ b/d2layouts/d2cycle/layout.go @@ -117,7 +117,7 @@ func createCircularArc(edge *d2graph.Edge) { tangentX /= mag tangentY /= mag } - const MIN_SEGMENT_LEN = 4.1 + const MIN_SEGMENT_LEN = 3.9 dx := lastPoint.X - secondLastPoint.X dy := lastPoint.Y - secondLastPoint.Y diff --git a/e2etests/testdata/txtar/cycle-diagram/dagre/board.exp.json b/e2etests/testdata/txtar/cycle-diagram/dagre/board.exp.json index 68b1440d2c..40969cfa05 100644 --- a/e2etests/testdata/txtar/cycle-diagram/dagre/board.exp.json +++ b/e2etests/testdata/txtar/cycle-diagram/dagre/board.exp.json @@ -864,8 +864,8 @@ "y": -37.47600173950195 }, { - "x": 196.5760040283203, - "y": -37.042999267578125 + "x": 196.60899353027344, + "y": -36.84600067138672 }, { "x": 197.2519989013672, @@ -1228,8 +1228,8 @@ "y": 197.53700256347656 }, { - "x": 30.562999725341797, - "y": 197.68699645996094 + "x": 30.364999771118164, + "y": 197.71299743652344 }, { "x": 26.5, @@ -1592,8 +1592,8 @@ "y": 37.47600173950195 }, { - "x": -196.5760040283203, - "y": 37.042999267578125 + "x": -196.60899353027344, + "y": 36.84600067138672 }, { "x": -197.2519989013672, @@ -1972,8 +1972,8 @@ "y": 111.8030014038086 }, { - "x": 702.8070068359375, - "y": 113.13600158691406 + "x": 702.739990234375, + "y": 113.32499694824219 }, { "x": 701.4329833984375, @@ -2336,8 +2336,8 @@ "y": 186.90899658203125 }, { - "x": 366.3689880371094, - "y": 186.06100463867188 + "x": 366.2359924316406, + "y": 185.91200256347656 }, { "x": 363.6419982910156, diff --git a/e2etests/testdata/txtar/cycle-diagram/dagre/sketch.exp.svg b/e2etests/testdata/txtar/cycle-diagram/dagre/sketch.exp.svg index 29008bab0c..b3368178c0 100644 --- a/e2etests/testdata/txtar/cycle-diagram/dagre/sketch.exp.svg +++ b/e2etests/testdata/txtar/cycle-diagram/dagre/sketch.exp.svg @@ -1,9 +1,9 @@ -abcdabcab + .d2-2211567844 .fill-N1{fill:#0A0F25;} + .d2-2211567844 .fill-N2{fill:#676C7E;} + .d2-2211567844 .fill-N3{fill:#9499AB;} + .d2-2211567844 .fill-N4{fill:#CFD2DD;} + .d2-2211567844 .fill-N5{fill:#DEE1EB;} + .d2-2211567844 .fill-N6{fill:#EEF1F8;} + .d2-2211567844 .fill-N7{fill:#FFFFFF;} + .d2-2211567844 .fill-B1{fill:#0D32B2;} + .d2-2211567844 .fill-B2{fill:#0D32B2;} + .d2-2211567844 .fill-B3{fill:#E3E9FD;} + .d2-2211567844 .fill-B4{fill:#E3E9FD;} + .d2-2211567844 .fill-B5{fill:#EDF0FD;} + .d2-2211567844 .fill-B6{fill:#F7F8FE;} + .d2-2211567844 .fill-AA2{fill:#4A6FF3;} + .d2-2211567844 .fill-AA4{fill:#EDF0FD;} + .d2-2211567844 .fill-AA5{fill:#F7F8FE;} + .d2-2211567844 .fill-AB4{fill:#EDF0FD;} + .d2-2211567844 .fill-AB5{fill:#F7F8FE;} + .d2-2211567844 .stroke-N1{stroke:#0A0F25;} + .d2-2211567844 .stroke-N2{stroke:#676C7E;} + .d2-2211567844 .stroke-N3{stroke:#9499AB;} + .d2-2211567844 .stroke-N4{stroke:#CFD2DD;} + .d2-2211567844 .stroke-N5{stroke:#DEE1EB;} + .d2-2211567844 .stroke-N6{stroke:#EEF1F8;} + .d2-2211567844 .stroke-N7{stroke:#FFFFFF;} + .d2-2211567844 .stroke-B1{stroke:#0D32B2;} + .d2-2211567844 .stroke-B2{stroke:#0D32B2;} + .d2-2211567844 .stroke-B3{stroke:#E3E9FD;} + .d2-2211567844 .stroke-B4{stroke:#E3E9FD;} + .d2-2211567844 .stroke-B5{stroke:#EDF0FD;} + .d2-2211567844 .stroke-B6{stroke:#F7F8FE;} + .d2-2211567844 .stroke-AA2{stroke:#4A6FF3;} + .d2-2211567844 .stroke-AA4{stroke:#EDF0FD;} + .d2-2211567844 .stroke-AA5{stroke:#F7F8FE;} + .d2-2211567844 .stroke-AB4{stroke:#EDF0FD;} + .d2-2211567844 .stroke-AB5{stroke:#F7F8FE;} + .d2-2211567844 .background-color-N1{background-color:#0A0F25;} + .d2-2211567844 .background-color-N2{background-color:#676C7E;} + .d2-2211567844 .background-color-N3{background-color:#9499AB;} + .d2-2211567844 .background-color-N4{background-color:#CFD2DD;} + .d2-2211567844 .background-color-N5{background-color:#DEE1EB;} + .d2-2211567844 .background-color-N6{background-color:#EEF1F8;} + .d2-2211567844 .background-color-N7{background-color:#FFFFFF;} + .d2-2211567844 .background-color-B1{background-color:#0D32B2;} + .d2-2211567844 .background-color-B2{background-color:#0D32B2;} + .d2-2211567844 .background-color-B3{background-color:#E3E9FD;} + .d2-2211567844 .background-color-B4{background-color:#E3E9FD;} + .d2-2211567844 .background-color-B5{background-color:#EDF0FD;} + .d2-2211567844 .background-color-B6{background-color:#F7F8FE;} + .d2-2211567844 .background-color-AA2{background-color:#4A6FF3;} + .d2-2211567844 .background-color-AA4{background-color:#EDF0FD;} + .d2-2211567844 .background-color-AA5{background-color:#F7F8FE;} + .d2-2211567844 .background-color-AB4{background-color:#EDF0FD;} + .d2-2211567844 .background-color-AB5{background-color:#F7F8FE;} + .d2-2211567844 .color-N1{color:#0A0F25;} + .d2-2211567844 .color-N2{color:#676C7E;} + .d2-2211567844 .color-N3{color:#9499AB;} + .d2-2211567844 .color-N4{color:#CFD2DD;} + .d2-2211567844 .color-N5{color:#DEE1EB;} + .d2-2211567844 .color-N6{color:#EEF1F8;} + .d2-2211567844 .color-N7{color:#FFFFFF;} + .d2-2211567844 .color-B1{color:#0D32B2;} + .d2-2211567844 .color-B2{color:#0D32B2;} + .d2-2211567844 .color-B3{color:#E3E9FD;} + .d2-2211567844 .color-B4{color:#E3E9FD;} + .d2-2211567844 .color-B5{color:#EDF0FD;} + .d2-2211567844 .color-B6{color:#F7F8FE;} + .d2-2211567844 .color-AA2{color:#4A6FF3;} + .d2-2211567844 .color-AA4{color:#EDF0FD;} + .d2-2211567844 .color-AA5{color:#F7F8FE;} + .d2-2211567844 .color-AB4{color:#EDF0FD;} + .d2-2211567844 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker-d2-2211567844);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker-d2-2211567844);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright-d2-2211567844);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright-d2-2211567844);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright-d2-2211567844);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright-d2-2211567844);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark-d2-2211567844);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright-d2-2211567844);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright-d2-2211567844);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright-d2-2211567844);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright-d2-2211567844);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker-d2-2211567844);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark-d2-2211567844);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal-d2-2211567844);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal-d2-2211567844);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright-d2-2211567844);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright-d2-2211567844);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright-d2-2211567844);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>abcdabcab diff --git a/e2etests/testdata/txtar/cycle-diagram/elk/board.exp.json b/e2etests/testdata/txtar/cycle-diagram/elk/board.exp.json index 4de7352c64..04d1df4e70 100644 --- a/e2etests/testdata/txtar/cycle-diagram/elk/board.exp.json +++ b/e2etests/testdata/txtar/cycle-diagram/elk/board.exp.json @@ -864,8 +864,8 @@ "y": -25.47599983215332 }, { - "x": 208.5760040283203, - "y": -25.042999267578125 + "x": 208.60899353027344, + "y": -24.84600067138672 }, { "x": 209.2519989013672, @@ -1228,8 +1228,8 @@ "y": 209.53700256347656 }, { - "x": 42.5629997253418, - "y": 209.68699645996094 + "x": 42.3650016784668, + "y": 209.71299743652344 }, { "x": 38.5, @@ -1592,8 +1592,8 @@ "y": 49.47600173950195 }, { - "x": -184.5760040283203, - "y": 49.042999267578125 + "x": -184.60899353027344, + "y": 48.84600067138672 }, { "x": -185.2519989013672, @@ -1972,8 +1972,8 @@ "y": 123.8030014038086 }, { - "x": 675.3070068359375, - "y": 125.13600158691406 + "x": 675.239990234375, + "y": 125.32499694824219 }, { "x": 673.9329833984375, @@ -2336,8 +2336,8 @@ "y": 198.90899658203125 }, { - "x": 338.8689880371094, - "y": 198.06100463867188 + "x": 338.7359924316406, + "y": 197.91200256347656 }, { "x": 336.1419982910156, diff --git a/e2etests/testdata/txtar/cycle-diagram/elk/sketch.exp.svg b/e2etests/testdata/txtar/cycle-diagram/elk/sketch.exp.svg index 6af5df9629..279a456742 100644 --- a/e2etests/testdata/txtar/cycle-diagram/elk/sketch.exp.svg +++ b/e2etests/testdata/txtar/cycle-diagram/elk/sketch.exp.svg @@ -1,9 +1,9 @@ -abcdabcab + .d2-3658008044 .fill-N1{fill:#0A0F25;} + .d2-3658008044 .fill-N2{fill:#676C7E;} + .d2-3658008044 .fill-N3{fill:#9499AB;} + .d2-3658008044 .fill-N4{fill:#CFD2DD;} + .d2-3658008044 .fill-N5{fill:#DEE1EB;} + .d2-3658008044 .fill-N6{fill:#EEF1F8;} + .d2-3658008044 .fill-N7{fill:#FFFFFF;} + .d2-3658008044 .fill-B1{fill:#0D32B2;} + .d2-3658008044 .fill-B2{fill:#0D32B2;} + .d2-3658008044 .fill-B3{fill:#E3E9FD;} + .d2-3658008044 .fill-B4{fill:#E3E9FD;} + .d2-3658008044 .fill-B5{fill:#EDF0FD;} + .d2-3658008044 .fill-B6{fill:#F7F8FE;} + .d2-3658008044 .fill-AA2{fill:#4A6FF3;} + .d2-3658008044 .fill-AA4{fill:#EDF0FD;} + .d2-3658008044 .fill-AA5{fill:#F7F8FE;} + .d2-3658008044 .fill-AB4{fill:#EDF0FD;} + .d2-3658008044 .fill-AB5{fill:#F7F8FE;} + .d2-3658008044 .stroke-N1{stroke:#0A0F25;} + .d2-3658008044 .stroke-N2{stroke:#676C7E;} + .d2-3658008044 .stroke-N3{stroke:#9499AB;} + .d2-3658008044 .stroke-N4{stroke:#CFD2DD;} + .d2-3658008044 .stroke-N5{stroke:#DEE1EB;} + .d2-3658008044 .stroke-N6{stroke:#EEF1F8;} + .d2-3658008044 .stroke-N7{stroke:#FFFFFF;} + .d2-3658008044 .stroke-B1{stroke:#0D32B2;} + .d2-3658008044 .stroke-B2{stroke:#0D32B2;} + .d2-3658008044 .stroke-B3{stroke:#E3E9FD;} + .d2-3658008044 .stroke-B4{stroke:#E3E9FD;} + .d2-3658008044 .stroke-B5{stroke:#EDF0FD;} + .d2-3658008044 .stroke-B6{stroke:#F7F8FE;} + .d2-3658008044 .stroke-AA2{stroke:#4A6FF3;} + .d2-3658008044 .stroke-AA4{stroke:#EDF0FD;} + .d2-3658008044 .stroke-AA5{stroke:#F7F8FE;} + .d2-3658008044 .stroke-AB4{stroke:#EDF0FD;} + .d2-3658008044 .stroke-AB5{stroke:#F7F8FE;} + .d2-3658008044 .background-color-N1{background-color:#0A0F25;} + .d2-3658008044 .background-color-N2{background-color:#676C7E;} + .d2-3658008044 .background-color-N3{background-color:#9499AB;} + .d2-3658008044 .background-color-N4{background-color:#CFD2DD;} + .d2-3658008044 .background-color-N5{background-color:#DEE1EB;} + .d2-3658008044 .background-color-N6{background-color:#EEF1F8;} + .d2-3658008044 .background-color-N7{background-color:#FFFFFF;} + .d2-3658008044 .background-color-B1{background-color:#0D32B2;} + .d2-3658008044 .background-color-B2{background-color:#0D32B2;} + .d2-3658008044 .background-color-B3{background-color:#E3E9FD;} + .d2-3658008044 .background-color-B4{background-color:#E3E9FD;} + .d2-3658008044 .background-color-B5{background-color:#EDF0FD;} + .d2-3658008044 .background-color-B6{background-color:#F7F8FE;} + .d2-3658008044 .background-color-AA2{background-color:#4A6FF3;} + .d2-3658008044 .background-color-AA4{background-color:#EDF0FD;} + .d2-3658008044 .background-color-AA5{background-color:#F7F8FE;} + .d2-3658008044 .background-color-AB4{background-color:#EDF0FD;} + .d2-3658008044 .background-color-AB5{background-color:#F7F8FE;} + .d2-3658008044 .color-N1{color:#0A0F25;} + .d2-3658008044 .color-N2{color:#676C7E;} + .d2-3658008044 .color-N3{color:#9499AB;} + .d2-3658008044 .color-N4{color:#CFD2DD;} + .d2-3658008044 .color-N5{color:#DEE1EB;} + .d2-3658008044 .color-N6{color:#EEF1F8;} + .d2-3658008044 .color-N7{color:#FFFFFF;} + .d2-3658008044 .color-B1{color:#0D32B2;} + .d2-3658008044 .color-B2{color:#0D32B2;} + .d2-3658008044 .color-B3{color:#E3E9FD;} + .d2-3658008044 .color-B4{color:#E3E9FD;} + .d2-3658008044 .color-B5{color:#EDF0FD;} + .d2-3658008044 .color-B6{color:#F7F8FE;} + .d2-3658008044 .color-AA2{color:#4A6FF3;} + .d2-3658008044 .color-AA4{color:#EDF0FD;} + .d2-3658008044 .color-AA5{color:#F7F8FE;} + .d2-3658008044 .color-AB4{color:#EDF0FD;} + .d2-3658008044 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker-d2-3658008044);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker-d2-3658008044);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright-d2-3658008044);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright-d2-3658008044);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright-d2-3658008044);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright-d2-3658008044);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark-d2-3658008044);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright-d2-3658008044);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright-d2-3658008044);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright-d2-3658008044);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright-d2-3658008044);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker-d2-3658008044);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark-d2-3658008044);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal-d2-3658008044);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal-d2-3658008044);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright-d2-3658008044);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright-d2-3658008044);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright-d2-3658008044);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>abcdabcab From 2fc8183c15702b578b5768db0bfde7ff9dfd4668 Mon Sep 17 00:00:00 2001 From: Mayank Mohapatra <125661248+Mayank77maruti@users.noreply.github.com> Date: Sun, 23 Feb 2025 17:03:37 +0000 Subject: [PATCH 58/73] try --- d2layouts/d2cycle/layout.go | 2 +- .../txtar/cycle-diagram/dagre/board.exp.json | 20 +-- .../txtar/cycle-diagram/dagre/sketch.exp.svg | 152 +++++++++--------- .../txtar/cycle-diagram/elk/board.exp.json | 20 +-- .../txtar/cycle-diagram/elk/sketch.exp.svg | 152 +++++++++--------- 5 files changed, 173 insertions(+), 173 deletions(-) diff --git a/d2layouts/d2cycle/layout.go b/d2layouts/d2cycle/layout.go index 1cb151738d..ef2e9a4f24 100644 --- a/d2layouts/d2cycle/layout.go +++ b/d2layouts/d2cycle/layout.go @@ -117,7 +117,7 @@ func createCircularArc(edge *d2graph.Edge) { tangentX /= mag tangentY /= mag } - const MIN_SEGMENT_LEN = 3.9 + const MIN_SEGMENT_LEN = 3.9999999999 dx := lastPoint.X - secondLastPoint.X dy := lastPoint.Y - secondLastPoint.Y diff --git a/e2etests/testdata/txtar/cycle-diagram/dagre/board.exp.json b/e2etests/testdata/txtar/cycle-diagram/dagre/board.exp.json index 40969cfa05..510d3de80d 100644 --- a/e2etests/testdata/txtar/cycle-diagram/dagre/board.exp.json +++ b/e2etests/testdata/txtar/cycle-diagram/dagre/board.exp.json @@ -864,8 +864,8 @@ "y": -37.47600173950195 }, { - "x": 196.60899353027344, - "y": -36.84600067138672 + "x": 196.5919952392578, + "y": -36.94499969482422 }, { "x": 197.2519989013672, @@ -1228,8 +1228,8 @@ "y": 197.53700256347656 }, { - "x": 30.364999771118164, - "y": 197.71299743652344 + "x": 30.464000701904297, + "y": 197.6999969482422 }, { "x": 26.5, @@ -1592,8 +1592,8 @@ "y": 37.47600173950195 }, { - "x": -196.60899353027344, - "y": 36.84600067138672 + "x": -196.5919952392578, + "y": 36.94499969482422 }, { "x": -197.2519989013672, @@ -1972,8 +1972,8 @@ "y": 111.8030014038086 }, { - "x": 702.739990234375, - "y": 113.32499694824219 + "x": 702.7730102539062, + "y": 113.23100280761719 }, { "x": 701.4329833984375, @@ -2336,8 +2336,8 @@ "y": 186.90899658203125 }, { - "x": 366.2359924316406, - "y": 185.91200256347656 + "x": 366.302001953125, + "y": 185.98699951171875 }, { "x": 363.6419982910156, diff --git a/e2etests/testdata/txtar/cycle-diagram/dagre/sketch.exp.svg b/e2etests/testdata/txtar/cycle-diagram/dagre/sketch.exp.svg index b3368178c0..04b91ed9e3 100644 --- a/e2etests/testdata/txtar/cycle-diagram/dagre/sketch.exp.svg +++ b/e2etests/testdata/txtar/cycle-diagram/dagre/sketch.exp.svg @@ -1,9 +1,9 @@ -abcdabcab + .d2-2890554203 .fill-N1{fill:#0A0F25;} + .d2-2890554203 .fill-N2{fill:#676C7E;} + .d2-2890554203 .fill-N3{fill:#9499AB;} + .d2-2890554203 .fill-N4{fill:#CFD2DD;} + .d2-2890554203 .fill-N5{fill:#DEE1EB;} + .d2-2890554203 .fill-N6{fill:#EEF1F8;} + .d2-2890554203 .fill-N7{fill:#FFFFFF;} + .d2-2890554203 .fill-B1{fill:#0D32B2;} + .d2-2890554203 .fill-B2{fill:#0D32B2;} + .d2-2890554203 .fill-B3{fill:#E3E9FD;} + .d2-2890554203 .fill-B4{fill:#E3E9FD;} + .d2-2890554203 .fill-B5{fill:#EDF0FD;} + .d2-2890554203 .fill-B6{fill:#F7F8FE;} + .d2-2890554203 .fill-AA2{fill:#4A6FF3;} + .d2-2890554203 .fill-AA4{fill:#EDF0FD;} + .d2-2890554203 .fill-AA5{fill:#F7F8FE;} + .d2-2890554203 .fill-AB4{fill:#EDF0FD;} + .d2-2890554203 .fill-AB5{fill:#F7F8FE;} + .d2-2890554203 .stroke-N1{stroke:#0A0F25;} + .d2-2890554203 .stroke-N2{stroke:#676C7E;} + .d2-2890554203 .stroke-N3{stroke:#9499AB;} + .d2-2890554203 .stroke-N4{stroke:#CFD2DD;} + .d2-2890554203 .stroke-N5{stroke:#DEE1EB;} + .d2-2890554203 .stroke-N6{stroke:#EEF1F8;} + .d2-2890554203 .stroke-N7{stroke:#FFFFFF;} + .d2-2890554203 .stroke-B1{stroke:#0D32B2;} + .d2-2890554203 .stroke-B2{stroke:#0D32B2;} + .d2-2890554203 .stroke-B3{stroke:#E3E9FD;} + .d2-2890554203 .stroke-B4{stroke:#E3E9FD;} + .d2-2890554203 .stroke-B5{stroke:#EDF0FD;} + .d2-2890554203 .stroke-B6{stroke:#F7F8FE;} + .d2-2890554203 .stroke-AA2{stroke:#4A6FF3;} + .d2-2890554203 .stroke-AA4{stroke:#EDF0FD;} + .d2-2890554203 .stroke-AA5{stroke:#F7F8FE;} + .d2-2890554203 .stroke-AB4{stroke:#EDF0FD;} + .d2-2890554203 .stroke-AB5{stroke:#F7F8FE;} + .d2-2890554203 .background-color-N1{background-color:#0A0F25;} + .d2-2890554203 .background-color-N2{background-color:#676C7E;} + .d2-2890554203 .background-color-N3{background-color:#9499AB;} + .d2-2890554203 .background-color-N4{background-color:#CFD2DD;} + .d2-2890554203 .background-color-N5{background-color:#DEE1EB;} + .d2-2890554203 .background-color-N6{background-color:#EEF1F8;} + .d2-2890554203 .background-color-N7{background-color:#FFFFFF;} + .d2-2890554203 .background-color-B1{background-color:#0D32B2;} + .d2-2890554203 .background-color-B2{background-color:#0D32B2;} + .d2-2890554203 .background-color-B3{background-color:#E3E9FD;} + .d2-2890554203 .background-color-B4{background-color:#E3E9FD;} + .d2-2890554203 .background-color-B5{background-color:#EDF0FD;} + .d2-2890554203 .background-color-B6{background-color:#F7F8FE;} + .d2-2890554203 .background-color-AA2{background-color:#4A6FF3;} + .d2-2890554203 .background-color-AA4{background-color:#EDF0FD;} + .d2-2890554203 .background-color-AA5{background-color:#F7F8FE;} + .d2-2890554203 .background-color-AB4{background-color:#EDF0FD;} + .d2-2890554203 .background-color-AB5{background-color:#F7F8FE;} + .d2-2890554203 .color-N1{color:#0A0F25;} + .d2-2890554203 .color-N2{color:#676C7E;} + .d2-2890554203 .color-N3{color:#9499AB;} + .d2-2890554203 .color-N4{color:#CFD2DD;} + .d2-2890554203 .color-N5{color:#DEE1EB;} + .d2-2890554203 .color-N6{color:#EEF1F8;} + .d2-2890554203 .color-N7{color:#FFFFFF;} + .d2-2890554203 .color-B1{color:#0D32B2;} + .d2-2890554203 .color-B2{color:#0D32B2;} + .d2-2890554203 .color-B3{color:#E3E9FD;} + .d2-2890554203 .color-B4{color:#E3E9FD;} + .d2-2890554203 .color-B5{color:#EDF0FD;} + .d2-2890554203 .color-B6{color:#F7F8FE;} + .d2-2890554203 .color-AA2{color:#4A6FF3;} + .d2-2890554203 .color-AA4{color:#EDF0FD;} + .d2-2890554203 .color-AA5{color:#F7F8FE;} + .d2-2890554203 .color-AB4{color:#EDF0FD;} + .d2-2890554203 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker-d2-2890554203);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker-d2-2890554203);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright-d2-2890554203);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright-d2-2890554203);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright-d2-2890554203);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright-d2-2890554203);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark-d2-2890554203);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright-d2-2890554203);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright-d2-2890554203);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright-d2-2890554203);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright-d2-2890554203);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker-d2-2890554203);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark-d2-2890554203);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal-d2-2890554203);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal-d2-2890554203);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright-d2-2890554203);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright-d2-2890554203);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright-d2-2890554203);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>abcdabcab diff --git a/e2etests/testdata/txtar/cycle-diagram/elk/board.exp.json b/e2etests/testdata/txtar/cycle-diagram/elk/board.exp.json index 04d1df4e70..24bf6f932c 100644 --- a/e2etests/testdata/txtar/cycle-diagram/elk/board.exp.json +++ b/e2etests/testdata/txtar/cycle-diagram/elk/board.exp.json @@ -864,8 +864,8 @@ "y": -25.47599983215332 }, { - "x": 208.60899353027344, - "y": -24.84600067138672 + "x": 208.5919952392578, + "y": -24.94499969482422 }, { "x": 209.2519989013672, @@ -1228,8 +1228,8 @@ "y": 209.53700256347656 }, { - "x": 42.3650016784668, - "y": 209.71299743652344 + "x": 42.4640007019043, + "y": 209.6999969482422 }, { "x": 38.5, @@ -1592,8 +1592,8 @@ "y": 49.47600173950195 }, { - "x": -184.60899353027344, - "y": 48.84600067138672 + "x": -184.5919952392578, + "y": 48.94499969482422 }, { "x": -185.2519989013672, @@ -1972,8 +1972,8 @@ "y": 123.8030014038086 }, { - "x": 675.239990234375, - "y": 125.32499694824219 + "x": 675.2730102539062, + "y": 125.23100280761719 }, { "x": 673.9329833984375, @@ -2336,8 +2336,8 @@ "y": 198.90899658203125 }, { - "x": 338.7359924316406, - "y": 197.91200256347656 + "x": 338.802001953125, + "y": 197.98699951171875 }, { "x": 336.1419982910156, diff --git a/e2etests/testdata/txtar/cycle-diagram/elk/sketch.exp.svg b/e2etests/testdata/txtar/cycle-diagram/elk/sketch.exp.svg index 279a456742..3e7aef6090 100644 --- a/e2etests/testdata/txtar/cycle-diagram/elk/sketch.exp.svg +++ b/e2etests/testdata/txtar/cycle-diagram/elk/sketch.exp.svg @@ -1,9 +1,9 @@ -abcdabcab + .d2-3193055920 .fill-N1{fill:#0A0F25;} + .d2-3193055920 .fill-N2{fill:#676C7E;} + .d2-3193055920 .fill-N3{fill:#9499AB;} + .d2-3193055920 .fill-N4{fill:#CFD2DD;} + .d2-3193055920 .fill-N5{fill:#DEE1EB;} + .d2-3193055920 .fill-N6{fill:#EEF1F8;} + .d2-3193055920 .fill-N7{fill:#FFFFFF;} + .d2-3193055920 .fill-B1{fill:#0D32B2;} + .d2-3193055920 .fill-B2{fill:#0D32B2;} + .d2-3193055920 .fill-B3{fill:#E3E9FD;} + .d2-3193055920 .fill-B4{fill:#E3E9FD;} + .d2-3193055920 .fill-B5{fill:#EDF0FD;} + .d2-3193055920 .fill-B6{fill:#F7F8FE;} + .d2-3193055920 .fill-AA2{fill:#4A6FF3;} + .d2-3193055920 .fill-AA4{fill:#EDF0FD;} + .d2-3193055920 .fill-AA5{fill:#F7F8FE;} + .d2-3193055920 .fill-AB4{fill:#EDF0FD;} + .d2-3193055920 .fill-AB5{fill:#F7F8FE;} + .d2-3193055920 .stroke-N1{stroke:#0A0F25;} + .d2-3193055920 .stroke-N2{stroke:#676C7E;} + .d2-3193055920 .stroke-N3{stroke:#9499AB;} + .d2-3193055920 .stroke-N4{stroke:#CFD2DD;} + .d2-3193055920 .stroke-N5{stroke:#DEE1EB;} + .d2-3193055920 .stroke-N6{stroke:#EEF1F8;} + .d2-3193055920 .stroke-N7{stroke:#FFFFFF;} + .d2-3193055920 .stroke-B1{stroke:#0D32B2;} + .d2-3193055920 .stroke-B2{stroke:#0D32B2;} + .d2-3193055920 .stroke-B3{stroke:#E3E9FD;} + .d2-3193055920 .stroke-B4{stroke:#E3E9FD;} + .d2-3193055920 .stroke-B5{stroke:#EDF0FD;} + .d2-3193055920 .stroke-B6{stroke:#F7F8FE;} + .d2-3193055920 .stroke-AA2{stroke:#4A6FF3;} + .d2-3193055920 .stroke-AA4{stroke:#EDF0FD;} + .d2-3193055920 .stroke-AA5{stroke:#F7F8FE;} + .d2-3193055920 .stroke-AB4{stroke:#EDF0FD;} + .d2-3193055920 .stroke-AB5{stroke:#F7F8FE;} + .d2-3193055920 .background-color-N1{background-color:#0A0F25;} + .d2-3193055920 .background-color-N2{background-color:#676C7E;} + .d2-3193055920 .background-color-N3{background-color:#9499AB;} + .d2-3193055920 .background-color-N4{background-color:#CFD2DD;} + .d2-3193055920 .background-color-N5{background-color:#DEE1EB;} + .d2-3193055920 .background-color-N6{background-color:#EEF1F8;} + .d2-3193055920 .background-color-N7{background-color:#FFFFFF;} + .d2-3193055920 .background-color-B1{background-color:#0D32B2;} + .d2-3193055920 .background-color-B2{background-color:#0D32B2;} + .d2-3193055920 .background-color-B3{background-color:#E3E9FD;} + .d2-3193055920 .background-color-B4{background-color:#E3E9FD;} + .d2-3193055920 .background-color-B5{background-color:#EDF0FD;} + .d2-3193055920 .background-color-B6{background-color:#F7F8FE;} + .d2-3193055920 .background-color-AA2{background-color:#4A6FF3;} + .d2-3193055920 .background-color-AA4{background-color:#EDF0FD;} + .d2-3193055920 .background-color-AA5{background-color:#F7F8FE;} + .d2-3193055920 .background-color-AB4{background-color:#EDF0FD;} + .d2-3193055920 .background-color-AB5{background-color:#F7F8FE;} + .d2-3193055920 .color-N1{color:#0A0F25;} + .d2-3193055920 .color-N2{color:#676C7E;} + .d2-3193055920 .color-N3{color:#9499AB;} + .d2-3193055920 .color-N4{color:#CFD2DD;} + .d2-3193055920 .color-N5{color:#DEE1EB;} + .d2-3193055920 .color-N6{color:#EEF1F8;} + .d2-3193055920 .color-N7{color:#FFFFFF;} + .d2-3193055920 .color-B1{color:#0D32B2;} + .d2-3193055920 .color-B2{color:#0D32B2;} + .d2-3193055920 .color-B3{color:#E3E9FD;} + .d2-3193055920 .color-B4{color:#E3E9FD;} + .d2-3193055920 .color-B5{color:#EDF0FD;} + .d2-3193055920 .color-B6{color:#F7F8FE;} + .d2-3193055920 .color-AA2{color:#4A6FF3;} + .d2-3193055920 .color-AA4{color:#EDF0FD;} + .d2-3193055920 .color-AA5{color:#F7F8FE;} + .d2-3193055920 .color-AB4{color:#EDF0FD;} + .d2-3193055920 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker-d2-3193055920);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker-d2-3193055920);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright-d2-3193055920);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright-d2-3193055920);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright-d2-3193055920);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright-d2-3193055920);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark-d2-3193055920);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright-d2-3193055920);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright-d2-3193055920);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright-d2-3193055920);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright-d2-3193055920);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker-d2-3193055920);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark-d2-3193055920);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal-d2-3193055920);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal-d2-3193055920);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright-d2-3193055920);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright-d2-3193055920);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright-d2-3193055920);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>abcdabcab From 8580d629fc5ffd0ee2b8ebb4219681565b8393d9 Mon Sep 17 00:00:00 2001 From: Mayank Mohapatra <125661248+Mayank77maruti@users.noreply.github.com> Date: Sun, 23 Feb 2025 17:04:06 +0000 Subject: [PATCH 59/73] try --- d2layouts/d2cycle/layout.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/d2layouts/d2cycle/layout.go b/d2layouts/d2cycle/layout.go index ef2e9a4f24..084657af97 100644 --- a/d2layouts/d2cycle/layout.go +++ b/d2layouts/d2cycle/layout.go @@ -117,7 +117,7 @@ func createCircularArc(edge *d2graph.Edge) { tangentX /= mag tangentY /= mag } - const MIN_SEGMENT_LEN = 3.9999999999 + const MIN_SEGMENT_LEN = 4.0 dx := lastPoint.X - secondLastPoint.X dy := lastPoint.Y - secondLastPoint.Y From d3be0f5a3b4056dc020b9e0ac5c08d0eda47c7d3 Mon Sep 17 00:00:00 2001 From: Mayank Mohapatra <125661248+Mayank77maruti@users.noreply.github.com> Date: Sun, 23 Feb 2025 17:04:41 +0000 Subject: [PATCH 60/73] try --- d2layouts/d2cycle/layout.go | 2 +- .../txtar/cycle-diagram/dagre/board.exp.json | 20 +-- .../txtar/cycle-diagram/dagre/sketch.exp.svg | 152 +++++++++--------- .../txtar/cycle-diagram/elk/board.exp.json | 20 +-- .../txtar/cycle-diagram/elk/sketch.exp.svg | 152 +++++++++--------- 5 files changed, 173 insertions(+), 173 deletions(-) diff --git a/d2layouts/d2cycle/layout.go b/d2layouts/d2cycle/layout.go index 084657af97..c11dd3c6d8 100644 --- a/d2layouts/d2cycle/layout.go +++ b/d2layouts/d2cycle/layout.go @@ -117,7 +117,7 @@ func createCircularArc(edge *d2graph.Edge) { tangentX /= mag tangentY /= mag } - const MIN_SEGMENT_LEN = 4.0 + const MIN_SEGMENT_LEN = 4.09 dx := lastPoint.X - secondLastPoint.X dy := lastPoint.Y - secondLastPoint.Y diff --git a/e2etests/testdata/txtar/cycle-diagram/dagre/board.exp.json b/e2etests/testdata/txtar/cycle-diagram/dagre/board.exp.json index 510d3de80d..b29a1b0c20 100644 --- a/e2etests/testdata/txtar/cycle-diagram/dagre/board.exp.json +++ b/e2etests/testdata/txtar/cycle-diagram/dagre/board.exp.json @@ -864,8 +864,8 @@ "y": -37.47600173950195 }, { - "x": 196.5919952392578, - "y": -36.94499969482422 + "x": 196.57699584960938, + "y": -37.03300094604492 }, { "x": 197.2519989013672, @@ -1228,8 +1228,8 @@ "y": 197.53700256347656 }, { - "x": 30.464000701904297, - "y": 197.6999969482422 + "x": 30.55299949645996, + "y": 197.68800354003906 }, { "x": 26.5, @@ -1592,8 +1592,8 @@ "y": 37.47600173950195 }, { - "x": -196.5919952392578, - "y": 36.94499969482422 + "x": -196.57699584960938, + "y": 37.03300094604492 }, { "x": -197.2519989013672, @@ -1972,8 +1972,8 @@ "y": 111.8030014038086 }, { - "x": 702.7730102539062, - "y": 113.23100280761719 + "x": 702.802978515625, + "y": 113.14600372314453 }, { "x": 701.4329833984375, @@ -2336,8 +2336,8 @@ "y": 186.90899658203125 }, { - "x": 366.302001953125, - "y": 185.98699951171875 + "x": 366.36199951171875, + "y": 186.0540008544922 }, { "x": 363.6419982910156, diff --git a/e2etests/testdata/txtar/cycle-diagram/dagre/sketch.exp.svg b/e2etests/testdata/txtar/cycle-diagram/dagre/sketch.exp.svg index 04b91ed9e3..47c2e642c3 100644 --- a/e2etests/testdata/txtar/cycle-diagram/dagre/sketch.exp.svg +++ b/e2etests/testdata/txtar/cycle-diagram/dagre/sketch.exp.svg @@ -1,9 +1,9 @@ -abcdabcab + .d2-3361501147 .fill-N1{fill:#0A0F25;} + .d2-3361501147 .fill-N2{fill:#676C7E;} + .d2-3361501147 .fill-N3{fill:#9499AB;} + .d2-3361501147 .fill-N4{fill:#CFD2DD;} + .d2-3361501147 .fill-N5{fill:#DEE1EB;} + .d2-3361501147 .fill-N6{fill:#EEF1F8;} + .d2-3361501147 .fill-N7{fill:#FFFFFF;} + .d2-3361501147 .fill-B1{fill:#0D32B2;} + .d2-3361501147 .fill-B2{fill:#0D32B2;} + .d2-3361501147 .fill-B3{fill:#E3E9FD;} + .d2-3361501147 .fill-B4{fill:#E3E9FD;} + .d2-3361501147 .fill-B5{fill:#EDF0FD;} + .d2-3361501147 .fill-B6{fill:#F7F8FE;} + .d2-3361501147 .fill-AA2{fill:#4A6FF3;} + .d2-3361501147 .fill-AA4{fill:#EDF0FD;} + .d2-3361501147 .fill-AA5{fill:#F7F8FE;} + .d2-3361501147 .fill-AB4{fill:#EDF0FD;} + .d2-3361501147 .fill-AB5{fill:#F7F8FE;} + .d2-3361501147 .stroke-N1{stroke:#0A0F25;} + .d2-3361501147 .stroke-N2{stroke:#676C7E;} + .d2-3361501147 .stroke-N3{stroke:#9499AB;} + .d2-3361501147 .stroke-N4{stroke:#CFD2DD;} + .d2-3361501147 .stroke-N5{stroke:#DEE1EB;} + .d2-3361501147 .stroke-N6{stroke:#EEF1F8;} + .d2-3361501147 .stroke-N7{stroke:#FFFFFF;} + .d2-3361501147 .stroke-B1{stroke:#0D32B2;} + .d2-3361501147 .stroke-B2{stroke:#0D32B2;} + .d2-3361501147 .stroke-B3{stroke:#E3E9FD;} + .d2-3361501147 .stroke-B4{stroke:#E3E9FD;} + .d2-3361501147 .stroke-B5{stroke:#EDF0FD;} + .d2-3361501147 .stroke-B6{stroke:#F7F8FE;} + .d2-3361501147 .stroke-AA2{stroke:#4A6FF3;} + .d2-3361501147 .stroke-AA4{stroke:#EDF0FD;} + .d2-3361501147 .stroke-AA5{stroke:#F7F8FE;} + .d2-3361501147 .stroke-AB4{stroke:#EDF0FD;} + .d2-3361501147 .stroke-AB5{stroke:#F7F8FE;} + .d2-3361501147 .background-color-N1{background-color:#0A0F25;} + .d2-3361501147 .background-color-N2{background-color:#676C7E;} + .d2-3361501147 .background-color-N3{background-color:#9499AB;} + .d2-3361501147 .background-color-N4{background-color:#CFD2DD;} + .d2-3361501147 .background-color-N5{background-color:#DEE1EB;} + .d2-3361501147 .background-color-N6{background-color:#EEF1F8;} + .d2-3361501147 .background-color-N7{background-color:#FFFFFF;} + .d2-3361501147 .background-color-B1{background-color:#0D32B2;} + .d2-3361501147 .background-color-B2{background-color:#0D32B2;} + .d2-3361501147 .background-color-B3{background-color:#E3E9FD;} + .d2-3361501147 .background-color-B4{background-color:#E3E9FD;} + .d2-3361501147 .background-color-B5{background-color:#EDF0FD;} + .d2-3361501147 .background-color-B6{background-color:#F7F8FE;} + .d2-3361501147 .background-color-AA2{background-color:#4A6FF3;} + .d2-3361501147 .background-color-AA4{background-color:#EDF0FD;} + .d2-3361501147 .background-color-AA5{background-color:#F7F8FE;} + .d2-3361501147 .background-color-AB4{background-color:#EDF0FD;} + .d2-3361501147 .background-color-AB5{background-color:#F7F8FE;} + .d2-3361501147 .color-N1{color:#0A0F25;} + .d2-3361501147 .color-N2{color:#676C7E;} + .d2-3361501147 .color-N3{color:#9499AB;} + .d2-3361501147 .color-N4{color:#CFD2DD;} + .d2-3361501147 .color-N5{color:#DEE1EB;} + .d2-3361501147 .color-N6{color:#EEF1F8;} + .d2-3361501147 .color-N7{color:#FFFFFF;} + .d2-3361501147 .color-B1{color:#0D32B2;} + .d2-3361501147 .color-B2{color:#0D32B2;} + .d2-3361501147 .color-B3{color:#E3E9FD;} + .d2-3361501147 .color-B4{color:#E3E9FD;} + .d2-3361501147 .color-B5{color:#EDF0FD;} + .d2-3361501147 .color-B6{color:#F7F8FE;} + .d2-3361501147 .color-AA2{color:#4A6FF3;} + .d2-3361501147 .color-AA4{color:#EDF0FD;} + .d2-3361501147 .color-AA5{color:#F7F8FE;} + .d2-3361501147 .color-AB4{color:#EDF0FD;} + .d2-3361501147 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker-d2-3361501147);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker-d2-3361501147);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright-d2-3361501147);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright-d2-3361501147);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright-d2-3361501147);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright-d2-3361501147);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark-d2-3361501147);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright-d2-3361501147);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright-d2-3361501147);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright-d2-3361501147);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright-d2-3361501147);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker-d2-3361501147);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark-d2-3361501147);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal-d2-3361501147);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal-d2-3361501147);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright-d2-3361501147);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright-d2-3361501147);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright-d2-3361501147);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>abcdabcab diff --git a/e2etests/testdata/txtar/cycle-diagram/elk/board.exp.json b/e2etests/testdata/txtar/cycle-diagram/elk/board.exp.json index 24bf6f932c..80d13f997e 100644 --- a/e2etests/testdata/txtar/cycle-diagram/elk/board.exp.json +++ b/e2etests/testdata/txtar/cycle-diagram/elk/board.exp.json @@ -864,8 +864,8 @@ "y": -25.47599983215332 }, { - "x": 208.5919952392578, - "y": -24.94499969482422 + "x": 208.57699584960938, + "y": -25.033000946044922 }, { "x": 209.2519989013672, @@ -1228,8 +1228,8 @@ "y": 209.53700256347656 }, { - "x": 42.4640007019043, - "y": 209.6999969482422 + "x": 42.553001403808594, + "y": 209.68800354003906 }, { "x": 38.5, @@ -1592,8 +1592,8 @@ "y": 49.47600173950195 }, { - "x": -184.5919952392578, - "y": 48.94499969482422 + "x": -184.57699584960938, + "y": 49.03300094604492 }, { "x": -185.2519989013672, @@ -1972,8 +1972,8 @@ "y": 123.8030014038086 }, { - "x": 675.2730102539062, - "y": 125.23100280761719 + "x": 675.302978515625, + "y": 125.14600372314453 }, { "x": 673.9329833984375, @@ -2336,8 +2336,8 @@ "y": 198.90899658203125 }, { - "x": 338.802001953125, - "y": 197.98699951171875 + "x": 338.86199951171875, + "y": 198.0540008544922 }, { "x": 336.1419982910156, diff --git a/e2etests/testdata/txtar/cycle-diagram/elk/sketch.exp.svg b/e2etests/testdata/txtar/cycle-diagram/elk/sketch.exp.svg index 3e7aef6090..bbecc16f75 100644 --- a/e2etests/testdata/txtar/cycle-diagram/elk/sketch.exp.svg +++ b/e2etests/testdata/txtar/cycle-diagram/elk/sketch.exp.svg @@ -1,9 +1,9 @@ -abcdabcab + .d2-2472456423 .fill-N1{fill:#0A0F25;} + .d2-2472456423 .fill-N2{fill:#676C7E;} + .d2-2472456423 .fill-N3{fill:#9499AB;} + .d2-2472456423 .fill-N4{fill:#CFD2DD;} + .d2-2472456423 .fill-N5{fill:#DEE1EB;} + .d2-2472456423 .fill-N6{fill:#EEF1F8;} + .d2-2472456423 .fill-N7{fill:#FFFFFF;} + .d2-2472456423 .fill-B1{fill:#0D32B2;} + .d2-2472456423 .fill-B2{fill:#0D32B2;} + .d2-2472456423 .fill-B3{fill:#E3E9FD;} + .d2-2472456423 .fill-B4{fill:#E3E9FD;} + .d2-2472456423 .fill-B5{fill:#EDF0FD;} + .d2-2472456423 .fill-B6{fill:#F7F8FE;} + .d2-2472456423 .fill-AA2{fill:#4A6FF3;} + .d2-2472456423 .fill-AA4{fill:#EDF0FD;} + .d2-2472456423 .fill-AA5{fill:#F7F8FE;} + .d2-2472456423 .fill-AB4{fill:#EDF0FD;} + .d2-2472456423 .fill-AB5{fill:#F7F8FE;} + .d2-2472456423 .stroke-N1{stroke:#0A0F25;} + .d2-2472456423 .stroke-N2{stroke:#676C7E;} + .d2-2472456423 .stroke-N3{stroke:#9499AB;} + .d2-2472456423 .stroke-N4{stroke:#CFD2DD;} + .d2-2472456423 .stroke-N5{stroke:#DEE1EB;} + .d2-2472456423 .stroke-N6{stroke:#EEF1F8;} + .d2-2472456423 .stroke-N7{stroke:#FFFFFF;} + .d2-2472456423 .stroke-B1{stroke:#0D32B2;} + .d2-2472456423 .stroke-B2{stroke:#0D32B2;} + .d2-2472456423 .stroke-B3{stroke:#E3E9FD;} + .d2-2472456423 .stroke-B4{stroke:#E3E9FD;} + .d2-2472456423 .stroke-B5{stroke:#EDF0FD;} + .d2-2472456423 .stroke-B6{stroke:#F7F8FE;} + .d2-2472456423 .stroke-AA2{stroke:#4A6FF3;} + .d2-2472456423 .stroke-AA4{stroke:#EDF0FD;} + .d2-2472456423 .stroke-AA5{stroke:#F7F8FE;} + .d2-2472456423 .stroke-AB4{stroke:#EDF0FD;} + .d2-2472456423 .stroke-AB5{stroke:#F7F8FE;} + .d2-2472456423 .background-color-N1{background-color:#0A0F25;} + .d2-2472456423 .background-color-N2{background-color:#676C7E;} + .d2-2472456423 .background-color-N3{background-color:#9499AB;} + .d2-2472456423 .background-color-N4{background-color:#CFD2DD;} + .d2-2472456423 .background-color-N5{background-color:#DEE1EB;} + .d2-2472456423 .background-color-N6{background-color:#EEF1F8;} + .d2-2472456423 .background-color-N7{background-color:#FFFFFF;} + .d2-2472456423 .background-color-B1{background-color:#0D32B2;} + .d2-2472456423 .background-color-B2{background-color:#0D32B2;} + .d2-2472456423 .background-color-B3{background-color:#E3E9FD;} + .d2-2472456423 .background-color-B4{background-color:#E3E9FD;} + .d2-2472456423 .background-color-B5{background-color:#EDF0FD;} + .d2-2472456423 .background-color-B6{background-color:#F7F8FE;} + .d2-2472456423 .background-color-AA2{background-color:#4A6FF3;} + .d2-2472456423 .background-color-AA4{background-color:#EDF0FD;} + .d2-2472456423 .background-color-AA5{background-color:#F7F8FE;} + .d2-2472456423 .background-color-AB4{background-color:#EDF0FD;} + .d2-2472456423 .background-color-AB5{background-color:#F7F8FE;} + .d2-2472456423 .color-N1{color:#0A0F25;} + .d2-2472456423 .color-N2{color:#676C7E;} + .d2-2472456423 .color-N3{color:#9499AB;} + .d2-2472456423 .color-N4{color:#CFD2DD;} + .d2-2472456423 .color-N5{color:#DEE1EB;} + .d2-2472456423 .color-N6{color:#EEF1F8;} + .d2-2472456423 .color-N7{color:#FFFFFF;} + .d2-2472456423 .color-B1{color:#0D32B2;} + .d2-2472456423 .color-B2{color:#0D32B2;} + .d2-2472456423 .color-B3{color:#E3E9FD;} + .d2-2472456423 .color-B4{color:#E3E9FD;} + .d2-2472456423 .color-B5{color:#EDF0FD;} + .d2-2472456423 .color-B6{color:#F7F8FE;} + .d2-2472456423 .color-AA2{color:#4A6FF3;} + .d2-2472456423 .color-AA4{color:#EDF0FD;} + .d2-2472456423 .color-AA5{color:#F7F8FE;} + .d2-2472456423 .color-AB4{color:#EDF0FD;} + .d2-2472456423 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker-d2-2472456423);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker-d2-2472456423);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright-d2-2472456423);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright-d2-2472456423);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright-d2-2472456423);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright-d2-2472456423);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark-d2-2472456423);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright-d2-2472456423);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright-d2-2472456423);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright-d2-2472456423);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright-d2-2472456423);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker-d2-2472456423);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark-d2-2472456423);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal-d2-2472456423);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal-d2-2472456423);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright-d2-2472456423);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright-d2-2472456423);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright-d2-2472456423);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>abcdabcab From 1ebb2db2fb8aee74a7f554afaacacee4a2fab26a Mon Sep 17 00:00:00 2001 From: Mayank Mohapatra <125661248+Mayank77maruti@users.noreply.github.com> Date: Sun, 23 Feb 2025 17:05:26 +0000 Subject: [PATCH 61/73] try --- d2layouts/d2cycle/layout.go | 2 +- .../txtar/cycle-diagram/dagre/board.exp.json | 20 +-- .../txtar/cycle-diagram/dagre/sketch.exp.svg | 152 +++++++++--------- .../txtar/cycle-diagram/elk/board.exp.json | 20 +-- .../txtar/cycle-diagram/elk/sketch.exp.svg | 152 +++++++++--------- 5 files changed, 173 insertions(+), 173 deletions(-) diff --git a/d2layouts/d2cycle/layout.go b/d2layouts/d2cycle/layout.go index c11dd3c6d8..52b265405f 100644 --- a/d2layouts/d2cycle/layout.go +++ b/d2layouts/d2cycle/layout.go @@ -117,7 +117,7 @@ func createCircularArc(edge *d2graph.Edge) { tangentX /= mag tangentY /= mag } - const MIN_SEGMENT_LEN = 4.09 + const MIN_SEGMENT_LEN = 4.05 dx := lastPoint.X - secondLastPoint.X dy := lastPoint.Y - secondLastPoint.Y diff --git a/e2etests/testdata/txtar/cycle-diagram/dagre/board.exp.json b/e2etests/testdata/txtar/cycle-diagram/dagre/board.exp.json index b29a1b0c20..49db25ebc6 100644 --- a/e2etests/testdata/txtar/cycle-diagram/dagre/board.exp.json +++ b/e2etests/testdata/txtar/cycle-diagram/dagre/board.exp.json @@ -864,8 +864,8 @@ "y": -37.47600173950195 }, { - "x": 196.57699584960938, - "y": -37.03300094604492 + "x": 196.58399963378906, + "y": -36.99399948120117 }, { "x": 197.2519989013672, @@ -1228,8 +1228,8 @@ "y": 197.53700256347656 }, { - "x": 30.55299949645996, - "y": 197.68800354003906 + "x": 30.513999938964844, + "y": 197.6929931640625 }, { "x": 26.5, @@ -1592,8 +1592,8 @@ "y": 37.47600173950195 }, { - "x": -196.57699584960938, - "y": 37.03300094604492 + "x": -196.58399963378906, + "y": 36.99399948120117 }, { "x": -197.2519989013672, @@ -1972,8 +1972,8 @@ "y": 111.8030014038086 }, { - "x": 702.802978515625, - "y": 113.14600372314453 + "x": 702.7899780273438, + "y": 113.18399810791016 }, { "x": 701.4329833984375, @@ -2336,8 +2336,8 @@ "y": 186.90899658203125 }, { - "x": 366.36199951171875, - "y": 186.0540008544922 + "x": 366.33599853515625, + "y": 186.0240020751953 }, { "x": 363.6419982910156, diff --git a/e2etests/testdata/txtar/cycle-diagram/dagre/sketch.exp.svg b/e2etests/testdata/txtar/cycle-diagram/dagre/sketch.exp.svg index 47c2e642c3..bd3c9ccb10 100644 --- a/e2etests/testdata/txtar/cycle-diagram/dagre/sketch.exp.svg +++ b/e2etests/testdata/txtar/cycle-diagram/dagre/sketch.exp.svg @@ -1,9 +1,9 @@ -abcdabcab + .d2-3455404426 .fill-N1{fill:#0A0F25;} + .d2-3455404426 .fill-N2{fill:#676C7E;} + .d2-3455404426 .fill-N3{fill:#9499AB;} + .d2-3455404426 .fill-N4{fill:#CFD2DD;} + .d2-3455404426 .fill-N5{fill:#DEE1EB;} + .d2-3455404426 .fill-N6{fill:#EEF1F8;} + .d2-3455404426 .fill-N7{fill:#FFFFFF;} + .d2-3455404426 .fill-B1{fill:#0D32B2;} + .d2-3455404426 .fill-B2{fill:#0D32B2;} + .d2-3455404426 .fill-B3{fill:#E3E9FD;} + .d2-3455404426 .fill-B4{fill:#E3E9FD;} + .d2-3455404426 .fill-B5{fill:#EDF0FD;} + .d2-3455404426 .fill-B6{fill:#F7F8FE;} + .d2-3455404426 .fill-AA2{fill:#4A6FF3;} + .d2-3455404426 .fill-AA4{fill:#EDF0FD;} + .d2-3455404426 .fill-AA5{fill:#F7F8FE;} + .d2-3455404426 .fill-AB4{fill:#EDF0FD;} + .d2-3455404426 .fill-AB5{fill:#F7F8FE;} + .d2-3455404426 .stroke-N1{stroke:#0A0F25;} + .d2-3455404426 .stroke-N2{stroke:#676C7E;} + .d2-3455404426 .stroke-N3{stroke:#9499AB;} + .d2-3455404426 .stroke-N4{stroke:#CFD2DD;} + .d2-3455404426 .stroke-N5{stroke:#DEE1EB;} + .d2-3455404426 .stroke-N6{stroke:#EEF1F8;} + .d2-3455404426 .stroke-N7{stroke:#FFFFFF;} + .d2-3455404426 .stroke-B1{stroke:#0D32B2;} + .d2-3455404426 .stroke-B2{stroke:#0D32B2;} + .d2-3455404426 .stroke-B3{stroke:#E3E9FD;} + .d2-3455404426 .stroke-B4{stroke:#E3E9FD;} + .d2-3455404426 .stroke-B5{stroke:#EDF0FD;} + .d2-3455404426 .stroke-B6{stroke:#F7F8FE;} + .d2-3455404426 .stroke-AA2{stroke:#4A6FF3;} + .d2-3455404426 .stroke-AA4{stroke:#EDF0FD;} + .d2-3455404426 .stroke-AA5{stroke:#F7F8FE;} + .d2-3455404426 .stroke-AB4{stroke:#EDF0FD;} + .d2-3455404426 .stroke-AB5{stroke:#F7F8FE;} + .d2-3455404426 .background-color-N1{background-color:#0A0F25;} + .d2-3455404426 .background-color-N2{background-color:#676C7E;} + .d2-3455404426 .background-color-N3{background-color:#9499AB;} + .d2-3455404426 .background-color-N4{background-color:#CFD2DD;} + .d2-3455404426 .background-color-N5{background-color:#DEE1EB;} + .d2-3455404426 .background-color-N6{background-color:#EEF1F8;} + .d2-3455404426 .background-color-N7{background-color:#FFFFFF;} + .d2-3455404426 .background-color-B1{background-color:#0D32B2;} + .d2-3455404426 .background-color-B2{background-color:#0D32B2;} + .d2-3455404426 .background-color-B3{background-color:#E3E9FD;} + .d2-3455404426 .background-color-B4{background-color:#E3E9FD;} + .d2-3455404426 .background-color-B5{background-color:#EDF0FD;} + .d2-3455404426 .background-color-B6{background-color:#F7F8FE;} + .d2-3455404426 .background-color-AA2{background-color:#4A6FF3;} + .d2-3455404426 .background-color-AA4{background-color:#EDF0FD;} + .d2-3455404426 .background-color-AA5{background-color:#F7F8FE;} + .d2-3455404426 .background-color-AB4{background-color:#EDF0FD;} + .d2-3455404426 .background-color-AB5{background-color:#F7F8FE;} + .d2-3455404426 .color-N1{color:#0A0F25;} + .d2-3455404426 .color-N2{color:#676C7E;} + .d2-3455404426 .color-N3{color:#9499AB;} + .d2-3455404426 .color-N4{color:#CFD2DD;} + .d2-3455404426 .color-N5{color:#DEE1EB;} + .d2-3455404426 .color-N6{color:#EEF1F8;} + .d2-3455404426 .color-N7{color:#FFFFFF;} + .d2-3455404426 .color-B1{color:#0D32B2;} + .d2-3455404426 .color-B2{color:#0D32B2;} + .d2-3455404426 .color-B3{color:#E3E9FD;} + .d2-3455404426 .color-B4{color:#E3E9FD;} + .d2-3455404426 .color-B5{color:#EDF0FD;} + .d2-3455404426 .color-B6{color:#F7F8FE;} + .d2-3455404426 .color-AA2{color:#4A6FF3;} + .d2-3455404426 .color-AA4{color:#EDF0FD;} + .d2-3455404426 .color-AA5{color:#F7F8FE;} + .d2-3455404426 .color-AB4{color:#EDF0FD;} + .d2-3455404426 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker-d2-3455404426);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker-d2-3455404426);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright-d2-3455404426);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright-d2-3455404426);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright-d2-3455404426);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright-d2-3455404426);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark-d2-3455404426);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright-d2-3455404426);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright-d2-3455404426);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright-d2-3455404426);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright-d2-3455404426);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker-d2-3455404426);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark-d2-3455404426);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal-d2-3455404426);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal-d2-3455404426);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright-d2-3455404426);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright-d2-3455404426);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright-d2-3455404426);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>abcdabcab diff --git a/e2etests/testdata/txtar/cycle-diagram/elk/board.exp.json b/e2etests/testdata/txtar/cycle-diagram/elk/board.exp.json index 80d13f997e..1c02a5b054 100644 --- a/e2etests/testdata/txtar/cycle-diagram/elk/board.exp.json +++ b/e2etests/testdata/txtar/cycle-diagram/elk/board.exp.json @@ -864,8 +864,8 @@ "y": -25.47599983215332 }, { - "x": 208.57699584960938, - "y": -25.033000946044922 + "x": 208.58399963378906, + "y": -24.993999481201172 }, { "x": 209.2519989013672, @@ -1228,8 +1228,8 @@ "y": 209.53700256347656 }, { - "x": 42.553001403808594, - "y": 209.68800354003906 + "x": 42.513999938964844, + "y": 209.6929931640625 }, { "x": 38.5, @@ -1592,8 +1592,8 @@ "y": 49.47600173950195 }, { - "x": -184.57699584960938, - "y": 49.03300094604492 + "x": -184.58399963378906, + "y": 48.99399948120117 }, { "x": -185.2519989013672, @@ -1972,8 +1972,8 @@ "y": 123.8030014038086 }, { - "x": 675.302978515625, - "y": 125.14600372314453 + "x": 675.2899780273438, + "y": 125.18399810791016 }, { "x": 673.9329833984375, @@ -2336,8 +2336,8 @@ "y": 198.90899658203125 }, { - "x": 338.86199951171875, - "y": 198.0540008544922 + "x": 338.83599853515625, + "y": 198.0240020751953 }, { "x": 336.1419982910156, diff --git a/e2etests/testdata/txtar/cycle-diagram/elk/sketch.exp.svg b/e2etests/testdata/txtar/cycle-diagram/elk/sketch.exp.svg index bbecc16f75..2beeeae6ce 100644 --- a/e2etests/testdata/txtar/cycle-diagram/elk/sketch.exp.svg +++ b/e2etests/testdata/txtar/cycle-diagram/elk/sketch.exp.svg @@ -1,9 +1,9 @@ -abcdabcab + .d2-2236231474 .fill-N1{fill:#0A0F25;} + .d2-2236231474 .fill-N2{fill:#676C7E;} + .d2-2236231474 .fill-N3{fill:#9499AB;} + .d2-2236231474 .fill-N4{fill:#CFD2DD;} + .d2-2236231474 .fill-N5{fill:#DEE1EB;} + .d2-2236231474 .fill-N6{fill:#EEF1F8;} + .d2-2236231474 .fill-N7{fill:#FFFFFF;} + .d2-2236231474 .fill-B1{fill:#0D32B2;} + .d2-2236231474 .fill-B2{fill:#0D32B2;} + .d2-2236231474 .fill-B3{fill:#E3E9FD;} + .d2-2236231474 .fill-B4{fill:#E3E9FD;} + .d2-2236231474 .fill-B5{fill:#EDF0FD;} + .d2-2236231474 .fill-B6{fill:#F7F8FE;} + .d2-2236231474 .fill-AA2{fill:#4A6FF3;} + .d2-2236231474 .fill-AA4{fill:#EDF0FD;} + .d2-2236231474 .fill-AA5{fill:#F7F8FE;} + .d2-2236231474 .fill-AB4{fill:#EDF0FD;} + .d2-2236231474 .fill-AB5{fill:#F7F8FE;} + .d2-2236231474 .stroke-N1{stroke:#0A0F25;} + .d2-2236231474 .stroke-N2{stroke:#676C7E;} + .d2-2236231474 .stroke-N3{stroke:#9499AB;} + .d2-2236231474 .stroke-N4{stroke:#CFD2DD;} + .d2-2236231474 .stroke-N5{stroke:#DEE1EB;} + .d2-2236231474 .stroke-N6{stroke:#EEF1F8;} + .d2-2236231474 .stroke-N7{stroke:#FFFFFF;} + .d2-2236231474 .stroke-B1{stroke:#0D32B2;} + .d2-2236231474 .stroke-B2{stroke:#0D32B2;} + .d2-2236231474 .stroke-B3{stroke:#E3E9FD;} + .d2-2236231474 .stroke-B4{stroke:#E3E9FD;} + .d2-2236231474 .stroke-B5{stroke:#EDF0FD;} + .d2-2236231474 .stroke-B6{stroke:#F7F8FE;} + .d2-2236231474 .stroke-AA2{stroke:#4A6FF3;} + .d2-2236231474 .stroke-AA4{stroke:#EDF0FD;} + .d2-2236231474 .stroke-AA5{stroke:#F7F8FE;} + .d2-2236231474 .stroke-AB4{stroke:#EDF0FD;} + .d2-2236231474 .stroke-AB5{stroke:#F7F8FE;} + .d2-2236231474 .background-color-N1{background-color:#0A0F25;} + .d2-2236231474 .background-color-N2{background-color:#676C7E;} + .d2-2236231474 .background-color-N3{background-color:#9499AB;} + .d2-2236231474 .background-color-N4{background-color:#CFD2DD;} + .d2-2236231474 .background-color-N5{background-color:#DEE1EB;} + .d2-2236231474 .background-color-N6{background-color:#EEF1F8;} + .d2-2236231474 .background-color-N7{background-color:#FFFFFF;} + .d2-2236231474 .background-color-B1{background-color:#0D32B2;} + .d2-2236231474 .background-color-B2{background-color:#0D32B2;} + .d2-2236231474 .background-color-B3{background-color:#E3E9FD;} + .d2-2236231474 .background-color-B4{background-color:#E3E9FD;} + .d2-2236231474 .background-color-B5{background-color:#EDF0FD;} + .d2-2236231474 .background-color-B6{background-color:#F7F8FE;} + .d2-2236231474 .background-color-AA2{background-color:#4A6FF3;} + .d2-2236231474 .background-color-AA4{background-color:#EDF0FD;} + .d2-2236231474 .background-color-AA5{background-color:#F7F8FE;} + .d2-2236231474 .background-color-AB4{background-color:#EDF0FD;} + .d2-2236231474 .background-color-AB5{background-color:#F7F8FE;} + .d2-2236231474 .color-N1{color:#0A0F25;} + .d2-2236231474 .color-N2{color:#676C7E;} + .d2-2236231474 .color-N3{color:#9499AB;} + .d2-2236231474 .color-N4{color:#CFD2DD;} + .d2-2236231474 .color-N5{color:#DEE1EB;} + .d2-2236231474 .color-N6{color:#EEF1F8;} + .d2-2236231474 .color-N7{color:#FFFFFF;} + .d2-2236231474 .color-B1{color:#0D32B2;} + .d2-2236231474 .color-B2{color:#0D32B2;} + .d2-2236231474 .color-B3{color:#E3E9FD;} + .d2-2236231474 .color-B4{color:#E3E9FD;} + .d2-2236231474 .color-B5{color:#EDF0FD;} + .d2-2236231474 .color-B6{color:#F7F8FE;} + .d2-2236231474 .color-AA2{color:#4A6FF3;} + .d2-2236231474 .color-AA4{color:#EDF0FD;} + .d2-2236231474 .color-AA5{color:#F7F8FE;} + .d2-2236231474 .color-AB4{color:#EDF0FD;} + .d2-2236231474 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker-d2-2236231474);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker-d2-2236231474);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright-d2-2236231474);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright-d2-2236231474);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright-d2-2236231474);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright-d2-2236231474);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark-d2-2236231474);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright-d2-2236231474);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright-d2-2236231474);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright-d2-2236231474);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright-d2-2236231474);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker-d2-2236231474);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark-d2-2236231474);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal-d2-2236231474);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal-d2-2236231474);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright-d2-2236231474);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright-d2-2236231474);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright-d2-2236231474);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>abcdabcab From 7cd533d6c04a62e195780699f97e19164bd9f753 Mon Sep 17 00:00:00 2001 From: Mayank Mohapatra <125661248+Mayank77maruti@users.noreply.github.com> Date: Sun, 23 Feb 2025 17:06:13 +0000 Subject: [PATCH 62/73] try --- d2layouts/d2cycle/layout.go | 2 +- .../txtar/cycle-diagram/dagre/board.exp.json | 20 +-- .../txtar/cycle-diagram/dagre/sketch.exp.svg | 152 +++++++++--------- .../txtar/cycle-diagram/elk/board.exp.json | 20 +-- .../txtar/cycle-diagram/elk/sketch.exp.svg | 152 +++++++++--------- 5 files changed, 173 insertions(+), 173 deletions(-) diff --git a/d2layouts/d2cycle/layout.go b/d2layouts/d2cycle/layout.go index 52b265405f..edb20e97e9 100644 --- a/d2layouts/d2cycle/layout.go +++ b/d2layouts/d2cycle/layout.go @@ -117,7 +117,7 @@ func createCircularArc(edge *d2graph.Edge) { tangentX /= mag tangentY /= mag } - const MIN_SEGMENT_LEN = 4.05 + const MIN_SEGMENT_LEN = 4.159 dx := lastPoint.X - secondLastPoint.X dy := lastPoint.Y - secondLastPoint.Y diff --git a/e2etests/testdata/txtar/cycle-diagram/dagre/board.exp.json b/e2etests/testdata/txtar/cycle-diagram/dagre/board.exp.json index 49db25ebc6..83148b1acd 100644 --- a/e2etests/testdata/txtar/cycle-diagram/dagre/board.exp.json +++ b/e2etests/testdata/txtar/cycle-diagram/dagre/board.exp.json @@ -864,8 +864,8 @@ "y": -37.47600173950195 }, { - "x": 196.58399963378906, - "y": -36.99399948120117 + "x": 196.5659942626953, + "y": -37.10100173950195 }, { "x": 197.2519989013672, @@ -1228,8 +1228,8 @@ "y": 197.53700256347656 }, { - "x": 30.513999938964844, - "y": 197.6929931640625 + "x": 30.621999740600586, + "y": 197.6790008544922 }, { "x": 26.5, @@ -1592,8 +1592,8 @@ "y": 37.47600173950195 }, { - "x": -196.58399963378906, - "y": 36.99399948120117 + "x": -196.5659942626953, + "y": 37.10100173950195 }, { "x": -197.2519989013672, @@ -1972,8 +1972,8 @@ "y": 111.8030014038086 }, { - "x": 702.7899780273438, - "y": 113.18399810791016 + "x": 702.8259887695312, + "y": 113.08100128173828 }, { "x": 701.4329833984375, @@ -2336,8 +2336,8 @@ "y": 186.90899658203125 }, { - "x": 366.33599853515625, - "y": 186.0240020751953 + "x": 366.4079895019531, + "y": 186.1060028076172 }, { "x": 363.6419982910156, diff --git a/e2etests/testdata/txtar/cycle-diagram/dagre/sketch.exp.svg b/e2etests/testdata/txtar/cycle-diagram/dagre/sketch.exp.svg index bd3c9ccb10..73b4459647 100644 --- a/e2etests/testdata/txtar/cycle-diagram/dagre/sketch.exp.svg +++ b/e2etests/testdata/txtar/cycle-diagram/dagre/sketch.exp.svg @@ -1,9 +1,9 @@ -abcdabcab + .d2-3766226099 .fill-N1{fill:#0A0F25;} + .d2-3766226099 .fill-N2{fill:#676C7E;} + .d2-3766226099 .fill-N3{fill:#9499AB;} + .d2-3766226099 .fill-N4{fill:#CFD2DD;} + .d2-3766226099 .fill-N5{fill:#DEE1EB;} + .d2-3766226099 .fill-N6{fill:#EEF1F8;} + .d2-3766226099 .fill-N7{fill:#FFFFFF;} + .d2-3766226099 .fill-B1{fill:#0D32B2;} + .d2-3766226099 .fill-B2{fill:#0D32B2;} + .d2-3766226099 .fill-B3{fill:#E3E9FD;} + .d2-3766226099 .fill-B4{fill:#E3E9FD;} + .d2-3766226099 .fill-B5{fill:#EDF0FD;} + .d2-3766226099 .fill-B6{fill:#F7F8FE;} + .d2-3766226099 .fill-AA2{fill:#4A6FF3;} + .d2-3766226099 .fill-AA4{fill:#EDF0FD;} + .d2-3766226099 .fill-AA5{fill:#F7F8FE;} + .d2-3766226099 .fill-AB4{fill:#EDF0FD;} + .d2-3766226099 .fill-AB5{fill:#F7F8FE;} + .d2-3766226099 .stroke-N1{stroke:#0A0F25;} + .d2-3766226099 .stroke-N2{stroke:#676C7E;} + .d2-3766226099 .stroke-N3{stroke:#9499AB;} + .d2-3766226099 .stroke-N4{stroke:#CFD2DD;} + .d2-3766226099 .stroke-N5{stroke:#DEE1EB;} + .d2-3766226099 .stroke-N6{stroke:#EEF1F8;} + .d2-3766226099 .stroke-N7{stroke:#FFFFFF;} + .d2-3766226099 .stroke-B1{stroke:#0D32B2;} + .d2-3766226099 .stroke-B2{stroke:#0D32B2;} + .d2-3766226099 .stroke-B3{stroke:#E3E9FD;} + .d2-3766226099 .stroke-B4{stroke:#E3E9FD;} + .d2-3766226099 .stroke-B5{stroke:#EDF0FD;} + .d2-3766226099 .stroke-B6{stroke:#F7F8FE;} + .d2-3766226099 .stroke-AA2{stroke:#4A6FF3;} + .d2-3766226099 .stroke-AA4{stroke:#EDF0FD;} + .d2-3766226099 .stroke-AA5{stroke:#F7F8FE;} + .d2-3766226099 .stroke-AB4{stroke:#EDF0FD;} + .d2-3766226099 .stroke-AB5{stroke:#F7F8FE;} + .d2-3766226099 .background-color-N1{background-color:#0A0F25;} + .d2-3766226099 .background-color-N2{background-color:#676C7E;} + .d2-3766226099 .background-color-N3{background-color:#9499AB;} + .d2-3766226099 .background-color-N4{background-color:#CFD2DD;} + .d2-3766226099 .background-color-N5{background-color:#DEE1EB;} + .d2-3766226099 .background-color-N6{background-color:#EEF1F8;} + .d2-3766226099 .background-color-N7{background-color:#FFFFFF;} + .d2-3766226099 .background-color-B1{background-color:#0D32B2;} + .d2-3766226099 .background-color-B2{background-color:#0D32B2;} + .d2-3766226099 .background-color-B3{background-color:#E3E9FD;} + .d2-3766226099 .background-color-B4{background-color:#E3E9FD;} + .d2-3766226099 .background-color-B5{background-color:#EDF0FD;} + .d2-3766226099 .background-color-B6{background-color:#F7F8FE;} + .d2-3766226099 .background-color-AA2{background-color:#4A6FF3;} + .d2-3766226099 .background-color-AA4{background-color:#EDF0FD;} + .d2-3766226099 .background-color-AA5{background-color:#F7F8FE;} + .d2-3766226099 .background-color-AB4{background-color:#EDF0FD;} + .d2-3766226099 .background-color-AB5{background-color:#F7F8FE;} + .d2-3766226099 .color-N1{color:#0A0F25;} + .d2-3766226099 .color-N2{color:#676C7E;} + .d2-3766226099 .color-N3{color:#9499AB;} + .d2-3766226099 .color-N4{color:#CFD2DD;} + .d2-3766226099 .color-N5{color:#DEE1EB;} + .d2-3766226099 .color-N6{color:#EEF1F8;} + .d2-3766226099 .color-N7{color:#FFFFFF;} + .d2-3766226099 .color-B1{color:#0D32B2;} + .d2-3766226099 .color-B2{color:#0D32B2;} + .d2-3766226099 .color-B3{color:#E3E9FD;} + .d2-3766226099 .color-B4{color:#E3E9FD;} + .d2-3766226099 .color-B5{color:#EDF0FD;} + .d2-3766226099 .color-B6{color:#F7F8FE;} + .d2-3766226099 .color-AA2{color:#4A6FF3;} + .d2-3766226099 .color-AA4{color:#EDF0FD;} + .d2-3766226099 .color-AA5{color:#F7F8FE;} + .d2-3766226099 .color-AB4{color:#EDF0FD;} + .d2-3766226099 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker-d2-3766226099);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker-d2-3766226099);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright-d2-3766226099);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright-d2-3766226099);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright-d2-3766226099);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright-d2-3766226099);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark-d2-3766226099);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright-d2-3766226099);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright-d2-3766226099);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright-d2-3766226099);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright-d2-3766226099);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker-d2-3766226099);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark-d2-3766226099);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal-d2-3766226099);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal-d2-3766226099);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright-d2-3766226099);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright-d2-3766226099);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright-d2-3766226099);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>abcdabcab diff --git a/e2etests/testdata/txtar/cycle-diagram/elk/board.exp.json b/e2etests/testdata/txtar/cycle-diagram/elk/board.exp.json index 1c02a5b054..ae1b04fd23 100644 --- a/e2etests/testdata/txtar/cycle-diagram/elk/board.exp.json +++ b/e2etests/testdata/txtar/cycle-diagram/elk/board.exp.json @@ -864,8 +864,8 @@ "y": -25.47599983215332 }, { - "x": 208.58399963378906, - "y": -24.993999481201172 + "x": 208.5659942626953, + "y": -25.10099983215332 }, { "x": 209.2519989013672, @@ -1228,8 +1228,8 @@ "y": 209.53700256347656 }, { - "x": 42.513999938964844, - "y": 209.6929931640625 + "x": 42.62200164794922, + "y": 209.6790008544922 }, { "x": 38.5, @@ -1592,8 +1592,8 @@ "y": 49.47600173950195 }, { - "x": -184.58399963378906, - "y": 48.99399948120117 + "x": -184.5659942626953, + "y": 49.10100173950195 }, { "x": -185.2519989013672, @@ -1972,8 +1972,8 @@ "y": 123.8030014038086 }, { - "x": 675.2899780273438, - "y": 125.18399810791016 + "x": 675.3259887695312, + "y": 125.08100128173828 }, { "x": 673.9329833984375, @@ -2336,8 +2336,8 @@ "y": 198.90899658203125 }, { - "x": 338.83599853515625, - "y": 198.0240020751953 + "x": 338.9079895019531, + "y": 198.1060028076172 }, { "x": 336.1419982910156, diff --git a/e2etests/testdata/txtar/cycle-diagram/elk/sketch.exp.svg b/e2etests/testdata/txtar/cycle-diagram/elk/sketch.exp.svg index 2beeeae6ce..5bada1dcfa 100644 --- a/e2etests/testdata/txtar/cycle-diagram/elk/sketch.exp.svg +++ b/e2etests/testdata/txtar/cycle-diagram/elk/sketch.exp.svg @@ -1,9 +1,9 @@ -abcdabcab + .d2-3805670610 .fill-N1{fill:#0A0F25;} + .d2-3805670610 .fill-N2{fill:#676C7E;} + .d2-3805670610 .fill-N3{fill:#9499AB;} + .d2-3805670610 .fill-N4{fill:#CFD2DD;} + .d2-3805670610 .fill-N5{fill:#DEE1EB;} + .d2-3805670610 .fill-N6{fill:#EEF1F8;} + .d2-3805670610 .fill-N7{fill:#FFFFFF;} + .d2-3805670610 .fill-B1{fill:#0D32B2;} + .d2-3805670610 .fill-B2{fill:#0D32B2;} + .d2-3805670610 .fill-B3{fill:#E3E9FD;} + .d2-3805670610 .fill-B4{fill:#E3E9FD;} + .d2-3805670610 .fill-B5{fill:#EDF0FD;} + .d2-3805670610 .fill-B6{fill:#F7F8FE;} + .d2-3805670610 .fill-AA2{fill:#4A6FF3;} + .d2-3805670610 .fill-AA4{fill:#EDF0FD;} + .d2-3805670610 .fill-AA5{fill:#F7F8FE;} + .d2-3805670610 .fill-AB4{fill:#EDF0FD;} + .d2-3805670610 .fill-AB5{fill:#F7F8FE;} + .d2-3805670610 .stroke-N1{stroke:#0A0F25;} + .d2-3805670610 .stroke-N2{stroke:#676C7E;} + .d2-3805670610 .stroke-N3{stroke:#9499AB;} + .d2-3805670610 .stroke-N4{stroke:#CFD2DD;} + .d2-3805670610 .stroke-N5{stroke:#DEE1EB;} + .d2-3805670610 .stroke-N6{stroke:#EEF1F8;} + .d2-3805670610 .stroke-N7{stroke:#FFFFFF;} + .d2-3805670610 .stroke-B1{stroke:#0D32B2;} + .d2-3805670610 .stroke-B2{stroke:#0D32B2;} + .d2-3805670610 .stroke-B3{stroke:#E3E9FD;} + .d2-3805670610 .stroke-B4{stroke:#E3E9FD;} + .d2-3805670610 .stroke-B5{stroke:#EDF0FD;} + .d2-3805670610 .stroke-B6{stroke:#F7F8FE;} + .d2-3805670610 .stroke-AA2{stroke:#4A6FF3;} + .d2-3805670610 .stroke-AA4{stroke:#EDF0FD;} + .d2-3805670610 .stroke-AA5{stroke:#F7F8FE;} + .d2-3805670610 .stroke-AB4{stroke:#EDF0FD;} + .d2-3805670610 .stroke-AB5{stroke:#F7F8FE;} + .d2-3805670610 .background-color-N1{background-color:#0A0F25;} + .d2-3805670610 .background-color-N2{background-color:#676C7E;} + .d2-3805670610 .background-color-N3{background-color:#9499AB;} + .d2-3805670610 .background-color-N4{background-color:#CFD2DD;} + .d2-3805670610 .background-color-N5{background-color:#DEE1EB;} + .d2-3805670610 .background-color-N6{background-color:#EEF1F8;} + .d2-3805670610 .background-color-N7{background-color:#FFFFFF;} + .d2-3805670610 .background-color-B1{background-color:#0D32B2;} + .d2-3805670610 .background-color-B2{background-color:#0D32B2;} + .d2-3805670610 .background-color-B3{background-color:#E3E9FD;} + .d2-3805670610 .background-color-B4{background-color:#E3E9FD;} + .d2-3805670610 .background-color-B5{background-color:#EDF0FD;} + .d2-3805670610 .background-color-B6{background-color:#F7F8FE;} + .d2-3805670610 .background-color-AA2{background-color:#4A6FF3;} + .d2-3805670610 .background-color-AA4{background-color:#EDF0FD;} + .d2-3805670610 .background-color-AA5{background-color:#F7F8FE;} + .d2-3805670610 .background-color-AB4{background-color:#EDF0FD;} + .d2-3805670610 .background-color-AB5{background-color:#F7F8FE;} + .d2-3805670610 .color-N1{color:#0A0F25;} + .d2-3805670610 .color-N2{color:#676C7E;} + .d2-3805670610 .color-N3{color:#9499AB;} + .d2-3805670610 .color-N4{color:#CFD2DD;} + .d2-3805670610 .color-N5{color:#DEE1EB;} + .d2-3805670610 .color-N6{color:#EEF1F8;} + .d2-3805670610 .color-N7{color:#FFFFFF;} + .d2-3805670610 .color-B1{color:#0D32B2;} + .d2-3805670610 .color-B2{color:#0D32B2;} + .d2-3805670610 .color-B3{color:#E3E9FD;} + .d2-3805670610 .color-B4{color:#E3E9FD;} + .d2-3805670610 .color-B5{color:#EDF0FD;} + .d2-3805670610 .color-B6{color:#F7F8FE;} + .d2-3805670610 .color-AA2{color:#4A6FF3;} + .d2-3805670610 .color-AA4{color:#EDF0FD;} + .d2-3805670610 .color-AA5{color:#F7F8FE;} + .d2-3805670610 .color-AB4{color:#EDF0FD;} + .d2-3805670610 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker-d2-3805670610);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker-d2-3805670610);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright-d2-3805670610);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright-d2-3805670610);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright-d2-3805670610);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright-d2-3805670610);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark-d2-3805670610);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright-d2-3805670610);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright-d2-3805670610);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright-d2-3805670610);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright-d2-3805670610);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker-d2-3805670610);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark-d2-3805670610);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal-d2-3805670610);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal-d2-3805670610);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright-d2-3805670610);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright-d2-3805670610);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright-d2-3805670610);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>abcdabcab From 5b28501fd9b92b8f80db2b1d2e0134458427a572 Mon Sep 17 00:00:00 2001 From: Mayank Mohapatra <125661248+Mayank77maruti@users.noreply.github.com> Date: Sun, 23 Feb 2025 18:35:34 +0000 Subject: [PATCH 63/73] lint try Signed-off-by: Mayank Mohapatra <125661248+Mayank77maruti@users.noreply.github.com> --- d2layouts/d2cycle/layout.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/d2layouts/d2cycle/layout.go b/d2layouts/d2cycle/layout.go index edb20e97e9..8ef08e7c8b 100644 --- a/d2layouts/d2cycle/layout.go +++ b/d2layouts/d2cycle/layout.go @@ -18,7 +18,7 @@ const ( ARC_STEPS = 100 ) -// Layout lays out the graph and computes curved edge routes. +// Layout lays out the graph and computes curved edge routes func Layout(ctx context.Context, g *d2graph.Graph, layout d2graph.LayoutGraph) error { objects := g.Root.ChildrenArray if len(objects) == 0 { From 090a225ec0b2d1320e7270285990f680ba4ddc11 Mon Sep 17 00:00:00 2001 From: Mayank Mohapatra <125661248+Mayank77maruti@users.noreply.github.com> Date: Sun, 23 Feb 2025 18:46:31 +0000 Subject: [PATCH 64/73] lint try Signed-off-by: Mayank Mohapatra <125661248+Mayank77maruti@users.noreply.github.com> --- d2graph/cyclediagram.go | 2 +- d2layouts/d2cycle/layout.go | 13 ++++++------- d2layouts/d2layouts.go | 2 +- lib/geo/point.go | 2 +- 4 files changed, 9 insertions(+), 10 deletions(-) diff --git a/d2graph/cyclediagram.go b/d2graph/cyclediagram.go index 1014dd1e81..a8f8e0b1ad 100644 --- a/d2graph/cyclediagram.go +++ b/d2graph/cyclediagram.go @@ -4,4 +4,4 @@ import "oss.terrastruct.com/d2/d2target" func (obj *Object) IsCycleDiagram() bool { return obj != nil && obj.Shape.Value == d2target.ShapeCycleDiagram -} \ No newline at end of file +} diff --git a/d2layouts/d2cycle/layout.go b/d2layouts/d2cycle/layout.go index 8ef08e7c8b..73f6635517 100644 --- a/d2layouts/d2cycle/layout.go +++ b/d2layouts/d2cycle/layout.go @@ -55,7 +55,7 @@ func positionObjects(objects []*d2graph.Object, radius float64) { angleOffset := -math.Pi / 2 for i, obj := range objects { - angle := angleOffset + (2*math.Pi*float64(i)/numObjects) + angle := angleOffset + (2 * math.Pi * float64(i) / numObjects) x := radius * math.Cos(angle) y := radius * math.Sin(angle) obj.TopLeft = geo.NewPoint( @@ -117,7 +117,7 @@ func createCircularArc(edge *d2graph.Edge) { tangentX /= mag tangentY /= mag } - const MIN_SEGMENT_LEN = 4.159 + const MIN_SEGMENT_LEN = 4.159 dx := lastPoint.X - secondLastPoint.X dy := lastPoint.Y - secondLastPoint.Y @@ -129,9 +129,9 @@ func createCircularArc(edge *d2graph.Edge) { // 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 + adjustLength := MIN_SEGMENT_LEN // Now float64 if segLength >= MIN_SEGMENT_LEN { - adjustLength = segLength // Both are float64 now + adjustLength = segLength // Both are float64 now } newSecondLastX := lastPoint.X - tangentX*adjustLength newSecondLastY := lastPoint.Y - tangentY*adjustLength @@ -141,7 +141,6 @@ func createCircularArc(edge *d2graph.Edge) { } } - // clampPointOutsideBox walks forward along the path until it finds a point outside the box, // then replaces the point with a precise intersection. func clampPointOutsideBox(box *geo.Box, path []*geo.Point, startIdx int) (int, *geo.Point) { @@ -163,7 +162,7 @@ func clampPointOutsideBox(box *geo.Box, path []*geo.Point, startIdx int) (int, * } return i, path[i] } - return len(path)-1, path[len(path)-1] + return len(path) - 1, path[len(path)-1] } // clampPointOutsideBoxReverse works similarly but in reverse order. @@ -326,4 +325,4 @@ func positionLabelsIcons(obj *d2graph.Object) { } } } -} \ No newline at end of file +} diff --git a/d2layouts/d2layouts.go b/d2layouts/d2layouts.go index d4dc1ad812..7e813953aa 100644 --- a/d2layouts/d2layouts.go +++ b/d2layouts/d2layouts.go @@ -267,7 +267,7 @@ func LayoutNested(ctx context.Context, g *d2graph.Graph, graphInfo GraphInfo, co err = d2cycle.Layout(ctx, g, coreLayout) if err != nil { return err - } + } default: log.Debug(ctx, "default layout", slog.Any("rootlevel", g.RootLevel), slog.Any("shapes", g.PrintString())) err := coreLayout(ctx, g) diff --git a/lib/geo/point.go b/lib/geo/point.go index 47882bb181..8883010ccb 100644 --- a/lib/geo/point.go +++ b/lib/geo/point.go @@ -331,4 +331,4 @@ func (v Vector) Normalize() Vector { return Vector{0, 0} } return Vector{v[0] / length, v[1] / length} -} \ No newline at end of file +} From 564c1f8edf322e8e5c372215c32f06bc5481f5c6 Mon Sep 17 00:00:00 2001 From: Mayank Mohapatra <125661248+Mayank77maruti@users.noreply.github.com> Date: Wed, 26 Feb 2025 04:12:19 +0000 Subject: [PATCH 65/73] try Signed-off-by: Mayank Mohapatra <125661248+Mayank77maruti@users.noreply.github.com> --- .emptyAllowedSigners | 0 d2layouts/d2cycle/layout.go | 334 ++- .../txtar/cycle-diagram/dagre/board.exp.json | 2272 +++++++++-------- .../txtar/cycle-diagram/dagre/sketch.exp.svg | 170 +- .../txtar/cycle-diagram/elk/board.exp.json | 2272 +++++++++-------- .../txtar/cycle-diagram/elk/sketch.exp.svg | 170 +- 6 files changed, 2902 insertions(+), 2316 deletions(-) create mode 100644 .emptyAllowedSigners diff --git a/.emptyAllowedSigners b/.emptyAllowedSigners new file mode 100644 index 0000000000..e69de29bb2 diff --git a/d2layouts/d2cycle/layout.go b/d2layouts/d2cycle/layout.go index 73f6635517..c3354fcae7 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] - - tangentX := -lastPoint.Y - tangentY := lastPoint.X - mag := math.Hypot(tangentX, tangentY) - if mag > 0 { - tangentX /= mag - tangentY /= mag - } - const MIN_SEGMENT_LEN = 4.159 - - dx := lastPoint.X - secondLastPoint.X - dy := lastPoint.Y - secondLastPoint.Y - segLength := math.Hypot(dx, dy) - if segLength > 0 { - currentDirX := dx / segLength - currentDirY := dy / segLength - - // 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) - } + adjustArrowDirection(edge) + } +} + +// 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 +} + +// 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] + + // 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 83148b1acd..d6a55bd46c 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": 223.8699951171875, + "y": 85.6449966430664 }, { - "x": 197.02099609375, - "y": 34.3849983215332 + "x": 221.2449951171875, + "y": 88.59500122070312 }, { - "x": 196.45700073242188, - "y": 37.47600173950195 + "x": 218.44700622558594, + "y": 91.65299987792969 }, { - "x": 195.843994140625, - "y": 40.55699920654297 + "x": 215.63499450683594, + "y": 94.63800048828125 }, { - "x": 195.18299865722656, - "y": 43.62799835205078 + "x": 212.81300354003906, + "y": 97.552001953125 }, { - "x": 194.47300720214844, - "y": 46.68899917602539 + "x": 209.98300170898438, + "y": 100.3949966430664 }, { - "x": 193.71600341796875, - "y": 49.73699951171875 + "x": 207.1490020751953, + "y": 103.16999816894531 }, { - "x": 192.91099548339844, - "y": 52.77399826049805 + "x": 204.31500244140625, + "y": 105.87699890136719 }, { - "x": 192.05799865722656, - "y": 55.79800033569336 + "x": 201.48300170898438, + "y": 108.5199966430664 }, { - "x": 191.1580047607422, - "y": 58.80799865722656 + "x": 198.65699768066406, + "y": 111.0989990234375 }, { - "x": 190.21099853515625, - "y": 61.803001403808594 + "x": 195.83999633789062, + "y": 113.61599731445312 }, { - "x": 189.2169952392578, - "y": 64.78299713134766 + "x": 193.03500366210938, + "y": 116.07499694824219 }, { - "x": 188.17599487304688, - "y": 67.74700164794922 + "x": 190.2429962158203, + "y": 118.47599792480469 }, { - "x": 187.08799743652344, - "y": 70.69400024414062 + "x": 187.468994140625, + "y": 120.822998046875 }, { - "x": 185.9550018310547, - "y": 73.6240005493164 + "x": 184.71299743652344, + "y": 123.11799621582031 }, { - "x": 184.77499389648438, - "y": 76.53600311279297 + "x": 181.97900390625, + "y": 125.36399841308594 }, { - "x": 183.5500030517578, - "y": 79.42900085449219 + "x": 179.26800537109375, + "y": 127.56199645996094 }, { - "x": 182.27999877929688, - "y": 82.302001953125 + "x": 176.58299255371094, + "y": 129.7169952392578 }, { - "x": 180.96499633789062, - "y": 85.15499877929688 + "x": 173.9250030517578, + "y": 131.8300018310547 }, { - "x": 179.60499572753906, - "y": 87.98699951171875 + "x": 171.2949981689453, + "y": 133.9040069580078 }, { - "x": 178.2010040283203, - "y": 90.7979965209961 + "x": 168.6959991455078, + "y": 135.94200134277344 }, { - "x": 176.7530059814453, - "y": 93.58499908447266 + "x": 166.1280059814453, + "y": 137.947998046875 }, { - "x": 175.26100158691406, - "y": 96.3499984741211 + "x": 163.59300231933594, + "y": 139.9239959716797 }, { - "x": 173.7259979248047, - "y": 99.09100341796875 + "x": 161.09100341796875, + "y": 141.87399291992188 }, { - "x": 172.1479949951172, - "y": 101.80799865722656 + "x": 158.6230010986328, + "y": 143.7989959716797 }, { - "x": 170.5279998779297, - "y": 104.4990005493164 + "x": 156.19000244140625, + "y": 145.7030029296875 }, { - "x": 168.86500549316406, - "y": 107.16500091552734 + "x": 153.79299926757812, + "y": 147.58999633789062 }, { - "x": 167.16099548339844, - "y": 109.80400085449219 + "x": 151.42999267578125, + "y": 149.46200561523438 }, { - "x": 165.41600036621094, - "y": 112.41600036621094 + "x": 149.10299682617188, + "y": 151.32200622558594 }, { - "x": 163.62899780273438, - "y": 115.0009994506836 + "x": 146.81199645996094, + "y": 153.17300415039062 }, { - "x": 161.80299377441406, - "y": 117.55699920654297 + "x": 144.55599975585938, + "y": 155.0189971923828 }, { - "x": 159.93600463867188, - "y": 120.08399963378906 + "x": 142.33399963378906, + "y": 156.86099243164062 }, { - "x": 158.031005859375, - "y": 122.58100128173828 + "x": 140.14700317382812, + "y": 158.7030029296875 }, { - "x": 156.08599853515625, - "y": 125.0479965209961 + "x": 137.9929962158203, + "y": 160.54800415039062 }, { - "x": 154.1020050048828, - "y": 127.48400115966797 + "x": 135.87100219726562, + "y": 162.39700317382812 }, { - "x": 152.08099365234375, - "y": 129.88900756835938 + "x": 133.77999877929688, + "y": 164.2550048828125 }, { - "x": 150.02200317382812, - "y": 132.26199340820312 + "x": 131.72000122070312, + "y": 166.1230010986328 }, { - "x": 147.92599487304688, - "y": 134.6020050048828 + "x": 129.68800354003906, + "y": 168.0050048828125 }, { - "x": 145.79299926757812, - "y": 136.90899658203125 + "x": 127.68299865722656, + "y": 169.9010009765625 }, { - "x": 143.625, - "y": 139.1820068359375 + "x": 125.7040023803711, + "y": 171.81500244140625 }, { - "x": 141.42100524902344, - "y": 141.42100524902344 + "x": 123.7490005493164, + "y": 173.74899291992188 }, { - "x": 139.1820068359375, - "y": 143.625 + "x": 121.81500244140625, + "y": 175.70399475097656 }, { - "x": 136.90899658203125, - "y": 145.79299926757812 + "x": 119.9010009765625, + "y": 177.68299865722656 }, { - "x": 134.6020050048828, - "y": 147.92599487304688 + "x": 118.00499725341797, + "y": 179.68800354003906 }, { - "x": 132.26199340820312, - "y": 150.02200317382812 + "x": 116.12300109863281, + "y": 181.72000122070312 }, { - "x": 129.88900756835938, - "y": 152.08099365234375 + "x": 114.25499725341797, + "y": 183.77999877929688 }, { - "x": 127.48400115966797, - "y": 154.1020050048828 + "x": 112.39700317382812, + "y": 185.87100219726562 }, { - "x": 125.0479965209961, - "y": 156.08599853515625 + "x": 110.5479965209961, + "y": 187.9929962158203 }, { - "x": 122.58100128173828, - "y": 158.031005859375 + "x": 108.7030029296875, + "y": 190.14700317382812 }, { - "x": 120.08399963378906, - "y": 159.93600463867188 + "x": 106.86100006103516, + "y": 192.33399963378906 }, { - "x": 117.55699920654297, - "y": 161.80299377441406 + "x": 105.01899719238281, + "y": 194.55599975585938 }, { - "x": 115.0009994506836, - "y": 163.62899780273438 + "x": 103.1729965209961, + "y": 196.81199645996094 }, { - "x": 112.41600036621094, - "y": 165.41600036621094 + "x": 101.3219985961914, + "y": 199.10299682617188 }, { - "x": 109.80400085449219, - "y": 167.16099548339844 + "x": 99.46199798583984, + "y": 201.42999267578125 }, { - "x": 107.16500091552734, - "y": 168.86500549316406 + "x": 97.58999633789062, + "y": 203.79299926757812 }, { - "x": 104.4990005493164, - "y": 170.5279998779297 + "x": 95.7030029296875, + "y": 206.19000244140625 }, { - "x": 101.80799865722656, - "y": 172.1479949951172 + "x": 93.79900360107422, + "y": 208.6230010986328 }, { - "x": 99.09100341796875, - "y": 173.7259979248047 + "x": 91.8740005493164, + "y": 211.09100341796875 }, { - "x": 96.3499984741211, - "y": 175.26100158691406 + "x": 89.92400360107422, + "y": 213.59300231933594 }, { - "x": 93.58499908447266, - "y": 176.7530059814453 + "x": 87.947998046875, + "y": 216.1280059814453 }, { - "x": 90.7979965209961, - "y": 178.2010040283203 + "x": 85.94200134277344, + "y": 218.6959991455078 }, { - "x": 87.98699951171875, - "y": 179.60499572753906 + "x": 83.90399932861328, + "y": 221.2949981689453 }, { - "x": 85.15499877929688, - "y": 180.96499633789062 + "x": 81.83000183105469, + "y": 223.9250030517578 }, { - "x": 82.302001953125, - "y": 182.27999877929688 + "x": 79.71700286865234, + "y": 226.58299255371094 }, { - "x": 79.42900085449219, - "y": 183.5500030517578 + "x": 77.56199645996094, + "y": 229.26800537109375 }, { - "x": 76.53600311279297, - "y": 184.77499389648438 + "x": 75.36399841308594, + "y": 231.97900390625 }, { - "x": 73.6240005493164, - "y": 185.9550018310547 + "x": 73.11799621582031, + "y": 234.71299743652344 }, { - "x": 70.69400024414062, - "y": 187.08799743652344 + "x": 70.822998046875, + "y": 237.468994140625 }, { - "x": 67.74700164794922, - "y": 188.17599487304688 + "x": 68.47599792480469, + "y": 240.2429962158203 }, { - "x": 64.78299713134766, - "y": 189.2169952392578 + "x": 66.07499694824219, + "y": 243.03500366210938 }, { - "x": 61.803001403808594, - "y": 190.21099853515625 + "x": 63.61600112915039, + "y": 245.83999633789062 }, { - "x": 58.80799865722656, - "y": 191.1580047607422 + "x": 61.0989990234375, + "y": 248.65699768066406 }, { - "x": 55.79800033569336, - "y": 192.05799865722656 + "x": 58.52000045776367, + "y": 251.48300170898438 }, { - "x": 52.77399826049805, - "y": 192.91099548339844 + "x": 55.87699890136719, + "y": 254.31500244140625 }, { - "x": 49.73699951171875, - "y": 193.71600341796875 + "x": 53.16999816894531, + "y": 257.14898681640625 }, { - "x": 46.68899917602539, - "y": 194.47300720214844 + "x": 50.39500045776367, + "y": 259.9830017089844 }, { - "x": 43.62799835205078, - "y": 195.18299865722656 + "x": 47.551998138427734, + "y": 262.81298828125 }, { - "x": 40.55699920654297, - "y": 195.843994140625 + "x": 44.63800048828125, + "y": 265.635009765625 }, { - "x": 37.47600173950195, - "y": 196.45700073242188 + "x": 41.65299987792969, + "y": 268.4469909667969 }, { - "x": 34.3849983215332, - "y": 197.02099609375 + "x": 38.595001220703125, + "y": 271.2449951171875 }, { - "x": 31.285999298095703, - "y": 197.53700256347656 + "x": 35.4640007019043, + "y": 274.0249938964844 }, { - "x": 30.621999740600586, - "y": 197.6790008544922 + "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": 696.72998046875, + "y": -113.11100006103516 + }, + { + "x": 699.8499755859375, + "y": -109.61100006103516 + }, + { + "x": 702.8800048828125, + "y": -106.1050033569336 + }, + { + "x": 705.823974609375, + "y": -102.59600067138672 }, { - "x": 616.60498046875, - "y": -121.0719985961914 + "x": 708.6840209960938, + "y": -99.08599853515625 }, { - "x": 620.1649780273438, - "y": -118.86499786376953 + "x": 711.4639892578125, + "y": -95.5790023803711 }, { - "x": 623.677978515625, - "y": -116.58399963378906 + "x": 714.166015625, + "y": -92.0770034790039 }, { - "x": 627.1420288085938, - "y": -114.22899627685547 + "x": 716.7940063476562, + "y": -88.58399963378906 }, { - "x": 630.5570068359375, - "y": -111.8030014038086 + "x": 719.3510131835938, + "y": -85.0999984741211 }, { - "x": 633.9190063476562, - "y": -109.30500030517578 + "x": 721.8400268554688, + "y": -81.62799835205078 }, { - "x": 637.22900390625, - "y": -106.73799896240234 + "x": 724.2659912109375, + "y": -78.16899871826172 }, { - "x": 640.4840087890625, - "y": -104.10199737548828 + "x": 726.6309814453125, + "y": -74.72699737548828 }, { - "x": 643.6840209960938, - "y": -101.39900207519531 + "x": 728.9390258789062, + "y": -71.30000305175781 }, { - "x": 646.8259887695312, - "y": -98.62799835205078 + "x": 731.1939697265625, + "y": -67.89099884033203 }, { - "x": 649.9089965820312, - "y": -95.79299926757812 + "x": 733.3980102539062, + "y": -64.5009994506836 }, { - "x": 652.9320068359375, - "y": -92.89399719238281 + "x": 735.5560302734375, + "y": -61.130001068115234 }, { - "x": 655.8939819335938, - "y": -89.93199920654297 + "x": 737.6719970703125, + "y": -57.777000427246094 }, { - "x": 658.7930297851562, - "y": -86.90899658203125 + "x": 739.7470092773438, + "y": -54.444000244140625 }, { - "x": 661.6279907226562, - "y": -83.82599639892578 + "x": 741.7869873046875, + "y": -51.130001068115234 }, { - "x": 664.3989868164062, - "y": -80.68399810791016 + "x": 743.7940063476562, + "y": -47.834999084472656 }, { - "x": 667.1019897460938, - "y": -77.48400115966797 + "x": 745.77099609375, + "y": -44.55799865722656 }, { - "x": 669.7379760742188, - "y": -74.22899627685547 + "x": 747.7219848632812, + "y": -41.29800033569336 }, { - "x": 672.3049926757812, - "y": -70.91899871826172 + "x": 749.6500244140625, + "y": -38.05400085449219 }, { - "x": 674.802978515625, - "y": -67.55699920654297 + "x": 751.5570068359375, + "y": -34.82600021362305 }, { - "x": 677.22900390625, - "y": -64.14199829101562 + "x": 753.447021484375, + "y": -31.611000061035156 }, { - "x": 679.583984375, - "y": -60.678001403808594 + "x": 755.3209838867188, + "y": -28.406999588012695 }, { - "x": 681.864990234375, - "y": -57.165000915527344 + "x": 757.1840209960938, + "y": -25.214000701904297 }, { - "x": 684.072021484375, - "y": -53.60499954223633 + "x": 759.0360107421875, + "y": -22.02899932861328 }, { - "x": 686.2050170898438, - "y": -50 + "x": 760.8800048828125, + "y": -18.849000930786133 }, { - "x": 688.260986328125, - "y": -46.349998474121094 + "x": 762.718994140625, + "y": -15.673999786376953 }, { - "x": 690.239990234375, - "y": -42.659000396728516 + "x": 764.552978515625, + "y": -12.49899959564209 }, { - "x": 692.1420288085938, - "y": -38.926998138427734 + "x": 766.385009765625, + "y": -9.322999954223633 }, { - "x": 693.9650268554688, - "y": -35.154998779296875 + "x": 768.2160034179688, + "y": -6.14300012588501 }, { - "x": 695.708984375, - "y": -31.347000122070312 + "x": 770.0479736328125, + "y": -2.9560000896453857 }, { - "x": 697.3720092773438, - "y": -27.503000259399414 + "x": 771.8800048828125, + "y": 0.23999999463558197 }, { - "x": 698.9550170898438, - "y": -23.624000549316406 + "x": 773.7139892578125, + "y": 3.4489998817443848 }, { - "x": 700.4559936523438, - "y": -19.714000701904297 + "x": 775.551025390625, + "y": 6.673999786376953 }, { - "x": 701.875, - "y": -15.77299976348877 + "x": 777.3909912109375, + "y": 9.918000221252441 }, { - "x": 703.2109985351562, - "y": -11.803000450134277 + "x": 779.2329711914062, + "y": 13.184000015258789 }, { - "x": 704.4630126953125, - "y": -7.806000232696533 + "x": 781.0780029296875, + "y": 16.47599983215332 }, { - "x": 705.6320190429688, - "y": -3.7829999923706055 + "x": 782.926025390625, + "y": 19.795000076293945 }, { - "x": 706.7160034179688, - "y": 0.2619999945163727 + "x": 784.7750244140625, + "y": 23.145999908447266 }, { - "x": 707.7150268554688, - "y": 4.328999996185303 + "x": 786.6259765625, + "y": 26.531999588012695 }, { - "x": 708.6290283203125, - "y": 8.416999816894531 + "x": 788.4760131835938, + "y": 29.954999923706055 }, { - "x": 709.4569702148438, - "y": 12.52299976348877 + "x": 790.323974609375, + "y": 33.41899871826172 }, { - "x": 710.198974609375, - "y": 16.645999908447266 + "x": 792.1699829101562, + "y": 36.926998138427734 }, { - "x": 710.85400390625, - "y": 20.783000946044922 + "x": 794.010986328125, + "y": 40.481998443603516 }, { - "x": 711.4219970703125, - "y": 24.933000564575195 + "x": 795.844970703125, + "y": 44.08599853515625 }, { - "x": 711.9039916992188, - "y": 29.0939998626709 + "x": 797.6690063476562, + "y": 47.74300003051758 }, { - "x": 712.2979736328125, - "y": 33.263999938964844 + "x": 799.4829711914062, + "y": 51.45500183105469 }, { - "x": 712.60498046875, - "y": 37.441001892089844 + "x": 801.281982421875, + "y": 55.224998474121094 }, { - "x": 712.823974609375, - "y": 41.624000549316406 + "x": 803.0640258789062, + "y": 59.05500030517578 }, { - "x": 712.9559936523438, - "y": 45.81100082397461 + "x": 804.8259887695312, + "y": 62.946998596191406 }, { - "x": 713, - "y": 50 + "x": 806.5650024414062, + "y": 66.90299987792969 }, { - "x": 712.9559936523438, - "y": 54.1879997253418 + "x": 808.2760009765625, + "y": 70.9260025024414 }, { - "x": 712.823974609375, - "y": 58.375 + "x": 809.9580078125, + "y": 75.01699829101562 }, { - "x": 712.60498046875, - "y": 62.55799865722656 + "x": 811.60498046875, + "y": 79.1780014038086 }, { - "x": 712.2979736328125, - "y": 66.73500061035156 + "x": 813.2150268554688, + "y": 83.41000366210938 }, { - "x": 711.9039916992188, - "y": 70.90499877929688 + "x": 814.781982421875, + "y": 87.71399688720703 }, { - "x": 711.4219970703125, - "y": 75.06600189208984 + "x": 816.302978515625, + "y": 92.09100341796875 }, { - "x": 710.85400390625, - "y": 79.21600341796875 + "x": 817.7739868164062, + "y": 96.54199981689453 }, { - "x": 710.198974609375, - "y": 83.35299682617188 + "x": 819.1890258789062, + "y": 101.06800079345703 }, { - "x": 709.4569702148438, - "y": 87.47599792480469 + "x": 820.5460205078125, + "y": 105.66799926757812 }, { - "x": 708.6290283203125, - "y": 91.58200073242188 + "x": 821.8380126953125, + "y": 110.34300231933594 }, { - "x": 707.7150268554688, - "y": 95.66999816894531 + "x": 823.0609741210938, + "y": 115.09300231933594 }, { - "x": 706.7160034179688, - "y": 99.73699951171875 + "x": 824.2119750976562, + "y": 119.91600036621094 }, { - "x": 705.6320190429688, - "y": 103.78299713134766 + "x": 825.2839965820312, + "y": 124.81300354003906 }, { - "x": 704.4630126953125, - "y": 107.80599975585938 + "x": 826.2730102539062, + "y": 129.78199768066406 }, { - "x": 703.2109985351562, - "y": 111.8030014038086 + "x": 827.1749877929688, + "y": 134.82200622558594 }, { - "x": 702.8259887695312, - "y": 113.08100128173828 + "x": 827.9840087890625, + "y": 139.93099975585938 }, { - "x": 701.4329833984375, - "y": 116.9990005493164 + "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": 613, - "y": 223.2050018310547 + "x": 752.7520141601562, + "y": 236.8719940185547 + }, + { + "x": 748.0269775390625, + "y": 238.18699645996094 }, { - "x": 609.3499755859375, - "y": 225.26100158691406 + "x": 743.3330078125, + "y": 239.40499877929688 }, { - "x": 605.6589965820312, - "y": 227.24000549316406 + "x": 738.6699829101562, + "y": 240.531005859375 }, { - "x": 601.927001953125, - "y": 229.14199829101562 + "x": 734.0430297851562, + "y": 241.5679931640625 }, { - "x": 598.155029296875, - "y": 230.96499633789062 + "x": 729.4530029296875, + "y": 242.52000427246094 }, { - "x": 594.3469848632812, - "y": 232.70899963378906 + "x": 724.9019775390625, + "y": 243.39100646972656 }, { - "x": 590.5029907226562, - "y": 234.3719940185547 + "x": 720.3900146484375, + "y": 244.18600463867188 }, { - "x": 586.6240234375, - "y": 235.9550018310547 + "x": 715.9210205078125, + "y": 244.9080047607422 }, { - "x": 582.7139892578125, - "y": 237.45599365234375 + "x": 711.4940185546875, + "y": 245.56199645996094 }, { - "x": 578.7730102539062, - "y": 238.875 + "x": 707.1099853515625, + "y": 246.1510009765625 }, { - "x": 574.802978515625, - "y": 240.21099853515625 + "x": 702.77001953125, + "y": 246.67999267578125 }, { - "x": 570.8060302734375, - "y": 241.46299743652344 + "x": 698.4749755859375, + "y": 247.1529998779297 }, { - "x": 566.7830200195312, - "y": 242.6320037841797 + "x": 694.2230224609375, + "y": 247.572998046875 }, { - "x": 562.7369995117188, - "y": 243.71600341796875 + "x": 690.0150146484375, + "y": 247.94400024414062 }, { - "x": 558.6699829101562, - "y": 244.71499633789062 + "x": 685.8510131835938, + "y": 248.27099609375 }, { - "x": 554.5819702148438, - "y": 245.62899780273438 + "x": 681.72998046875, + "y": 248.5570068359375 }, { - "x": 550.4760131835938, - "y": 246.45700073242188 + "x": 677.6500244140625, + "y": 248.80499267578125 }, { - "x": 546.35302734375, - "y": 247.19900512695312 + "x": 673.6119995117188, + "y": 249.0189971923828 }, { - "x": 542.2160034179688, - "y": 247.85400390625 + "x": 669.6129760742188, + "y": 249.20199584960938 }, { - "x": 538.0659790039062, - "y": 248.4219970703125 + "x": 665.6519775390625, + "y": 249.35800170898438 }, { - "x": 533.905029296875, - "y": 248.9040069580078 + "x": 661.72802734375, + "y": 249.48899841308594 }, { - "x": 529.7349853515625, - "y": 249.29800415039062 + "x": 657.8380126953125, + "y": 249.59800720214844 }, { - "x": 525.5579833984375, - "y": 249.60499572753906 + "x": 653.9810180664062, + "y": 249.68800354003906 }, { - "x": 521.375, - "y": 249.82400512695312 + "x": 650.1539916992188, + "y": 249.76199340820312 }, { - "x": 517.18798828125, - "y": 249.95599365234375 + "x": 646.3560180664062, + "y": 249.82200622558594 }, { - "x": 513, - "y": 250 + "x": 642.5830078125, + "y": 249.8699951171875 }, { - "x": 508.8110046386719, - "y": 249.95599365234375 + "x": 638.8330078125, + "y": 249.90699768066406 }, { - "x": 504.6239929199219, - "y": 249.82400512695312 + "x": 635.10400390625, + "y": 249.93600463867188 }, { - "x": 500.4410095214844, - "y": 249.60499572753906 + "x": 631.3920288085938, + "y": 249.95799255371094 }, { - "x": 496.2640075683594, - "y": 249.29800415039062 + "x": 627.6959838867188, + "y": 249.9739990234375 }, { - "x": 492.093994140625, - "y": 248.9040069580078 + "x": 624.010986328125, + "y": 249.98500061035156 }, { - "x": 487.9330139160156, - "y": 248.4219970703125 + "x": 620.3350219726562, + "y": 249.9929962158203 }, { - "x": 483.7829895019531, - "y": 247.85400390625 + "x": 616.666015625, + "y": 249.9969940185547 }, { - "x": 479.64599609375, - "y": 247.19900512695312 + "x": 613, + "y": 249.99899291992188 }, { - "x": 475.52301025390625, - "y": 246.45700073242188 + "x": 609.3330078125, + "y": 249.9969940185547 }, { - "x": 471.4169921875, - "y": 245.62899780273438 + "x": 605.6640014648438, + "y": 249.9929962158203 }, { - "x": 467.3290100097656, - "y": 244.71499633789062 + "x": 601.9879760742188, + "y": 249.98500061035156 }, { - "x": 463.2619934082031, - "y": 243.71600341796875 + "x": 598.302978515625, + "y": 249.9739990234375 }, { - "x": 459.21600341796875, - "y": 242.6320037841797 + "x": 594.6069946289062, + "y": 249.95799255371094 }, { - "x": 455.1929931640625, - "y": 241.46299743652344 + "x": 590.89501953125, + "y": 249.93600463867188 }, { - "x": 451.1960144042969, - "y": 240.21099853515625 + "x": 587.166015625, + "y": 249.90699768066406 }, { - "x": 447.22601318359375, - "y": 238.875 + "x": 583.416015625, + "y": 249.8699951171875 }, { - "x": 443.2850036621094, - "y": 237.45599365234375 + "x": 579.6430053710938, + "y": 249.82200622558594 }, { - "x": 439.375, - "y": 235.9550018310547 + "x": 575.844970703125, + "y": 249.76199340820312 }, { - "x": 435.4960021972656, - "y": 234.3719940185547 + "x": 572.0180053710938, + "y": 249.68800354003906 }, { - "x": 431.6520080566406, - "y": 232.70899963378906 + "x": 568.1610107421875, + "y": 249.59800720214844 }, { - "x": 427.843994140625, - "y": 230.96499633789062 + "x": 564.27099609375, + "y": 249.48899841308594 }, { - "x": 424.0719909667969, - "y": 229.14199829101562 + "x": 560.3469848632812, + "y": 249.35800170898438 }, { - "x": 420.3399963378906, - "y": 227.24000549316406 + "x": 556.385986328125, + "y": 249.20199584960938 }, { - "x": 416.64898681640625, - "y": 225.26100158691406 + "x": 552.3870239257812, + "y": 249.0189971923828 }, { - "x": 413, - "y": 223.2050018310547 + "x": 548.3489990234375, + "y": 248.80499267578125 }, { - "x": 409.3940124511719, - "y": 221.07200622558594 + "x": 544.2689819335938, + "y": 248.5570068359375 }, { - "x": 405.8340148925781, - "y": 218.86500549316406 + "x": 540.1480102539062, + "y": 248.27099609375 }, { - "x": 402.3210144042969, - "y": 216.58399963378906 + "x": 535.9840087890625, + "y": 247.94400024414062 }, { - "x": 398.85699462890625, - "y": 214.22900390625 + "x": 531.7760009765625, + "y": 247.572998046875 }, { - "x": 395.4419860839844, - "y": 211.80299377441406 + "x": 527.5239868164062, + "y": 247.1529998779297 }, { - "x": 392.0799865722656, - "y": 209.30499267578125 + "x": 523.22900390625, + "y": 246.67999267578125 }, { - "x": 388.7699890136719, - "y": 206.73800659179688 + "x": 518.8889770507812, + "y": 246.1510009765625 }, { - "x": 385.5150146484375, - "y": 204.1020050048828 + "x": 514.5050048828125, + "y": 245.56199645996094 }, { - "x": 382.31500244140625, - "y": 201.3990020751953 + "x": 510.0780029296875, + "y": 244.9080047607422 }, { - "x": 379.1730041503906, - "y": 198.6280059814453 + "x": 505.6090087890625, + "y": 244.18600463867188 }, { - "x": 376.0899963378906, - "y": 195.79299926757812 + "x": 501.09698486328125, + "y": 243.39100646972656 }, { - "x": 373.0669860839844, - "y": 192.8939971923828 + "x": 496.5459899902344, + "y": 242.52000427246094 }, { - "x": 370.1050109863281, - "y": 189.9320068359375 + "x": 491.95599365234375, + "y": 241.5679931640625 }, { - "x": 367.20599365234375, - "y": 186.90899658203125 + "x": 487.3290100097656, + "y": 240.531005859375 }, { - "x": 366.4079895019531, - "y": 186.1060028076172 + "x": 482.6659851074219, + "y": 239.40499877929688 }, { - "x": 363.6419982910156, - "y": 183 + "x": 477.97198486328125, + "y": 238.18699645996094 + }, + { + "x": 473.24700927734375, + "y": 236.8719940185547 + }, + { + "x": 468.4939880371094, + "y": 235.45599365234375 + }, + { + "x": 463.7170104980469, + "y": 233.93600463867188 + }, + { + "x": 458.91900634765625, + "y": 232.30799865722656 + }, + { + "x": 454.10400390625, + "y": 230.56900024414062 + }, + { + "x": 449.2749938964844, + "y": 228.71600341796875 + }, + { + "x": 444.43499755859375, + "y": 226.74400329589844 + }, + { + "x": 439.5899963378906, + "y": 224.6510009765625 + }, + { + "x": 434.7430114746094, + "y": 222.43499755859375 + }, + { + "x": 429.8999938964844, + "y": 220.0919952392578 + }, + { + "x": 425.0639953613281, + "y": 217.6199951171875 + }, + { + "x": 420.24200439453125, + "y": 215.01600646972656 + }, + { + "x": 415.43701171875, + "y": 212.2790069580078 + }, + { + "x": 410.6549987792969, + "y": 209.40699768066406 + }, + { + "x": 405.9020080566406, + "y": 206.3979949951172 + }, + { + "x": 387.3290100097656, + "y": 225.91799926757812 + }, + { + "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": 1253.9620361328125, + "y": -251.71200561523438 + }, + { + "x": 1260.3609619140625, + "y": -244.74899291992188 }, { - "x": 1003.2860107421875, - "y": -197.53700256347656 + "x": 1267.8199462890625, + "y": -241.8090057373047 }, { - "x": 1009.4760131835938, - "y": -196.45700073242188 + "x": 1275.1109619140625, + "y": -238.64999389648438 }, { - "x": 1015.6279907226562, - "y": -195.18299865722656 + "x": 1282.22802734375, + "y": -235.28399658203125 }, { - "x": 1021.7369995117188, - "y": -193.71600341796875 + "x": 1289.1650390625, + "y": -231.72000122070312 }, { - "x": 1027.7979736328125, - "y": -192.05799865722656 + "x": 1295.9189453125, + "y": -227.96800231933594 }, { - "x": 1033.802978515625, - "y": -190.21099853515625 + "x": 1302.4859619140625, + "y": -224.03799438476562 }, { - "x": 1039.7469482421875, - "y": -188.17599487304688 + "x": 1308.8609619140625, + "y": -219.94000244140625 }, { - "x": 1045.6240234375, - "y": -185.9550018310547 + "x": 1315.04296875, + "y": -215.68499755859375 }, { - "x": 1051.428955078125, - "y": -183.5500030517578 + "x": 1321.029052734375, + "y": -211.28199768066406 }, { - "x": 1057.155029296875, - "y": -180.96499633789062 + "x": 1326.8170166015625, + "y": -206.74099731445312 }, { - "x": 1062.7979736328125, - "y": -178.2010040283203 + "x": 1332.406982421875, + "y": -202.07200622558594 }, { - "x": 1068.3499755859375, - "y": -175.26100158691406 + "x": 1337.7979736328125, + "y": -197.28500366210938 }, { - "x": 1073.8079833984375, - "y": -172.1479949951172 + "x": 1342.989013671875, + "y": -192.38800048828125 }, { - "x": 1079.1650390625, - "y": -168.86500549316406 + "x": 1347.9820556640625, + "y": -187.39100646972656 }, { - "x": 1084.416015625, - "y": -165.41600036621094 + "x": 1352.7760009765625, + "y": -182.30299377441406 }, { - "x": 1089.5570068359375, - "y": -161.80299377441406 + "x": 1357.3740234375, + "y": -177.1320037841797 }, { - "x": 1094.5810546875, - "y": -158.031005859375 + "x": 1361.7769775390625, + "y": -171.88600158691406 }, { - "x": 1099.4840087890625, - "y": -154.1020050048828 + "x": 1365.9859619140625, + "y": -166.57400512695312 }, { - "x": 1104.261962890625, - "y": -150.02200317382812 + "x": 1370.0050048828125, + "y": -161.2030029296875 }, { - "x": 1108.9090576171875, - "y": -145.79299926757812 + "x": 1373.8360595703125, + "y": -155.781005859375 }, { - "x": 1113.4210205078125, - "y": -141.42100524902344 + "x": 1377.4820556640625, + "y": -150.31300354003906 }, { - "x": 1117.79296875, - "y": -136.90899658203125 + "x": 1380.946044921875, + "y": -144.80799865722656 }, { - "x": 1122.02197265625, - "y": -132.26199340820312 + "x": 1384.2330322265625, + "y": -139.27000427246094 }, { - "x": 1126.10205078125, - "y": -127.48400115966797 + "x": 1387.343994140625, + "y": -133.7050018310547 }, { - "x": 1130.031005859375, - "y": -122.58100128173828 + "x": 1390.2860107421875, + "y": -128.11900329589844 }, { - "x": 1133.802978515625, - "y": -117.55699920654297 + "x": 1393.06005859375, + "y": -122.51699829101562 }, { - "x": 1137.416015625, - "y": -112.41600036621094 + "x": 1395.6729736328125, + "y": -116.9020004272461 }, { - "x": 1140.864990234375, - "y": -107.16500091552734 + "x": 1398.126953125, + "y": -111.27999877929688 }, { - "x": 1144.14794921875, - "y": -101.80799865722656 + "x": 1400.427978515625, + "y": -105.65299987792969 }, { - "x": 1147.260986328125, - "y": -96.3499984741211 + "x": 1402.5780029296875, + "y": -100.0260009765625 }, { - "x": 1150.2010498046875, - "y": -90.7979965209961 + "x": 1404.583984375, + "y": -94.39900207519531 }, { - "x": 1152.9649658203125, - "y": -85.15499877929688 + "x": 1406.447998046875, + "y": -88.7770004272461 }, { - "x": 1155.550048828125, - "y": -79.42900085449219 + "x": 1408.176025390625, + "y": -83.16100311279297 }, { - "x": 1157.9549560546875, - "y": -73.6240005493164 + "x": 1409.77099609375, + "y": -77.552001953125 }, { - "x": 1160.176025390625, - "y": -67.74700164794922 + "x": 1411.2359619140625, + "y": -71.9530029296875 }, { - "x": 1162.2110595703125, - "y": -61.803001403808594 + "x": 1412.5770263671875, + "y": -66.36299896240234 }, { - "x": 1164.0579833984375, - "y": -55.79800033569336 + "x": 1413.7960205078125, + "y": -60.78300094604492 }, { - "x": 1165.7159423828125, - "y": -49.73699951171875 + "x": 1414.89697265625, + "y": -55.2140007019043 }, { - "x": 1167.1829833984375, - "y": -43.62799835205078 + "x": 1415.883056640625, + "y": -49.65599822998047 }, { - "x": 1168.45703125, - "y": -37.47600173950195 + "x": 1416.7559814453125, + "y": -44.10900115966797 }, { - "x": 1169.5369873046875, - "y": -31.285999298095703 + "x": 1417.52099609375, + "y": -38.57099914550781 }, { - "x": 1170.4219970703125, - "y": -25.06599998474121 + "x": 1418.178955078125, + "y": -33.04199981689453 }, { - "x": 1171.112060546875, - "y": -18.820999145507812 + "x": 1418.73095703125, + "y": -27.52199935913086 }, { - "x": 1171.60498046875, - "y": -12.557999610900879 + "x": 1419.1810302734375, + "y": -22.007999420166016 }, { - "x": 1171.9010009765625, - "y": -6.2820000648498535 + "x": 1419.529052734375, + "y": -16.500999450683594 }, { - "x": 1172, + "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": 1419.7769775390625, + "y": 10.998000144958496 + }, + { + "x": 1419.529052734375, + "y": 16.500999450683594 + }, + { + "x": 1419.1810302734375, + "y": 22.007999420166016 + }, + { + "x": 1418.73095703125, + "y": 27.52199935913086 }, { - "x": 1171.60498046875, - "y": 12.557999610900879 + "x": 1418.178955078125, + "y": 33.04199981689453 }, { - "x": 1171.112060546875, - "y": 18.820999145507812 + "x": 1417.52099609375, + "y": 38.57099914550781 }, { - "x": 1170.4219970703125, - "y": 25.06599998474121 + "x": 1416.7559814453125, + "y": 44.10900115966797 }, { - "x": 1169.5369873046875, - "y": 31.285999298095703 + "x": 1415.883056640625, + "y": 49.65599822998047 }, { - "x": 1168.45703125, - "y": 37.47600173950195 + "x": 1414.89697265625, + "y": 55.2140007019043 }, { - "x": 1167.1829833984375, - "y": 43.62799835205078 + "x": 1413.7960205078125, + "y": 60.78300094604492 }, { - "x": 1165.7159423828125, - "y": 49.73699951171875 + "x": 1412.5770263671875, + "y": 66.36299896240234 }, { - "x": 1164.0579833984375, - "y": 55.79800033569336 + "x": 1411.2359619140625, + "y": 71.9530029296875 }, { - "x": 1162.2110595703125, - "y": 61.803001403808594 + "x": 1409.77099609375, + "y": 77.552001953125 }, { - "x": 1160.176025390625, - "y": 67.74700164794922 + "x": 1408.176025390625, + "y": 83.16100311279297 }, { - "x": 1157.9549560546875, - "y": 73.6240005493164 + "x": 1406.447998046875, + "y": 88.7770004272461 }, { - "x": 1155.550048828125, - "y": 79.42900085449219 + "x": 1404.583984375, + "y": 94.39900207519531 }, { - "x": 1152.9649658203125, - "y": 85.15499877929688 + "x": 1402.5780029296875, + "y": 100.0260009765625 }, { - "x": 1150.2010498046875, - "y": 90.7979965209961 + "x": 1400.427978515625, + "y": 105.65299987792969 }, { - "x": 1147.260986328125, - "y": 96.3499984741211 + "x": 1398.126953125, + "y": 111.27999877929688 }, { - "x": 1144.14794921875, - "y": 101.80799865722656 + "x": 1395.6729736328125, + "y": 116.9020004272461 }, { - "x": 1140.864990234375, - "y": 107.16500091552734 + "x": 1393.06005859375, + "y": 122.51699829101562 }, { - "x": 1137.416015625, - "y": 112.41600036621094 + "x": 1390.2860107421875, + "y": 128.11900329589844 }, { - "x": 1133.802978515625, - "y": 117.55699920654297 + "x": 1387.343994140625, + "y": 133.7050018310547 }, { - "x": 1130.031005859375, - "y": 122.58100128173828 + "x": 1384.2330322265625, + "y": 139.27000427246094 }, { - "x": 1126.10205078125, - "y": 127.48400115966797 + "x": 1380.946044921875, + "y": 144.80799865722656 }, { - "x": 1122.02197265625, - "y": 132.26199340820312 + "x": 1377.4820556640625, + "y": 150.31300354003906 }, { - "x": 1117.79296875, - "y": 136.90899658203125 + "x": 1373.8360595703125, + "y": 155.781005859375 }, { - "x": 1113.4210205078125, - "y": 141.42100524902344 + "x": 1370.0050048828125, + "y": 161.2030029296875 }, { - "x": 1108.9090576171875, - "y": 145.79299926757812 + "x": 1365.9859619140625, + "y": 166.57400512695312 }, { - "x": 1104.261962890625, - "y": 150.02200317382812 + "x": 1361.7769775390625, + "y": 171.88600158691406 }, { - "x": 1099.4840087890625, - "y": 154.1020050048828 + "x": 1357.3740234375, + "y": 177.1320037841797 }, { - "x": 1094.5810546875, - "y": 158.031005859375 + "x": 1352.7760009765625, + "y": 182.30299377441406 }, { - "x": 1089.5570068359375, - "y": 161.80299377441406 + "x": 1347.9820556640625, + "y": 187.39100646972656 }, { - "x": 1084.416015625, - "y": 165.41600036621094 + "x": 1342.989013671875, + "y": 192.38800048828125 }, { - "x": 1079.1650390625, - "y": 168.86500549316406 + "x": 1337.7979736328125, + "y": 197.28500366210938 }, { - "x": 1073.8079833984375, - "y": 172.1479949951172 + "x": 1332.406982421875, + "y": 202.07200622558594 }, { - "x": 1068.3499755859375, - "y": 175.26100158691406 + "x": 1326.8170166015625, + "y": 206.74099731445312 }, { - "x": 1062.7979736328125, - "y": 178.2010040283203 + "x": 1321.029052734375, + "y": 211.28199768066406 }, { - "x": 1057.155029296875, - "y": 180.96499633789062 + "x": 1315.04296875, + "y": 215.68499755859375 }, { - "x": 1051.428955078125, - "y": 183.5500030517578 + "x": 1308.8609619140625, + "y": 219.94000244140625 }, { - "x": 1045.6240234375, - "y": 185.9550018310547 + "x": 1302.4859619140625, + "y": 224.03799438476562 }, { - "x": 1039.7469482421875, - "y": 188.17599487304688 + "x": 1295.9189453125, + "y": 227.96800231933594 }, { - "x": 1033.802978515625, - "y": 190.21099853515625 + "x": 1289.1650390625, + "y": 231.72000122070312 }, { - "x": 1027.7979736328125, - "y": 192.05799865722656 + "x": 1282.22802734375, + "y": 235.28399658203125 }, { - "x": 1021.7369995117188, - "y": 193.71600341796875 + "x": 1275.1109619140625, + "y": 238.64999389648438 }, { - "x": 1015.6279907226562, - "y": 195.18299865722656 + "x": 1267.8199462890625, + "y": 241.8090057373047 }, { - "x": 1009.4760131835938, - "y": 196.45700073242188 + "x": 1260.3609619140625, + "y": 244.74899291992188 }, { - "x": 1003.2860107421875, - "y": 197.53700256347656 + "x": 1264.887939453125, + "y": 266.7250061035156 }, { - "x": 998.5, - "y": 198.21800231933594 + "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 73b4459647..8579a80028 100644 --- a/e2etests/testdata/txtar/cycle-diagram/dagre/sketch.exp.svg +++ b/e2etests/testdata/txtar/cycle-diagram/dagre/sketch.exp.svg @@ -1,9 +1,9 @@ -abcdabcab - + .d2-3460380611 .fill-N1{fill:#0A0F25;} + .d2-3460380611 .fill-N2{fill:#676C7E;} + .d2-3460380611 .fill-N3{fill:#9499AB;} + .d2-3460380611 .fill-N4{fill:#CFD2DD;} + .d2-3460380611 .fill-N5{fill:#DEE1EB;} + .d2-3460380611 .fill-N6{fill:#EEF1F8;} + .d2-3460380611 .fill-N7{fill:#FFFFFF;} + .d2-3460380611 .fill-B1{fill:#0D32B2;} + .d2-3460380611 .fill-B2{fill:#0D32B2;} + .d2-3460380611 .fill-B3{fill:#E3E9FD;} + .d2-3460380611 .fill-B4{fill:#E3E9FD;} + .d2-3460380611 .fill-B5{fill:#EDF0FD;} + .d2-3460380611 .fill-B6{fill:#F7F8FE;} + .d2-3460380611 .fill-AA2{fill:#4A6FF3;} + .d2-3460380611 .fill-AA4{fill:#EDF0FD;} + .d2-3460380611 .fill-AA5{fill:#F7F8FE;} + .d2-3460380611 .fill-AB4{fill:#EDF0FD;} + .d2-3460380611 .fill-AB5{fill:#F7F8FE;} + .d2-3460380611 .stroke-N1{stroke:#0A0F25;} + .d2-3460380611 .stroke-N2{stroke:#676C7E;} + .d2-3460380611 .stroke-N3{stroke:#9499AB;} + .d2-3460380611 .stroke-N4{stroke:#CFD2DD;} + .d2-3460380611 .stroke-N5{stroke:#DEE1EB;} + .d2-3460380611 .stroke-N6{stroke:#EEF1F8;} + .d2-3460380611 .stroke-N7{stroke:#FFFFFF;} + .d2-3460380611 .stroke-B1{stroke:#0D32B2;} + .d2-3460380611 .stroke-B2{stroke:#0D32B2;} + .d2-3460380611 .stroke-B3{stroke:#E3E9FD;} + .d2-3460380611 .stroke-B4{stroke:#E3E9FD;} + .d2-3460380611 .stroke-B5{stroke:#EDF0FD;} + .d2-3460380611 .stroke-B6{stroke:#F7F8FE;} + .d2-3460380611 .stroke-AA2{stroke:#4A6FF3;} + .d2-3460380611 .stroke-AA4{stroke:#EDF0FD;} + .d2-3460380611 .stroke-AA5{stroke:#F7F8FE;} + .d2-3460380611 .stroke-AB4{stroke:#EDF0FD;} + .d2-3460380611 .stroke-AB5{stroke:#F7F8FE;} + .d2-3460380611 .background-color-N1{background-color:#0A0F25;} + .d2-3460380611 .background-color-N2{background-color:#676C7E;} + .d2-3460380611 .background-color-N3{background-color:#9499AB;} + .d2-3460380611 .background-color-N4{background-color:#CFD2DD;} + .d2-3460380611 .background-color-N5{background-color:#DEE1EB;} + .d2-3460380611 .background-color-N6{background-color:#EEF1F8;} + .d2-3460380611 .background-color-N7{background-color:#FFFFFF;} + .d2-3460380611 .background-color-B1{background-color:#0D32B2;} + .d2-3460380611 .background-color-B2{background-color:#0D32B2;} + .d2-3460380611 .background-color-B3{background-color:#E3E9FD;} + .d2-3460380611 .background-color-B4{background-color:#E3E9FD;} + .d2-3460380611 .background-color-B5{background-color:#EDF0FD;} + .d2-3460380611 .background-color-B6{background-color:#F7F8FE;} + .d2-3460380611 .background-color-AA2{background-color:#4A6FF3;} + .d2-3460380611 .background-color-AA4{background-color:#EDF0FD;} + .d2-3460380611 .background-color-AA5{background-color:#F7F8FE;} + .d2-3460380611 .background-color-AB4{background-color:#EDF0FD;} + .d2-3460380611 .background-color-AB5{background-color:#F7F8FE;} + .d2-3460380611 .color-N1{color:#0A0F25;} + .d2-3460380611 .color-N2{color:#676C7E;} + .d2-3460380611 .color-N3{color:#9499AB;} + .d2-3460380611 .color-N4{color:#CFD2DD;} + .d2-3460380611 .color-N5{color:#DEE1EB;} + .d2-3460380611 .color-N6{color:#EEF1F8;} + .d2-3460380611 .color-N7{color:#FFFFFF;} + .d2-3460380611 .color-B1{color:#0D32B2;} + .d2-3460380611 .color-B2{color:#0D32B2;} + .d2-3460380611 .color-B3{color:#E3E9FD;} + .d2-3460380611 .color-B4{color:#E3E9FD;} + .d2-3460380611 .color-B5{color:#EDF0FD;} + .d2-3460380611 .color-B6{color:#F7F8FE;} + .d2-3460380611 .color-AA2{color:#4A6FF3;} + .d2-3460380611 .color-AA4{color:#EDF0FD;} + .d2-3460380611 .color-AA5{color:#F7F8FE;} + .d2-3460380611 .color-AB4{color:#EDF0FD;} + .d2-3460380611 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker-d2-3460380611);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker-d2-3460380611);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright-d2-3460380611);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright-d2-3460380611);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright-d2-3460380611);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright-d2-3460380611);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark-d2-3460380611);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright-d2-3460380611);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright-d2-3460380611);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright-d2-3460380611);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright-d2-3460380611);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker-d2-3460380611);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark-d2-3460380611);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal-d2-3460380611);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal-d2-3460380611);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright-d2-3460380611);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright-d2-3460380611);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright-d2-3460380611);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>abcdabcab + - - - - - - - - + + + + + + + + \ No newline at end of file diff --git a/e2etests/testdata/txtar/cycle-diagram/elk/board.exp.json b/e2etests/testdata/txtar/cycle-diagram/elk/board.exp.json index ae1b04fd23..277750cbc4 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": 41.19200134277344, + "y": -167.34300231933594 }, { - "x": 40.18000030517578, - "y": -186.00399780273438 + "x": 44.257999420166016, + "y": -164.7830047607422 }, { - "x": 43.2859992980957, - "y": -185.53700256347656 + "x": 47.4640007019043, + "y": -162.02499389648438 }, { - "x": 46.3849983215332, - "y": -185.02099609375 + "x": 50.595001220703125, + "y": -159.2449951171875 }, { - "x": 49.47600173950195, - "y": -184.45700073242188 + "x": 53.65299987792969, + "y": -156.44700622558594 }, { - "x": 52.55699920654297, - "y": -183.843994140625 + "x": 56.63800048828125, + "y": -153.63499450683594 }, { - "x": 55.62799835205078, - "y": -183.18299865722656 + "x": 59.551998138427734, + "y": -150.81300354003906 }, { - "x": 58.68899917602539, - "y": -182.47300720214844 + "x": 62.39500045776367, + "y": -147.98300170898438 }, { - "x": 61.73699951171875, - "y": -181.71600341796875 + "x": 65.16999816894531, + "y": -145.1490020751953 }, { - "x": 64.77400207519531, - "y": -180.91099548339844 + "x": 67.87699890136719, + "y": -142.31500244140625 }, { - "x": 67.7979965209961, - "y": -180.05799865722656 + "x": 70.5199966430664, + "y": -139.48300170898438 }, { - "x": 70.80799865722656, - "y": -179.1580047607422 + "x": 73.0989990234375, + "y": -136.65699768066406 }, { - "x": 73.8030014038086, - "y": -178.21099853515625 + "x": 75.61599731445312, + "y": -133.83999633789062 }, { - "x": 76.78299713134766, - "y": -177.2169952392578 + "x": 78.07499694824219, + "y": -131.03500366210938 }, { - "x": 79.74700164794922, - "y": -176.17599487304688 + "x": 80.47599792480469, + "y": -128.2429962158203 }, { - "x": 82.69400024414062, - "y": -175.08799743652344 + "x": 82.822998046875, + "y": -125.46900177001953 }, { - "x": 85.6240005493164, - "y": -173.9550018310547 + "x": 85.11799621582031, + "y": -122.71299743652344 }, { - "x": 88.53600311279297, - "y": -172.77499389648438 + "x": 87.36399841308594, + "y": -119.97899627685547 }, { - "x": 91.42900085449219, - "y": -171.5500030517578 + "x": 89.56199645996094, + "y": -117.26799774169922 }, { - "x": 94.302001953125, - "y": -170.27999877929688 + "x": 91.71700286865234, + "y": -114.58300018310547 }, { - "x": 97.15499877929688, - "y": -168.96499633789062 + "x": 93.83000183105469, + "y": -111.92500305175781 }, { - "x": 99.98699951171875, - "y": -167.60499572753906 + "x": 95.90399932861328, + "y": -109.29499816894531 }, { - "x": 102.7979965209961, - "y": -166.2010040283203 + "x": 97.94200134277344, + "y": -106.69599914550781 }, { - "x": 105.58499908447266, - "y": -164.7530059814453 + "x": 99.947998046875, + "y": -104.12799835205078 }, { - "x": 108.3499984741211, - "y": -163.26100158691406 + "x": 101.92400360107422, + "y": -101.59300231933594 }, { - "x": 111.09100341796875, - "y": -161.7259979248047 + "x": 103.8740005493164, + "y": -99.09100341796875 }, { - "x": 113.80799865722656, - "y": -160.1479949951172 + "x": 105.79900360107422, + "y": -96.62300109863281 }, { - "x": 116.4990005493164, - "y": -158.5279998779297 + "x": 107.7030029296875, + "y": -94.19000244140625 }, { - "x": 119.16500091552734, - "y": -156.86500549316406 + "x": 109.58999633789062, + "y": -91.79299926757812 }, { - "x": 121.80400085449219, - "y": -155.16099548339844 + "x": 111.46199798583984, + "y": -89.43000030517578 }, { - "x": 124.41600036621094, - "y": -153.41600036621094 + "x": 113.3219985961914, + "y": -87.10299682617188 }, { - "x": 127.0009994506836, - "y": -151.62899780273438 + "x": 115.1729965209961, + "y": -84.81199645996094 }, { - "x": 129.5570068359375, - "y": -149.80299377441406 + "x": 117.01899719238281, + "y": -82.55599975585938 }, { - "x": 132.08399963378906, - "y": -147.93600463867188 + "x": 118.86100006103516, + "y": -80.33399963378906 }, { - "x": 134.58099365234375, - "y": -146.031005859375 + "x": 120.7030029296875, + "y": -78.14700317382812 }, { - "x": 137.04800415039062, - "y": -144.08599853515625 + "x": 122.5479965209961, + "y": -75.99299621582031 }, { - "x": 139.48399353027344, - "y": -142.1020050048828 + "x": 124.39700317382812, + "y": -73.87100219726562 }, { - "x": 141.88900756835938, - "y": -140.08099365234375 + "x": 126.25499725341797, + "y": -71.77999877929688 }, { - "x": 144.26199340820312, - "y": -138.02200317382812 + "x": 128.1230010986328, + "y": -69.72000122070312 }, { - "x": 146.6020050048828, - "y": -135.92599487304688 + "x": 130.0050048828125, + "y": -67.68800354003906 }, { - "x": 148.90899658203125, - "y": -133.79299926757812 + "x": 131.9010009765625, + "y": -65.68299865722656 }, { - "x": 151.1820068359375, - "y": -131.625 + "x": 133.81500244140625, + "y": -63.70399856567383 }, { - "x": 153.42100524902344, - "y": -129.42100524902344 + "x": 135.74899291992188, + "y": -61.749000549316406 }, { - "x": 155.625, - "y": -127.18199920654297 + "x": 137.70399475097656, + "y": -59.814998626708984 }, { - "x": 157.79299926757812, - "y": -124.90899658203125 + "x": 139.68299865722656, + "y": -57.9010009765625 }, { - "x": 159.92599487304688, - "y": -122.60199737548828 + "x": 141.68800354003906, + "y": -56.005001068115234 }, { - "x": 162.02200317382812, - "y": -120.26200103759766 + "x": 143.72000122070312, + "y": -54.12300109863281 }, { - "x": 164.08099365234375, - "y": -117.88899993896484 + "x": 145.77999877929688, + "y": -52.255001068115234 }, { - "x": 166.1020050048828, - "y": -115.48400115966797 + "x": 147.87100219726562, + "y": -50.39699935913086 }, { - "x": 168.08599853515625, - "y": -113.0479965209961 + "x": 149.9929962158203, + "y": -48.54800033569336 }, { - "x": 170.031005859375, - "y": -110.58100128173828 + "x": 152.14700317382812, + "y": -46.702999114990234 }, { - "x": 171.93600463867188, - "y": -108.08399963378906 + "x": 154.33399963378906, + "y": -44.861000061035156 }, { - "x": 173.80299377441406, - "y": -105.55699920654297 + "x": 156.55599975585938, + "y": -43.01900100708008 }, { - "x": 175.62899780273438, - "y": -103.0009994506836 + "x": 158.81199645996094, + "y": -41.17300033569336 }, { - "x": 177.41600036621094, - "y": -100.41600036621094 + "x": 161.10299682617188, + "y": -39.321998596191406 }, { - "x": 179.16099548339844, - "y": -97.80400085449219 + "x": 163.42999267578125, + "y": -37.46200180053711 }, { - "x": 180.86500549316406, - "y": -95.16500091552734 + "x": 165.79299926757812, + "y": -35.59000015258789 }, { - "x": 182.5279998779297, - "y": -92.4990005493164 + "x": 168.19000244140625, + "y": -33.702999114990234 }, { - "x": 184.1479949951172, - "y": -89.80799865722656 + "x": 170.6230010986328, + "y": -31.798999786376953 }, { - "x": 185.7259979248047, - "y": -87.09100341796875 + "x": 173.09100341796875, + "y": -29.874000549316406 }, { - "x": 187.26100158691406, - "y": -84.3499984741211 + "x": 175.59300231933594, + "y": -27.923999786376953 }, { - "x": 188.7530059814453, - "y": -81.58499908447266 + "x": 178.1280059814453, + "y": -25.947999954223633 }, { - "x": 190.2010040283203, - "y": -78.7979965209961 + "x": 180.6959991455078, + "y": -23.941999435424805 }, { - "x": 191.60499572753906, - "y": -75.98699951171875 + "x": 183.2949981689453, + "y": -21.90399932861328 }, { - "x": 192.96499633789062, - "y": -73.15499877929688 + "x": 185.9250030517578, + "y": -19.829999923706055 }, { - "x": 194.27999877929688, - "y": -70.302001953125 + "x": 188.58299255371094, + "y": -17.716999053955078 }, { - "x": 195.5500030517578, - "y": -67.42900085449219 + "x": 191.26800537109375, + "y": -15.562000274658203 }, { - "x": 196.77499389648438, - "y": -64.53600311279297 + "x": 193.97900390625, + "y": -13.36400032043457 }, { - "x": 197.9550018310547, - "y": -61.624000549316406 + "x": 196.71299743652344, + "y": -11.118000030517578 }, { - "x": 199.08799743652344, - "y": -58.694000244140625 + "x": 199.468994140625, + "y": -8.822999954223633 }, { - "x": 200.17599487304688, - "y": -55.74700164794922 + "x": 202.2429962158203, + "y": -6.47599983215332 }, { - "x": 201.2169952392578, - "y": -52.78300094604492 + "x": 205.03500366210938, + "y": -4.074999809265137 }, { - "x": 202.21099853515625, - "y": -49.803001403808594 + "x": 207.83999633789062, + "y": -1.6160000562667847 }, { - "x": 203.1580047607422, - "y": -46.80799865722656 + "x": 210.65699768066406, + "y": 0.8999999761581421 }, { - "x": 204.05799865722656, - "y": -43.79800033569336 + "x": 213.48300170898438, + "y": 3.4790000915527344 }, { - "x": 204.91099548339844, - "y": -40.77399826049805 + "x": 216.31500244140625, + "y": 6.122000217437744 }, { - "x": 205.71600341796875, - "y": -37.73699951171875 + "x": 219.1490020751953, + "y": 8.829000473022461 }, { - "x": 206.47300720214844, - "y": -34.68899917602539 + "x": 221.98300170898438, + "y": 11.604000091552734 }, { - "x": 207.18299865722656, - "y": -31.628000259399414 + "x": 224.81300354003906, + "y": 14.446999549865723 }, { - "x": 207.843994140625, - "y": -28.55699920654297 + "x": 227.63499450683594, + "y": 17.361000061035156 }, { - "x": 208.45700073242188, - "y": -25.47599983215332 + "x": 230.44700622558594, + "y": 20.34600067138672 }, { - "x": 208.5659942626953, - "y": -25.10099983215332 + "x": 233.2449951171875, + "y": 23.40399932861328 }, { - "x": 209.2519989013672, - "y": -21 + "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": 669.22998046875, + "y": -101.11100006103516 + }, + { + "x": 672.3499755859375, + "y": -97.61100006103516 + }, + { + "x": 675.3800048828125, + "y": -94.1050033569336 + }, + { + "x": 678.323974609375, + "y": -90.59600067138672 + }, + { + "x": 681.1840209960938, + "y": -87.08599853515625 }, { - "x": 589.10498046875, - "y": -109.0719985961914 + "x": 683.9639892578125, + "y": -83.5790023803711 }, { - "x": 592.6649780273438, - "y": -106.86499786376953 + "x": 686.666015625, + "y": -80.0770034790039 }, { - "x": 596.177978515625, - "y": -104.58399963378906 + "x": 689.2940063476562, + "y": -76.58399963378906 }, { - "x": 599.6420288085938, - "y": -102.22899627685547 + "x": 691.8510131835938, + "y": -73.0999984741211 }, { - "x": 603.0570068359375, - "y": -99.8030014038086 + "x": 694.3400268554688, + "y": -69.62799835205078 }, { - "x": 606.4190063476562, - "y": -97.30500030517578 + "x": 696.7659912109375, + "y": -66.16899871826172 }, { - "x": 609.72900390625, - "y": -94.73799896240234 + "x": 699.1309814453125, + "y": -62.72700119018555 }, { - "x": 612.9840087890625, - "y": -92.10199737548828 + "x": 701.4390258789062, + "y": -59.29999923706055 }, { - "x": 616.1840209960938, - "y": -89.39900207519531 + "x": 703.6939697265625, + "y": -55.89099884033203 }, { - "x": 619.3259887695312, - "y": -86.62799835205078 + "x": 705.8980102539062, + "y": -52.500999450683594 }, { - "x": 622.4089965820312, - "y": -83.79299926757812 + "x": 708.0560302734375, + "y": -49.130001068115234 }, { - "x": 625.4320068359375, - "y": -80.89399719238281 + "x": 710.1719970703125, + "y": -45.777000427246094 }, { - "x": 628.3939819335938, - "y": -77.93199920654297 + "x": 712.2470092773438, + "y": -42.444000244140625 }, { - "x": 631.2930297851562, - "y": -74.90899658203125 + "x": 714.2869873046875, + "y": -39.130001068115234 }, { - "x": 634.1279907226562, - "y": -71.82599639892578 + "x": 716.2940063476562, + "y": -35.834999084472656 }, { - "x": 636.8989868164062, - "y": -68.68399810791016 + "x": 718.27099609375, + "y": -32.55799865722656 }, { - "x": 639.6019897460938, - "y": -65.48400115966797 + "x": 720.2219848632812, + "y": -29.29800033569336 }, { - "x": 642.2379760742188, - "y": -62.229000091552734 + "x": 722.1500244140625, + "y": -26.054000854492188 }, { - "x": 644.8049926757812, - "y": -58.91899871826172 + "x": 724.0570068359375, + "y": -22.826000213623047 }, { - "x": 647.302978515625, - "y": -55.55699920654297 + "x": 725.947021484375, + "y": -19.611000061035156 }, { - "x": 649.72900390625, - "y": -52.141998291015625 + "x": 727.8209838867188, + "y": -16.406999588012695 }, { - "x": 652.083984375, - "y": -48.678001403808594 + "x": 729.6840209960938, + "y": -13.21399974822998 }, { - "x": 654.364990234375, - "y": -45.165000915527344 + "x": 731.5360107421875, + "y": -10.029000282287598 }, { - "x": 656.572021484375, - "y": -41.60499954223633 + "x": 733.3800048828125, + "y": -6.848999977111816 }, { - "x": 658.7050170898438, - "y": -38 + "x": 735.218994140625, + "y": -3.6740000247955322 }, { - "x": 660.760986328125, - "y": -34.349998474121094 + "x": 737.052978515625, + "y": -0.49900001287460327 }, { - "x": 662.739990234375, - "y": -30.659000396728516 + "x": 738.885009765625, + "y": 2.6760001182556152 }, { - "x": 664.6420288085938, - "y": -26.927000045776367 + "x": 740.7160034179688, + "y": 5.855999946594238 }, { - "x": 666.4650268554688, - "y": -23.155000686645508 + "x": 742.5479736328125, + "y": 9.043000221252441 }, { - "x": 668.208984375, - "y": -19.347000122070312 + "x": 744.3800048828125, + "y": 12.239999771118164 }, { - "x": 669.8720092773438, - "y": -15.503000259399414 + "x": 746.2139892578125, + "y": 15.449000358581543 }, { - "x": 671.4550170898438, - "y": -11.62399959564209 + "x": 748.051025390625, + "y": 18.673999786376953 }, { - "x": 672.9559936523438, - "y": -7.714000225067139 + "x": 749.8909912109375, + "y": 21.917999267578125 }, { - "x": 674.375, - "y": -3.7730000019073486 + "x": 751.7329711914062, + "y": 25.18400001525879 }, { - "x": 675.7109985351562, - "y": 0.19599999487400055 + "x": 753.5780029296875, + "y": 28.47599983215332 }, { - "x": 676.9630126953125, - "y": 4.192999839782715 + "x": 755.426025390625, + "y": 31.795000076293945 }, { - "x": 678.1320190429688, - "y": 8.215999603271484 + "x": 757.2750244140625, + "y": 35.145999908447266 }, { - "x": 679.2160034179688, - "y": 12.26200008392334 + "x": 759.1259765625, + "y": 38.53200149536133 }, { - "x": 680.2150268554688, - "y": 16.32900047302246 + "x": 760.9760131835938, + "y": 41.95500183105469 }, { - "x": 681.1290283203125, - "y": 20.41699981689453 + "x": 762.823974609375, + "y": 45.41899871826172 }, { - "x": 681.9569702148438, - "y": 24.523000717163086 + "x": 764.6699829101562, + "y": 48.926998138427734 }, { - "x": 682.698974609375, - "y": 28.645999908447266 + "x": 766.510986328125, + "y": 52.481998443603516 }, { - "x": 683.35400390625, - "y": 32.78300094604492 + "x": 768.344970703125, + "y": 56.08599853515625 }, { - "x": 683.9219970703125, - "y": 36.93299865722656 + "x": 770.1690063476562, + "y": 59.74300003051758 }, { - "x": 684.4039916992188, - "y": 41.09400177001953 + "x": 771.9829711914062, + "y": 63.45500183105469 }, { - "x": 684.7979736328125, - "y": 45.263999938964844 + "x": 773.781982421875, + "y": 67.2249984741211 }, { - "x": 685.10498046875, - "y": 49.441001892089844 + "x": 775.5640258789062, + "y": 71.05500030517578 }, { - "x": 685.323974609375, - "y": 53.624000549316406 + "x": 777.3259887695312, + "y": 74.9469985961914 }, { - "x": 685.4559936523438, - "y": 57.81100082397461 + "x": 779.0650024414062, + "y": 78.90299987792969 }, { - "x": 685.5, - "y": 61.999000549316406 + "x": 780.7760009765625, + "y": 82.9260025024414 }, { - "x": 685.4559936523438, - "y": 66.18800354003906 + "x": 782.4580078125, + "y": 87.01699829101562 }, { - "x": 685.323974609375, - "y": 70.375 + "x": 784.10498046875, + "y": 91.1780014038086 }, { - "x": 685.10498046875, - "y": 74.55799865722656 + "x": 785.7150268554688, + "y": 95.41000366210938 }, { - "x": 684.7979736328125, - "y": 78.73500061035156 + "x": 787.281982421875, + "y": 99.71399688720703 }, { - "x": 684.4039916992188, - "y": 82.90499877929688 + "x": 788.802978515625, + "y": 104.09100341796875 }, { - "x": 683.9219970703125, - "y": 87.06600189208984 + "x": 790.2739868164062, + "y": 108.54199981689453 }, { - "x": 683.35400390625, - "y": 91.21600341796875 + "x": 791.6890258789062, + "y": 113.06800079345703 }, { - "x": 682.698974609375, - "y": 95.35299682617188 + "x": 793.0460205078125, + "y": 117.66799926757812 }, { - "x": 681.9569702148438, - "y": 99.47599792480469 + "x": 794.3380126953125, + "y": 122.34300231933594 }, { - "x": 681.1290283203125, - "y": 103.58200073242188 + "x": 795.5609741210938, + "y": 127.09300231933594 }, { - "x": 680.2150268554688, - "y": 107.66999816894531 + "x": 796.7119750976562, + "y": 131.91600036621094 }, { - "x": 679.2160034179688, - "y": 111.73699951171875 + "x": 797.7839965820312, + "y": 136.81300354003906 }, { - "x": 678.1320190429688, - "y": 115.78299713134766 + "x": 798.7730102539062, + "y": 141.78199768066406 }, { - "x": 676.9630126953125, - "y": 119.80599975585938 + "x": 799.6749877929688, + "y": 146.82200622558594 }, { - "x": 675.7109985351562, - "y": 123.8030014038086 + "x": 800.4840087890625, + "y": 151.93099975585938 }, { - "x": 675.3259887695312, - "y": 125.08100128173828 + "x": 801.1959838867188, + "y": 157.10800170898438 }, { - "x": 673.9329833984375, - "y": 128.99899291992188 + "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": 585.5, - "y": 235.2050018310547 + "x": 725.2520141601562, + "y": 248.8719940185547 + }, + { + "x": 720.5269775390625, + "y": 250.18699645996094 }, { - "x": 581.8499755859375, - "y": 237.26100158691406 + "x": 715.8330078125, + "y": 251.40499877929688 }, { - "x": 578.1589965820312, - "y": 239.24000549316406 + "x": 711.1699829101562, + "y": 252.531005859375 }, { - "x": 574.427001953125, - "y": 241.14199829101562 + "x": 706.5430297851562, + "y": 253.5679931640625 }, { - "x": 570.655029296875, - "y": 242.96499633789062 + "x": 701.9530029296875, + "y": 254.52000427246094 }, { - "x": 566.8469848632812, - "y": 244.70899963378906 + "x": 697.4019775390625, + "y": 255.39100646972656 }, { - "x": 563.0029907226562, - "y": 246.3719940185547 + "x": 692.8900146484375, + "y": 256.1860046386719 }, { - "x": 559.1240234375, - "y": 247.9550018310547 + "x": 688.4210205078125, + "y": 256.9079895019531 }, { - "x": 555.2139892578125, - "y": 249.45599365234375 + "x": 683.9940185546875, + "y": 257.56201171875 }, { - "x": 551.2730102539062, - "y": 250.875 + "x": 679.6099853515625, + "y": 258.1510009765625 }, { - "x": 547.302978515625, - "y": 252.21099853515625 + "x": 675.27001953125, + "y": 258.67999267578125 }, { - "x": 543.3060302734375, - "y": 253.46299743652344 + "x": 670.9749755859375, + "y": 259.15301513671875 }, { - "x": 539.2830200195312, - "y": 254.6320037841797 + "x": 666.7230224609375, + "y": 259.572998046875 }, { - "x": 535.2369995117188, - "y": 255.71600341796875 + "x": 662.5150146484375, + "y": 259.9440002441406 }, { - "x": 531.1699829101562, - "y": 256.7149963378906 + "x": 658.3510131835938, + "y": 260.27099609375 }, { - "x": 527.0819702148438, - "y": 257.6289978027344 + "x": 654.22998046875, + "y": 260.5570068359375 }, { - "x": 522.9760131835938, - "y": 258.4570007324219 + "x": 650.1500244140625, + "y": 260.80499267578125 }, { - "x": 518.85302734375, - "y": 259.1990051269531 + "x": 646.1119995117188, + "y": 261.0190124511719 }, { - "x": 514.7160034179688, - "y": 259.85400390625 + "x": 642.1129760742188, + "y": 261.2019958496094 }, { - "x": 510.5660095214844, - "y": 260.4219970703125 + "x": 638.1519775390625, + "y": 261.3580017089844 }, { - "x": 506.4049987792969, - "y": 260.90399169921875 + "x": 634.22802734375, + "y": 261.489013671875 }, { - "x": 502.2349853515625, - "y": 261.2980041503906 + "x": 630.3380126953125, + "y": 261.5979919433594 }, { - "x": 498.0580139160156, - "y": 261.6050109863281 + "x": 626.4810180664062, + "y": 261.68798828125 }, { - "x": 493.875, - "y": 261.8240051269531 + "x": 622.6539916992188, + "y": 261.7619934082031 }, { - "x": 489.68798828125, - "y": 261.95599365234375 + "x": 618.8560180664062, + "y": 261.8219909667969 }, { - "x": 485.5, - "y": 262 + "x": 615.0830078125, + "y": 261.8699951171875 }, { - "x": 481.3110046386719, - "y": 261.95599365234375 + "x": 611.3330078125, + "y": 261.9070129394531 }, { - "x": 477.1239929199219, - "y": 261.8240051269531 + "x": 607.60400390625, + "y": 261.9360046386719 }, { - "x": 472.9410095214844, - "y": 261.6050109863281 + "x": 603.8920288085938, + "y": 261.9580078125 }, { - "x": 468.7640075683594, - "y": 261.2980041503906 + "x": 600.1959838867188, + "y": 261.9739990234375 }, { - "x": 464.593994140625, - "y": 260.90399169921875 + "x": 596.510986328125, + "y": 261.9849853515625 }, { - "x": 460.4330139160156, - "y": 260.4219970703125 + "x": 592.8350219726562, + "y": 261.9930114746094 }, { - "x": 456.2829895019531, - "y": 259.85400390625 + "x": 589.166015625, + "y": 261.99700927734375 + }, + { + "x": 585.5, + "y": 261.9989929199219 }, { - "x": 452.14599609375, - "y": 259.1990051269531 + "x": 581.8330078125, + "y": 261.99700927734375 }, { - "x": 448.02301025390625, - "y": 258.4570007324219 + "x": 578.1640014648438, + "y": 261.9930114746094 }, { - "x": 443.9169921875, - "y": 257.6289978027344 + "x": 574.4879760742188, + "y": 261.9849853515625 }, { - "x": 439.8290100097656, - "y": 256.7149963378906 + "x": 570.802978515625, + "y": 261.9739990234375 }, { - "x": 435.7619934082031, - "y": 255.71600341796875 + "x": 567.1069946289062, + "y": 261.9580078125 }, { - "x": 431.71600341796875, - "y": 254.6320037841797 + "x": 563.39501953125, + "y": 261.9360046386719 }, { - "x": 427.6929931640625, - "y": 253.46299743652344 + "x": 559.666015625, + "y": 261.9070129394531 }, { - "x": 423.6960144042969, - "y": 252.21099853515625 + "x": 555.916015625, + "y": 261.8699951171875 }, { - "x": 419.72601318359375, - "y": 250.875 + "x": 552.1430053710938, + "y": 261.8219909667969 }, { - "x": 415.7850036621094, - "y": 249.45599365234375 + "x": 548.344970703125, + "y": 261.7619934082031 }, { - "x": 411.875, - "y": 247.9550018310547 + "x": 544.5180053710938, + "y": 261.68798828125 }, { - "x": 407.9960021972656, - "y": 246.3719940185547 + "x": 540.6610107421875, + "y": 261.5979919433594 }, { - "x": 404.1520080566406, - "y": 244.70899963378906 + "x": 536.77099609375, + "y": 261.489013671875 }, { - "x": 400.343994140625, - "y": 242.96499633789062 + "x": 532.8469848632812, + "y": 261.3580017089844 }, { - "x": 396.5719909667969, - "y": 241.14199829101562 + "x": 528.885986328125, + "y": 261.2019958496094 }, { - "x": 392.8399963378906, - "y": 239.24000549316406 + "x": 524.8870239257812, + "y": 261.0190124511719 }, { - "x": 389.14898681640625, - "y": 237.26100158691406 + "x": 520.8489990234375, + "y": 260.80499267578125 }, { - "x": 385.5, - "y": 235.2050018310547 + "x": 516.7689819335938, + "y": 260.5570068359375 }, { - "x": 381.8940124511719, - "y": 233.07200622558594 + "x": 512.6480102539062, + "y": 260.27099609375 }, { - "x": 378.3340148925781, - "y": 230.86500549316406 + "x": 508.4840087890625, + "y": 259.9440002441406 }, { - "x": 374.8210144042969, - "y": 228.58399963378906 + "x": 504.2760009765625, + "y": 259.572998046875 }, { - "x": 371.35699462890625, - "y": 226.22900390625 + "x": 500.02398681640625, + "y": 259.15301513671875 }, { - "x": 367.9419860839844, - "y": 223.80299377441406 + "x": 495.72900390625, + "y": 258.67999267578125 }, { - "x": 364.5799865722656, - "y": 221.30499267578125 + "x": 491.3890075683594, + "y": 258.1510009765625 }, { - "x": 361.2699890136719, - "y": 218.73800659179688 + "x": 487.0050048828125, + "y": 257.56201171875 }, { - "x": 358.0150146484375, - "y": 216.1020050048828 + "x": 482.5780029296875, + "y": 256.9079895019531 }, { - "x": 354.81500244140625, - "y": 213.3990020751953 + "x": 478.1090087890625, + "y": 256.1860046386719 }, { - "x": 351.6730041503906, - "y": 210.6280059814453 + "x": 473.59698486328125, + "y": 255.39100646972656 }, { - "x": 348.5899963378906, - "y": 207.79299926757812 + "x": 469.0459899902344, + "y": 254.52000427246094 }, { - "x": 345.5669860839844, - "y": 204.8939971923828 + "x": 464.45599365234375, + "y": 253.5679931640625 }, { - "x": 342.6050109863281, - "y": 201.9320068359375 + "x": 459.8290100097656, + "y": 252.531005859375 }, { - "x": 339.70599365234375, - "y": 198.90899658203125 + "x": 455.1659851074219, + "y": 251.40499877929688 }, { - "x": 338.9079895019531, - "y": 198.1060028076172 + "x": 450.47198486328125, + "y": 250.18699645996094 }, { - "x": 336.1419982910156, - "y": 195 + "x": 445.74700927734375, + "y": 248.8719940185547 + }, + { + "x": 440.9939880371094, + "y": 247.45599365234375 + }, + { + "x": 436.2170104980469, + "y": 245.93600463867188 + }, + { + "x": 431.41900634765625, + "y": 244.30799865722656 + }, + { + "x": 426.60400390625, + "y": 242.56900024414062 + }, + { + "x": 421.7749938964844, + "y": 240.71600341796875 + }, + { + "x": 416.93499755859375, + "y": 238.74400329589844 + }, + { + "x": 412.0899963378906, + "y": 236.6510009765625 + }, + { + "x": 407.2430114746094, + "y": 234.43499755859375 + }, + { + "x": 402.3999938964844, + "y": 232.0919952392578 + }, + { + "x": 397.5639953613281, + "y": 229.6199951171875 + }, + { + "x": 392.74200439453125, + "y": 227.01600646972656 + }, + { + "x": 387.93701171875, + "y": 224.2790069580078 + }, + { + "x": 383.1549987792969, + "y": 221.40699768066406 + }, + { + "x": 378.4020080566406, + "y": 218.3979949951172 + }, + { + "x": 359.8290100097656, + "y": 237.91799926757812 + }, + { + "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": 1187.0770263671875, + "y": -239.71200561523438 + }, + { + "x": 1193.4759521484375, + "y": -232.74899291992188 }, { - "x": 936.197021484375, - "y": -185.53700256347656 + "x": 1200.93505859375, + "y": -229.8090057373047 }, { - "x": 942.385986328125, - "y": -184.45700073242188 + "x": 1208.2259521484375, + "y": -226.64999389648438 }, { - "x": 948.5380249023438, - "y": -183.18299865722656 + "x": 1215.343017578125, + "y": -223.28399658203125 }, { - "x": 954.6480102539062, - "y": -181.71600341796875 + "x": 1222.281005859375, + "y": -219.72000122070312 }, { - "x": 960.7080078125, - "y": -180.05799865722656 + "x": 1229.0350341796875, + "y": -215.96800231933594 }, { - "x": 966.7130126953125, - "y": -178.21099853515625 + "x": 1235.6009521484375, + "y": -212.03799438476562 }, { - "x": 972.656982421875, - "y": -176.17599487304688 + "x": 1241.9759521484375, + "y": -207.94000244140625 }, { - "x": 978.5349731445312, - "y": -173.9550018310547 + "x": 1248.157958984375, + "y": -203.68499755859375 }, { - "x": 984.3389892578125, - "y": -171.5500030517578 + "x": 1254.14404296875, + "y": -199.28199768066406 }, { - "x": 990.0659790039062, - "y": -168.96499633789062 + "x": 1259.9329833984375, + "y": -194.74099731445312 }, { - "x": 995.7080078125, - "y": -166.2010040283203 + "x": 1265.52197265625, + "y": -190.07200622558594 }, { - "x": 1001.260009765625, - "y": -163.26100158691406 + "x": 1270.9129638671875, + "y": -185.28500366210938 }, { - "x": 1006.718017578125, - "y": -160.1479949951172 + "x": 1276.10498046875, + "y": -180.38800048828125 }, { - "x": 1012.0750122070312, - "y": -156.86500549316406 + "x": 1281.0970458984375, + "y": -175.39100646972656 }, { - "x": 1017.3259887695312, - "y": -153.41600036621094 + "x": 1285.8919677734375, + "y": -170.30299377441406 }, { - "x": 1022.4669799804688, - "y": -149.80299377441406 + "x": 1290.489013671875, + "y": -165.1320037841797 }, { - "x": 1027.490966796875, - "y": -146.031005859375 + "x": 1294.8919677734375, + "y": -159.88600158691406 }, { - "x": 1032.39404296875, - "y": -142.1020050048828 + "x": 1299.10205078125, + "y": -154.57400512695312 }, { - "x": 1037.1719970703125, - "y": -138.02200317382812 + "x": 1303.1199951171875, + "y": -149.2030029296875 }, { - "x": 1041.8189697265625, - "y": -133.79299926757812 + "x": 1306.9510498046875, + "y": -143.781005859375 }, { - "x": 1046.3310546875, - "y": -129.42100524902344 + "x": 1310.5970458984375, + "y": -138.31300354003906 }, { - "x": 1050.7030029296875, - "y": -124.90899658203125 + "x": 1314.06201171875, + "y": -132.80799865722656 }, { - "x": 1054.9320068359375, - "y": -120.26200103759766 + "x": 1317.3480224609375, + "y": -127.2699966430664 }, { - "x": 1059.011962890625, - "y": -115.48400115966797 + "x": 1320.4599609375, + "y": -121.70500183105469 }, { - "x": 1062.9410400390625, - "y": -110.58100128173828 + "x": 1323.4010009765625, + "y": -116.11900329589844 }, { - "x": 1066.7130126953125, - "y": -105.55699920654297 + "x": 1326.176025390625, + "y": -110.51699829101562 }, { - "x": 1070.3260498046875, - "y": -100.41600036621094 + "x": 1328.7879638671875, + "y": -104.9020004272461 }, { - "x": 1073.7750244140625, - "y": -95.16500091552734 + "x": 1331.241943359375, + "y": -99.27999877929688 }, { - "x": 1077.0579833984375, - "y": -89.80799865722656 + "x": 1333.54296875, + "y": -93.65299987792969 }, { - "x": 1080.1710205078125, - "y": -84.3499984741211 + "x": 1335.6939697265625, + "y": -88.0260009765625 }, { - "x": 1083.1109619140625, - "y": -78.7979965209961 + "x": 1337.698974609375, + "y": -82.39900207519531 }, { - "x": 1085.875, - "y": -73.15499877929688 + "x": 1339.56396484375, + "y": -76.7770004272461 }, { - "x": 1088.4610595703125, - "y": -67.42900085449219 + "x": 1341.291015625, + "y": -71.16100311279297 }, { - "x": 1090.864990234375, - "y": -61.624000549316406 + "x": 1342.885986328125, + "y": -65.552001953125 }, { - "x": 1093.0860595703125, - "y": -55.74700164794922 + "x": 1344.35205078125, + "y": -59.952999114990234 }, { - "x": 1095.1209716796875, - "y": -49.803001403808594 + "x": 1345.6920166015625, + "y": -54.362998962402344 }, { - "x": 1096.968017578125, - "y": -43.79800033569336 + "x": 1346.9110107421875, + "y": -48.78300094604492 }, { - "x": 1098.6259765625, - "y": -37.73699951171875 + "x": 1348.011962890625, + "y": -43.2140007019043 }, { - "x": 1100.093017578125, - "y": -31.628000259399414 + "x": 1348.998046875, + "y": -37.65599822998047 }, { - "x": 1101.366943359375, - "y": -25.47599983215332 + "x": 1349.8719482421875, + "y": -32.10900115966797 }, { - "x": 1102.447021484375, - "y": -19.285999298095703 + "x": 1350.635986328125, + "y": -26.570999145507812 }, { - "x": 1103.3330078125, - "y": -13.065999984741211 + "x": 1351.2939453125, + "y": -21.04199981689453 }, { - "x": 1104.02197265625, - "y": -6.821000099182129 + "x": 1351.845947265625, + "y": -15.522000312805176 }, { - "x": 1104.5150146484375, - "y": -0.5580000281333923 + "x": 1352.2960205078125, + "y": -10.008000373840332 }, { - "x": 1104.81103515625, - "y": 5.7170000076293945 + "x": 1352.64404296875, + "y": -4.500999927520752 }, { - "x": 1104.9100341796875, + "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": 1352.8919677734375, + "y": 22.99799919128418 + }, + { + "x": 1352.64404296875, + "y": 28.500999450683594 + }, + { + "x": 1352.2960205078125, + "y": 34.007999420166016 + }, + { + "x": 1351.845947265625, + "y": 39.52199935913086 }, { - "x": 1104.5150146484375, - "y": 24.558000564575195 + "x": 1351.2939453125, + "y": 45.04199981689453 }, { - "x": 1104.02197265625, - "y": 30.820999145507812 + "x": 1350.635986328125, + "y": 50.57099914550781 }, { - "x": 1103.3330078125, - "y": 37.066001892089844 + "x": 1349.8719482421875, + "y": 56.10900115966797 }, { - "x": 1102.447021484375, - "y": 43.2859992980957 + "x": 1348.998046875, + "y": 61.65599822998047 }, { - "x": 1101.366943359375, - "y": 49.47600173950195 + "x": 1348.011962890625, + "y": 67.21399688720703 }, { - "x": 1100.093017578125, - "y": 55.62799835205078 + "x": 1346.9110107421875, + "y": 72.78299713134766 }, { - "x": 1098.6259765625, - "y": 61.73699951171875 + "x": 1345.6920166015625, + "y": 78.36299896240234 }, { - "x": 1096.968017578125, - "y": 67.7979965209961 + "x": 1344.35205078125, + "y": 83.9530029296875 }, { - "x": 1095.1209716796875, - "y": 73.8030014038086 + "x": 1342.885986328125, + "y": 89.552001953125 }, { - "x": 1093.0860595703125, - "y": 79.74700164794922 + "x": 1341.291015625, + "y": 95.16100311279297 }, { - "x": 1090.864990234375, - "y": 85.6240005493164 + "x": 1339.56396484375, + "y": 100.7770004272461 }, { - "x": 1088.4610595703125, - "y": 91.42900085449219 + "x": 1337.698974609375, + "y": 106.39900207519531 }, { - "x": 1085.875, - "y": 97.15499877929688 + "x": 1335.6939697265625, + "y": 112.0260009765625 }, { - "x": 1083.1109619140625, - "y": 102.7979965209961 + "x": 1333.54296875, + "y": 117.65299987792969 }, { - "x": 1080.1710205078125, - "y": 108.3499984741211 + "x": 1331.241943359375, + "y": 123.27999877929688 }, { - "x": 1077.0579833984375, - "y": 113.80799865722656 + "x": 1328.7879638671875, + "y": 128.90199279785156 }, { - "x": 1073.7750244140625, - "y": 119.16500091552734 + "x": 1326.176025390625, + "y": 134.51699829101562 }, { - "x": 1070.3260498046875, - "y": 124.41600036621094 + "x": 1323.4010009765625, + "y": 140.11900329589844 }, { - "x": 1066.7130126953125, - "y": 129.5570068359375 + "x": 1320.4599609375, + "y": 145.7050018310547 }, { - "x": 1062.9410400390625, - "y": 134.58099365234375 + "x": 1317.3480224609375, + "y": 151.27000427246094 }, { - "x": 1059.011962890625, - "y": 139.48399353027344 + "x": 1314.06201171875, + "y": 156.80799865722656 }, { - "x": 1054.9320068359375, - "y": 144.26199340820312 + "x": 1310.5970458984375, + "y": 162.31300354003906 }, { - "x": 1050.7030029296875, - "y": 148.90899658203125 + "x": 1306.9510498046875, + "y": 167.781005859375 }, { - "x": 1046.3310546875, - "y": 153.42100524902344 + "x": 1303.1199951171875, + "y": 173.2030029296875 }, { - "x": 1041.8189697265625, - "y": 157.79299926757812 + "x": 1299.10205078125, + "y": 178.57400512695312 }, { - "x": 1037.1719970703125, - "y": 162.02200317382812 + "x": 1294.8919677734375, + "y": 183.88600158691406 }, { - "x": 1032.39404296875, - "y": 166.1020050048828 + "x": 1290.489013671875, + "y": 189.1320037841797 }, { - "x": 1027.490966796875, - "y": 170.031005859375 + "x": 1285.8919677734375, + "y": 194.30299377441406 }, { - "x": 1022.4669799804688, - "y": 173.80299377441406 + "x": 1281.0970458984375, + "y": 199.39100646972656 }, { - "x": 1017.3259887695312, - "y": 177.41600036621094 + "x": 1276.10498046875, + "y": 204.38800048828125 }, { - "x": 1012.0750122070312, - "y": 180.86500549316406 + "x": 1270.9129638671875, + "y": 209.28500366210938 }, { - "x": 1006.718017578125, - "y": 184.1479949951172 + "x": 1265.52197265625, + "y": 214.07200622558594 }, { - "x": 1001.260009765625, - "y": 187.26100158691406 + "x": 1259.9329833984375, + "y": 218.74099731445312 }, { - "x": 995.7080078125, - "y": 190.2010040283203 + "x": 1254.14404296875, + "y": 223.28199768066406 }, { - "x": 990.0659790039062, - "y": 192.96499633789062 + "x": 1248.157958984375, + "y": 227.68499755859375 }, { - "x": 984.3389892578125, - "y": 195.5500030517578 + "x": 1241.9759521484375, + "y": 231.94000244140625 }, { - "x": 978.5349731445312, - "y": 197.9550018310547 + "x": 1235.6009521484375, + "y": 236.03799438476562 }, { - "x": 972.656982421875, - "y": 200.17599487304688 + "x": 1229.0350341796875, + "y": 239.96800231933594 }, { - "x": 966.7130126953125, - "y": 202.21099853515625 + "x": 1222.281005859375, + "y": 243.72000122070312 }, { - "x": 960.7080078125, - "y": 204.05799865722656 + "x": 1215.343017578125, + "y": 247.28399658203125 }, { - "x": 954.6480102539062, - "y": 205.71600341796875 + "x": 1208.2259521484375, + "y": 250.64999389648438 }, { - "x": 948.5380249023438, - "y": 207.18299865722656 + "x": 1200.93505859375, + "y": 253.8090057373047 }, { - "x": 942.385986328125, - "y": 208.45700073242188 + "x": 1193.4759521484375, + "y": 256.7489929199219 }, { - "x": 936.197021484375, - "y": 209.53700256347656 + "x": 1198.0040283203125, + "y": 278.7250061035156 }, { - "x": 931.4099731445312, - "y": 210.21800231933594 + "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 5bada1dcfa..6505cf6e6b 100644 --- a/e2etests/testdata/txtar/cycle-diagram/elk/sketch.exp.svg +++ b/e2etests/testdata/txtar/cycle-diagram/elk/sketch.exp.svg @@ -1,9 +1,9 @@ -abcdabcab - + .d2-1162226478 .fill-N1{fill:#0A0F25;} + .d2-1162226478 .fill-N2{fill:#676C7E;} + .d2-1162226478 .fill-N3{fill:#9499AB;} + .d2-1162226478 .fill-N4{fill:#CFD2DD;} + .d2-1162226478 .fill-N5{fill:#DEE1EB;} + .d2-1162226478 .fill-N6{fill:#EEF1F8;} + .d2-1162226478 .fill-N7{fill:#FFFFFF;} + .d2-1162226478 .fill-B1{fill:#0D32B2;} + .d2-1162226478 .fill-B2{fill:#0D32B2;} + .d2-1162226478 .fill-B3{fill:#E3E9FD;} + .d2-1162226478 .fill-B4{fill:#E3E9FD;} + .d2-1162226478 .fill-B5{fill:#EDF0FD;} + .d2-1162226478 .fill-B6{fill:#F7F8FE;} + .d2-1162226478 .fill-AA2{fill:#4A6FF3;} + .d2-1162226478 .fill-AA4{fill:#EDF0FD;} + .d2-1162226478 .fill-AA5{fill:#F7F8FE;} + .d2-1162226478 .fill-AB4{fill:#EDF0FD;} + .d2-1162226478 .fill-AB5{fill:#F7F8FE;} + .d2-1162226478 .stroke-N1{stroke:#0A0F25;} + .d2-1162226478 .stroke-N2{stroke:#676C7E;} + .d2-1162226478 .stroke-N3{stroke:#9499AB;} + .d2-1162226478 .stroke-N4{stroke:#CFD2DD;} + .d2-1162226478 .stroke-N5{stroke:#DEE1EB;} + .d2-1162226478 .stroke-N6{stroke:#EEF1F8;} + .d2-1162226478 .stroke-N7{stroke:#FFFFFF;} + .d2-1162226478 .stroke-B1{stroke:#0D32B2;} + .d2-1162226478 .stroke-B2{stroke:#0D32B2;} + .d2-1162226478 .stroke-B3{stroke:#E3E9FD;} + .d2-1162226478 .stroke-B4{stroke:#E3E9FD;} + .d2-1162226478 .stroke-B5{stroke:#EDF0FD;} + .d2-1162226478 .stroke-B6{stroke:#F7F8FE;} + .d2-1162226478 .stroke-AA2{stroke:#4A6FF3;} + .d2-1162226478 .stroke-AA4{stroke:#EDF0FD;} + .d2-1162226478 .stroke-AA5{stroke:#F7F8FE;} + .d2-1162226478 .stroke-AB4{stroke:#EDF0FD;} + .d2-1162226478 .stroke-AB5{stroke:#F7F8FE;} + .d2-1162226478 .background-color-N1{background-color:#0A0F25;} + .d2-1162226478 .background-color-N2{background-color:#676C7E;} + .d2-1162226478 .background-color-N3{background-color:#9499AB;} + .d2-1162226478 .background-color-N4{background-color:#CFD2DD;} + .d2-1162226478 .background-color-N5{background-color:#DEE1EB;} + .d2-1162226478 .background-color-N6{background-color:#EEF1F8;} + .d2-1162226478 .background-color-N7{background-color:#FFFFFF;} + .d2-1162226478 .background-color-B1{background-color:#0D32B2;} + .d2-1162226478 .background-color-B2{background-color:#0D32B2;} + .d2-1162226478 .background-color-B3{background-color:#E3E9FD;} + .d2-1162226478 .background-color-B4{background-color:#E3E9FD;} + .d2-1162226478 .background-color-B5{background-color:#EDF0FD;} + .d2-1162226478 .background-color-B6{background-color:#F7F8FE;} + .d2-1162226478 .background-color-AA2{background-color:#4A6FF3;} + .d2-1162226478 .background-color-AA4{background-color:#EDF0FD;} + .d2-1162226478 .background-color-AA5{background-color:#F7F8FE;} + .d2-1162226478 .background-color-AB4{background-color:#EDF0FD;} + .d2-1162226478 .background-color-AB5{background-color:#F7F8FE;} + .d2-1162226478 .color-N1{color:#0A0F25;} + .d2-1162226478 .color-N2{color:#676C7E;} + .d2-1162226478 .color-N3{color:#9499AB;} + .d2-1162226478 .color-N4{color:#CFD2DD;} + .d2-1162226478 .color-N5{color:#DEE1EB;} + .d2-1162226478 .color-N6{color:#EEF1F8;} + .d2-1162226478 .color-N7{color:#FFFFFF;} + .d2-1162226478 .color-B1{color:#0D32B2;} + .d2-1162226478 .color-B2{color:#0D32B2;} + .d2-1162226478 .color-B3{color:#E3E9FD;} + .d2-1162226478 .color-B4{color:#E3E9FD;} + .d2-1162226478 .color-B5{color:#EDF0FD;} + .d2-1162226478 .color-B6{color:#F7F8FE;} + .d2-1162226478 .color-AA2{color:#4A6FF3;} + .d2-1162226478 .color-AA4{color:#EDF0FD;} + .d2-1162226478 .color-AA5{color:#F7F8FE;} + .d2-1162226478 .color-AB4{color:#EDF0FD;} + .d2-1162226478 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker-d2-1162226478);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker-d2-1162226478);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright-d2-1162226478);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright-d2-1162226478);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright-d2-1162226478);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright-d2-1162226478);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark-d2-1162226478);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright-d2-1162226478);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright-d2-1162226478);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright-d2-1162226478);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright-d2-1162226478);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker-d2-1162226478);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark-d2-1162226478);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal-d2-1162226478);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal-d2-1162226478);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright-d2-1162226478);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright-d2-1162226478);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright-d2-1162226478);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>abcdabcab + - - - - - - - - + + + + + + + + \ No newline at end of file From d49b46324dd26d5e2b901687d404f5dd22d77a36 Mon Sep 17 00:00:00 2001 From: Mayank Mohapatra <125661248+Mayank77maruti@users.noreply.github.com> Date: Wed, 26 Feb 2025 04:17:44 +0000 Subject: [PATCH 66/73] try Signed-off-by: Mayank Mohapatra <125661248+Mayank77maruti@users.noreply.github.com> --- d2layouts/d2cycle/layout.go | 334 +- .../txtar/cycle-diagram/dagre/board.exp.json | 5894 +++++++++++++---- .../txtar/cycle-diagram/dagre/sketch.exp.svg | 183 +- .../txtar/cycle-diagram/elk/board.exp.json | 5894 +++++++++++++---- .../txtar/cycle-diagram/elk/sketch.exp.svg | 183 +- e2etests/txtar.txt | 8 + 6 files changed, 9390 insertions(+), 3106 deletions(-) diff --git a/d2layouts/d2cycle/layout.go b/d2layouts/d2cycle/layout.go index c3354fcae7..73f6635517 100644 --- a/d2layouts/d2cycle/layout.go +++ b/d2layouts/d2cycle/layout.go @@ -2,7 +2,6 @@ package d2cycle import ( "context" - "fmt" "math" "sort" @@ -13,13 +12,10 @@ import ( ) const ( - 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 + MIN_RADIUS = 200 + PADDING = 20 + MIN_SEGMENT_LEN = 10 + ARC_STEPS = 100 ) // Layout lays out the graph and computes curved edge routes @@ -29,319 +25,118 @@ 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) } - // Calculate optimal radius based on number and size of objects - radius := calculateOptimalRadius(objects) - - // Position objects in a circle + radius := calculateRadius(objects) positionObjects(objects, radius) - - // Adjust positions to resolve overlaps - resolveOverlaps(objects, radius) - // Create edge routes for all edges - createEdgeRoutes(g.Edges, objects, radius) + for _, edge := range g.Edges { + createCircularArc(edge) + } return nil } -// calculateOptimalRadius computes an ideal radius based on number and size of objects -func calculateOptimalRadius(objects []*d2graph.Object) float64 { +func calculateRadius(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 } - - // 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) + minRadius := (maxSize/2.0 + PADDING) / math.Sin(math.Pi/numObjects) + return math.Max(minRadius, 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, ) } } -// 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) { +func createCircularArc(edge *d2graph.Edge) { 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 { - if srcAngle - dstAngle > math.Pi { - dstAngle += 2 * math.Pi - } - } else { - if dstAngle - srcAngle > math.Pi { - srcAngle += 2 * math.Pi - } + dstAngle += 2 * math.Pi } - - // Adjust radius based on offset for parallel edges - arcRadius := baseRadius * (1.0 + offset) - - // Control points for the path + + arcRadius := math.Hypot(srcCenter.X, srcCenter.Y) + 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) - - // 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) + x := arcRadius * math.Cos(angle) + y := arcRadius * 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 boxes + // Clamp endpoints to the boundaries of the source and destination 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 + // Trim redundant path points that fall inside node boundaries. 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 { - adjustArrowDirection(edge) - } -} - -// 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 -} - -// 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] - - // 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) + lastIndex := len(edge.Route) - 1 + lastPoint := edge.Route[lastIndex] + secondLastPoint := edge.Route[lastIndex-1] + + tangentX := -lastPoint.Y + tangentY := lastPoint.X + mag := math.Hypot(tangentX, tangentY) + if mag > 0 { + tangentX /= mag + tangentY /= mag + } + const MIN_SEGMENT_LEN = 4.159 + + dx := lastPoint.X - secondLastPoint.X + dy := lastPoint.Y - secondLastPoint.Y + segLength := math.Hypot(dx, dy) + if segLength > 0 { + currentDirX := dx / segLength + currentDirY := dy / segLength + + // 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) + } } } } @@ -487,7 +282,7 @@ func trimPathPoints(path []*geo.Point, box *geo.Box) []*geo.Point { return trimmed } -// boxContains checks if a point is inside a box (strictly inside, not on boundary) +// boxContains uses strict inequalities so that points exactly on the boundary are considered outside. func boxContains(b *geo.Box, p *geo.Point) bool { return p.X > b.TopLeft.X && p.X < b.TopLeft.X+b.Width && @@ -495,47 +290,34 @@ 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 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 float64(obj.LabelDimensions.Width) > obj.Width || + float64(obj.LabelDimensions.Height) > obj.Height { if len(obj.ChildrenArray) > 0 { obj.LabelPosition = go2.Pointer(label.OutsideTopCenter.String()) } else { @@ -543,4 +325,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 d6a55bd46c..a44184a6d5 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": 50 + "y": 0 }, - "width": 553, - "height": 566, + "width": 453, + "height": 466, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -98,8 +98,8 @@ "id": "1.b", "type": "rectangle", "pos": { - "x": 223, - "y": 17 + "x": 173, + "y": -33 }, "width": 53, "height": 66, @@ -141,7 +141,7 @@ "type": "rectangle", "pos": { "x": -26, - "y": 267 + "y": 167 }, "width": 53, "height": 66, @@ -182,8 +182,8 @@ "id": "1.d", "type": "rectangle", "pos": { - "x": -277, - "y": 17 + "x": -227, + "y": -32 }, "width": 54, "height": 66, @@ -224,11 +224,11 @@ "id": "2", "type": "cycle", "pos": { - "x": 613, - "y": 75 + "x": 513, + "y": 50 }, - "width": 572, - "height": 516, + "width": 399, + "height": 366, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -265,8 +265,8 @@ "id": "2.a", "type": "rectangle", "pos": { - "x": 586, - "y": -258 + "x": 486, + "y": -183 }, "width": 53, "height": 66, @@ -307,8 +307,8 @@ "id": "2.b", "type": "rectangle", "pos": { - "x": 846, - "y": 191 + "x": 659, + "y": 116 }, "width": 53, "height": 66, @@ -349,8 +349,8 @@ "id": "2.c", "type": "rectangle", "pos": { - "x": 326, - "y": 192 + "x": 313, + "y": 117 }, "width": 53, "height": 66, @@ -391,11 +391,11 @@ "id": "3", "type": "cycle", "pos": { - "x": 1245, + "x": 972, "y": 0 }, "width": 53, - "height": 666, + "height": 466, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -432,8 +432,8 @@ "id": "3.a", "type": "rectangle", "pos": { - "x": 1218, - "y": -333 + "x": 945, + "y": -233 }, "width": 53, "height": 66, @@ -474,8 +474,8 @@ "id": "3.b", "type": "rectangle", "pos": { - "x": 1218, - "y": 267 + "x": 945, + "y": 167 }, "width": 53, "height": 66, @@ -511,373 +511,3709 @@ "labelPosition": "INSIDE_MIDDLE_CENTER", "zIndex": 0, "level": 2 - } - ], - "connections": [ + }, { - "id": "1.(a -> b)[0]", - "src": "1.a", - "srcArrow": "none", - "dst": "1.b", - "dstArrow": "triangle", + "id": "4", + "type": "cycle", + "pos": { + "x": 1085, + "y": 0 + }, + "width": 399, + "height": 466, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, + "borderRadius": 0, + "fill": "N7", "stroke": "B1", - "borderRadius": 10, + "animated": false, + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": null, "label": "", - "fontSize": 16, + "fontSize": 28, "fontFamily": "DEFAULT", "language": "", - "color": "N2", - "italic": true, + "color": "N1", + "italic": false, "bold": false, "underline": false, "labelWidth": 0, "labelHeight": 0, - "labelPosition": "", - "labelPercentage": 0, + "zIndex": 0, + "level": 1 + }, + { + "id": "4.a", + "type": "rectangle", + "pos": { + "x": 1058, + "y": -233 + }, + "width": 53, + "height": 66, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "B5", + "stroke": "B1", + "animated": false, + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", "link": "", - "route": [ - { - "x": 26.5, - "y": -181.53399658203125 - }, - { - "x": 29.191999435424805, - "y": -179.34300231933594 - }, - { - "x": 32.257999420166016, - "y": -176.7830047607422 - }, - { - "x": 35.4640007019043, - "y": -174.02499389648438 - }, - { - "x": 38.595001220703125, - "y": -171.2449951171875 - }, - { - "x": 41.65299987792969, - "y": -168.44700622558594 - }, - { - "x": 44.63800048828125, - "y": -165.63499450683594 - }, - { - "x": 47.551998138427734, - "y": -162.81300354003906 - }, - { - "x": 50.39500045776367, - "y": -159.98300170898438 - }, - { - "x": 53.16999816894531, - "y": -157.1490020751953 - }, - { - "x": 55.87699890136719, - "y": -154.31500244140625 - }, - { - "x": 58.52000045776367, - "y": -151.48300170898438 - }, - { - "x": 61.0989990234375, - "y": -148.65699768066406 - }, - { - "x": 63.61600112915039, - "y": -145.83999633789062 - }, - { - "x": 66.07499694824219, - "y": -143.03500366210938 - }, + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "a", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": true, + "underline": false, + "labelWidth": 8, + "labelHeight": 21, + "labelPosition": "INSIDE_MIDDLE_CENTER", + "zIndex": 0, + "level": 2 + }, + { + "id": "4.b", + "type": "rectangle", + "pos": { + "x": 1231, + "y": -133 + }, + "width": 53, + "height": 66, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "B5", + "stroke": "B1", + "animated": false, + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "b", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": true, + "underline": false, + "labelWidth": 8, + "labelHeight": 21, + "labelPosition": "INSIDE_MIDDLE_CENTER", + "zIndex": 0, + "level": 2 + }, + { + "id": "4.c", + "type": "rectangle", + "pos": { + "x": 1231, + "y": 66 + }, + "width": 53, + "height": 66, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "B5", + "stroke": "B1", + "animated": false, + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "c", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": true, + "underline": false, + "labelWidth": 8, + "labelHeight": 21, + "labelPosition": "INSIDE_MIDDLE_CENTER", + "zIndex": 0, + "level": 2 + }, + { + "id": "4.d", + "type": "rectangle", + "pos": { + "x": 1058, + "y": 167 + }, + "width": 54, + "height": 66, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "B5", + "stroke": "B1", + "animated": false, + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "d", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": true, + "underline": false, + "labelWidth": 9, + "labelHeight": 21, + "labelPosition": "INSIDE_MIDDLE_CENTER", + "zIndex": 0, + "level": 2 + }, + { + "id": "4.e", + "type": "rectangle", + "pos": { + "x": 885, + "y": 67 + }, + "width": 53, + "height": 66, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "B5", + "stroke": "B1", + "animated": false, + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "e", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": true, + "underline": false, + "labelWidth": 8, + "labelHeight": 21, + "labelPosition": "INSIDE_MIDDLE_CENTER", + "zIndex": 0, + "level": 2 + }, + { + "id": "4.f", + "type": "rectangle", + "pos": { + "x": 886, + "y": -133 + }, + "width": 51, + "height": 66, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "B5", + "stroke": "B1", + "animated": false, + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "f", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": true, + "underline": false, + "labelWidth": 6, + "labelHeight": 21, + "labelPosition": "INSIDE_MIDDLE_CENTER", + "zIndex": 0, + "level": 2 + }, + { + "id": "5", + "type": "cycle", + "pos": { + "x": 1544, + "y": 20 + }, + "width": 433, + "height": 427, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "N7", + "stroke": "B1", + "animated": false, + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "", + "fontSize": 28, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": false, + "underline": false, + "labelWidth": 0, + "labelHeight": 0, + "zIndex": 0, + "level": 1 + }, + { + "id": "5.a", + "type": "rectangle", + "pos": { + "x": 1517, + "y": -213 + }, + "width": 53, + "height": 66, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "B5", + "stroke": "B1", + "animated": false, + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "a", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": true, + "underline": false, + "labelWidth": 8, + "labelHeight": 21, + "labelPosition": "INSIDE_MIDDLE_CENTER", + "zIndex": 0, + "level": 2 + }, + { + "id": "5.b", + "type": "rectangle", + "pos": { + "x": 1707, + "y": -74 + }, + "width": 53, + "height": 66, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "B5", + "stroke": "B1", + "animated": false, + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "b", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": true, + "underline": false, + "labelWidth": 8, + "labelHeight": 21, + "labelPosition": "INSIDE_MIDDLE_CENTER", + "zIndex": 0, + "level": 2 + }, + { + "id": "5.c", + "type": "rectangle", + "pos": { + "x": 1635, + "y": 148 + }, + "width": 53, + "height": 66, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "B5", + "stroke": "B1", + "animated": false, + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "c", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": true, + "underline": false, + "labelWidth": 8, + "labelHeight": 21, + "labelPosition": "INSIDE_MIDDLE_CENTER", + "zIndex": 0, + "level": 2 + }, + { + "id": "5.d", + "type": "rectangle", + "pos": { + "x": 1399, + "y": 148 + }, + "width": 54, + "height": 66, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "B5", + "stroke": "B1", + "animated": false, + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "d", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": true, + "underline": false, + "labelWidth": 9, + "labelHeight": 21, + "labelPosition": "INSIDE_MIDDLE_CENTER", + "zIndex": 0, + "level": 2 + }, + { + "id": "5.e", + "type": "rectangle", + "pos": { + "x": 1327, + "y": -74 + }, + "width": 53, + "height": 66, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "B5", + "stroke": "B1", + "animated": false, + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "e", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": true, + "underline": false, + "labelWidth": 8, + "labelHeight": 21, + "labelPosition": "INSIDE_MIDDLE_CENTER", + "zIndex": 0, + "level": 2 + } + ], + "connections": [ + { + "id": "1.(a -> b)[0]", + "src": "1.a", + "srcArrow": "none", + "dst": "1.b", + "dstArrow": "triangle", + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "stroke": "B1", + "borderRadius": 10, + "label": "", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N2", + "italic": true, + "bold": false, + "underline": false, + "labelWidth": 0, + "labelHeight": 0, + "labelPosition": "", + "labelPercentage": 0, + "link": "", + "route": [ + { + "x": 26.5, + "y": -198.22999572753906 + }, + { + "x": 28.18000030517578, + "y": -198.00399780273438 + }, + { + "x": 31.285999298095703, + "y": -197.53700256347656 + }, + { + "x": 34.3849983215332, + "y": -197.02099609375 + }, + { + "x": 37.47600173950195, + "y": -196.45700073242188 + }, + { + "x": 40.55699920654297, + "y": -195.843994140625 + }, + { + "x": 43.62799835205078, + "y": -195.18299865722656 + }, + { + "x": 46.68899917602539, + "y": -194.47300720214844 + }, + { + "x": 49.73699951171875, + "y": -193.71600341796875 + }, + { + "x": 52.77399826049805, + "y": -192.91099548339844 + }, + { + "x": 55.79800033569336, + "y": -192.05799865722656 + }, + { + "x": 58.80799865722656, + "y": -191.1580047607422 + }, + { + "x": 61.803001403808594, + "y": -190.21099853515625 + }, + { + "x": 64.78299713134766, + "y": -189.2169952392578 + }, + { + "x": 67.74700164794922, + "y": -188.17599487304688 + }, + { + "x": 70.69400024414062, + "y": -187.08799743652344 + }, + { + "x": 73.6240005493164, + "y": -185.9550018310547 + }, + { + "x": 76.53600311279297, + "y": -184.77499389648438 + }, + { + "x": 79.42900085449219, + "y": -183.5500030517578 + }, + { + "x": 82.302001953125, + "y": -182.27999877929688 + }, + { + "x": 85.15499877929688, + "y": -180.96499633789062 + }, + { + "x": 87.98699951171875, + "y": -179.60499572753906 + }, + { + "x": 90.7979965209961, + "y": -178.2010040283203 + }, + { + "x": 93.58499908447266, + "y": -176.7530059814453 + }, + { + "x": 96.3499984741211, + "y": -175.26100158691406 + }, + { + "x": 99.09100341796875, + "y": -173.7259979248047 + }, + { + "x": 101.80799865722656, + "y": -172.1479949951172 + }, + { + "x": 104.4990005493164, + "y": -170.5279998779297 + }, + { + "x": 107.16500091552734, + "y": -168.86500549316406 + }, + { + "x": 109.80400085449219, + "y": -167.16099548339844 + }, + { + "x": 112.41600036621094, + "y": -165.41600036621094 + }, + { + "x": 115.0009994506836, + "y": -163.62899780273438 + }, + { + "x": 117.55699920654297, + "y": -161.80299377441406 + }, + { + "x": 120.08399963378906, + "y": -159.93600463867188 + }, + { + "x": 122.58100128173828, + "y": -158.031005859375 + }, + { + "x": 125.0479965209961, + "y": -156.08599853515625 + }, + { + "x": 127.48400115966797, + "y": -154.1020050048828 + }, + { + "x": 129.88900756835938, + "y": -152.08099365234375 + }, + { + "x": 132.26199340820312, + "y": -150.02200317382812 + }, + { + "x": 134.6020050048828, + "y": -147.92599487304688 + }, + { + "x": 136.90899658203125, + "y": -145.79299926757812 + }, + { + "x": 139.1820068359375, + "y": -143.625 + }, + { + "x": 141.42100524902344, + "y": -141.42100524902344 + }, + { + "x": 143.625, + "y": -139.1820068359375 + }, + { + "x": 145.79299926757812, + "y": -136.90899658203125 + }, + { + "x": 147.92599487304688, + "y": -134.6020050048828 + }, + { + "x": 150.02200317382812, + "y": -132.26199340820312 + }, + { + "x": 152.08099365234375, + "y": -129.88900756835938 + }, + { + "x": 154.1020050048828, + "y": -127.48400115966797 + }, + { + "x": 156.08599853515625, + "y": -125.0479965209961 + }, + { + "x": 158.031005859375, + "y": -122.58100128173828 + }, + { + "x": 159.93600463867188, + "y": -120.08399963378906 + }, + { + "x": 161.80299377441406, + "y": -117.55699920654297 + }, + { + "x": 163.62899780273438, + "y": -115.0009994506836 + }, + { + "x": 165.41600036621094, + "y": -112.41600036621094 + }, + { + "x": 167.16099548339844, + "y": -109.80400085449219 + }, + { + "x": 168.86500549316406, + "y": -107.16500091552734 + }, + { + "x": 170.5279998779297, + "y": -104.4990005493164 + }, + { + "x": 172.1479949951172, + "y": -101.80799865722656 + }, + { + "x": 173.7259979248047, + "y": -99.09100341796875 + }, + { + "x": 175.26100158691406, + "y": -96.3499984741211 + }, + { + "x": 176.7530059814453, + "y": -93.58499908447266 + }, + { + "x": 178.2010040283203, + "y": -90.7979965209961 + }, + { + "x": 179.60499572753906, + "y": -87.98699951171875 + }, + { + "x": 180.96499633789062, + "y": -85.15499877929688 + }, + { + "x": 182.27999877929688, + "y": -82.302001953125 + }, + { + "x": 183.5500030517578, + "y": -79.42900085449219 + }, + { + "x": 184.77499389648438, + "y": -76.53600311279297 + }, + { + "x": 185.9550018310547, + "y": -73.6240005493164 + }, + { + "x": 187.08799743652344, + "y": -70.69400024414062 + }, + { + "x": 188.17599487304688, + "y": -67.74700164794922 + }, + { + "x": 189.2169952392578, + "y": -64.78299713134766 + }, + { + "x": 190.21099853515625, + "y": -61.803001403808594 + }, + { + "x": 191.1580047607422, + "y": -58.80799865722656 + }, + { + "x": 192.05799865722656, + "y": -55.79800033569336 + }, + { + "x": 192.91099548339844, + "y": -52.77399826049805 + }, + { + "x": 193.71600341796875, + "y": -49.73699951171875 + }, + { + "x": 194.47300720214844, + "y": -46.68899917602539 + }, + { + "x": 195.18299865722656, + "y": -43.62799835205078 + }, + { + "x": 195.843994140625, + "y": -40.55699920654297 + }, + { + "x": 196.45700073242188, + "y": -37.47600173950195 + }, + { + "x": 196.5659942626953, + "y": -37.10100173950195 + }, + { + "x": 197.2519989013672, + "y": -33 + } + ], + "isCurve": true, + "animated": false, + "tooltip": "", + "icon": null, + "zIndex": 0 + }, + { + "id": "1.(b -> c)[0]", + "src": "1.b", + "srcArrow": "none", + "dst": "1.c", + "dstArrow": "triangle", + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "stroke": "B1", + "borderRadius": 10, + "label": "", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N2", + "italic": true, + "bold": false, + "underline": false, + "labelWidth": 0, + "labelHeight": 0, + "labelPosition": "", + "labelPercentage": 0, + "link": "", + "route": [ + { + "x": 197.2519989013672, + "y": 33 + }, + { + "x": 197.02099609375, + "y": 34.3849983215332 + }, + { + "x": 196.45700073242188, + "y": 37.47600173950195 + }, + { + "x": 195.843994140625, + "y": 40.55699920654297 + }, + { + "x": 195.18299865722656, + "y": 43.62799835205078 + }, + { + "x": 194.47300720214844, + "y": 46.68899917602539 + }, + { + "x": 193.71600341796875, + "y": 49.73699951171875 + }, + { + "x": 192.91099548339844, + "y": 52.77399826049805 + }, + { + "x": 192.05799865722656, + "y": 55.79800033569336 + }, + { + "x": 191.1580047607422, + "y": 58.80799865722656 + }, + { + "x": 190.21099853515625, + "y": 61.803001403808594 + }, + { + "x": 189.2169952392578, + "y": 64.78299713134766 + }, + { + "x": 188.17599487304688, + "y": 67.74700164794922 + }, + { + "x": 187.08799743652344, + "y": 70.69400024414062 + }, + { + "x": 185.9550018310547, + "y": 73.6240005493164 + }, + { + "x": 184.77499389648438, + "y": 76.53600311279297 + }, + { + "x": 183.5500030517578, + "y": 79.42900085449219 + }, + { + "x": 182.27999877929688, + "y": 82.302001953125 + }, + { + "x": 180.96499633789062, + "y": 85.15499877929688 + }, + { + "x": 179.60499572753906, + "y": 87.98699951171875 + }, + { + "x": 178.2010040283203, + "y": 90.7979965209961 + }, + { + "x": 176.7530059814453, + "y": 93.58499908447266 + }, + { + "x": 175.26100158691406, + "y": 96.3499984741211 + }, + { + "x": 173.7259979248047, + "y": 99.09100341796875 + }, + { + "x": 172.1479949951172, + "y": 101.80799865722656 + }, + { + "x": 170.5279998779297, + "y": 104.4990005493164 + }, + { + "x": 168.86500549316406, + "y": 107.16500091552734 + }, + { + "x": 167.16099548339844, + "y": 109.80400085449219 + }, + { + "x": 165.41600036621094, + "y": 112.41600036621094 + }, + { + "x": 163.62899780273438, + "y": 115.0009994506836 + }, + { + "x": 161.80299377441406, + "y": 117.55699920654297 + }, + { + "x": 159.93600463867188, + "y": 120.08399963378906 + }, + { + "x": 158.031005859375, + "y": 122.58100128173828 + }, + { + "x": 156.08599853515625, + "y": 125.0479965209961 + }, + { + "x": 154.1020050048828, + "y": 127.48400115966797 + }, + { + "x": 152.08099365234375, + "y": 129.88900756835938 + }, + { + "x": 150.02200317382812, + "y": 132.26199340820312 + }, + { + "x": 147.92599487304688, + "y": 134.6020050048828 + }, + { + "x": 145.79299926757812, + "y": 136.90899658203125 + }, + { + "x": 143.625, + "y": 139.1820068359375 + }, + { + "x": 141.42100524902344, + "y": 141.42100524902344 + }, + { + "x": 139.1820068359375, + "y": 143.625 + }, + { + "x": 136.90899658203125, + "y": 145.79299926757812 + }, + { + "x": 134.6020050048828, + "y": 147.92599487304688 + }, + { + "x": 132.26199340820312, + "y": 150.02200317382812 + }, + { + "x": 129.88900756835938, + "y": 152.08099365234375 + }, + { + "x": 127.48400115966797, + "y": 154.1020050048828 + }, + { + "x": 125.0479965209961, + "y": 156.08599853515625 + }, + { + "x": 122.58100128173828, + "y": 158.031005859375 + }, + { + "x": 120.08399963378906, + "y": 159.93600463867188 + }, + { + "x": 117.55699920654297, + "y": 161.80299377441406 + }, + { + "x": 115.0009994506836, + "y": 163.62899780273438 + }, + { + "x": 112.41600036621094, + "y": 165.41600036621094 + }, + { + "x": 109.80400085449219, + "y": 167.16099548339844 + }, + { + "x": 107.16500091552734, + "y": 168.86500549316406 + }, + { + "x": 104.4990005493164, + "y": 170.5279998779297 + }, + { + "x": 101.80799865722656, + "y": 172.1479949951172 + }, + { + "x": 99.09100341796875, + "y": 173.7259979248047 + }, + { + "x": 96.3499984741211, + "y": 175.26100158691406 + }, + { + "x": 93.58499908447266, + "y": 176.7530059814453 + }, + { + "x": 90.7979965209961, + "y": 178.2010040283203 + }, + { + "x": 87.98699951171875, + "y": 179.60499572753906 + }, + { + "x": 85.15499877929688, + "y": 180.96499633789062 + }, + { + "x": 82.302001953125, + "y": 182.27999877929688 + }, + { + "x": 79.42900085449219, + "y": 183.5500030517578 + }, + { + "x": 76.53600311279297, + "y": 184.77499389648438 + }, + { + "x": 73.6240005493164, + "y": 185.9550018310547 + }, + { + "x": 70.69400024414062, + "y": 187.08799743652344 + }, + { + "x": 67.74700164794922, + "y": 188.17599487304688 + }, + { + "x": 64.78299713134766, + "y": 189.2169952392578 + }, + { + "x": 61.803001403808594, + "y": 190.21099853515625 + }, + { + "x": 58.80799865722656, + "y": 191.1580047607422 + }, + { + "x": 55.79800033569336, + "y": 192.05799865722656 + }, + { + "x": 52.77399826049805, + "y": 192.91099548339844 + }, + { + "x": 49.73699951171875, + "y": 193.71600341796875 + }, + { + "x": 46.68899917602539, + "y": 194.47300720214844 + }, + { + "x": 43.62799835205078, + "y": 195.18299865722656 + }, + { + "x": 40.55699920654297, + "y": 195.843994140625 + }, + { + "x": 37.47600173950195, + "y": 196.45700073242188 + }, + { + "x": 34.3849983215332, + "y": 197.02099609375 + }, + { + "x": 31.285999298095703, + "y": 197.53700256347656 + }, + { + "x": 30.621999740600586, + "y": 197.6790008544922 + }, + { + "x": 26.5, + "y": 198.22999572753906 + } + ], + "isCurve": true, + "animated": false, + "tooltip": "", + "icon": null, + "zIndex": 0 + }, + { + "id": "1.(c -> d)[0]", + "src": "1.c", + "srcArrow": "none", + "dst": "1.d", + "dstArrow": "triangle", + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "stroke": "B1", + "borderRadius": 10, + "label": "", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N2", + "italic": true, + "bold": false, + "underline": false, + "labelWidth": 0, + "labelHeight": 0, + "labelPosition": "", + "labelPercentage": 0, + "link": "", + "route": [ + { + "x": -26.499000549316406, + "y": 198.22999572753906 + }, + { + "x": -28.18000030517578, + "y": 198.00399780273438 + }, + { + "x": -31.285999298095703, + "y": 197.53700256347656 + }, + { + "x": -34.3849983215332, + "y": 197.02099609375 + }, + { + "x": -37.47600173950195, + "y": 196.45700073242188 + }, + { + "x": -40.55699920654297, + "y": 195.843994140625 + }, + { + "x": -43.62799835205078, + "y": 195.18299865722656 + }, + { + "x": -46.68899917602539, + "y": 194.47300720214844 + }, + { + "x": -49.73699951171875, + "y": 193.71600341796875 + }, + { + "x": -52.77399826049805, + "y": 192.91099548339844 + }, + { + "x": -55.79800033569336, + "y": 192.05799865722656 + }, + { + "x": -58.80799865722656, + "y": 191.1580047607422 + }, + { + "x": -61.803001403808594, + "y": 190.21099853515625 + }, + { + "x": -64.78299713134766, + "y": 189.2169952392578 + }, + { + "x": -67.74700164794922, + "y": 188.17599487304688 + }, + { + "x": -70.69400024414062, + "y": 187.08799743652344 + }, + { + "x": -73.6240005493164, + "y": 185.9550018310547 + }, + { + "x": -76.53600311279297, + "y": 184.77499389648438 + }, + { + "x": -79.42900085449219, + "y": 183.5500030517578 + }, + { + "x": -82.302001953125, + "y": 182.27999877929688 + }, + { + "x": -85.15499877929688, + "y": 180.96499633789062 + }, + { + "x": -87.98699951171875, + "y": 179.60499572753906 + }, + { + "x": -90.7979965209961, + "y": 178.2010040283203 + }, + { + "x": -93.58499908447266, + "y": 176.7530059814453 + }, + { + "x": -96.3499984741211, + "y": 175.26100158691406 + }, + { + "x": -99.09100341796875, + "y": 173.7259979248047 + }, + { + "x": -101.80799865722656, + "y": 172.1479949951172 + }, + { + "x": -104.4990005493164, + "y": 170.5279998779297 + }, + { + "x": -107.16500091552734, + "y": 168.86500549316406 + }, + { + "x": -109.80400085449219, + "y": 167.16099548339844 + }, + { + "x": -112.41600036621094, + "y": 165.41600036621094 + }, + { + "x": -115.0009994506836, + "y": 163.62899780273438 + }, + { + "x": -117.55699920654297, + "y": 161.80299377441406 + }, + { + "x": -120.08399963378906, + "y": 159.93600463867188 + }, + { + "x": -122.58100128173828, + "y": 158.031005859375 + }, + { + "x": -125.0479965209961, + "y": 156.08599853515625 + }, + { + "x": -127.48400115966797, + "y": 154.1020050048828 + }, + { + "x": -129.88900756835938, + "y": 152.08099365234375 + }, + { + "x": -132.26199340820312, + "y": 150.02200317382812 + }, + { + "x": -134.6020050048828, + "y": 147.92599487304688 + }, + { + "x": -136.90899658203125, + "y": 145.79299926757812 + }, + { + "x": -139.1820068359375, + "y": 143.625 + }, + { + "x": -141.42100524902344, + "y": 141.42100524902344 + }, + { + "x": -143.625, + "y": 139.1820068359375 + }, + { + "x": -145.79299926757812, + "y": 136.90899658203125 + }, + { + "x": -147.92599487304688, + "y": 134.6020050048828 + }, + { + "x": -150.02200317382812, + "y": 132.26199340820312 + }, + { + "x": -152.08099365234375, + "y": 129.88900756835938 + }, + { + "x": -154.1020050048828, + "y": 127.48400115966797 + }, + { + "x": -156.08599853515625, + "y": 125.0479965209961 + }, + { + "x": -158.031005859375, + "y": 122.58100128173828 + }, + { + "x": -159.93600463867188, + "y": 120.08399963378906 + }, + { + "x": -161.80299377441406, + "y": 117.55699920654297 + }, + { + "x": -163.62899780273438, + "y": 115.0009994506836 + }, + { + "x": -165.41600036621094, + "y": 112.41600036621094 + }, + { + "x": -167.16099548339844, + "y": 109.80400085449219 + }, + { + "x": -168.86500549316406, + "y": 107.16500091552734 + }, + { + "x": -170.5279998779297, + "y": 104.4990005493164 + }, + { + "x": -172.1479949951172, + "y": 101.80799865722656 + }, + { + "x": -173.7259979248047, + "y": 99.09100341796875 + }, + { + "x": -175.26100158691406, + "y": 96.3499984741211 + }, + { + "x": -176.7530059814453, + "y": 93.58499908447266 + }, + { + "x": -178.2010040283203, + "y": 90.7979965209961 + }, + { + "x": -179.60499572753906, + "y": 87.98699951171875 + }, + { + "x": -180.96499633789062, + "y": 85.15499877929688 + }, + { + "x": -182.27999877929688, + "y": 82.302001953125 + }, + { + "x": -183.5500030517578, + "y": 79.42900085449219 + }, + { + "x": -184.77499389648438, + "y": 76.53600311279297 + }, + { + "x": -185.9550018310547, + "y": 73.6240005493164 + }, + { + "x": -187.08799743652344, + "y": 70.69400024414062 + }, + { + "x": -188.17599487304688, + "y": 67.74700164794922 + }, + { + "x": -189.2169952392578, + "y": 64.78299713134766 + }, + { + "x": -190.21099853515625, + "y": 61.803001403808594 + }, + { + "x": -191.1580047607422, + "y": 58.80799865722656 + }, + { + "x": -192.05799865722656, + "y": 55.79800033569336 + }, + { + "x": -192.91099548339844, + "y": 52.77399826049805 + }, + { + "x": -193.71600341796875, + "y": 49.73699951171875 + }, + { + "x": -194.47300720214844, + "y": 46.68899917602539 + }, + { + "x": -195.18299865722656, + "y": 43.62799835205078 + }, + { + "x": -195.843994140625, + "y": 40.55699920654297 + }, + { + "x": -196.45700073242188, + "y": 37.47600173950195 + }, + { + "x": -196.5659942626953, + "y": 37.10100173950195 + }, + { + "x": -197.2519989013672, + "y": 33 + } + ], + "isCurve": true, + "animated": false, + "tooltip": "", + "icon": null, + "zIndex": 0 + }, + { + "id": "2.(a -> b)[0]", + "src": "2.a", + "srcArrow": "none", + "dst": "2.b", + "dstArrow": "triangle", + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "stroke": "B1", + "borderRadius": 10, + "label": "", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N2", + "italic": true, + "bold": false, + "underline": false, + "labelWidth": 0, + "labelHeight": 0, + "labelPosition": "", + "labelPercentage": 0, + "link": "", + "route": [ + { + "x": 539.5, + "y": -148.2259979248047 + }, + { + "x": 542.2160034179688, + "y": -147.85400390625 + }, + { + "x": 546.35302734375, + "y": -147.19900512695312 + }, + { + "x": 550.4760131835938, + "y": -146.45700073242188 + }, + { + "x": 554.5819702148438, + "y": -145.62899780273438 + }, + { + "x": 558.6699829101562, + "y": -144.71499633789062 + }, + { + "x": 562.7369995117188, + "y": -143.71600341796875 + }, + { + "x": 566.7830200195312, + "y": -142.6320037841797 + }, + { + "x": 570.8060302734375, + "y": -141.46299743652344 + }, + { + "x": 574.802978515625, + "y": -140.21099853515625 + }, + { + "x": 578.7730102539062, + "y": -138.875 + }, + { + "x": 582.7139892578125, + "y": -137.45599365234375 + }, + { + "x": 586.6240234375, + "y": -135.9550018310547 + }, + { + "x": 590.5029907226562, + "y": -134.3719940185547 + }, + { + "x": 594.3469848632812, + "y": -132.70899963378906 + }, + { + "x": 598.155029296875, + "y": -130.96499633789062 + }, + { + "x": 601.927001953125, + "y": -129.14199829101562 + }, + { + "x": 605.6589965820312, + "y": -127.23999786376953 + }, + { + "x": 609.3499755859375, + "y": -125.26100158691406 + }, + { + "x": 613, + "y": -123.20500183105469 + }, + { + "x": 616.60498046875, + "y": -121.0719985961914 + }, + { + "x": 620.1649780273438, + "y": -118.86499786376953 + }, + { + "x": 623.677978515625, + "y": -116.58399963378906 + }, + { + "x": 627.1420288085938, + "y": -114.22899627685547 + }, + { + "x": 630.5570068359375, + "y": -111.8030014038086 + }, + { + "x": 633.9190063476562, + "y": -109.30500030517578 + }, + { + "x": 637.22900390625, + "y": -106.73799896240234 + }, + { + "x": 640.4840087890625, + "y": -104.10199737548828 + }, + { + "x": 643.6840209960938, + "y": -101.39900207519531 + }, + { + "x": 646.8259887695312, + "y": -98.62799835205078 + }, + { + "x": 649.9089965820312, + "y": -95.79299926757812 + }, + { + "x": 652.9320068359375, + "y": -92.89399719238281 + }, + { + "x": 655.8939819335938, + "y": -89.93199920654297 + }, + { + "x": 658.7930297851562, + "y": -86.90899658203125 + }, + { + "x": 661.6279907226562, + "y": -83.82599639892578 + }, + { + "x": 664.3989868164062, + "y": -80.68399810791016 + }, + { + "x": 667.1019897460938, + "y": -77.48400115966797 + }, + { + "x": 669.7379760742188, + "y": -74.22899627685547 + }, + { + "x": 672.3049926757812, + "y": -70.91899871826172 + }, + { + "x": 674.802978515625, + "y": -67.55699920654297 + }, + { + "x": 677.22900390625, + "y": -64.14199829101562 + }, + { + "x": 679.583984375, + "y": -60.678001403808594 + }, + { + "x": 681.864990234375, + "y": -57.165000915527344 + }, + { + "x": 684.072021484375, + "y": -53.60499954223633 + }, + { + "x": 686.2050170898438, + "y": -50 + }, + { + "x": 688.260986328125, + "y": -46.349998474121094 + }, + { + "x": 690.239990234375, + "y": -42.659000396728516 + }, + { + "x": 692.1420288085938, + "y": -38.926998138427734 + }, + { + "x": 693.9650268554688, + "y": -35.154998779296875 + }, + { + "x": 695.708984375, + "y": -31.347000122070312 + }, + { + "x": 697.3720092773438, + "y": -27.503000259399414 + }, + { + "x": 698.9550170898438, + "y": -23.624000549316406 + }, + { + "x": 700.4559936523438, + "y": -19.714000701904297 + }, + { + "x": 701.875, + "y": -15.77299976348877 + }, + { + "x": 703.2109985351562, + "y": -11.803000450134277 + }, + { + "x": 704.4630126953125, + "y": -7.806000232696533 + }, + { + "x": 705.6320190429688, + "y": -3.7829999923706055 + }, + { + "x": 706.7160034179688, + "y": 0.2619999945163727 + }, + { + "x": 707.7150268554688, + "y": 4.328999996185303 + }, + { + "x": 708.6290283203125, + "y": 8.416999816894531 + }, + { + "x": 709.4569702148438, + "y": 12.52299976348877 + }, + { + "x": 710.198974609375, + "y": 16.645999908447266 + }, + { + "x": 710.85400390625, + "y": 20.783000946044922 + }, + { + "x": 711.4219970703125, + "y": 24.933000564575195 + }, + { + "x": 711.9039916992188, + "y": 29.0939998626709 + }, + { + "x": 712.2979736328125, + "y": 33.263999938964844 + }, + { + "x": 712.60498046875, + "y": 37.441001892089844 + }, + { + "x": 712.823974609375, + "y": 41.624000549316406 + }, + { + "x": 712.9559936523438, + "y": 45.81100082397461 + }, + { + "x": 713, + "y": 50 + }, + { + "x": 712.9559936523438, + "y": 54.1879997253418 + }, + { + "x": 712.823974609375, + "y": 58.375 + }, + { + "x": 712.60498046875, + "y": 62.55799865722656 + }, + { + "x": 712.2979736328125, + "y": 66.73500061035156 + }, + { + "x": 711.9039916992188, + "y": 70.90499877929688 + }, + { + "x": 711.4219970703125, + "y": 75.06600189208984 + }, + { + "x": 710.85400390625, + "y": 79.21600341796875 + }, + { + "x": 710.198974609375, + "y": 83.35299682617188 + }, + { + "x": 709.4569702148438, + "y": 87.47599792480469 + }, + { + "x": 708.6290283203125, + "y": 91.58200073242188 + }, + { + "x": 707.7150268554688, + "y": 95.66999816894531 + }, + { + "x": 706.7160034179688, + "y": 99.73699951171875 + }, + { + "x": 705.6320190429688, + "y": 103.78299713134766 + }, + { + "x": 704.4630126953125, + "y": 107.80599975585938 + }, + { + "x": 703.2109985351562, + "y": 111.8030014038086 + }, + { + "x": 702.8259887695312, + "y": 113.08100128173828 + }, + { + "x": 701.4329833984375, + "y": 116.9990005493164 + } + ], + "isCurve": true, + "animated": false, + "tooltip": "", + "icon": null, + "zIndex": 0 + }, + { + "id": "2.(b -> c)[0]", + "src": "2.b", + "srcArrow": "none", + "dst": "2.c", + "dstArrow": "triangle", + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "stroke": "B1", + "borderRadius": 10, + "label": "", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N2", + "italic": true, + "bold": false, + "underline": false, + "labelWidth": 0, + "labelHeight": 0, + "labelPosition": "", + "labelPercentage": 0, + "link": "", + "route": [ + { + "x": 662.3569946289062, + "y": 182.99899291992188 + }, + { + "x": 661.6279907226562, + "y": 183.8260040283203 + }, + { + "x": 658.7930297851562, + "y": 186.90899658203125 + }, + { + "x": 655.8939819335938, + "y": 189.9320068359375 + }, + { + "x": 652.9320068359375, + "y": 192.8939971923828 + }, + { + "x": 649.9089965820312, + "y": 195.79299926757812 + }, + { + "x": 646.8259887695312, + "y": 198.6280059814453 + }, + { + "x": 643.6840209960938, + "y": 201.3990020751953 + }, + { + "x": 640.4840087890625, + "y": 204.1020050048828 + }, + { + "x": 637.22900390625, + "y": 206.73800659179688 + }, + { + "x": 633.9190063476562, + "y": 209.30499267578125 + }, + { + "x": 630.5570068359375, + "y": 211.80299377441406 + }, + { + "x": 627.1420288085938, + "y": 214.22900390625 + }, + { + "x": 623.677978515625, + "y": 216.58399963378906 + }, + { + "x": 620.1649780273438, + "y": 218.86500549316406 + }, + { + "x": 616.60498046875, + "y": 221.07200622558594 + }, + { + "x": 613, + "y": 223.2050018310547 + }, + { + "x": 609.3499755859375, + "y": 225.26100158691406 + }, + { + "x": 605.6589965820312, + "y": 227.24000549316406 + }, + { + "x": 601.927001953125, + "y": 229.14199829101562 + }, + { + "x": 598.155029296875, + "y": 230.96499633789062 + }, + { + "x": 594.3469848632812, + "y": 232.70899963378906 + }, + { + "x": 590.5029907226562, + "y": 234.3719940185547 + }, + { + "x": 586.6240234375, + "y": 235.9550018310547 + }, + { + "x": 582.7139892578125, + "y": 237.45599365234375 + }, + { + "x": 578.7730102539062, + "y": 238.875 + }, + { + "x": 574.802978515625, + "y": 240.21099853515625 + }, + { + "x": 570.8060302734375, + "y": 241.46299743652344 + }, + { + "x": 566.7830200195312, + "y": 242.6320037841797 + }, + { + "x": 562.7369995117188, + "y": 243.71600341796875 + }, + { + "x": 558.6699829101562, + "y": 244.71499633789062 + }, + { + "x": 554.5819702148438, + "y": 245.62899780273438 + }, + { + "x": 550.4760131835938, + "y": 246.45700073242188 + }, + { + "x": 546.35302734375, + "y": 247.19900512695312 + }, + { + "x": 542.2160034179688, + "y": 247.85400390625 + }, + { + "x": 538.0659790039062, + "y": 248.4219970703125 + }, + { + "x": 533.905029296875, + "y": 248.9040069580078 + }, + { + "x": 529.7349853515625, + "y": 249.29800415039062 + }, + { + "x": 525.5579833984375, + "y": 249.60499572753906 + }, + { + "x": 521.375, + "y": 249.82400512695312 + }, + { + "x": 517.18798828125, + "y": 249.95599365234375 + }, + { + "x": 513, + "y": 250 + }, + { + "x": 508.8110046386719, + "y": 249.95599365234375 + }, + { + "x": 504.6239929199219, + "y": 249.82400512695312 + }, + { + "x": 500.4410095214844, + "y": 249.60499572753906 + }, + { + "x": 496.2640075683594, + "y": 249.29800415039062 + }, + { + "x": 492.093994140625, + "y": 248.9040069580078 + }, + { + "x": 487.9330139160156, + "y": 248.4219970703125 + }, + { + "x": 483.7829895019531, + "y": 247.85400390625 + }, + { + "x": 479.64599609375, + "y": 247.19900512695312 + }, + { + "x": 475.52301025390625, + "y": 246.45700073242188 + }, + { + "x": 471.4169921875, + "y": 245.62899780273438 + }, + { + "x": 467.3290100097656, + "y": 244.71499633789062 + }, + { + "x": 463.2619934082031, + "y": 243.71600341796875 + }, + { + "x": 459.21600341796875, + "y": 242.6320037841797 + }, + { + "x": 455.1929931640625, + "y": 241.46299743652344 + }, + { + "x": 451.1960144042969, + "y": 240.21099853515625 + }, + { + "x": 447.22601318359375, + "y": 238.875 + }, + { + "x": 443.2850036621094, + "y": 237.45599365234375 + }, + { + "x": 439.375, + "y": 235.9550018310547 + }, + { + "x": 435.4960021972656, + "y": 234.3719940185547 + }, + { + "x": 431.6520080566406, + "y": 232.70899963378906 + }, + { + "x": 427.843994140625, + "y": 230.96499633789062 + }, + { + "x": 424.0719909667969, + "y": 229.14199829101562 + }, + { + "x": 420.3399963378906, + "y": 227.24000549316406 + }, + { + "x": 416.64898681640625, + "y": 225.26100158691406 + }, + { + "x": 413, + "y": 223.2050018310547 + }, + { + "x": 409.3940124511719, + "y": 221.07200622558594 + }, + { + "x": 405.8340148925781, + "y": 218.86500549316406 + }, + { + "x": 402.3210144042969, + "y": 216.58399963378906 + }, + { + "x": 398.85699462890625, + "y": 214.22900390625 + }, + { + "x": 395.4419860839844, + "y": 211.80299377441406 + }, + { + "x": 392.0799865722656, + "y": 209.30499267578125 + }, + { + "x": 388.7699890136719, + "y": 206.73800659179688 + }, + { + "x": 385.5150146484375, + "y": 204.1020050048828 + }, + { + "x": 382.31500244140625, + "y": 201.3990020751953 + }, + { + "x": 379.1730041503906, + "y": 198.6280059814453 + }, + { + "x": 376.0899963378906, + "y": 195.79299926757812 + }, + { + "x": 373.0669860839844, + "y": 192.8939971923828 + }, + { + "x": 370.1050109863281, + "y": 189.9320068359375 + }, + { + "x": 367.20599365234375, + "y": 186.90899658203125 + }, + { + "x": 366.4079895019531, + "y": 186.1060028076172 + }, + { + "x": 363.6419982910156, + "y": 183 + } + ], + "isCurve": true, + "animated": false, + "tooltip": "", + "icon": null, + "zIndex": 0 + }, + { + "id": "3.(a -> b)[0]", + "src": "3.a", + "srcArrow": "none", + "dst": "3.b", + "dstArrow": "triangle", + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "stroke": "B1", + "borderRadius": 10, + "label": "", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N2", + "italic": true, + "bold": false, + "underline": false, + "labelWidth": 0, + "labelHeight": 0, + "labelPosition": "", + "labelPercentage": 0, + "link": "", + "route": [ + { + "x": 998.5, + "y": -198.21800231933594 + }, + { + "x": 1003.2860107421875, + "y": -197.53700256347656 + }, + { + "x": 1009.4760131835938, + "y": -196.45700073242188 + }, + { + "x": 1015.6279907226562, + "y": -195.18299865722656 + }, + { + "x": 1021.7369995117188, + "y": -193.71600341796875 + }, + { + "x": 1027.7979736328125, + "y": -192.05799865722656 + }, + { + "x": 1033.802978515625, + "y": -190.21099853515625 + }, + { + "x": 1039.7469482421875, + "y": -188.17599487304688 + }, + { + "x": 1045.6240234375, + "y": -185.9550018310547 + }, + { + "x": 1051.428955078125, + "y": -183.5500030517578 + }, + { + "x": 1057.155029296875, + "y": -180.96499633789062 + }, + { + "x": 1062.7979736328125, + "y": -178.2010040283203 + }, + { + "x": 1068.3499755859375, + "y": -175.26100158691406 + }, + { + "x": 1073.8079833984375, + "y": -172.1479949951172 + }, + { + "x": 1079.1650390625, + "y": -168.86500549316406 + }, + { + "x": 1084.416015625, + "y": -165.41600036621094 + }, + { + "x": 1089.5570068359375, + "y": -161.80299377441406 + }, + { + "x": 1094.5810546875, + "y": -158.031005859375 + }, + { + "x": 1099.4840087890625, + "y": -154.1020050048828 + }, + { + "x": 1104.261962890625, + "y": -150.02200317382812 + }, + { + "x": 1108.9090576171875, + "y": -145.79299926757812 + }, + { + "x": 1113.4210205078125, + "y": -141.42100524902344 + }, + { + "x": 1117.79296875, + "y": -136.90899658203125 + }, + { + "x": 1122.02197265625, + "y": -132.26199340820312 + }, + { + "x": 1126.10205078125, + "y": -127.48400115966797 + }, + { + "x": 1130.031005859375, + "y": -122.58100128173828 + }, + { + "x": 1133.802978515625, + "y": -117.55699920654297 + }, + { + "x": 1137.416015625, + "y": -112.41600036621094 + }, + { + "x": 1140.864990234375, + "y": -107.16500091552734 + }, + { + "x": 1144.14794921875, + "y": -101.80799865722656 + }, + { + "x": 1147.260986328125, + "y": -96.3499984741211 + }, + { + "x": 1150.2010498046875, + "y": -90.7979965209961 + }, + { + "x": 1152.9649658203125, + "y": -85.15499877929688 + }, + { + "x": 1155.550048828125, + "y": -79.42900085449219 + }, + { + "x": 1157.9549560546875, + "y": -73.6240005493164 + }, + { + "x": 1160.176025390625, + "y": -67.74700164794922 + }, + { + "x": 1162.2110595703125, + "y": -61.803001403808594 + }, + { + "x": 1164.0579833984375, + "y": -55.79800033569336 + }, + { + "x": 1165.7159423828125, + "y": -49.73699951171875 + }, + { + "x": 1167.1829833984375, + "y": -43.62799835205078 + }, + { + "x": 1168.45703125, + "y": -37.47600173950195 + }, + { + "x": 1169.5369873046875, + "y": -31.285999298095703 + }, + { + "x": 1170.4219970703125, + "y": -25.06599998474121 + }, + { + "x": 1171.112060546875, + "y": -18.820999145507812 + }, + { + "x": 1171.60498046875, + "y": -12.557999610900879 + }, + { + "x": 1171.9010009765625, + "y": -6.2820000648498535 + }, + { + "x": 1172, + "y": 0 + }, + { + "x": 1171.9010009765625, + "y": 6.2820000648498535 + }, + { + "x": 1171.60498046875, + "y": 12.557999610900879 + }, + { + "x": 1171.112060546875, + "y": 18.820999145507812 + }, + { + "x": 1170.4219970703125, + "y": 25.06599998474121 + }, + { + "x": 1169.5369873046875, + "y": 31.285999298095703 + }, + { + "x": 1168.45703125, + "y": 37.47600173950195 + }, + { + "x": 1167.1829833984375, + "y": 43.62799835205078 + }, + { + "x": 1165.7159423828125, + "y": 49.73699951171875 + }, + { + "x": 1164.0579833984375, + "y": 55.79800033569336 + }, + { + "x": 1162.2110595703125, + "y": 61.803001403808594 + }, + { + "x": 1160.176025390625, + "y": 67.74700164794922 + }, + { + "x": 1157.9549560546875, + "y": 73.6240005493164 + }, + { + "x": 1155.550048828125, + "y": 79.42900085449219 + }, + { + "x": 1152.9649658203125, + "y": 85.15499877929688 + }, + { + "x": 1150.2010498046875, + "y": 90.7979965209961 + }, + { + "x": 1147.260986328125, + "y": 96.3499984741211 + }, + { + "x": 1144.14794921875, + "y": 101.80799865722656 + }, + { + "x": 1140.864990234375, + "y": 107.16500091552734 + }, + { + "x": 1137.416015625, + "y": 112.41600036621094 + }, + { + "x": 1133.802978515625, + "y": 117.55699920654297 + }, + { + "x": 1130.031005859375, + "y": 122.58100128173828 + }, + { + "x": 1126.10205078125, + "y": 127.48400115966797 + }, + { + "x": 1122.02197265625, + "y": 132.26199340820312 + }, + { + "x": 1117.79296875, + "y": 136.90899658203125 + }, + { + "x": 1113.4210205078125, + "y": 141.42100524902344 + }, + { + "x": 1108.9090576171875, + "y": 145.79299926757812 + }, + { + "x": 1104.261962890625, + "y": 150.02200317382812 + }, + { + "x": 1099.4840087890625, + "y": 154.1020050048828 + }, + { + "x": 1094.5810546875, + "y": 158.031005859375 + }, + { + "x": 1089.5570068359375, + "y": 161.80299377441406 + }, + { + "x": 1084.416015625, + "y": 165.41600036621094 + }, + { + "x": 1079.1650390625, + "y": 168.86500549316406 + }, + { + "x": 1073.8079833984375, + "y": 172.1479949951172 + }, + { + "x": 1068.3499755859375, + "y": 175.26100158691406 + }, + { + "x": 1062.7979736328125, + "y": 178.2010040283203 + }, + { + "x": 1057.155029296875, + "y": 180.96499633789062 + }, + { + "x": 1051.428955078125, + "y": 183.5500030517578 + }, + { + "x": 1045.6240234375, + "y": 185.9550018310547 + }, + { + "x": 1039.7469482421875, + "y": 188.17599487304688 + }, + { + "x": 1033.802978515625, + "y": 190.21099853515625 + }, + { + "x": 1027.7979736328125, + "y": 192.05799865722656 + }, + { + "x": 1021.7369995117188, + "y": 193.71600341796875 + }, + { + "x": 1015.6279907226562, + "y": 195.18299865722656 + }, + { + "x": 1009.4760131835938, + "y": 196.45700073242188 + }, + { + "x": 1003.2860107421875, + "y": 197.53700256347656 + }, + { + "x": 998.5, + "y": 198.21800231933594 + } + ], + "isCurve": true, + "animated": false, + "tooltip": "", + "icon": null, + "zIndex": 0 + }, + { + "id": "4.(a -> b)[0]", + "src": "4.a", + "srcArrow": "none", + "dst": "4.b", + "dstArrow": "triangle", + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "stroke": "B1", + "borderRadius": 10, + "label": "", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N2", + "italic": true, + "bold": false, + "underline": false, + "labelWidth": 0, + "labelHeight": 0, + "labelPosition": "", + "labelPercentage": 0, + "link": "", + "route": [ + { + "x": 1111.5, + "y": -198.23399353027344 + }, + { + "x": 1112.1429443359375, + "y": -198.1490020751953 + }, + { + "x": 1114.2159423828125, + "y": -197.85400390625 + }, + { + "x": 1116.2860107421875, + "y": -197.53700256347656 + }, + { + "x": 1118.35302734375, + "y": -197.19900512695312 + }, + { + "x": 1120.416015625, + "y": -196.83900451660156 + }, + { + "x": 1122.4759521484375, + "y": -196.45700073242188 + }, + { + "x": 1124.531005859375, + "y": -196.0540008544922 + }, + { + "x": 1126.58203125, + "y": -195.62899780273438 + }, + { + "x": 1128.6280517578125, + "y": -195.18299865722656 + }, + { + "x": 1130.6700439453125, + "y": -194.71499633789062 + }, + { + "x": 1132.7060546875, + "y": -194.2259979248047 + }, + { + "x": 1134.737060546875, + "y": -193.71600341796875 + }, + { + "x": 1136.762939453125, + "y": -193.18499755859375 + }, + { + "x": 1138.782958984375, + "y": -192.6320037841797 + }, + { + "x": 1140.7979736328125, + "y": -192.05799865722656 + }, + { + "x": 1142.8060302734375, + "y": -191.46299743652344 + }, + { + "x": 1144.8079833984375, + "y": -190.84800720214844 + }, + { + "x": 1146.802978515625, + "y": -190.21099853515625 + }, + { + "x": 1148.791015625, + "y": -189.55299377441406 + }, + { + "x": 1150.77294921875, + "y": -188.875 + }, + { + "x": 1152.7469482421875, + "y": -188.17599487304688 + }, + { + "x": 1154.7139892578125, + "y": -187.45599365234375 + }, + { + "x": 1156.6729736328125, + "y": -186.71600341796875 + }, + { + "x": 1158.6240234375, + "y": -185.9550018310547 + }, + { + "x": 1160.5679931640625, + "y": -185.1739959716797 + }, + { + "x": 1162.5030517578125, + "y": -184.3719940185547 + }, + { + "x": 1164.428955078125, + "y": -183.5500030517578 + }, + { + "x": 1166.3470458984375, + "y": -182.70899963378906 + }, + { + "x": 1168.2559814453125, + "y": -181.8470001220703 + }, + { + "x": 1170.155029296875, + "y": -180.96499633789062 + }, + { + "x": 1172.0460205078125, + "y": -180.06300354003906 + }, + { + "x": 1173.927001953125, + "y": -179.14199829101562 + }, + { + "x": 1175.7979736328125, + "y": -178.2010040283203 + }, + { + "x": 1177.6590576171875, + "y": -177.24000549316406 + }, + { + "x": 1179.510009765625, + "y": -176.25999450683594 + }, + { + "x": 1181.3499755859375, + "y": -175.26100158691406 + }, + { + "x": 1183.1800537109375, + "y": -174.24200439453125 + }, + { + "x": 1185, + "y": -173.2050018310547 + }, + { + "x": 1186.8079833984375, + "y": -172.1479949951172 + }, + { + "x": 1188.60498046875, + "y": -171.07200622558594 + }, + { + "x": 1190.3909912109375, + "y": -169.97799682617188 + }, + { + "x": 1192.1650390625, + "y": -168.86500549316406 + }, + { + "x": 1193.927001953125, + "y": -167.73399353027344 + }, + { + "x": 1195.677978515625, + "y": -166.58399963378906 + }, + { + "x": 1197.416015625, + "y": -165.41600036621094 + }, + { + "x": 1199.1419677734375, + "y": -164.22900390625 + }, + { + "x": 1200.85595703125, + "y": -163.02499389648438 + }, + { + "x": 1202.5570068359375, + "y": -161.80299377441406 + }, + { + "x": 1204.2440185546875, + "y": -160.56300354003906 + }, + { + "x": 1205.9189453125, + "y": -159.30499267578125 + }, + { + "x": 1207.5810546875, + "y": -158.031005859375 + }, + { + "x": 1209.22900390625, + "y": -156.73800659179688 + }, + { + "x": 1210.864013671875, + "y": -155.4290008544922 + }, + { + "x": 1212.4840087890625, + "y": -154.1020050048828 + }, + { + "x": 1214.0909423828125, + "y": -152.75900268554688 + }, + { + "x": 1215.6839599609375, + "y": -151.3990020751953 + }, + { + "x": 1217.261962890625, + "y": -150.02200317382812 + }, + { + "x": 1218.8260498046875, + "y": -148.6280059814453 + }, + { + "x": 1220.375, + "y": -147.218994140625 + }, + { + "x": 1221.9090576171875, + "y": -145.79299926757812 + }, + { + "x": 1223.427978515625, + "y": -144.3520050048828 + }, + { + "x": 1224.9320068359375, + "y": -142.8939971923828 + }, + { + "x": 1226.4210205078125, + "y": -141.42100524902344 + }, + { + "x": 1227.89404296875, + "y": -139.9320068359375 + }, + { + "x": 1229.35205078125, + "y": -138.42799377441406 + }, + { + "x": 1230.79296875, + "y": -136.90899658203125 + }, + { + "x": 1232.218994140625, + "y": -135.375 + }, + { + "x": 1231.5989990234375, + "y": -136.1060028076172 + }, + { + "x": 1234.364990234375, + "y": -133 + } + ], + "isCurve": true, + "animated": false, + "tooltip": "", + "icon": null, + "zIndex": 0 + }, + { + "id": "4.(b -> c)[0]", + "src": "4.b", + "srcArrow": "none", + "dst": "4.c", + "dstArrow": "triangle", + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "stroke": "B1", + "borderRadius": 10, + "label": "", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N2", + "italic": true, + "bold": false, + "underline": false, + "labelWidth": 0, + "labelHeight": 0, + "labelPosition": "", + "labelPercentage": 0, + "link": "", + "route": [ + { + "x": 1273.43994140625, + "y": -67 + }, + { + "x": 1273.875, + "y": -65.77300262451172 + }, + { + "x": 1274.552978515625, + "y": -63.79100036621094 + }, + { + "x": 1275.2110595703125, + "y": -61.803001403808594 + }, + { + "x": 1275.8480224609375, + "y": -59.80799865722656 + }, + { + "x": 1276.4630126953125, + "y": -57.805999755859375 + }, + { + "x": 1277.0579833984375, + "y": -55.79800033569336 + }, + { + "x": 1277.6319580078125, + "y": -53.78300094604492 + }, + { + "x": 1278.18505859375, + "y": -51.76300048828125 + }, + { + "x": 1278.7159423828125, + "y": -49.73699951171875 + }, + { + "x": 1279.2259521484375, + "y": -47.70600128173828 + }, + { + "x": 1279.7149658203125, + "y": -45.66999816894531 + }, + { + "x": 1280.1829833984375, + "y": -43.62799835205078 + }, + { + "x": 1280.6290283203125, + "y": -41.582000732421875 + }, + { + "x": 1281.053955078125, + "y": -39.53099822998047 + }, + { + "x": 1281.45703125, + "y": -37.47600173950195 + }, + { + "x": 1281.8389892578125, + "y": -35.41600036621094 + }, + { + "x": 1282.198974609375, + "y": -33.35300064086914 + }, + { + "x": 1282.5369873046875, + "y": -31.285999298095703 + }, + { + "x": 1282.85400390625, + "y": -29.215999603271484 + }, + { + "x": 1283.1490478515625, + "y": -27.14299964904785 + }, + { + "x": 1283.4219970703125, + "y": -25.06599998474121 + }, + { + "x": 1283.6739501953125, + "y": -22.98699951171875 + }, + { + "x": 1283.904052734375, + "y": -20.905000686645508 + }, + { + "x": 1284.112060546875, + "y": -18.820999145507812 + }, + { + "x": 1284.2979736328125, + "y": -16.735000610351562 + }, + { + "x": 1284.4620361328125, + "y": -14.647000312805176 + }, + { + "x": 1284.60498046875, + "y": -12.557999610900879 + }, + { + "x": 1284.7249755859375, + "y": -10.467000007629395 + }, + { + "x": 1284.823974609375, + "y": -8.375 + }, + { + "x": 1284.9010009765625, + "y": -6.2820000648498535 + }, + { + "x": 1284.9560546875, + "y": -4.188000202178955 + }, + { + "x": 1284.989013671875, + "y": -2.0940001010894775 + }, + { + "x": 1285, + "y": 0 + }, + { + "x": 1284.989013671875, + "y": 2.0940001010894775 + }, + { + "x": 1284.9560546875, + "y": 4.188000202178955 + }, + { + "x": 1284.9010009765625, + "y": 6.2820000648498535 + }, + { + "x": 1284.823974609375, + "y": 8.375 + }, + { + "x": 1284.7249755859375, + "y": 10.467000007629395 + }, + { + "x": 1284.60498046875, + "y": 12.557999610900879 + }, + { + "x": 1284.4620361328125, + "y": 14.647000312805176 + }, + { + "x": 1284.2979736328125, + "y": 16.735000610351562 + }, + { + "x": 1284.112060546875, + "y": 18.820999145507812 + }, + { + "x": 1283.904052734375, + "y": 20.905000686645508 + }, + { + "x": 1283.6739501953125, + "y": 22.98699951171875 + }, + { + "x": 1283.4219970703125, + "y": 25.06599998474121 + }, + { + "x": 1283.1490478515625, + "y": 27.14299964904785 + }, + { + "x": 1282.85400390625, + "y": 29.215999603271484 + }, + { + "x": 1282.5369873046875, + "y": 31.285999298095703 + }, + { + "x": 1282.198974609375, + "y": 33.35300064086914 + }, + { + "x": 1281.8389892578125, + "y": 35.41600036621094 + }, + { + "x": 1281.45703125, + "y": 37.47600173950195 + }, + { + "x": 1281.053955078125, + "y": 39.53099822998047 + }, + { + "x": 1280.6290283203125, + "y": 41.582000732421875 + }, + { + "x": 1280.1829833984375, + "y": 43.62799835205078 + }, + { + "x": 1279.7149658203125, + "y": 45.66999816894531 + }, + { + "x": 1279.2259521484375, + "y": 47.70600128173828 + }, + { + "x": 1278.7159423828125, + "y": 49.73699951171875 + }, + { + "x": 1278.18505859375, + "y": 51.76300048828125 + }, + { + "x": 1277.6319580078125, + "y": 53.78300094604492 + }, + { + "x": 1277.0579833984375, + "y": 55.79800033569336 + }, + { + "x": 1276.4630126953125, + "y": 57.805999755859375 + }, + { + "x": 1275.8480224609375, + "y": 59.80799865722656 + }, + { + "x": 1275.2110595703125, + "y": 61.803001403808594 + }, + { + "x": 1274.552978515625, + "y": 63.79100036621094 + }, + { + "x": 1274.833984375, + "y": 63.08100128173828 + }, + { + "x": 1273.43994140625, + "y": 66.9990005493164 + } + ], + "isCurve": true, + "animated": false, + "tooltip": "", + "icon": null, + "zIndex": 0 + }, + { + "id": "4.(c -> d)[0]", + "src": "4.c", + "srcArrow": "none", + "dst": "4.d", + "dstArrow": "triangle", + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "stroke": "B1", + "borderRadius": 10, + "label": "", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N2", + "italic": true, + "bold": false, + "underline": false, + "labelWidth": 0, + "labelHeight": 0, + "labelPosition": "", + "labelPercentage": 0, + "link": "", + "route": [ { - "x": 68.47599792480469, - "y": -140.2429962158203 + "x": 1234.364990234375, + "y": 132.99899291992188 }, { - "x": 70.822998046875, - "y": -137.468994140625 + "x": 1233.6280517578125, + "y": 133.8260040283203 }, { - "x": 73.11799621582031, - "y": -134.71299743652344 + "x": 1232.218994140625, + "y": 135.375 }, { - "x": 75.36399841308594, - "y": -131.97900390625 + "x": 1230.79296875, + "y": 136.90899658203125 }, { - "x": 77.56199645996094, - "y": -129.26800537109375 + "x": 1229.35205078125, + "y": 138.42799377441406 }, { - "x": 79.71700286865234, - "y": -126.58300018310547 + "x": 1227.89404296875, + "y": 139.9320068359375 }, { - "x": 81.83000183105469, - "y": -123.92500305175781 + "x": 1226.4210205078125, + "y": 141.42100524902344 }, { - "x": 83.90399932861328, - "y": -121.29499816894531 + "x": 1224.9320068359375, + "y": 142.8939971923828 }, { - "x": 85.94200134277344, - "y": -118.69599914550781 + "x": 1223.427978515625, + "y": 144.3520050048828 }, { - "x": 87.947998046875, - "y": -116.12799835205078 + "x": 1221.9090576171875, + "y": 145.79299926757812 }, { - "x": 89.92400360107422, - "y": -113.59300231933594 + "x": 1220.375, + "y": 147.218994140625 }, { - "x": 91.8740005493164, - "y": -111.09100341796875 + "x": 1218.8260498046875, + "y": 148.6280059814453 }, { - "x": 93.79900360107422, - "y": -108.62300109863281 + "x": 1217.261962890625, + "y": 150.02200317382812 }, { - "x": 95.7030029296875, - "y": -106.19000244140625 + "x": 1215.6839599609375, + "y": 151.3990020751953 }, { - "x": 97.58999633789062, - "y": -103.79299926757812 + "x": 1214.0909423828125, + "y": 152.75900268554688 }, { - "x": 99.46199798583984, - "y": -101.43000030517578 + "x": 1212.4840087890625, + "y": 154.1020050048828 }, { - "x": 101.3219985961914, - "y": -99.10299682617188 + "x": 1210.864013671875, + "y": 155.4290008544922 }, { - "x": 103.1729965209961, - "y": -96.81199645996094 + "x": 1209.22900390625, + "y": 156.73800659179688 }, { - "x": 105.01899719238281, - "y": -94.55599975585938 + "x": 1207.5810546875, + "y": 158.031005859375 }, { - "x": 106.86100006103516, - "y": -92.33399963378906 + "x": 1205.9189453125, + "y": 159.30499267578125 }, { - "x": 108.7030029296875, - "y": -90.14700317382812 + "x": 1204.2440185546875, + "y": 160.56300354003906 }, { - "x": 110.5479965209961, - "y": -87.99299621582031 + "x": 1202.5570068359375, + "y": 161.80299377441406 }, { - "x": 112.39700317382812, - "y": -85.87100219726562 + "x": 1200.85595703125, + "y": 163.02499389648438 }, { - "x": 114.25499725341797, - "y": -83.77999877929688 + "x": 1199.1419677734375, + "y": 164.22900390625 }, { - "x": 116.12300109863281, - "y": -81.72000122070312 + "x": 1197.416015625, + "y": 165.41600036621094 }, { - "x": 118.00499725341797, - "y": -79.68800354003906 + "x": 1195.677978515625, + "y": 166.58399963378906 }, { - "x": 119.9010009765625, - "y": -77.68299865722656 + "x": 1193.927001953125, + "y": 167.73399353027344 }, { - "x": 121.81500244140625, - "y": -75.7040023803711 + "x": 1192.1650390625, + "y": 168.86500549316406 }, { - "x": 123.7490005493164, - "y": -73.7490005493164 + "x": 1190.3909912109375, + "y": 169.97799682617188 }, { - "x": 125.7040023803711, - "y": -71.81500244140625 + "x": 1188.60498046875, + "y": 171.07200622558594 }, { - "x": 127.68299865722656, - "y": -69.9010009765625 + "x": 1186.8079833984375, + "y": 172.1479949951172 }, { - "x": 129.68800354003906, - "y": -68.00499725341797 + "x": 1185, + "y": 173.2050018310547 }, { - "x": 131.72000122070312, - "y": -66.12300109863281 + "x": 1183.1800537109375, + "y": 174.24200439453125 }, { - "x": 133.77999877929688, - "y": -64.25499725341797 + "x": 1181.3499755859375, + "y": 175.26100158691406 }, { - "x": 135.87100219726562, - "y": -62.39699935913086 + "x": 1179.510009765625, + "y": 176.25999450683594 }, { - "x": 137.9929962158203, - "y": -60.54800033569336 + "x": 1177.6590576171875, + "y": 177.24000549316406 }, { - "x": 140.14700317382812, - "y": -58.702999114990234 + "x": 1175.7979736328125, + "y": 178.2010040283203 }, { - "x": 142.33399963378906, - "y": -56.861000061035156 + "x": 1173.927001953125, + "y": 179.14199829101562 }, { - "x": 144.55599975585938, - "y": -55.01900100708008 + "x": 1172.0460205078125, + "y": 180.06300354003906 }, { - "x": 146.81199645996094, - "y": -53.17300033569336 + "x": 1170.155029296875, + "y": 180.96499633789062 }, { - "x": 149.10299682617188, - "y": -51.321998596191406 + "x": 1168.2559814453125, + "y": 181.8470001220703 }, { - "x": 151.42999267578125, - "y": -49.46200180053711 + "x": 1166.3470458984375, + "y": 182.70899963378906 }, { - "x": 153.79299926757812, - "y": -47.59000015258789 + "x": 1164.428955078125, + "y": 183.5500030517578 }, { - "x": 156.19000244140625, - "y": -45.702999114990234 + "x": 1162.5030517578125, + "y": 184.3719940185547 }, { - "x": 158.6230010986328, - "y": -43.79899978637695 + "x": 1160.5679931640625, + "y": 185.1739959716797 }, { - "x": 161.09100341796875, - "y": -41.874000549316406 + "x": 1158.6240234375, + "y": 185.9550018310547 }, { - "x": 163.59300231933594, - "y": -39.92399978637695 + "x": 1156.6729736328125, + "y": 186.71600341796875 }, { - "x": 166.1280059814453, - "y": -37.948001861572266 + "x": 1154.7139892578125, + "y": 187.45599365234375 }, { - "x": 168.6959991455078, - "y": -35.94200134277344 + "x": 1152.7469482421875, + "y": 188.17599487304688 }, { - "x": 171.2949981689453, - "y": -33.90399932861328 + "x": 1150.77294921875, + "y": 188.875 }, { - "x": 173.9250030517578, - "y": -31.829999923706055 + "x": 1148.791015625, + "y": 189.55299377441406 }, { - "x": 176.58299255371094, - "y": -29.716999053955078 + "x": 1146.802978515625, + "y": 190.21099853515625 }, { - "x": 179.26800537109375, - "y": -27.562000274658203 + "x": 1144.8079833984375, + "y": 190.84800720214844 }, { - "x": 181.97900390625, - "y": -25.36400032043457 + "x": 1142.8060302734375, + "y": 191.46299743652344 }, { - "x": 184.71299743652344, - "y": -23.118000030517578 + "x": 1140.7979736328125, + "y": 192.05799865722656 }, { - "x": 187.468994140625, - "y": -20.822999954223633 + "x": 1138.782958984375, + "y": 192.6320037841797 }, { - "x": 190.2429962158203, - "y": -18.47599983215332 + "x": 1136.762939453125, + "y": 193.18499755859375 }, { - "x": 193.03500366210938, - "y": -16.075000762939453 + "x": 1134.737060546875, + "y": 193.71600341796875 }, { - "x": 195.83999633789062, - "y": -13.616000175476074 + "x": 1132.7060546875, + "y": 194.2259979248047 }, { - "x": 198.65699768066406, - "y": -11.098999977111816 + "x": 1130.6700439453125, + "y": 194.71499633789062 }, { - "x": 201.48300170898438, - "y": -8.520000457763672 + "x": 1128.6280517578125, + "y": 195.18299865722656 }, { - "x": 204.31500244140625, - "y": -5.876999855041504 + "x": 1126.58203125, + "y": 195.62899780273438 }, { - "x": 207.1490020751953, - "y": -3.1700000762939453 + "x": 1124.531005859375, + "y": 196.0540008544922 }, { - "x": 209.98300170898438, - "y": -0.39500001072883606 + "x": 1122.4759521484375, + "y": 196.45700073242188 }, { - "x": 212.81300354003906, - "y": 2.447000026702881 + "x": 1120.416015625, + "y": 196.83900451660156 }, { - "x": 215.63499450683594, - "y": 5.361000061035156 + "x": 1118.35302734375, + "y": 197.19900512695312 }, { - "x": 218.44700622558594, - "y": 8.345999717712402 + "x": 1116.2860107421875, + "y": 197.53700256347656 }, { - "x": 221.2449951171875, - "y": 11.404000282287598 + "x": 1114.2159423828125, + "y": 197.85400390625 }, { - "x": 224.0019989013672, - "y": 2.1570000648498535 + "x": 1116.1199951171875, + "y": 197.6060028076172 }, { - "x": 226.16799926757812, - "y": 17 + "x": 1112, + "y": 198.16799926757812 } ], "isCurve": true, @@ -887,10 +4223,10 @@ "zIndex": 0 }, { - "id": "1.(b -> c)[0]", - "src": "1.b", + "id": "4.(d -> e)[0]", + "src": "4.d", "srcArrow": "none", - "dst": "1.c", + "dst": "4.e", "dstArrow": "triangle", "opacity": 1, "strokeDash": 0, @@ -912,344 +4248,284 @@ "link": "", "route": [ { - "x": 226.16799926757812, - "y": 83 - }, - { - "x": 223.8699951171875, - "y": 85.6449966430664 - }, - { - "x": 221.2449951171875, - "y": 88.59500122070312 - }, - { - "x": 218.44700622558594, - "y": 91.65299987792969 - }, - { - "x": 215.63499450683594, - "y": 94.63800048828125 - }, - { - "x": 212.81300354003906, - "y": 97.552001953125 - }, - { - "x": 209.98300170898438, - "y": 100.3949966430664 - }, - { - "x": 207.1490020751953, - "y": 103.16999816894531 + "x": 1058, + "y": 198.16799926757812 }, { - "x": 204.31500244140625, - "y": 105.87699890136719 + "x": 1057.85595703125, + "y": 198.1490020751953 }, { - "x": 201.48300170898438, - "y": 108.5199966430664 + "x": 1055.782958984375, + "y": 197.85400390625 }, { - "x": 198.65699768066406, - "y": 111.0989990234375 + "x": 1053.7130126953125, + "y": 197.53700256347656 }, { - "x": 195.83999633789062, - "y": 113.61599731445312 + "x": 1051.64599609375, + "y": 197.19900512695312 }, { - "x": 193.03500366210938, - "y": 116.07499694824219 + "x": 1049.5830078125, + "y": 196.83900451660156 }, { - "x": 190.2429962158203, - "y": 118.47599792480469 + "x": 1047.52294921875, + "y": 196.45700073242188 }, { - "x": 187.468994140625, - "y": 120.822998046875 + "x": 1045.468017578125, + "y": 196.0540008544922 }, { - "x": 184.71299743652344, - "y": 123.11799621582031 + "x": 1043.4169921875, + "y": 195.62899780273438 }, { - "x": 181.97900390625, - "y": 125.36399841308594 + "x": 1041.3709716796875, + "y": 195.18299865722656 }, { - "x": 179.26800537109375, - "y": 127.56199645996094 + "x": 1039.3289794921875, + "y": 194.71499633789062 }, { - "x": 176.58299255371094, - "y": 129.7169952392578 + "x": 1037.29296875, + "y": 194.2259979248047 }, { - "x": 173.9250030517578, - "y": 131.8300018310547 + "x": 1035.261962890625, + "y": 193.71600341796875 }, { - "x": 171.2949981689453, - "y": 133.9040069580078 + "x": 1033.2359619140625, + "y": 193.18499755859375 }, { - "x": 168.6959991455078, - "y": 135.94200134277344 + "x": 1031.2159423828125, + "y": 192.6320037841797 }, { - "x": 166.1280059814453, - "y": 137.947998046875 + "x": 1029.2010498046875, + "y": 192.05799865722656 }, { - "x": 163.59300231933594, - "y": 139.9239959716797 + "x": 1027.1929931640625, + "y": 191.46299743652344 }, { - "x": 161.09100341796875, - "y": 141.87399291992188 + "x": 1025.1910400390625, + "y": 190.84800720214844 }, { - "x": 158.6230010986328, - "y": 143.7989959716797 + "x": 1023.1959838867188, + "y": 190.21099853515625 }, { - "x": 156.19000244140625, - "y": 145.7030029296875 + "x": 1021.2080078125, + "y": 189.55299377441406 }, { - "x": 153.79299926757812, - "y": 147.58999633789062 + "x": 1019.2260131835938, + "y": 188.875 }, { - "x": 151.42999267578125, - "y": 149.46200561523438 + "x": 1017.2520141601562, + "y": 188.17599487304688 }, { - "x": 149.10299682617188, - "y": 151.32200622558594 + "x": 1015.2849731445312, + "y": 187.45599365234375 }, { - "x": 146.81199645996094, - "y": 153.17300415039062 + "x": 1013.3259887695312, + "y": 186.71600341796875 }, { - "x": 144.55599975585938, - "y": 155.0189971923828 + "x": 1011.375, + "y": 185.9550018310547 }, { - "x": 142.33399963378906, - "y": 156.86099243164062 + "x": 1009.4310302734375, + "y": 185.1739959716797 }, { - "x": 140.14700317382812, - "y": 158.7030029296875 + "x": 1007.4959716796875, + "y": 184.3719940185547 }, { - "x": 137.9929962158203, - "y": 160.54800415039062 + "x": 1005.5700073242188, + "y": 183.5500030517578 }, { - "x": 135.87100219726562, - "y": 162.39700317382812 + "x": 1003.6519775390625, + "y": 182.70899963378906 }, { - "x": 133.77999877929688, - "y": 164.2550048828125 + "x": 1001.7429809570312, + "y": 181.8470001220703 }, { - "x": 131.72000122070312, - "y": 166.1230010986328 + "x": 999.843994140625, + "y": 180.96499633789062 }, { - "x": 129.68800354003906, - "y": 168.0050048828125 + "x": 997.9530029296875, + "y": 180.06300354003906 }, { - "x": 127.68299865722656, - "y": 169.9010009765625 + "x": 996.072021484375, + "y": 179.14199829101562 }, { - "x": 125.7040023803711, - "y": 171.81500244140625 + "x": 994.2009887695312, + "y": 178.2010040283203 }, { - "x": 123.7490005493164, - "y": 173.74899291992188 + "x": 992.3400268554688, + "y": 177.24000549316406 }, { - "x": 121.81500244140625, - "y": 175.70399475097656 + "x": 990.489013671875, + "y": 176.25999450683594 }, { - "x": 119.9010009765625, - "y": 177.68299865722656 + "x": 988.6489868164062, + "y": 175.26100158691406 }, { - "x": 118.00499725341797, - "y": 179.68800354003906 + "x": 986.8189697265625, + "y": 174.24200439453125 }, { - "x": 116.12300109863281, - "y": 181.72000122070312 + "x": 985, + "y": 173.2050018310547 }, { - "x": 114.25499725341797, - "y": 183.77999877929688 + "x": 983.1909790039062, + "y": 172.1479949951172 }, { - "x": 112.39700317382812, - "y": 185.87100219726562 + "x": 981.3939819335938, + "y": 171.07200622558594 }, { - "x": 110.5479965209961, - "y": 187.9929962158203 + "x": 979.6079711914062, + "y": 169.97799682617188 }, { - "x": 108.7030029296875, - "y": 190.14700317382812 + "x": 977.833984375, + "y": 168.86500549316406 }, { - "x": 106.86100006103516, - "y": 192.33399963378906 + "x": 976.072021484375, + "y": 167.73399353027344 }, { - "x": 105.01899719238281, - "y": 194.55599975585938 + "x": 974.3209838867188, + "y": 166.58399963378906 }, { - "x": 103.1729965209961, - "y": 196.81199645996094 + "x": 972.5830078125, + "y": 165.41600036621094 }, { - "x": 101.3219985961914, - "y": 199.10299682617188 + "x": 970.8569946289062, + "y": 164.22900390625 }, { - "x": 99.46199798583984, - "y": 201.42999267578125 + "x": 969.1430053710938, + "y": 163.02499389648438 }, { - "x": 97.58999633789062, - "y": 203.79299926757812 + "x": 967.4420166015625, + "y": 161.80299377441406 }, { - "x": 95.7030029296875, - "y": 206.19000244140625 + "x": 965.7550048828125, + "y": 160.56300354003906 }, { - "x": 93.79900360107422, - "y": 208.6230010986328 + "x": 964.0800170898438, + "y": 159.30499267578125 }, { - "x": 91.8740005493164, - "y": 211.09100341796875 + "x": 962.4180297851562, + "y": 158.031005859375 }, { - "x": 89.92400360107422, - "y": 213.59300231933594 + "x": 960.77001953125, + "y": 156.73800659179688 }, { - "x": 87.947998046875, - "y": 216.1280059814453 + "x": 959.135009765625, + "y": 155.4290008544922 }, { - "x": 85.94200134277344, - "y": 218.6959991455078 + "x": 957.5150146484375, + "y": 154.1020050048828 }, { - "x": 83.90399932861328, - "y": 221.2949981689453 + "x": 955.9080200195312, + "y": 152.75900268554688 }, { - "x": 81.83000183105469, - "y": 223.9250030517578 + "x": 954.3150024414062, + "y": 151.3990020751953 }, { - "x": 79.71700286865234, - "y": 226.58299255371094 + "x": 952.7369995117188, + "y": 150.02200317382812 }, { - "x": 77.56199645996094, - "y": 229.26800537109375 + "x": 951.1729736328125, + "y": 148.6280059814453 }, { - "x": 75.36399841308594, - "y": 231.97900390625 + "x": 949.6240234375, + "y": 147.218994140625 }, { - "x": 73.11799621582031, - "y": 234.71299743652344 + "x": 948.0900268554688, + "y": 145.79299926757812 }, { - "x": 70.822998046875, - "y": 237.468994140625 + "x": 946.5709838867188, + "y": 144.3520050048828 }, { - "x": 68.47599792480469, - "y": 240.2429962158203 + "x": 945.0670166015625, + "y": 142.8939971923828 }, { - "x": 66.07499694824219, - "y": 243.03500366210938 + "x": 943.5780029296875, + "y": 141.42100524902344 }, { - "x": 63.61600112915039, - "y": 245.83999633789062 + "x": 942.10498046875, + "y": 139.9320068359375 }, { - "x": 61.0989990234375, - "y": 248.65699768066406 + "x": 940.64697265625, + "y": 138.42799377441406 }, { - "x": 58.52000045776367, - "y": 251.48300170898438 + "x": 939.2059936523438, + "y": 136.90899658203125 }, { - "x": 55.87699890136719, - "y": 254.31500244140625 + "x": 937.780029296875, + "y": 135.375 }, { - "x": 53.16999816894531, - "y": 257.14898681640625 + "x": 938.4000244140625, + "y": 136.1060028076172 }, { - "x": 50.39500045776367, - "y": 259.9830017089844 - }, - { - "x": 47.551998138427734, - "y": 262.81298828125 - }, - { - "x": 44.63800048828125, - "y": 265.635009765625 - }, - { - "x": 41.65299987792969, - "y": 268.4469909667969 - }, - { - "x": 38.595001220703125, - "y": 271.2449951171875 - }, - { - "x": 35.4640007019043, - "y": 274.0249938964844 - }, - { - "x": 32.257999420166016, - "y": 276.7829895019531 - }, - { - "x": 41.402000427246094, - "y": 279.8280029296875 - }, - { - "x": 26.5, - "y": 281.53399658203125 + "x": 935.6339721679688, + "y": 133 } ], "isCurve": true, @@ -1259,10 +4535,10 @@ "zIndex": 0 }, { - "id": "1.(c -> d)[0]", - "src": "1.c", + "id": "4.(e -> f)[0]", + "src": "4.e", "srcArrow": "none", - "dst": "1.d", + "dst": "4.f", "dstArrow": "triangle", "opacity": 1, "strokeDash": 0, @@ -1284,344 +4560,272 @@ "link": "", "route": [ { - "x": -26.499000549316406, - "y": 281.53399658203125 - }, - { - "x": -29.191999435424805, - "y": 279.3429870605469 - }, - { - "x": -32.257999420166016, - "y": 276.7829895019531 - }, - { - "x": -35.4640007019043, - "y": 274.0249938964844 - }, - { - "x": -38.595001220703125, - "y": 271.2449951171875 - }, - { - "x": -41.65299987792969, - "y": 268.4469909667969 - }, - { - "x": -44.63800048828125, - "y": 265.635009765625 - }, - { - "x": -47.551998138427734, - "y": 262.81298828125 - }, - { - "x": -50.39500045776367, - "y": 259.9830017089844 - }, - { - "x": -53.16999816894531, - "y": 257.14898681640625 - }, - { - "x": -55.87699890136719, - "y": 254.31500244140625 - }, - { - "x": -58.52000045776367, - "y": 251.48300170898438 - }, - { - "x": -61.0989990234375, - "y": 248.65699768066406 - }, - { - "x": -63.61600112915039, - "y": 245.83999633789062 - }, - { - "x": -66.07499694824219, - "y": 243.03500366210938 - }, - { - "x": -68.47599792480469, - "y": 240.2429962158203 - }, - { - "x": -70.822998046875, - "y": 237.468994140625 - }, - { - "x": -73.11799621582031, - "y": 234.71299743652344 - }, - { - "x": -75.36399841308594, - "y": 231.97900390625 + "x": 896.5590209960938, + "y": 67 }, { - "x": -77.56199645996094, - "y": 229.26800537109375 + "x": 896.1240234375, + "y": 65.77300262451172 }, { - "x": -79.71700286865234, - "y": 226.58299255371094 + "x": 895.4459838867188, + "y": 63.79100036621094 }, { - "x": -81.83000183105469, - "y": 223.9250030517578 + "x": 894.7880249023438, + "y": 61.803001403808594 }, { - "x": -83.90399932861328, - "y": 221.2949981689453 + "x": 894.1510009765625, + "y": 59.80799865722656 }, { - "x": -85.94200134277344, - "y": 218.6959991455078 + "x": 893.5360107421875, + "y": 57.805999755859375 }, { - "x": -87.947998046875, - "y": 216.1280059814453 + "x": 892.9409790039062, + "y": 55.79800033569336 }, { - "x": -89.92400360107422, - "y": 213.59300231933594 + "x": 892.3670043945312, + "y": 53.78300094604492 }, { - "x": -91.8740005493164, - "y": 211.09100341796875 + "x": 891.8140258789062, + "y": 51.76300048828125 }, { - "x": -93.79900360107422, - "y": 208.6230010986328 + "x": 891.2830200195312, + "y": 49.73699951171875 }, { - "x": -95.7030029296875, - "y": 206.19000244140625 + "x": 890.7730102539062, + "y": 47.70600128173828 }, { - "x": -97.58999633789062, - "y": 203.79299926757812 + "x": 890.2839965820312, + "y": 45.66999816894531 }, { - "x": -99.46199798583984, - "y": 201.42999267578125 + "x": 889.8159790039062, + "y": 43.62799835205078 }, { - "x": -101.3219985961914, - "y": 199.10299682617188 + "x": 889.3699951171875, + "y": 41.582000732421875 }, { - "x": -103.1729965209961, - "y": 196.81199645996094 + "x": 888.9450073242188, + "y": 39.53099822998047 }, { - "x": -105.01899719238281, - "y": 194.55599975585938 + "x": 888.5419921875, + "y": 37.47600173950195 }, { - "x": -106.86100006103516, - "y": 192.33399963378906 + "x": 888.1599731445312, + "y": 35.41600036621094 }, { - "x": -108.7030029296875, - "y": 190.14700317382812 + "x": 887.7999877929688, + "y": 33.35300064086914 }, { - "x": -110.5479965209961, - "y": 187.9929962158203 + "x": 887.4619750976562, + "y": 31.285999298095703 }, { - "x": -112.39700317382812, - "y": 185.87100219726562 + "x": 887.14501953125, + "y": 29.215999603271484 }, { - "x": -114.25499725341797, - "y": 183.77999877929688 + "x": 886.8499755859375, + "y": 27.14299964904785 }, { - "x": -116.12300109863281, - "y": 181.72000122070312 + "x": 886.5770263671875, + "y": 25.06599998474121 }, { - "x": -118.00499725341797, - "y": 179.68800354003906 + "x": 886.3250122070312, + "y": 22.98699951171875 }, { - "x": -119.9010009765625, - "y": 177.68299865722656 + "x": 886.094970703125, + "y": 20.905000686645508 }, { - "x": -121.81500244140625, - "y": 175.70399475097656 + "x": 885.8870239257812, + "y": 18.820999145507812 }, { - "x": -123.7490005493164, - "y": 173.74899291992188 + "x": 885.7009887695312, + "y": 16.735000610351562 }, { - "x": -125.7040023803711, - "y": 171.81500244140625 + "x": 885.5369873046875, + "y": 14.647000312805176 }, { - "x": -127.68299865722656, - "y": 169.9010009765625 + "x": 885.3939819335938, + "y": 12.557999610900879 }, { - "x": -129.68800354003906, - "y": 168.0050048828125 + "x": 885.2739868164062, + "y": 10.467000007629395 }, { - "x": -131.72000122070312, - "y": 166.1230010986328 + "x": 885.1749877929688, + "y": 8.375 }, { - "x": -133.77999877929688, - "y": 164.2550048828125 + "x": 885.0980224609375, + "y": 6.2820000648498535 }, { - "x": -135.87100219726562, - "y": 162.39700317382812 + "x": 885.0430297851562, + "y": 4.188000202178955 }, { - "x": -137.9929962158203, - "y": 160.54800415039062 + "x": 885.010009765625, + "y": 2.0940001010894775 }, { - "x": -140.14700317382812, - "y": 158.7030029296875 + "x": 885, + "y": 0 }, { - "x": -142.33399963378906, - "y": 156.86099243164062 + "x": 885.010009765625, + "y": -2.0940001010894775 }, { - "x": -144.55599975585938, - "y": 155.0189971923828 + "x": 885.0430297851562, + "y": -4.188000202178955 }, { - "x": -146.81199645996094, - "y": 153.17300415039062 + "x": 885.0980224609375, + "y": -6.2820000648498535 }, { - "x": -149.10299682617188, - "y": 151.32200622558594 + "x": 885.1749877929688, + "y": -8.375 }, { - "x": -151.42999267578125, - "y": 149.46200561523438 + "x": 885.2739868164062, + "y": -10.467000007629395 }, { - "x": -153.79299926757812, - "y": 147.58999633789062 + "x": 885.3939819335938, + "y": -12.557999610900879 }, { - "x": -156.19000244140625, - "y": 145.7030029296875 + "x": 885.5369873046875, + "y": -14.647000312805176 }, { - "x": -158.6230010986328, - "y": 143.7989959716797 + "x": 885.7009887695312, + "y": -16.735000610351562 }, { - "x": -161.09100341796875, - "y": 141.87399291992188 + "x": 885.8870239257812, + "y": -18.820999145507812 }, { - "x": -163.59300231933594, - "y": 139.9239959716797 + "x": 886.094970703125, + "y": -20.905000686645508 }, { - "x": -166.1280059814453, - "y": 137.947998046875 + "x": 886.3250122070312, + "y": -22.98699951171875 }, { - "x": -168.6959991455078, - "y": 135.94200134277344 + "x": 886.5770263671875, + "y": -25.06599998474121 }, { - "x": -171.2949981689453, - "y": 133.9040069580078 + "x": 886.8499755859375, + "y": -27.14299964904785 }, { - "x": -173.9250030517578, - "y": 131.8300018310547 + "x": 887.14501953125, + "y": -29.215999603271484 }, { - "x": -176.58299255371094, - "y": 129.7169952392578 + "x": 887.4619750976562, + "y": -31.285999298095703 }, { - "x": -179.26800537109375, - "y": 127.56199645996094 + "x": 887.7999877929688, + "y": -33.35300064086914 }, { - "x": -181.97900390625, - "y": 125.36399841308594 + "x": 888.1599731445312, + "y": -35.41600036621094 }, { - "x": -184.71299743652344, - "y": 123.11799621582031 + "x": 888.5419921875, + "y": -37.47600173950195 }, { - "x": -187.468994140625, - "y": 120.822998046875 + "x": 888.9450073242188, + "y": -39.53099822998047 }, { - "x": -190.2429962158203, - "y": 118.47599792480469 + "x": 889.3699951171875, + "y": -41.582000732421875 }, { - "x": -193.03500366210938, - "y": 116.07499694824219 + "x": 889.8159790039062, + "y": -43.62799835205078 }, { - "x": -195.83999633789062, - "y": 113.61599731445312 + "x": 890.2839965820312, + "y": -45.66999816894531 }, { - "x": -198.65699768066406, - "y": 111.0989990234375 + "x": 890.7730102539062, + "y": -47.70600128173828 }, { - "x": -201.48300170898438, - "y": 108.5199966430664 + "x": 891.2830200195312, + "y": -49.73699951171875 }, { - "x": -204.31500244140625, - "y": 105.87699890136719 + "x": 891.8140258789062, + "y": -51.76300048828125 }, { - "x": -207.1490020751953, - "y": 103.16999816894531 + "x": 892.3670043945312, + "y": -53.78300094604492 }, { - "x": -209.98300170898438, - "y": 100.3949966430664 + "x": 892.9409790039062, + "y": -55.79800033569336 }, { - "x": -212.81300354003906, - "y": 97.552001953125 + "x": 893.5360107421875, + "y": -57.805999755859375 }, { - "x": -215.63499450683594, - "y": 94.63800048828125 + "x": 894.1510009765625, + "y": -59.80799865722656 }, { - "x": -218.44700622558594, - "y": 91.65299987792969 + "x": 894.7880249023438, + "y": -61.803001403808594 }, { - "x": -221.2449951171875, - "y": 88.59500122070312 + "x": 895.4459838867188, + "y": -63.79100036621094 }, { - "x": -224.0019989013672, - "y": 97.84200286865234 + "x": 895.1649780273438, + "y": -63.08100128173828 }, { - "x": -226.16799926757812, - "y": 83 + "x": 896.5590209960938, + "y": -67 } ], "isCurve": true, @@ -1631,10 +4835,10 @@ "zIndex": 0 }, { - "id": "2.(a -> b)[0]", - "src": "2.a", + "id": "5.(a -> b)[0]", + "src": "5.a", "srcArrow": "none", - "dst": "2.b", + "dst": "5.b", "dstArrow": "triangle", "opacity": 1, "strokeDash": 0, @@ -1656,1280 +4860,1312 @@ "link": "", "route": [ { - "x": 616.2650146484375, - "y": -192 + "x": 1570.5, + "y": -178.23199462890625 }, { - "x": 618.9769897460938, - "y": -176.81300354003906 + "x": 1571.5579833984375, + "y": -178.0919952392578 }, { - "x": 623.2459716796875, - "y": -170.0500030517578 + "x": 1574.0450439453125, + "y": -177.72999572753906 }, { - "x": 628.22802734375, - "y": -167.43899536132812 + "x": 1576.5269775390625, + "y": -177.33700561523438 }, { - "x": 633.1060180664062, - "y": -164.73399353027344 + "x": 1579.0040283203125, + "y": -176.91200256347656 }, { - "x": 637.8790283203125, - "y": -161.9409942626953 + "x": 1581.4759521484375, + "y": -176.45700073242188 }, { - "x": 642.5449829101562, - "y": -159.0659942626953 + "x": 1583.9410400390625, + "y": -175.9709930419922 }, { - "x": 647.10302734375, - "y": -156.11500549316406 + "x": 1586.4010009765625, + "y": -175.4530029296875 }, { - "x": 651.5540161132812, - "y": -153.09100341796875 + "x": 1588.85400390625, + "y": -174.90499877929688 }, { - "x": 655.89697265625, - "y": -150.0019989013672 + "x": 1591.2989501953125, + "y": -174.3260040283203 }, { - "x": 660.1320190429688, - "y": -146.85299682617188 + "x": 1593.737060546875, + "y": -173.71600341796875 }, { - "x": 664.2589721679688, - "y": -143.6479949951172 + "x": 1596.16796875, + "y": -173.0760040283203 }, { - "x": 668.2789916992188, - "y": -140.39199829101562 + "x": 1598.5899658203125, + "y": -172.40499877929688 }, { - "x": 672.1929931640625, - "y": -137.09100341796875 + "x": 1601.0030517578125, + "y": -171.70399475097656 }, { - "x": 676.0020141601562, - "y": -133.75 + "x": 1603.407958984375, + "y": -170.9720001220703 }, { - "x": 679.7059936523438, - "y": -130.3730010986328 + "x": 1605.802978515625, + "y": -170.21099853515625 }, { - "x": 683.3090209960938, - "y": -126.96499633789062 + "x": 1608.18798828125, + "y": -169.41900634765625 }, { - "x": 686.8099975585938, - "y": -123.53099822998047 + "x": 1610.56298828125, + "y": -168.59800720214844 }, { - "x": 690.2130126953125, - "y": -120.0739974975586 + "x": 1612.927978515625, + "y": -167.74600219726562 }, { - "x": 693.5189819335938, - "y": -116.5989990234375 + "x": 1615.281982421875, + "y": -166.86500549316406 }, { - "x": 696.72998046875, - "y": -113.11100006103516 + "x": 1617.6240234375, + "y": -165.9550018310547 }, { - "x": 699.8499755859375, - "y": -109.61100006103516 + "x": 1619.9549560546875, + "y": -165.01499938964844 }, { - "x": 702.8800048828125, - "y": -106.1050033569336 + "x": 1622.2740478515625, + "y": -164.04600524902344 }, { - "x": 705.823974609375, - "y": -102.59600067138672 + "x": 1624.5810546875, + "y": -163.04800415039062 }, { - "x": 708.6840209960938, - "y": -99.08599853515625 + "x": 1626.875, + "y": -162.02099609375 }, { - "x": 711.4639892578125, - "y": -95.5790023803711 + "x": 1629.155029296875, + "y": -160.96499633789062 }, { - "x": 714.166015625, - "y": -92.0770034790039 + "x": 1631.4229736328125, + "y": -159.88099670410156 }, { - "x": 716.7940063476562, - "y": -88.58399963378906 + "x": 1633.676025390625, + "y": -158.76800537109375 }, { - "x": 719.3510131835938, - "y": -85.0999984741211 + "x": 1635.9150390625, + "y": -157.6269989013672 }, { - "x": 721.8400268554688, - "y": -81.62799835205078 + "x": 1638.1400146484375, + "y": -156.45799255371094 }, { - "x": 724.2659912109375, - "y": -78.16899871826172 + "x": 1640.3499755859375, + "y": -155.26100158691406 }, { - "x": 726.6309814453125, - "y": -74.72699737548828 + "x": 1642.5450439453125, + "y": -154.03599548339844 }, { - "x": 728.9390258789062, - "y": -71.30000305175781 + "x": 1644.7239990234375, + "y": -152.78399658203125 }, { - "x": 731.1939697265625, - "y": -67.89099884033203 + "x": 1646.886962890625, + "y": -151.5050048828125 }, { - "x": 733.3980102539062, - "y": -64.5009994506836 + "x": 1649.0340576171875, + "y": -150.197998046875 }, { - "x": 735.5560302734375, - "y": -61.130001068115234 + "x": 1651.1650390625, + "y": -148.86500549316406 }, { - "x": 737.6719970703125, - "y": -57.777000427246094 + "x": 1653.2779541015625, + "y": -147.5050048828125 }, { - "x": 739.7470092773438, - "y": -54.444000244140625 + "x": 1655.375, + "y": -146.11900329589844 }, { - "x": 741.7869873046875, - "y": -51.130001068115234 + "x": 1657.4530029296875, + "y": -144.70599365234375 }, { - "x": 743.7940063476562, - "y": -47.834999084472656 + "x": 1659.5140380859375, + "y": -143.26699829101562 }, { - "x": 745.77099609375, - "y": -44.55799865722656 + "x": 1661.5570068359375, + "y": -141.80299377441406 }, { - "x": 747.7219848632812, - "y": -41.29800033569336 + "x": 1663.5799560546875, + "y": -140.31300354003906 }, { - "x": 749.6500244140625, - "y": -38.05400085449219 + "x": 1665.5860595703125, + "y": -138.79800415039062 }, { - "x": 751.5570068359375, - "y": -34.82600021362305 + "x": 1667.571044921875, + "y": -137.2570037841797 }, { - "x": 753.447021484375, - "y": -31.611000061035156 + "x": 1669.5379638671875, + "y": -135.69200134277344 }, { - "x": 755.3209838867188, - "y": -28.406999588012695 + "x": 1671.4840087890625, + "y": -134.1020050048828 }, { - "x": 757.1840209960938, - "y": -25.214000701904297 + "x": 1673.4110107421875, + "y": -132.48800659179688 }, { - "x": 759.0360107421875, - "y": -22.02899932861328 + "x": 1675.3170166015625, + "y": -130.85000610351562 }, { - "x": 760.8800048828125, - "y": -18.849000930786133 + "x": 1677.2020263671875, + "y": -129.18800354003906 }, { - "x": 762.718994140625, - "y": -15.673999786376953 + "x": 1679.0660400390625, + "y": -127.50199890136719 }, { - "x": 764.552978515625, - "y": -12.49899959564209 + "x": 1680.9090576171875, + "y": -125.79299926757812 }, { - "x": 766.385009765625, - "y": -9.322999954223633 + "x": 1682.72998046875, + "y": -124.06099700927734 }, { - "x": 768.2160034179688, - "y": -6.14300012588501 + "x": 1684.529052734375, + "y": -122.30699920654297 }, { - "x": 770.0479736328125, - "y": -2.9560000896453857 + "x": 1686.3070068359375, + "y": -120.52899932861328 }, { - "x": 771.8800048828125, - "y": 0.23999999463558197 + "x": 1688.06103515625, + "y": -118.7300033569336 }, { - "x": 773.7139892578125, - "y": 3.4489998817443848 + "x": 1689.79296875, + "y": -116.90899658203125 }, { - "x": 775.551025390625, - "y": 6.673999786376953 + "x": 1691.501953125, + "y": -115.06600189208984 }, { - "x": 777.3909912109375, - "y": 9.918000221252441 + "x": 1693.18798828125, + "y": -113.2020034790039 }, { - "x": 779.2329711914062, - "y": 13.184000015258789 + "x": 1694.8499755859375, + "y": -111.31700134277344 }, { - "x": 781.0780029296875, - "y": 16.47599983215332 + "x": 1696.488037109375, + "y": -109.41100311279297 }, { - "x": 782.926025390625, - "y": 19.795000076293945 + "x": 1698.10205078125, + "y": -107.48400115966797 }, { - "x": 784.7750244140625, - "y": 23.145999908447266 + "x": 1699.6920166015625, + "y": -105.53800201416016 }, { - "x": 786.6259765625, - "y": 26.531999588012695 + "x": 1701.2569580078125, + "y": -103.57099914550781 }, { - "x": 788.4760131835938, - "y": 29.954999923706055 + "x": 1702.7979736328125, + "y": -101.58599853515625 }, { - "x": 790.323974609375, - "y": 33.41899871826172 + "x": 1704.31298828125, + "y": -99.58000183105469 }, { - "x": 792.1699829101562, - "y": 36.926998138427734 + "x": 1705.802978515625, + "y": -97.55699920654297 }, { - "x": 794.010986328125, - "y": 40.481998443603516 + "x": 1707.2669677734375, + "y": -95.51399993896484 }, { - "x": 795.844970703125, - "y": 44.08599853515625 + "x": 1708.7060546875, + "y": -93.4530029296875 }, { - "x": 797.6690063476562, - "y": 47.74300003051758 + "x": 1710.1190185546875, + "y": -91.375 }, { - "x": 799.4829711914062, - "y": 51.45500183105469 + "x": 1711.5050048828125, + "y": -89.27799987792969 }, { - "x": 801.281982421875, - "y": 55.224998474121094 + "x": 1712.864990234375, + "y": -87.16500091552734 }, { - "x": 803.0640258789062, - "y": 59.05500030517578 + "x": 1714.197998046875, + "y": -85.03399658203125 }, { - "x": 804.8259887695312, - "y": 62.946998596191406 + "x": 1715.5050048828125, + "y": -82.88700103759766 }, { - "x": 806.5650024414062, - "y": 66.90299987792969 + "x": 1716.7840576171875, + "y": -80.7239990234375 }, { - "x": 808.2760009765625, - "y": 70.9260025024414 + "x": 1718.0360107421875, + "y": -78.54499816894531 }, { - "x": 809.9580078125, - "y": 75.01699829101562 + "x": 1718.126953125, + "y": -78.46499633789062 }, { - "x": 811.60498046875, - "y": 79.1780014038086 - }, + "x": 1720.0989990234375, + "y": -74.8030014038086 + } + ], + "isCurve": true, + "animated": false, + "tooltip": "", + "icon": null, + "zIndex": 0 + }, + { + "id": "5.(b -> c)[0]", + "src": "5.b", + "srcArrow": "none", + "dst": "5.c", + "dstArrow": "triangle", + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "stroke": "B1", + "borderRadius": 10, + "label": "", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N2", + "italic": true, + "bold": false, + "underline": false, + "labelWidth": 0, + "labelHeight": 0, + "labelPosition": "", + "labelPercentage": 0, + "link": "", + "route": [ { - "x": 813.2150268554688, - "y": 83.41000366210938 + "x": 1741.9110107421875, + "y": -8.803000450134277 }, { - "x": 814.781982421875, - "y": 87.71399688720703 + "x": 1742.092041015625, + "y": -7.558000087738037 }, { - "x": 816.302978515625, - "y": 92.09100341796875 + "x": 1742.4219970703125, + "y": -5.065999984741211 }, { - "x": 817.7739868164062, - "y": 96.54199981689453 + "x": 1742.7220458984375, + "y": -2.571000099182129 }, { - "x": 819.1890258789062, - "y": 101.06800079345703 + "x": 1742.989990234375, + "y": -0.07199999690055847 }, { - "x": 820.5460205078125, - "y": 105.66799926757812 + "x": 1743.2259521484375, + "y": 2.428999900817871 }, { - "x": 821.8380126953125, - "y": 110.34300231933594 + "x": 1743.4310302734375, + "y": 4.934000015258789 }, { - "x": 823.0609741210938, - "y": 115.09300231933594 + "x": 1743.60498046875, + "y": 7.440999984741211 }, { - "x": 824.2119750976562, - "y": 119.91600036621094 + "x": 1743.7469482421875, + "y": 9.951000213623047 }, { - "x": 825.2839965820312, - "y": 124.81300354003906 + "x": 1743.8570556640625, + "y": 12.461000442504883 }, { - "x": 826.2730102539062, - "y": 129.78199768066406 + "x": 1743.93603515625, + "y": 14.972999572753906 }, { - "x": 827.1749877929688, - "y": 134.82200622558594 + "x": 1743.9840087890625, + "y": 17.486000061035156 }, { - "x": 827.9840087890625, - "y": 139.93099975585938 + "x": 1744, + "y": 20 }, { - "x": 828.6959838867188, - "y": 145.10800170898438 + "x": 1743.9840087890625, + "y": 22.51300048828125 }, { - "x": 829.3070068359375, - "y": 150.3509979248047 + "x": 1743.93603515625, + "y": 25.025999069213867 }, { - "x": 829.8099975585938, - "y": 155.656005859375 + "x": 1743.8570556640625, + "y": 27.538000106811523 }, { - "x": 830.2030029296875, - "y": 161.02200317382812 + "x": 1743.7469482421875, + "y": 30.04800033569336 }, { - "x": 830.47998046875, - "y": 166.4459991455078 + "x": 1743.60498046875, + "y": 32.55799865722656 }, { - "x": 830.635986328125, - "y": 171.9239959716797 + "x": 1743.4310302734375, + "y": 35.064998626708984 }, { - "x": 830.6690063476562, - "y": 177.45399475097656 + "x": 1743.2259521484375, + "y": 37.56999969482422 }, { - "x": 830.572021484375, - "y": 183.031005859375 + "x": 1742.989990234375, + "y": 40.071998596191406 }, { - "x": 830.343017578125, - "y": 188.65199279785156 + "x": 1742.7220458984375, + "y": 42.57099914550781 }, { - "x": 853.6510009765625, - "y": 192.91200256347656 + "x": 1742.4219970703125, + "y": 45.066001892089844 }, { - "x": 846.3070068359375, - "y": 205.99099731445312 - } - ], - "isCurve": true, - "animated": false, - "tooltip": "", - "icon": null, - "zIndex": 0 - }, - { - "id": "2.(b -> c)[0]", - "src": "2.b", - "srcArrow": "none", - "dst": "2.c", - "dstArrow": "triangle", - "opacity": 1, - "strokeDash": 0, - "strokeWidth": 2, - "stroke": "B1", - "borderRadius": 10, - "label": "", - "fontSize": 16, - "fontFamily": "DEFAULT", - "language": "", - "color": "N2", - "italic": true, - "bold": false, - "underline": false, - "labelWidth": 0, - "labelHeight": 0, - "labelPosition": "", - "labelPercentage": 0, - "link": "", - "route": [ - { - "x": 846.3070068359375, - "y": 213.0070037841797 + "x": 1742.092041015625, + "y": 47.55799865722656 }, { - "x": 829.0159912109375, - "y": 206.5030059814453 + "x": 1741.72998046875, + "y": 50.04499816894531 }, { - "x": 820.0969848632812, - "y": 206.3979949951172 + "x": 1741.3370361328125, + "y": 52.527000427246094 }, { - "x": 815.343994140625, - "y": 209.40699768066406 + "x": 1740.9119873046875, + "y": 55.00400161743164 }, { - "x": 810.56201171875, - "y": 212.2790069580078 + "x": 1740.45703125, + "y": 57.47600173950195 }, { - "x": 805.7570190429688, - "y": 215.01600646972656 + "x": 1739.970947265625, + "y": 59.941001892089844 }, { - "x": 800.9349975585938, - "y": 217.6199951171875 + "x": 1739.4530029296875, + "y": 62.4010009765625 }, { - "x": 796.0989990234375, - "y": 220.0919952392578 + "x": 1738.905029296875, + "y": 64.85399627685547 }, { - "x": 791.2559814453125, - "y": 222.43499755859375 + "x": 1738.3260498046875, + "y": 67.29900360107422 }, { - "x": 786.4089965820312, - "y": 224.6510009765625 + "x": 1737.7159423828125, + "y": 69.73699951171875 }, { - "x": 781.5640258789062, - "y": 226.74400329589844 + "x": 1737.0760498046875, + "y": 72.16799926757812 }, { - "x": 776.7239990234375, - "y": 228.71600341796875 + "x": 1736.405029296875, + "y": 74.58999633789062 }, { - "x": 771.89501953125, - "y": 230.56900024414062 + "x": 1735.7039794921875, + "y": 77.00299835205078 }, { - "x": 767.0800170898438, - "y": 232.30799865722656 + "x": 1734.9720458984375, + "y": 79.40799713134766 }, { - "x": 762.281982421875, - "y": 233.93600463867188 + "x": 1734.2110595703125, + "y": 81.8030014038086 }, { - "x": 757.5050048828125, - "y": 235.45599365234375 + "x": 1733.4189453125, + "y": 84.18800354003906 }, { - "x": 752.7520141601562, - "y": 236.8719940185547 + "x": 1732.5980224609375, + "y": 86.56300354003906 }, { - "x": 748.0269775390625, - "y": 238.18699645996094 + "x": 1731.7459716796875, + "y": 88.9280014038086 }, { - "x": 743.3330078125, - "y": 239.40499877929688 + "x": 1730.864990234375, + "y": 91.28199768066406 }, { - "x": 738.6699829101562, - "y": 240.531005859375 + "x": 1729.9549560546875, + "y": 93.6240005493164 }, { - "x": 734.0430297851562, - "y": 241.5679931640625 + "x": 1729.0150146484375, + "y": 95.95500183105469 }, { - "x": 729.4530029296875, - "y": 242.52000427246094 + "x": 1728.0460205078125, + "y": 98.27400207519531 }, { - "x": 724.9019775390625, - "y": 243.39100646972656 + "x": 1727.0479736328125, + "y": 100.58100128173828 }, { - "x": 720.3900146484375, - "y": 244.18600463867188 + "x": 1726.02099609375, + "y": 102.875 }, { - "x": 715.9210205078125, - "y": 244.9080047607422 + "x": 1724.9649658203125, + "y": 105.15499877929688 }, { - "x": 711.4940185546875, - "y": 245.56199645996094 + "x": 1723.8809814453125, + "y": 107.4229965209961 }, { - "x": 707.1099853515625, - "y": 246.1510009765625 + "x": 1722.7679443359375, + "y": 109.6760025024414 }, { - "x": 702.77001953125, - "y": 246.67999267578125 + "x": 1721.626953125, + "y": 111.91500091552734 }, { - "x": 698.4749755859375, - "y": 247.1529998779297 + "x": 1720.4580078125, + "y": 114.13999938964844 }, { - "x": 694.2230224609375, - "y": 247.572998046875 + "x": 1719.260986328125, + "y": 116.3499984741211 }, { - "x": 690.0150146484375, - "y": 247.94400024414062 + "x": 1718.0360107421875, + "y": 118.54499816894531 }, { - "x": 685.8510131835938, - "y": 248.27099609375 + "x": 1716.7840576171875, + "y": 120.7239990234375 }, { - "x": 681.72998046875, - "y": 248.5570068359375 + "x": 1715.5050048828125, + "y": 122.88700103759766 }, { - "x": 677.6500244140625, - "y": 248.80499267578125 + "x": 1714.197998046875, + "y": 125.03399658203125 }, { - "x": 673.6119995117188, - "y": 249.0189971923828 + "x": 1712.864990234375, + "y": 127.16500091552734 }, { - "x": 669.6129760742188, - "y": 249.20199584960938 + "x": 1711.5050048828125, + "y": 129.2779998779297 }, { - "x": 665.6519775390625, - "y": 249.35800170898438 + "x": 1710.1190185546875, + "y": 131.375 }, { - "x": 661.72802734375, - "y": 249.48899841308594 + "x": 1708.7060546875, + "y": 133.4530029296875 }, { - "x": 657.8380126953125, - "y": 249.59800720214844 + "x": 1707.2669677734375, + "y": 135.51400756835938 }, { - "x": 653.9810180664062, - "y": 249.68800354003906 + "x": 1705.802978515625, + "y": 137.5570068359375 }, { - "x": 650.1539916992188, - "y": 249.76199340820312 + "x": 1704.31298828125, + "y": 139.5800018310547 }, { - "x": 646.3560180664062, - "y": 249.82200622558594 + "x": 1702.7979736328125, + "y": 141.58599853515625 }, { - "x": 642.5830078125, - "y": 249.8699951171875 + "x": 1701.2569580078125, + "y": 143.5709991455078 }, { - "x": 638.8330078125, - "y": 249.90699768066406 + "x": 1699.6920166015625, + "y": 145.53799438476562 }, { - "x": 635.10400390625, - "y": 249.93600463867188 + "x": 1698.10205078125, + "y": 147.48399353027344 }, { - "x": 631.3920288085938, - "y": 249.95799255371094 + "x": 1696.488037109375, + "y": 149.41099548339844 }, { - "x": 627.6959838867188, - "y": 249.9739990234375 + "x": 1694.8499755859375, + "y": 151.31700134277344 }, { - "x": 624.010986328125, - "y": 249.98500061035156 + "x": 1693.18798828125, + "y": 153.20199584960938 }, { - "x": 620.3350219726562, - "y": 249.9929962158203 + "x": 1691.501953125, + "y": 155.0659942626953 }, { - "x": 616.666015625, - "y": 249.9969940185547 + "x": 1689.79296875, + "y": 156.90899658203125 }, { - "x": 613, - "y": 249.99899291992188 + "x": 1690.9420166015625, + "y": 155.73899841308594 }, { - "x": 609.3330078125, - "y": 249.9969940185547 - }, + "x": 1688.0570068359375, + "y": 158.73500061035156 + } + ], + "isCurve": true, + "animated": false, + "tooltip": "", + "icon": null, + "zIndex": 0 + }, + { + "id": "5.(c -> d)[0]", + "src": "5.c", + "srcArrow": "none", + "dst": "5.d", + "dstArrow": "triangle", + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "stroke": "B1", + "borderRadius": 10, + "label": "", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N2", + "italic": true, + "bold": false, + "underline": false, + "labelWidth": 0, + "labelHeight": 0, + "labelPosition": "", + "labelPercentage": 0, + "link": "", + "route": [ { - "x": 605.6640014648438, - "y": 249.9929962158203 + "x": 1635.0570068359375, + "y": 198.06399536132812 }, { - "x": 601.9879760742188, - "y": 249.98500061035156 + "x": 1633.676025390625, + "y": 198.76800537109375 }, { - "x": 598.302978515625, - "y": 249.9739990234375 + "x": 1631.4229736328125, + "y": 199.88099670410156 }, { - "x": 594.6069946289062, - "y": 249.95799255371094 + "x": 1629.155029296875, + "y": 200.96499633789062 }, { - "x": 590.89501953125, - "y": 249.93600463867188 + "x": 1626.875, + "y": 202.02099609375 }, { - "x": 587.166015625, - "y": 249.90699768066406 + "x": 1624.5810546875, + "y": 203.04800415039062 }, { - "x": 583.416015625, - "y": 249.8699951171875 + "x": 1622.2740478515625, + "y": 204.04600524902344 }, { - "x": 579.6430053710938, - "y": 249.82200622558594 + "x": 1619.9549560546875, + "y": 205.01499938964844 }, { - "x": 575.844970703125, - "y": 249.76199340820312 + "x": 1617.6240234375, + "y": 205.9550018310547 }, { - "x": 572.0180053710938, - "y": 249.68800354003906 + "x": 1615.281982421875, + "y": 206.86500549316406 }, { - "x": 568.1610107421875, - "y": 249.59800720214844 + "x": 1612.927978515625, + "y": 207.74600219726562 }, { - "x": 564.27099609375, - "y": 249.48899841308594 + "x": 1610.56298828125, + "y": 208.59800720214844 }, { - "x": 560.3469848632812, - "y": 249.35800170898438 + "x": 1608.18798828125, + "y": 209.41900634765625 }, { - "x": 556.385986328125, - "y": 249.20199584960938 + "x": 1605.802978515625, + "y": 210.21099853515625 }, { - "x": 552.3870239257812, - "y": 249.0189971923828 + "x": 1603.407958984375, + "y": 210.9720001220703 }, { - "x": 548.3489990234375, - "y": 248.80499267578125 + "x": 1601.0030517578125, + "y": 211.70399475097656 }, { - "x": 544.2689819335938, - "y": 248.5570068359375 + "x": 1598.5899658203125, + "y": 212.40499877929688 }, { - "x": 540.1480102539062, - "y": 248.27099609375 + "x": 1596.16796875, + "y": 213.0760040283203 }, { - "x": 535.9840087890625, - "y": 247.94400024414062 + "x": 1593.737060546875, + "y": 213.71600341796875 }, { - "x": 531.7760009765625, - "y": 247.572998046875 + "x": 1591.2989501953125, + "y": 214.3260040283203 }, { - "x": 527.5239868164062, - "y": 247.1529998779297 + "x": 1588.85400390625, + "y": 214.90499877929688 }, { - "x": 523.22900390625, - "y": 246.67999267578125 + "x": 1586.4010009765625, + "y": 215.4530029296875 }, { - "x": 518.8889770507812, - "y": 246.1510009765625 + "x": 1583.9410400390625, + "y": 215.9709930419922 }, { - "x": 514.5050048828125, - "y": 245.56199645996094 + "x": 1581.4759521484375, + "y": 216.45700073242188 }, { - "x": 510.0780029296875, - "y": 244.9080047607422 + "x": 1579.0040283203125, + "y": 216.91200256347656 }, { - "x": 505.6090087890625, - "y": 244.18600463867188 + "x": 1576.5269775390625, + "y": 217.33700561523438 }, { - "x": 501.09698486328125, - "y": 243.39100646972656 + "x": 1574.0450439453125, + "y": 217.72999572753906 }, { - "x": 496.5459899902344, - "y": 242.52000427246094 + "x": 1571.5579833984375, + "y": 218.0919952392578 }, { - "x": 491.95599365234375, - "y": 241.5679931640625 + "x": 1569.0660400390625, + "y": 218.4219970703125 }, { - "x": 487.3290100097656, - "y": 240.531005859375 + "x": 1566.571044921875, + "y": 218.7220001220703 }, { - "x": 482.6659851074219, - "y": 239.40499877929688 + "x": 1564.072021484375, + "y": 218.99000549316406 }, { - "x": 477.97198486328125, - "y": 238.18699645996094 + "x": 1561.5699462890625, + "y": 219.2259979248047 }, { - "x": 473.24700927734375, - "y": 236.8719940185547 + "x": 1559.06494140625, + "y": 219.43099975585938 }, { - "x": 468.4939880371094, - "y": 235.45599365234375 + "x": 1556.5579833984375, + "y": 219.60499572753906 }, { - "x": 463.7170104980469, - "y": 233.93600463867188 + "x": 1554.0479736328125, + "y": 219.7469940185547 }, { - "x": 458.91900634765625, - "y": 232.30799865722656 + "x": 1551.5379638671875, + "y": 219.85699462890625 }, { - "x": 454.10400390625, - "y": 230.56900024414062 + "x": 1549.0260009765625, + "y": 219.93600463867188 }, { - "x": 449.2749938964844, - "y": 228.71600341796875 + "x": 1546.512939453125, + "y": 219.98399353027344 }, { - "x": 444.43499755859375, - "y": 226.74400329589844 + "x": 1544, + "y": 220 }, { - "x": 439.5899963378906, - "y": 224.6510009765625 + "x": 1541.4859619140625, + "y": 219.98399353027344 }, { - "x": 434.7430114746094, - "y": 222.43499755859375 + "x": 1538.9730224609375, + "y": 219.93600463867188 }, { - "x": 429.8999938964844, - "y": 220.0919952392578 + "x": 1536.4610595703125, + "y": 219.85699462890625 }, { - "x": 425.0639953613281, - "y": 217.6199951171875 + "x": 1533.9510498046875, + "y": 219.7469940185547 }, { - "x": 420.24200439453125, - "y": 215.01600646972656 + "x": 1531.4410400390625, + "y": 219.60499572753906 }, { - "x": 415.43701171875, - "y": 212.2790069580078 + "x": 1528.9339599609375, + "y": 219.43099975585938 }, { - "x": 410.6549987792969, - "y": 209.40699768066406 + "x": 1526.428955078125, + "y": 219.2259979248047 }, { - "x": 405.9020080566406, - "y": 206.3979949951172 + "x": 1523.927001953125, + "y": 218.99000549316406 }, { - "x": 387.3290100097656, - "y": 225.91799926757812 + "x": 1521.427978515625, + "y": 218.7220001220703 }, { - "x": 379.6919860839844, - "y": 213.0070037841797 - } - ], - "isCurve": true, - "animated": false, - "tooltip": "", - "icon": null, - "zIndex": 0 - }, - { - "id": "3.(a -> b)[0]", - "src": "3.a", - "srcArrow": "none", - "dst": "3.b", - "dstArrow": "triangle", - "opacity": 1, - "strokeDash": 0, - "strokeWidth": 2, - "stroke": "B1", - "borderRadius": 10, - "label": "", - "fontSize": 16, - "fontFamily": "DEFAULT", - "language": "", - "color": "N2", - "italic": true, - "bold": false, - "underline": false, - "labelWidth": 0, - "labelHeight": 0, - "labelPosition": "", - "labelPercentage": 0, - "link": "", - "route": [ + "x": 1518.9329833984375, + "y": 218.4219970703125 + }, { - "x": 1249.8909912109375, - "y": -267 + "x": 1516.4410400390625, + "y": 218.0919952392578 }, { - "x": 1253.9620361328125, - "y": -251.71200561523438 + "x": 1513.9539794921875, + "y": 217.72999572753906 }, { - "x": 1260.3609619140625, - "y": -244.74899291992188 + "x": 1511.4720458984375, + "y": 217.33700561523438 }, { - "x": 1267.8199462890625, - "y": -241.8090057373047 + "x": 1508.9949951171875, + "y": 216.91200256347656 }, { - "x": 1275.1109619140625, - "y": -238.64999389648438 + "x": 1506.52294921875, + "y": 216.45700073242188 }, { - "x": 1282.22802734375, - "y": -235.28399658203125 + "x": 1504.0579833984375, + "y": 215.9709930419922 }, { - "x": 1289.1650390625, - "y": -231.72000122070312 + "x": 1501.5980224609375, + "y": 215.4530029296875 }, { - "x": 1295.9189453125, - "y": -227.96800231933594 + "x": 1499.14501953125, + "y": 214.90499877929688 }, { - "x": 1302.4859619140625, - "y": -224.03799438476562 + "x": 1496.699951171875, + "y": 214.3260040283203 }, { - "x": 1308.8609619140625, - "y": -219.94000244140625 + "x": 1494.261962890625, + "y": 213.71600341796875 }, { - "x": 1315.04296875, - "y": -215.68499755859375 + "x": 1491.8310546875, + "y": 213.0760040283203 }, { - "x": 1321.029052734375, - "y": -211.28199768066406 + "x": 1489.4090576171875, + "y": 212.40499877929688 }, { - "x": 1326.8170166015625, - "y": -206.74099731445312 + "x": 1486.9959716796875, + "y": 211.70399475097656 }, { - "x": 1332.406982421875, - "y": -202.07200622558594 + "x": 1484.5909423828125, + "y": 210.9720001220703 }, { - "x": 1337.7979736328125, - "y": -197.28500366210938 + "x": 1482.196044921875, + "y": 210.21099853515625 }, { - "x": 1342.989013671875, - "y": -192.38800048828125 + "x": 1479.81103515625, + "y": 209.41900634765625 }, { - "x": 1347.9820556640625, - "y": -187.39100646972656 + "x": 1477.43603515625, + "y": 208.59800720214844 }, { - "x": 1352.7760009765625, - "y": -182.30299377441406 + "x": 1475.071044921875, + "y": 207.74600219726562 }, { - "x": 1357.3740234375, - "y": -177.1320037841797 + "x": 1472.717041015625, + "y": 206.86500549316406 }, { - "x": 1361.7769775390625, - "y": -171.88600158691406 + "x": 1470.375, + "y": 205.9550018310547 }, { - "x": 1365.9859619140625, - "y": -166.57400512695312 + "x": 1468.0439453125, + "y": 205.01499938964844 }, { - "x": 1370.0050048828125, - "y": -161.2030029296875 + "x": 1465.7249755859375, + "y": 204.04600524902344 }, { - "x": 1373.8360595703125, - "y": -155.781005859375 + "x": 1463.41796875, + "y": 203.04800415039062 }, { - "x": 1377.4820556640625, - "y": -150.31300354003906 + "x": 1461.1240234375, + "y": 202.02099609375 }, { - "x": 1380.946044921875, - "y": -144.80799865722656 + "x": 1458.843994140625, + "y": 200.96499633789062 }, { - "x": 1384.2330322265625, - "y": -139.27000427246094 + "x": 1456.5760498046875, + "y": 199.88099670410156 }, { - "x": 1387.343994140625, - "y": -133.7050018310547 + "x": 1457.1510009765625, + "y": 200.20199584960938 }, { - "x": 1390.2860107421875, - "y": -128.11900329589844 + "x": 1453.4420166015625, + "y": 198.31900024414062 + } + ], + "isCurve": true, + "animated": false, + "tooltip": "", + "icon": null, + "zIndex": 0 + }, + { + "id": "5.(d -> e)[0]", + "src": "5.d", + "srcArrow": "none", + "dst": "5.e", + "dstArrow": "triangle", + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "stroke": "B1", + "borderRadius": 10, + "label": "", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N2", + "italic": true, + "bold": false, + "underline": false, + "labelWidth": 0, + "labelHeight": 0, + "labelPosition": "", + "labelPercentage": 0, + "link": "", + "route": [ + { + "x": 1399.4420166015625, + "y": 158.20899963378906 }, { - "x": 1393.06005859375, - "y": -122.51699829101562 + "x": 1398.2060546875, + "y": 156.90899658203125 }, { - "x": 1395.6729736328125, - "y": -116.9020004272461 + "x": 1396.4969482421875, + "y": 155.0659942626953 }, { - "x": 1398.126953125, - "y": -111.27999877929688 + "x": 1394.81103515625, + "y": 153.20199584960938 }, { - "x": 1400.427978515625, - "y": -105.65299987792969 + "x": 1393.1490478515625, + "y": 151.31700134277344 }, { - "x": 1402.5780029296875, - "y": -100.0260009765625 + "x": 1391.510986328125, + "y": 149.41099548339844 }, { - "x": 1404.583984375, - "y": -94.39900207519531 + "x": 1389.89697265625, + "y": 147.48399353027344 }, { - "x": 1406.447998046875, - "y": -88.7770004272461 + "x": 1388.3070068359375, + "y": 145.53799438476562 }, { - "x": 1408.176025390625, - "y": -83.16100311279297 + "x": 1386.741943359375, + "y": 143.5709991455078 }, { - "x": 1409.77099609375, - "y": -77.552001953125 + "x": 1385.2010498046875, + "y": 141.58599853515625 }, { - "x": 1411.2359619140625, - "y": -71.9530029296875 + "x": 1383.68603515625, + "y": 139.5800018310547 }, { - "x": 1412.5770263671875, - "y": -66.36299896240234 + "x": 1382.196044921875, + "y": 137.5570068359375 }, { - "x": 1413.7960205078125, - "y": -60.78300094604492 + "x": 1380.7320556640625, + "y": 135.51400756835938 }, { - "x": 1414.89697265625, - "y": -55.2140007019043 + "x": 1379.29296875, + "y": 133.4530029296875 }, { - "x": 1415.883056640625, - "y": -49.65599822998047 + "x": 1377.8800048828125, + "y": 131.375 }, { - "x": 1416.7559814453125, - "y": -44.10900115966797 + "x": 1376.4940185546875, + "y": 129.2779998779297 }, { - "x": 1417.52099609375, - "y": -38.57099914550781 + "x": 1375.134033203125, + "y": 127.16500091552734 }, { - "x": 1418.178955078125, - "y": -33.04199981689453 + "x": 1373.801025390625, + "y": 125.03399658203125 }, { - "x": 1418.73095703125, - "y": -27.52199935913086 + "x": 1372.4940185546875, + "y": 122.88700103759766 }, { - "x": 1419.1810302734375, - "y": -22.007999420166016 + "x": 1371.2149658203125, + "y": 120.7239990234375 }, { - "x": 1419.529052734375, - "y": -16.500999450683594 + "x": 1369.9630126953125, + "y": 118.54499816894531 }, { - "x": 1419.7769775390625, - "y": -10.998000144958496 + "x": 1368.738037109375, + "y": 116.3499984741211 }, { - "x": 1419.925048828125, - "y": -5.498000144958496 + "x": 1367.541015625, + "y": 114.13999938964844 }, { - "x": 1419.9749755859375, - "y": 0 + "x": 1366.3719482421875, + "y": 111.91500091552734 }, { - "x": 1419.925048828125, - "y": 5.498000144958496 + "x": 1365.23095703125, + "y": 109.6760025024414 }, { - "x": 1419.7769775390625, - "y": 10.998000144958496 + "x": 1364.1180419921875, + "y": 107.4229965209961 }, { - "x": 1419.529052734375, - "y": 16.500999450683594 + "x": 1363.0340576171875, + "y": 105.15499877929688 }, { - "x": 1419.1810302734375, - "y": 22.007999420166016 + "x": 1361.97802734375, + "y": 102.875 }, { - "x": 1418.73095703125, - "y": 27.52199935913086 + "x": 1360.9510498046875, + "y": 100.58100128173828 }, { - "x": 1418.178955078125, - "y": 33.04199981689453 + "x": 1359.9530029296875, + "y": 98.27400207519531 }, { - "x": 1417.52099609375, - "y": 38.57099914550781 + "x": 1358.9840087890625, + "y": 95.95500183105469 }, { - "x": 1416.7559814453125, - "y": 44.10900115966797 + "x": 1358.0439453125, + "y": 93.6240005493164 }, { - "x": 1415.883056640625, - "y": 49.65599822998047 + "x": 1357.134033203125, + "y": 91.28199768066406 }, { - "x": 1414.89697265625, - "y": 55.2140007019043 + "x": 1356.2530517578125, + "y": 88.9280014038086 }, { - "x": 1413.7960205078125, - "y": 60.78300094604492 + "x": 1355.4010009765625, + "y": 86.56300354003906 }, { - "x": 1412.5770263671875, - "y": 66.36299896240234 + "x": 1354.5799560546875, + "y": 84.18800354003906 }, { - "x": 1411.2359619140625, - "y": 71.9530029296875 + "x": 1353.7879638671875, + "y": 81.8030014038086 }, { - "x": 1409.77099609375, - "y": 77.552001953125 + "x": 1353.0269775390625, + "y": 79.40799713134766 }, { - "x": 1408.176025390625, - "y": 83.16100311279297 + "x": 1352.2950439453125, + "y": 77.00299835205078 }, { - "x": 1406.447998046875, - "y": 88.7770004272461 + "x": 1351.593994140625, + "y": 74.58999633789062 }, { - "x": 1404.583984375, - "y": 94.39900207519531 + "x": 1350.9229736328125, + "y": 72.16799926757812 }, { - "x": 1402.5780029296875, - "y": 100.0260009765625 + "x": 1350.282958984375, + "y": 69.73699951171875 }, { - "x": 1400.427978515625, - "y": 105.65299987792969 + "x": 1349.6729736328125, + "y": 67.29900360107422 }, { - "x": 1398.126953125, - "y": 111.27999877929688 + "x": 1349.093994140625, + "y": 64.85399627685547 }, { - "x": 1395.6729736328125, - "y": 116.9020004272461 + "x": 1348.5460205078125, + "y": 62.4010009765625 }, { - "x": 1393.06005859375, - "y": 122.51699829101562 + "x": 1348.0279541015625, + "y": 59.941001892089844 }, { - "x": 1390.2860107421875, - "y": 128.11900329589844 + "x": 1347.5419921875, + "y": 57.47600173950195 }, { - "x": 1387.343994140625, - "y": 133.7050018310547 + "x": 1347.0870361328125, + "y": 55.00400161743164 }, { - "x": 1384.2330322265625, - "y": 139.27000427246094 + "x": 1346.6619873046875, + "y": 52.527000427246094 }, { - "x": 1380.946044921875, - "y": 144.80799865722656 + "x": 1346.26904296875, + "y": 50.04499816894531 }, { - "x": 1377.4820556640625, - "y": 150.31300354003906 + "x": 1345.906982421875, + "y": 47.55799865722656 }, { - "x": 1373.8360595703125, - "y": 155.781005859375 + "x": 1345.5770263671875, + "y": 45.066001892089844 }, { - "x": 1370.0050048828125, - "y": 161.2030029296875 + "x": 1345.2769775390625, + "y": 42.57099914550781 }, { - "x": 1365.9859619140625, - "y": 166.57400512695312 + "x": 1345.009033203125, + "y": 40.071998596191406 }, { - "x": 1361.7769775390625, - "y": 171.88600158691406 + "x": 1344.77294921875, + "y": 37.56999969482422 }, { - "x": 1357.3740234375, - "y": 177.1320037841797 + "x": 1344.5679931640625, + "y": 35.064998626708984 }, { - "x": 1352.7760009765625, - "y": 182.30299377441406 + "x": 1344.39404296875, + "y": 32.55799865722656 }, { - "x": 1347.9820556640625, - "y": 187.39100646972656 + "x": 1344.251953125, + "y": 30.04800033569336 }, { - "x": 1342.989013671875, - "y": 192.38800048828125 + "x": 1344.1419677734375, + "y": 27.538000106811523 }, { - "x": 1337.7979736328125, - "y": 197.28500366210938 + "x": 1344.06298828125, + "y": 25.025999069213867 }, { - "x": 1332.406982421875, - "y": 202.07200622558594 + "x": 1344.0150146484375, + "y": 22.51300048828125 }, { - "x": 1326.8170166015625, - "y": 206.74099731445312 + "x": 1344, + "y": 20 }, { - "x": 1321.029052734375, - "y": 211.28199768066406 + "x": 1344.0150146484375, + "y": 17.486000061035156 }, { - "x": 1315.04296875, - "y": 215.68499755859375 + "x": 1344.06298828125, + "y": 14.972999572753906 }, { - "x": 1308.8609619140625, - "y": 219.94000244140625 + "x": 1344.1419677734375, + "y": 12.461000442504883 }, { - "x": 1302.4859619140625, - "y": 224.03799438476562 + "x": 1344.251953125, + "y": 9.951000213623047 }, { - "x": 1295.9189453125, - "y": 227.96800231933594 + "x": 1344.39404296875, + "y": 7.440999984741211 }, { - "x": 1289.1650390625, - "y": 231.72000122070312 + "x": 1344.5679931640625, + "y": 4.934000015258789 }, { - "x": 1282.22802734375, - "y": 235.28399658203125 + "x": 1344.77294921875, + "y": 2.428999900817871 }, { - "x": 1275.1109619140625, - "y": 238.64999389648438 + "x": 1345.009033203125, + "y": -0.07199999690055847 }, { - "x": 1267.8199462890625, - "y": 241.8090057373047 + "x": 1345.2769775390625, + "y": -2.571000099182129 }, { - "x": 1260.3609619140625, - "y": 244.74899291992188 + "x": 1345.5770263671875, + "y": -5.065999984741211 }, { - "x": 1264.887939453125, - "y": 266.7250061035156 + "x": 1345.489013671875, + "y": -4.686999797821045 }, { - "x": 1249.8909912109375, - "y": 267 + "x": 1346.0880126953125, + "y": -8.803000450134277 } ], "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 8579a80028..b1b31e77f0 100644 --- a/e2etests/testdata/txtar/cycle-diagram/dagre/sketch.exp.svg +++ b/e2etests/testdata/txtar/cycle-diagram/dagre/sketch.exp.svg @@ -1,10 +1,10 @@ -abcdabcab - + .d2-3510071088 .fill-N1{fill:#0A0F25;} + .d2-3510071088 .fill-N2{fill:#676C7E;} + .d2-3510071088 .fill-N3{fill:#9499AB;} + .d2-3510071088 .fill-N4{fill:#CFD2DD;} + .d2-3510071088 .fill-N5{fill:#DEE1EB;} + .d2-3510071088 .fill-N6{fill:#EEF1F8;} + .d2-3510071088 .fill-N7{fill:#FFFFFF;} + .d2-3510071088 .fill-B1{fill:#0D32B2;} + .d2-3510071088 .fill-B2{fill:#0D32B2;} + .d2-3510071088 .fill-B3{fill:#E3E9FD;} + .d2-3510071088 .fill-B4{fill:#E3E9FD;} + .d2-3510071088 .fill-B5{fill:#EDF0FD;} + .d2-3510071088 .fill-B6{fill:#F7F8FE;} + .d2-3510071088 .fill-AA2{fill:#4A6FF3;} + .d2-3510071088 .fill-AA4{fill:#EDF0FD;} + .d2-3510071088 .fill-AA5{fill:#F7F8FE;} + .d2-3510071088 .fill-AB4{fill:#EDF0FD;} + .d2-3510071088 .fill-AB5{fill:#F7F8FE;} + .d2-3510071088 .stroke-N1{stroke:#0A0F25;} + .d2-3510071088 .stroke-N2{stroke:#676C7E;} + .d2-3510071088 .stroke-N3{stroke:#9499AB;} + .d2-3510071088 .stroke-N4{stroke:#CFD2DD;} + .d2-3510071088 .stroke-N5{stroke:#DEE1EB;} + .d2-3510071088 .stroke-N6{stroke:#EEF1F8;} + .d2-3510071088 .stroke-N7{stroke:#FFFFFF;} + .d2-3510071088 .stroke-B1{stroke:#0D32B2;} + .d2-3510071088 .stroke-B2{stroke:#0D32B2;} + .d2-3510071088 .stroke-B3{stroke:#E3E9FD;} + .d2-3510071088 .stroke-B4{stroke:#E3E9FD;} + .d2-3510071088 .stroke-B5{stroke:#EDF0FD;} + .d2-3510071088 .stroke-B6{stroke:#F7F8FE;} + .d2-3510071088 .stroke-AA2{stroke:#4A6FF3;} + .d2-3510071088 .stroke-AA4{stroke:#EDF0FD;} + .d2-3510071088 .stroke-AA5{stroke:#F7F8FE;} + .d2-3510071088 .stroke-AB4{stroke:#EDF0FD;} + .d2-3510071088 .stroke-AB5{stroke:#F7F8FE;} + .d2-3510071088 .background-color-N1{background-color:#0A0F25;} + .d2-3510071088 .background-color-N2{background-color:#676C7E;} + .d2-3510071088 .background-color-N3{background-color:#9499AB;} + .d2-3510071088 .background-color-N4{background-color:#CFD2DD;} + .d2-3510071088 .background-color-N5{background-color:#DEE1EB;} + .d2-3510071088 .background-color-N6{background-color:#EEF1F8;} + .d2-3510071088 .background-color-N7{background-color:#FFFFFF;} + .d2-3510071088 .background-color-B1{background-color:#0D32B2;} + .d2-3510071088 .background-color-B2{background-color:#0D32B2;} + .d2-3510071088 .background-color-B3{background-color:#E3E9FD;} + .d2-3510071088 .background-color-B4{background-color:#E3E9FD;} + .d2-3510071088 .background-color-B5{background-color:#EDF0FD;} + .d2-3510071088 .background-color-B6{background-color:#F7F8FE;} + .d2-3510071088 .background-color-AA2{background-color:#4A6FF3;} + .d2-3510071088 .background-color-AA4{background-color:#EDF0FD;} + .d2-3510071088 .background-color-AA5{background-color:#F7F8FE;} + .d2-3510071088 .background-color-AB4{background-color:#EDF0FD;} + .d2-3510071088 .background-color-AB5{background-color:#F7F8FE;} + .d2-3510071088 .color-N1{color:#0A0F25;} + .d2-3510071088 .color-N2{color:#676C7E;} + .d2-3510071088 .color-N3{color:#9499AB;} + .d2-3510071088 .color-N4{color:#CFD2DD;} + .d2-3510071088 .color-N5{color:#DEE1EB;} + .d2-3510071088 .color-N6{color:#EEF1F8;} + .d2-3510071088 .color-N7{color:#FFFFFF;} + .d2-3510071088 .color-B1{color:#0D32B2;} + .d2-3510071088 .color-B2{color:#0D32B2;} + .d2-3510071088 .color-B3{color:#E3E9FD;} + .d2-3510071088 .color-B4{color:#E3E9FD;} + .d2-3510071088 .color-B5{color:#EDF0FD;} + .d2-3510071088 .color-B6{color:#F7F8FE;} + .d2-3510071088 .color-AA2{color:#4A6FF3;} + .d2-3510071088 .color-AA4{color:#EDF0FD;} + .d2-3510071088 .color-AA5{color:#F7F8FE;} + .d2-3510071088 .color-AB4{color:#EDF0FD;} + .d2-3510071088 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker-d2-3510071088);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker-d2-3510071088);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright-d2-3510071088);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright-d2-3510071088);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright-d2-3510071088);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright-d2-3510071088);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark-d2-3510071088);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright-d2-3510071088);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright-d2-3510071088);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright-d2-3510071088);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright-d2-3510071088);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker-d2-3510071088);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark-d2-3510071088);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal-d2-3510071088);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal-d2-3510071088);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright-d2-3510071088);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright-d2-3510071088);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright-d2-3510071088);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>abcdabcababcdefabcde + - - - - - - - - + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/e2etests/testdata/txtar/cycle-diagram/elk/board.exp.json b/e2etests/testdata/txtar/cycle-diagram/elk/board.exp.json index 277750cbc4..bc4abcf553 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": 62 + "y": 12 }, - "width": 554, - "height": 566, + "width": 454, + "height": 466, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -98,8 +98,8 @@ "id": "1.b", "type": "rectangle", "pos": { - "x": 235, - "y": 29 + "x": 185, + "y": -21 }, "width": 53, "height": 66, @@ -141,7 +141,7 @@ "type": "rectangle", "pos": { "x": -14, - "y": 279 + "y": 179 }, "width": 53, "height": 66, @@ -182,8 +182,8 @@ "id": "1.d", "type": "rectangle", "pos": { - "x": -265, - "y": 29 + "x": -215, + "y": -20 }, "width": 54, "height": 66, @@ -224,11 +224,11 @@ "id": "2", "type": "cycle", "pos": { - "x": 585, - "y": 86 + "x": 485, + "y": 61 }, - "width": 573, - "height": 517, + "width": 400, + "height": 367, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -265,8 +265,8 @@ "id": "2.a", "type": "rectangle", "pos": { - "x": 559, - "y": -246 + "x": 459, + "y": -171 }, "width": 53, "height": 66, @@ -307,8 +307,8 @@ "id": "2.b", "type": "rectangle", "pos": { - "x": 818, - "y": 203 + "x": 632, + "y": 128 }, "width": 53, "height": 66, @@ -349,8 +349,8 @@ "id": "2.c", "type": "rectangle", "pos": { - "x": 299, - "y": 204 + "x": 285, + "y": 129 }, "width": 53, "height": 66, @@ -391,11 +391,11 @@ "id": "3", "type": "cycle", "pos": { - "x": 1178, + "x": 904, "y": 12 }, "width": 53, - "height": 666, + "height": 466, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -432,8 +432,8 @@ "id": "3.a", "type": "rectangle", "pos": { - "x": 1151, - "y": -321 + "x": 878, + "y": -221 }, "width": 53, "height": 66, @@ -474,8 +474,8 @@ "id": "3.b", "type": "rectangle", "pos": { - "x": 1151, - "y": 279 + "x": 878, + "y": 179 }, "width": 53, "height": 66, @@ -511,373 +511,3709 @@ "labelPosition": "INSIDE_MIDDLE_CENTER", "zIndex": 0, "level": 2 - } - ], - "connections": [ + }, { - "id": "1.(a -> b)[0]", - "src": "1.a", - "srcArrow": "none", - "dst": "1.b", - "dstArrow": "triangle", + "id": "4", + "type": "cycle", + "pos": { + "x": 977, + "y": 12 + }, + "width": 400, + "height": 466, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, + "borderRadius": 0, + "fill": "N7", "stroke": "B1", - "borderRadius": 10, + "animated": false, + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": null, "label": "", - "fontSize": 16, + "fontSize": 28, "fontFamily": "DEFAULT", "language": "", - "color": "N2", - "italic": true, + "color": "N1", + "italic": false, "bold": false, "underline": false, "labelWidth": 0, "labelHeight": 0, - "labelPosition": "", - "labelPercentage": 0, + "zIndex": 0, + "level": 1 + }, + { + "id": "4.a", + "type": "rectangle", + "pos": { + "x": 951, + "y": -221 + }, + "width": 53, + "height": 66, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "B5", + "stroke": "B1", + "animated": false, + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", "link": "", - "route": [ - { - "x": 38.5, - "y": -169.53399658203125 - }, - { - "x": 41.19200134277344, - "y": -167.34300231933594 - }, - { - "x": 44.257999420166016, - "y": -164.7830047607422 - }, - { - "x": 47.4640007019043, - "y": -162.02499389648438 - }, - { - "x": 50.595001220703125, - "y": -159.2449951171875 - }, - { - "x": 53.65299987792969, - "y": -156.44700622558594 - }, - { - "x": 56.63800048828125, - "y": -153.63499450683594 - }, - { - "x": 59.551998138427734, - "y": -150.81300354003906 - }, - { - "x": 62.39500045776367, - "y": -147.98300170898438 - }, - { - "x": 65.16999816894531, - "y": -145.1490020751953 - }, - { - "x": 67.87699890136719, - "y": -142.31500244140625 - }, - { - "x": 70.5199966430664, - "y": -139.48300170898438 - }, - { - "x": 73.0989990234375, - "y": -136.65699768066406 - }, - { - "x": 75.61599731445312, - "y": -133.83999633789062 - }, - { - "x": 78.07499694824219, - "y": -131.03500366210938 - }, + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "a", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": true, + "underline": false, + "labelWidth": 8, + "labelHeight": 21, + "labelPosition": "INSIDE_MIDDLE_CENTER", + "zIndex": 0, + "level": 2 + }, + { + "id": "4.b", + "type": "rectangle", + "pos": { + "x": 1124, + "y": -121 + }, + "width": 53, + "height": 66, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "B5", + "stroke": "B1", + "animated": false, + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "b", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": true, + "underline": false, + "labelWidth": 8, + "labelHeight": 21, + "labelPosition": "INSIDE_MIDDLE_CENTER", + "zIndex": 0, + "level": 2 + }, + { + "id": "4.c", + "type": "rectangle", + "pos": { + "x": 1124, + "y": 78 + }, + "width": 53, + "height": 66, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "B5", + "stroke": "B1", + "animated": false, + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "c", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": true, + "underline": false, + "labelWidth": 8, + "labelHeight": 21, + "labelPosition": "INSIDE_MIDDLE_CENTER", + "zIndex": 0, + "level": 2 + }, + { + "id": "4.d", + "type": "rectangle", + "pos": { + "x": 950, + "y": 179 + }, + "width": 54, + "height": 66, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "B5", + "stroke": "B1", + "animated": false, + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "d", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": true, + "underline": false, + "labelWidth": 9, + "labelHeight": 21, + "labelPosition": "INSIDE_MIDDLE_CENTER", + "zIndex": 0, + "level": 2 + }, + { + "id": "4.e", + "type": "rectangle", + "pos": { + "x": 778, + "y": 79 + }, + "width": 53, + "height": 66, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "B5", + "stroke": "B1", + "animated": false, + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "e", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": true, + "underline": false, + "labelWidth": 8, + "labelHeight": 21, + "labelPosition": "INSIDE_MIDDLE_CENTER", + "zIndex": 0, + "level": 2 + }, + { + "id": "4.f", + "type": "rectangle", + "pos": { + "x": 779, + "y": -121 + }, + "width": 51, + "height": 66, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "B5", + "stroke": "B1", + "animated": false, + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "f", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": true, + "underline": false, + "labelWidth": 6, + "labelHeight": 21, + "labelPosition": "INSIDE_MIDDLE_CENTER", + "zIndex": 0, + "level": 2 + }, + { + "id": "5", + "type": "cycle", + "pos": { + "x": 1397, + "y": 31 + }, + "width": 434, + "height": 428, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "N7", + "stroke": "B1", + "animated": false, + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "", + "fontSize": 28, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": false, + "underline": false, + "labelWidth": 0, + "labelHeight": 0, + "zIndex": 0, + "level": 1 + }, + { + "id": "5.a", + "type": "rectangle", + "pos": { + "x": 1370, + "y": -201 + }, + "width": 53, + "height": 66, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "B5", + "stroke": "B1", + "animated": false, + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "a", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": true, + "underline": false, + "labelWidth": 8, + "labelHeight": 21, + "labelPosition": "INSIDE_MIDDLE_CENTER", + "zIndex": 0, + "level": 2 + }, + { + "id": "5.b", + "type": "rectangle", + "pos": { + "x": 1561, + "y": -63 + }, + "width": 53, + "height": 66, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "B5", + "stroke": "B1", + "animated": false, + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "b", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": true, + "underline": false, + "labelWidth": 8, + "labelHeight": 21, + "labelPosition": "INSIDE_MIDDLE_CENTER", + "zIndex": 0, + "level": 2 + }, + { + "id": "5.c", + "type": "rectangle", + "pos": { + "x": 1488, + "y": 159 + }, + "width": 53, + "height": 66, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "B5", + "stroke": "B1", + "animated": false, + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "c", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": true, + "underline": false, + "labelWidth": 8, + "labelHeight": 21, + "labelPosition": "INSIDE_MIDDLE_CENTER", + "zIndex": 0, + "level": 2 + }, + { + "id": "5.d", + "type": "rectangle", + "pos": { + "x": 1252, + "y": 159 + }, + "width": 54, + "height": 66, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "B5", + "stroke": "B1", + "animated": false, + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "d", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": true, + "underline": false, + "labelWidth": 9, + "labelHeight": 21, + "labelPosition": "INSIDE_MIDDLE_CENTER", + "zIndex": 0, + "level": 2 + }, + { + "id": "5.e", + "type": "rectangle", + "pos": { + "x": 1180, + "y": -63 + }, + "width": 53, + "height": 66, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "B5", + "stroke": "B1", + "animated": false, + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "e", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": true, + "underline": false, + "labelWidth": 8, + "labelHeight": 21, + "labelPosition": "INSIDE_MIDDLE_CENTER", + "zIndex": 0, + "level": 2 + } + ], + "connections": [ + { + "id": "1.(a -> b)[0]", + "src": "1.a", + "srcArrow": "none", + "dst": "1.b", + "dstArrow": "triangle", + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "stroke": "B1", + "borderRadius": 10, + "label": "", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N2", + "italic": true, + "bold": false, + "underline": false, + "labelWidth": 0, + "labelHeight": 0, + "labelPosition": "", + "labelPercentage": 0, + "link": "", + "route": [ + { + "x": 38.5, + "y": -186.22999572753906 + }, + { + "x": 40.18000030517578, + "y": -186.00399780273438 + }, + { + "x": 43.2859992980957, + "y": -185.53700256347656 + }, + { + "x": 46.3849983215332, + "y": -185.02099609375 + }, + { + "x": 49.47600173950195, + "y": -184.45700073242188 + }, + { + "x": 52.55699920654297, + "y": -183.843994140625 + }, + { + "x": 55.62799835205078, + "y": -183.18299865722656 + }, + { + "x": 58.68899917602539, + "y": -182.47300720214844 + }, + { + "x": 61.73699951171875, + "y": -181.71600341796875 + }, + { + "x": 64.77400207519531, + "y": -180.91099548339844 + }, + { + "x": 67.7979965209961, + "y": -180.05799865722656 + }, + { + "x": 70.80799865722656, + "y": -179.1580047607422 + }, + { + "x": 73.8030014038086, + "y": -178.21099853515625 + }, + { + "x": 76.78299713134766, + "y": -177.2169952392578 + }, + { + "x": 79.74700164794922, + "y": -176.17599487304688 + }, + { + "x": 82.69400024414062, + "y": -175.08799743652344 + }, + { + "x": 85.6240005493164, + "y": -173.9550018310547 + }, + { + "x": 88.53600311279297, + "y": -172.77499389648438 + }, + { + "x": 91.42900085449219, + "y": -171.5500030517578 + }, + { + "x": 94.302001953125, + "y": -170.27999877929688 + }, + { + "x": 97.15499877929688, + "y": -168.96499633789062 + }, + { + "x": 99.98699951171875, + "y": -167.60499572753906 + }, + { + "x": 102.7979965209961, + "y": -166.2010040283203 + }, + { + "x": 105.58499908447266, + "y": -164.7530059814453 + }, + { + "x": 108.3499984741211, + "y": -163.26100158691406 + }, + { + "x": 111.09100341796875, + "y": -161.7259979248047 + }, + { + "x": 113.80799865722656, + "y": -160.1479949951172 + }, + { + "x": 116.4990005493164, + "y": -158.5279998779297 + }, + { + "x": 119.16500091552734, + "y": -156.86500549316406 + }, + { + "x": 121.80400085449219, + "y": -155.16099548339844 + }, + { + "x": 124.41600036621094, + "y": -153.41600036621094 + }, + { + "x": 127.0009994506836, + "y": -151.62899780273438 + }, + { + "x": 129.5570068359375, + "y": -149.80299377441406 + }, + { + "x": 132.08399963378906, + "y": -147.93600463867188 + }, + { + "x": 134.58099365234375, + "y": -146.031005859375 + }, + { + "x": 137.04800415039062, + "y": -144.08599853515625 + }, + { + "x": 139.48399353027344, + "y": -142.1020050048828 + }, + { + "x": 141.88900756835938, + "y": -140.08099365234375 + }, + { + "x": 144.26199340820312, + "y": -138.02200317382812 + }, + { + "x": 146.6020050048828, + "y": -135.92599487304688 + }, + { + "x": 148.90899658203125, + "y": -133.79299926757812 + }, + { + "x": 151.1820068359375, + "y": -131.625 + }, + { + "x": 153.42100524902344, + "y": -129.42100524902344 + }, + { + "x": 155.625, + "y": -127.18199920654297 + }, + { + "x": 157.79299926757812, + "y": -124.90899658203125 + }, + { + "x": 159.92599487304688, + "y": -122.60199737548828 + }, + { + "x": 162.02200317382812, + "y": -120.26200103759766 + }, + { + "x": 164.08099365234375, + "y": -117.88899993896484 + }, + { + "x": 166.1020050048828, + "y": -115.48400115966797 + }, + { + "x": 168.08599853515625, + "y": -113.0479965209961 + }, + { + "x": 170.031005859375, + "y": -110.58100128173828 + }, + { + "x": 171.93600463867188, + "y": -108.08399963378906 + }, + { + "x": 173.80299377441406, + "y": -105.55699920654297 + }, + { + "x": 175.62899780273438, + "y": -103.0009994506836 + }, + { + "x": 177.41600036621094, + "y": -100.41600036621094 + }, + { + "x": 179.16099548339844, + "y": -97.80400085449219 + }, + { + "x": 180.86500549316406, + "y": -95.16500091552734 + }, + { + "x": 182.5279998779297, + "y": -92.4990005493164 + }, + { + "x": 184.1479949951172, + "y": -89.80799865722656 + }, + { + "x": 185.7259979248047, + "y": -87.09100341796875 + }, + { + "x": 187.26100158691406, + "y": -84.3499984741211 + }, + { + "x": 188.7530059814453, + "y": -81.58499908447266 + }, + { + "x": 190.2010040283203, + "y": -78.7979965209961 + }, + { + "x": 191.60499572753906, + "y": -75.98699951171875 + }, + { + "x": 192.96499633789062, + "y": -73.15499877929688 + }, + { + "x": 194.27999877929688, + "y": -70.302001953125 + }, + { + "x": 195.5500030517578, + "y": -67.42900085449219 + }, + { + "x": 196.77499389648438, + "y": -64.53600311279297 + }, + { + "x": 197.9550018310547, + "y": -61.624000549316406 + }, + { + "x": 199.08799743652344, + "y": -58.694000244140625 + }, + { + "x": 200.17599487304688, + "y": -55.74700164794922 + }, + { + "x": 201.2169952392578, + "y": -52.78300094604492 + }, + { + "x": 202.21099853515625, + "y": -49.803001403808594 + }, + { + "x": 203.1580047607422, + "y": -46.80799865722656 + }, + { + "x": 204.05799865722656, + "y": -43.79800033569336 + }, + { + "x": 204.91099548339844, + "y": -40.77399826049805 + }, + { + "x": 205.71600341796875, + "y": -37.73699951171875 + }, + { + "x": 206.47300720214844, + "y": -34.68899917602539 + }, + { + "x": 207.18299865722656, + "y": -31.628000259399414 + }, + { + "x": 207.843994140625, + "y": -28.55699920654297 + }, + { + "x": 208.45700073242188, + "y": -25.47599983215332 + }, + { + "x": 208.5659942626953, + "y": -25.10099983215332 + }, + { + "x": 209.2519989013672, + "y": -21 + } + ], + "isCurve": true, + "animated": false, + "tooltip": "", + "icon": null, + "zIndex": 0 + }, + { + "id": "1.(b -> c)[0]", + "src": "1.b", + "srcArrow": "none", + "dst": "1.c", + "dstArrow": "triangle", + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "stroke": "B1", + "borderRadius": 10, + "label": "", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N2", + "italic": true, + "bold": false, + "underline": false, + "labelWidth": 0, + "labelHeight": 0, + "labelPosition": "", + "labelPercentage": 0, + "link": "", + "route": [ + { + "x": 209.2519989013672, + "y": 45 + }, + { + "x": 209.02099609375, + "y": 46.3849983215332 + }, + { + "x": 208.45700073242188, + "y": 49.47600173950195 + }, + { + "x": 207.843994140625, + "y": 52.55699920654297 + }, + { + "x": 207.18299865722656, + "y": 55.62799835205078 + }, + { + "x": 206.47300720214844, + "y": 58.68899917602539 + }, + { + "x": 205.71600341796875, + "y": 61.73699951171875 + }, + { + "x": 204.91099548339844, + "y": 64.77400207519531 + }, + { + "x": 204.05799865722656, + "y": 67.7979965209961 + }, + { + "x": 203.1580047607422, + "y": 70.80799865722656 + }, + { + "x": 202.21099853515625, + "y": 73.8030014038086 + }, + { + "x": 201.2169952392578, + "y": 76.78299713134766 + }, + { + "x": 200.17599487304688, + "y": 79.74700164794922 + }, + { + "x": 199.08799743652344, + "y": 82.69400024414062 + }, + { + "x": 197.9550018310547, + "y": 85.6240005493164 + }, + { + "x": 196.77499389648438, + "y": 88.53600311279297 + }, + { + "x": 195.5500030517578, + "y": 91.42900085449219 + }, + { + "x": 194.27999877929688, + "y": 94.302001953125 + }, + { + "x": 192.96499633789062, + "y": 97.15499877929688 + }, + { + "x": 191.60499572753906, + "y": 99.98699951171875 + }, + { + "x": 190.2010040283203, + "y": 102.7979965209961 + }, + { + "x": 188.7530059814453, + "y": 105.58499908447266 + }, + { + "x": 187.26100158691406, + "y": 108.3499984741211 + }, + { + "x": 185.7259979248047, + "y": 111.09100341796875 + }, + { + "x": 184.1479949951172, + "y": 113.80799865722656 + }, + { + "x": 182.5279998779297, + "y": 116.4990005493164 + }, + { + "x": 180.86500549316406, + "y": 119.16500091552734 + }, + { + "x": 179.16099548339844, + "y": 121.80400085449219 + }, + { + "x": 177.41600036621094, + "y": 124.41600036621094 + }, + { + "x": 175.62899780273438, + "y": 127.0009994506836 + }, + { + "x": 173.80299377441406, + "y": 129.5570068359375 + }, + { + "x": 171.93600463867188, + "y": 132.08399963378906 + }, + { + "x": 170.031005859375, + "y": 134.58099365234375 + }, + { + "x": 168.08599853515625, + "y": 137.04800415039062 + }, + { + "x": 166.1020050048828, + "y": 139.48399353027344 + }, + { + "x": 164.08099365234375, + "y": 141.88900756835938 + }, + { + "x": 162.02200317382812, + "y": 144.26199340820312 + }, + { + "x": 159.92599487304688, + "y": 146.6020050048828 + }, + { + "x": 157.79299926757812, + "y": 148.90899658203125 + }, + { + "x": 155.625, + "y": 151.1820068359375 + }, + { + "x": 153.42100524902344, + "y": 153.42100524902344 + }, + { + "x": 151.1820068359375, + "y": 155.625 + }, + { + "x": 148.90899658203125, + "y": 157.79299926757812 + }, + { + "x": 146.6020050048828, + "y": 159.92599487304688 + }, + { + "x": 144.26199340820312, + "y": 162.02200317382812 + }, + { + "x": 141.88900756835938, + "y": 164.08099365234375 + }, + { + "x": 139.48399353027344, + "y": 166.1020050048828 + }, + { + "x": 137.04800415039062, + "y": 168.08599853515625 + }, + { + "x": 134.58099365234375, + "y": 170.031005859375 + }, + { + "x": 132.08399963378906, + "y": 171.93600463867188 + }, + { + "x": 129.5570068359375, + "y": 173.80299377441406 + }, + { + "x": 127.0009994506836, + "y": 175.62899780273438 + }, + { + "x": 124.41600036621094, + "y": 177.41600036621094 + }, + { + "x": 121.80400085449219, + "y": 179.16099548339844 + }, + { + "x": 119.16500091552734, + "y": 180.86500549316406 + }, + { + "x": 116.4990005493164, + "y": 182.5279998779297 + }, + { + "x": 113.80799865722656, + "y": 184.1479949951172 + }, + { + "x": 111.09100341796875, + "y": 185.7259979248047 + }, + { + "x": 108.3499984741211, + "y": 187.26100158691406 + }, + { + "x": 105.58499908447266, + "y": 188.7530059814453 + }, + { + "x": 102.7979965209961, + "y": 190.2010040283203 + }, + { + "x": 99.98699951171875, + "y": 191.60499572753906 + }, + { + "x": 97.15499877929688, + "y": 192.96499633789062 + }, + { + "x": 94.302001953125, + "y": 194.27999877929688 + }, + { + "x": 91.42900085449219, + "y": 195.5500030517578 + }, + { + "x": 88.53600311279297, + "y": 196.77499389648438 + }, + { + "x": 85.6240005493164, + "y": 197.9550018310547 + }, + { + "x": 82.69400024414062, + "y": 199.08799743652344 + }, + { + "x": 79.74700164794922, + "y": 200.17599487304688 + }, + { + "x": 76.78299713134766, + "y": 201.2169952392578 + }, + { + "x": 73.8030014038086, + "y": 202.21099853515625 + }, + { + "x": 70.80799865722656, + "y": 203.1580047607422 + }, + { + "x": 67.7979965209961, + "y": 204.05799865722656 + }, + { + "x": 64.77400207519531, + "y": 204.91099548339844 + }, + { + "x": 61.73699951171875, + "y": 205.71600341796875 + }, + { + "x": 58.68899917602539, + "y": 206.47300720214844 + }, + { + "x": 55.62799835205078, + "y": 207.18299865722656 + }, + { + "x": 52.55699920654297, + "y": 207.843994140625 + }, + { + "x": 49.47600173950195, + "y": 208.45700073242188 + }, + { + "x": 46.3849983215332, + "y": 209.02099609375 + }, + { + "x": 43.2859992980957, + "y": 209.53700256347656 + }, + { + "x": 42.62200164794922, + "y": 209.6790008544922 + }, + { + "x": 38.5, + "y": 210.22999572753906 + } + ], + "isCurve": true, + "animated": false, + "tooltip": "", + "icon": null, + "zIndex": 0 + }, + { + "id": "1.(c -> d)[0]", + "src": "1.c", + "srcArrow": "none", + "dst": "1.d", + "dstArrow": "triangle", + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "stroke": "B1", + "borderRadius": 10, + "label": "", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N2", + "italic": true, + "bold": false, + "underline": false, + "labelWidth": 0, + "labelHeight": 0, + "labelPosition": "", + "labelPercentage": 0, + "link": "", + "route": [ + { + "x": -14.49899959564209, + "y": 210.22999572753906 + }, + { + "x": -16.18000030517578, + "y": 210.00399780273438 + }, + { + "x": -19.285999298095703, + "y": 209.53700256347656 + }, + { + "x": -22.385000228881836, + "y": 209.02099609375 + }, + { + "x": -25.47599983215332, + "y": 208.45700073242188 + }, + { + "x": -28.55699920654297, + "y": 207.843994140625 + }, + { + "x": -31.628000259399414, + "y": 207.18299865722656 + }, + { + "x": -34.68899917602539, + "y": 206.47300720214844 + }, + { + "x": -37.73699951171875, + "y": 205.71600341796875 + }, + { + "x": -40.77399826049805, + "y": 204.91099548339844 + }, + { + "x": -43.79800033569336, + "y": 204.05799865722656 + }, + { + "x": -46.80799865722656, + "y": 203.1580047607422 + }, + { + "x": -49.803001403808594, + "y": 202.21099853515625 + }, + { + "x": -52.78300094604492, + "y": 201.2169952392578 + }, + { + "x": -55.74700164794922, + "y": 200.17599487304688 + }, + { + "x": -58.694000244140625, + "y": 199.08799743652344 + }, + { + "x": -61.624000549316406, + "y": 197.9550018310547 + }, + { + "x": -64.53600311279297, + "y": 196.77499389648438 + }, + { + "x": -67.42900085449219, + "y": 195.5500030517578 + }, + { + "x": -70.302001953125, + "y": 194.27999877929688 + }, + { + "x": -73.15499877929688, + "y": 192.96499633789062 + }, + { + "x": -75.98699951171875, + "y": 191.60499572753906 + }, + { + "x": -78.7979965209961, + "y": 190.2010040283203 + }, + { + "x": -81.58499908447266, + "y": 188.7530059814453 + }, + { + "x": -84.3499984741211, + "y": 187.26100158691406 + }, + { + "x": -87.09100341796875, + "y": 185.7259979248047 + }, + { + "x": -89.80799865722656, + "y": 184.1479949951172 + }, + { + "x": -92.4990005493164, + "y": 182.5279998779297 + }, + { + "x": -95.16500091552734, + "y": 180.86500549316406 + }, + { + "x": -97.80400085449219, + "y": 179.16099548339844 + }, + { + "x": -100.41600036621094, + "y": 177.41600036621094 + }, + { + "x": -103.0009994506836, + "y": 175.62899780273438 + }, + { + "x": -105.55699920654297, + "y": 173.80299377441406 + }, + { + "x": -108.08399963378906, + "y": 171.93600463867188 + }, + { + "x": -110.58100128173828, + "y": 170.031005859375 + }, + { + "x": -113.0479965209961, + "y": 168.08599853515625 + }, + { + "x": -115.48400115966797, + "y": 166.1020050048828 + }, + { + "x": -117.88899993896484, + "y": 164.08099365234375 + }, + { + "x": -120.26200103759766, + "y": 162.02200317382812 + }, + { + "x": -122.60199737548828, + "y": 159.92599487304688 + }, + { + "x": -124.90899658203125, + "y": 157.79299926757812 + }, + { + "x": -127.18199920654297, + "y": 155.625 + }, + { + "x": -129.42100524902344, + "y": 153.42100524902344 + }, + { + "x": -131.625, + "y": 151.1820068359375 + }, + { + "x": -133.79299926757812, + "y": 148.90899658203125 + }, + { + "x": -135.92599487304688, + "y": 146.6020050048828 + }, + { + "x": -138.02200317382812, + "y": 144.26199340820312 + }, + { + "x": -140.08099365234375, + "y": 141.88900756835938 + }, + { + "x": -142.1020050048828, + "y": 139.48399353027344 + }, + { + "x": -144.08599853515625, + "y": 137.04800415039062 + }, + { + "x": -146.031005859375, + "y": 134.58099365234375 + }, + { + "x": -147.93600463867188, + "y": 132.08399963378906 + }, + { + "x": -149.80299377441406, + "y": 129.5570068359375 + }, + { + "x": -151.62899780273438, + "y": 127.0009994506836 + }, + { + "x": -153.41600036621094, + "y": 124.41600036621094 + }, + { + "x": -155.16099548339844, + "y": 121.80400085449219 + }, + { + "x": -156.86500549316406, + "y": 119.16500091552734 + }, + { + "x": -158.5279998779297, + "y": 116.4990005493164 + }, + { + "x": -160.1479949951172, + "y": 113.80799865722656 + }, + { + "x": -161.7259979248047, + "y": 111.09100341796875 + }, + { + "x": -163.26100158691406, + "y": 108.3499984741211 + }, + { + "x": -164.7530059814453, + "y": 105.58499908447266 + }, + { + "x": -166.2010040283203, + "y": 102.7979965209961 + }, + { + "x": -167.60499572753906, + "y": 99.98699951171875 + }, + { + "x": -168.96499633789062, + "y": 97.15499877929688 + }, + { + "x": -170.27999877929688, + "y": 94.302001953125 + }, + { + "x": -171.5500030517578, + "y": 91.42900085449219 + }, + { + "x": -172.77499389648438, + "y": 88.53600311279297 + }, + { + "x": -173.9550018310547, + "y": 85.6240005493164 + }, + { + "x": -175.08799743652344, + "y": 82.69400024414062 + }, + { + "x": -176.17599487304688, + "y": 79.74700164794922 + }, + { + "x": -177.2169952392578, + "y": 76.78299713134766 + }, + { + "x": -178.21099853515625, + "y": 73.8030014038086 + }, + { + "x": -179.1580047607422, + "y": 70.80799865722656 + }, + { + "x": -180.05799865722656, + "y": 67.7979965209961 + }, + { + "x": -180.91099548339844, + "y": 64.77400207519531 + }, + { + "x": -181.71600341796875, + "y": 61.73699951171875 + }, + { + "x": -182.47300720214844, + "y": 58.68899917602539 + }, + { + "x": -183.18299865722656, + "y": 55.62799835205078 + }, + { + "x": -183.843994140625, + "y": 52.55699920654297 + }, + { + "x": -184.45700073242188, + "y": 49.47600173950195 + }, + { + "x": -184.5659942626953, + "y": 49.10100173950195 + }, + { + "x": -185.2519989013672, + "y": 45 + } + ], + "isCurve": true, + "animated": false, + "tooltip": "", + "icon": null, + "zIndex": 0 + }, + { + "id": "2.(a -> b)[0]", + "src": "2.a", + "srcArrow": "none", + "dst": "2.b", + "dstArrow": "triangle", + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "stroke": "B1", + "borderRadius": 10, + "label": "", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N2", + "italic": true, + "bold": false, + "underline": false, + "labelWidth": 0, + "labelHeight": 0, + "labelPosition": "", + "labelPercentage": 0, + "link": "", + "route": [ + { + "x": 512, + "y": -136.2259979248047 + }, + { + "x": 514.7160034179688, + "y": -135.85400390625 + }, + { + "x": 518.85302734375, + "y": -135.19900512695312 + }, + { + "x": 522.9760131835938, + "y": -134.45700073242188 + }, + { + "x": 527.0819702148438, + "y": -133.62899780273438 + }, + { + "x": 531.1699829101562, + "y": -132.71499633789062 + }, + { + "x": 535.2369995117188, + "y": -131.71600341796875 + }, + { + "x": 539.2830200195312, + "y": -130.6320037841797 + }, + { + "x": 543.3060302734375, + "y": -129.46299743652344 + }, + { + "x": 547.302978515625, + "y": -128.21099853515625 + }, + { + "x": 551.2730102539062, + "y": -126.875 + }, + { + "x": 555.2139892578125, + "y": -125.45600128173828 + }, + { + "x": 559.1240234375, + "y": -123.95500183105469 + }, + { + "x": 563.0029907226562, + "y": -122.37200164794922 + }, + { + "x": 566.8469848632812, + "y": -120.70899963378906 + }, + { + "x": 570.655029296875, + "y": -118.96499633789062 + }, + { + "x": 574.427001953125, + "y": -117.14199829101562 + }, + { + "x": 578.1589965820312, + "y": -115.23999786376953 + }, + { + "x": 581.8499755859375, + "y": -113.26100158691406 + }, + { + "x": 585.5, + "y": -111.20500183105469 + }, + { + "x": 589.10498046875, + "y": -109.0719985961914 + }, + { + "x": 592.6649780273438, + "y": -106.86499786376953 + }, + { + "x": 596.177978515625, + "y": -104.58399963378906 + }, + { + "x": 599.6420288085938, + "y": -102.22899627685547 + }, + { + "x": 603.0570068359375, + "y": -99.8030014038086 + }, + { + "x": 606.4190063476562, + "y": -97.30500030517578 + }, + { + "x": 609.72900390625, + "y": -94.73799896240234 + }, + { + "x": 612.9840087890625, + "y": -92.10199737548828 + }, + { + "x": 616.1840209960938, + "y": -89.39900207519531 + }, + { + "x": 619.3259887695312, + "y": -86.62799835205078 + }, + { + "x": 622.4089965820312, + "y": -83.79299926757812 + }, + { + "x": 625.4320068359375, + "y": -80.89399719238281 + }, + { + "x": 628.3939819335938, + "y": -77.93199920654297 + }, + { + "x": 631.2930297851562, + "y": -74.90899658203125 + }, + { + "x": 634.1279907226562, + "y": -71.82599639892578 + }, + { + "x": 636.8989868164062, + "y": -68.68399810791016 + }, + { + "x": 639.6019897460938, + "y": -65.48400115966797 + }, + { + "x": 642.2379760742188, + "y": -62.229000091552734 + }, + { + "x": 644.8049926757812, + "y": -58.91899871826172 + }, + { + "x": 647.302978515625, + "y": -55.55699920654297 + }, + { + "x": 649.72900390625, + "y": -52.141998291015625 + }, + { + "x": 652.083984375, + "y": -48.678001403808594 + }, + { + "x": 654.364990234375, + "y": -45.165000915527344 + }, + { + "x": 656.572021484375, + "y": -41.60499954223633 + }, + { + "x": 658.7050170898438, + "y": -38 + }, + { + "x": 660.760986328125, + "y": -34.349998474121094 + }, + { + "x": 662.739990234375, + "y": -30.659000396728516 + }, + { + "x": 664.6420288085938, + "y": -26.927000045776367 + }, + { + "x": 666.4650268554688, + "y": -23.155000686645508 + }, + { + "x": 668.208984375, + "y": -19.347000122070312 + }, + { + "x": 669.8720092773438, + "y": -15.503000259399414 + }, + { + "x": 671.4550170898438, + "y": -11.62399959564209 + }, + { + "x": 672.9559936523438, + "y": -7.714000225067139 + }, + { + "x": 674.375, + "y": -3.7730000019073486 + }, + { + "x": 675.7109985351562, + "y": 0.19599999487400055 + }, + { + "x": 676.9630126953125, + "y": 4.192999839782715 + }, + { + "x": 678.1320190429688, + "y": 8.215999603271484 + }, + { + "x": 679.2160034179688, + "y": 12.26200008392334 + }, + { + "x": 680.2150268554688, + "y": 16.32900047302246 + }, + { + "x": 681.1290283203125, + "y": 20.41699981689453 + }, + { + "x": 681.9569702148438, + "y": 24.523000717163086 + }, + { + "x": 682.698974609375, + "y": 28.645999908447266 + }, + { + "x": 683.35400390625, + "y": 32.78300094604492 + }, + { + "x": 683.9219970703125, + "y": 36.93299865722656 + }, + { + "x": 684.4039916992188, + "y": 41.09400177001953 + }, + { + "x": 684.7979736328125, + "y": 45.263999938964844 + }, + { + "x": 685.10498046875, + "y": 49.441001892089844 + }, + { + "x": 685.323974609375, + "y": 53.624000549316406 + }, + { + "x": 685.4559936523438, + "y": 57.81100082397461 + }, + { + "x": 685.5, + "y": 61.999000549316406 + }, + { + "x": 685.4559936523438, + "y": 66.18800354003906 + }, + { + "x": 685.323974609375, + "y": 70.375 + }, + { + "x": 685.10498046875, + "y": 74.55799865722656 + }, + { + "x": 684.7979736328125, + "y": 78.73500061035156 + }, + { + "x": 684.4039916992188, + "y": 82.90499877929688 + }, + { + "x": 683.9219970703125, + "y": 87.06600189208984 + }, + { + "x": 683.35400390625, + "y": 91.21600341796875 + }, + { + "x": 682.698974609375, + "y": 95.35299682617188 + }, + { + "x": 681.9569702148438, + "y": 99.47599792480469 + }, + { + "x": 681.1290283203125, + "y": 103.58200073242188 + }, + { + "x": 680.2150268554688, + "y": 107.66999816894531 + }, + { + "x": 679.2160034179688, + "y": 111.73699951171875 + }, + { + "x": 678.1320190429688, + "y": 115.78299713134766 + }, + { + "x": 676.9630126953125, + "y": 119.80599975585938 + }, + { + "x": 675.7109985351562, + "y": 123.8030014038086 + }, + { + "x": 675.3259887695312, + "y": 125.08100128173828 + }, + { + "x": 673.9329833984375, + "y": 128.99899291992188 + } + ], + "isCurve": true, + "animated": false, + "tooltip": "", + "icon": null, + "zIndex": 0 + }, + { + "id": "2.(b -> c)[0]", + "src": "2.b", + "srcArrow": "none", + "dst": "2.c", + "dstArrow": "triangle", + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "stroke": "B1", + "borderRadius": 10, + "label": "", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N2", + "italic": true, + "bold": false, + "underline": false, + "labelWidth": 0, + "labelHeight": 0, + "labelPosition": "", + "labelPercentage": 0, + "link": "", + "route": [ + { + "x": 634.8569946289062, + "y": 194.99899291992188 + }, + { + "x": 634.1279907226562, + "y": 195.8260040283203 + }, + { + "x": 631.2930297851562, + "y": 198.90899658203125 + }, + { + "x": 628.3939819335938, + "y": 201.9320068359375 + }, + { + "x": 625.4320068359375, + "y": 204.8939971923828 + }, + { + "x": 622.4089965820312, + "y": 207.79299926757812 + }, + { + "x": 619.3259887695312, + "y": 210.6280059814453 + }, + { + "x": 616.1840209960938, + "y": 213.3990020751953 + }, + { + "x": 612.9840087890625, + "y": 216.1020050048828 + }, + { + "x": 609.72900390625, + "y": 218.73800659179688 + }, + { + "x": 606.4190063476562, + "y": 221.30499267578125 + }, + { + "x": 603.0570068359375, + "y": 223.80299377441406 + }, + { + "x": 599.6420288085938, + "y": 226.22900390625 + }, + { + "x": 596.177978515625, + "y": 228.58399963378906 + }, + { + "x": 592.6649780273438, + "y": 230.86500549316406 + }, + { + "x": 589.10498046875, + "y": 233.07200622558594 + }, + { + "x": 585.5, + "y": 235.2050018310547 + }, + { + "x": 581.8499755859375, + "y": 237.26100158691406 + }, + { + "x": 578.1589965820312, + "y": 239.24000549316406 + }, + { + "x": 574.427001953125, + "y": 241.14199829101562 + }, + { + "x": 570.655029296875, + "y": 242.96499633789062 + }, + { + "x": 566.8469848632812, + "y": 244.70899963378906 + }, + { + "x": 563.0029907226562, + "y": 246.3719940185547 + }, + { + "x": 559.1240234375, + "y": 247.9550018310547 + }, + { + "x": 555.2139892578125, + "y": 249.45599365234375 + }, + { + "x": 551.2730102539062, + "y": 250.875 + }, + { + "x": 547.302978515625, + "y": 252.21099853515625 + }, + { + "x": 543.3060302734375, + "y": 253.46299743652344 + }, + { + "x": 539.2830200195312, + "y": 254.6320037841797 + }, + { + "x": 535.2369995117188, + "y": 255.71600341796875 + }, + { + "x": 531.1699829101562, + "y": 256.7149963378906 + }, + { + "x": 527.0819702148438, + "y": 257.6289978027344 + }, + { + "x": 522.9760131835938, + "y": 258.4570007324219 + }, + { + "x": 518.85302734375, + "y": 259.1990051269531 + }, + { + "x": 514.7160034179688, + "y": 259.85400390625 + }, + { + "x": 510.5660095214844, + "y": 260.4219970703125 + }, + { + "x": 506.4049987792969, + "y": 260.90399169921875 + }, + { + "x": 502.2349853515625, + "y": 261.2980041503906 + }, + { + "x": 498.0580139160156, + "y": 261.6050109863281 + }, + { + "x": 493.875, + "y": 261.8240051269531 + }, + { + "x": 489.68798828125, + "y": 261.95599365234375 + }, + { + "x": 485.5, + "y": 262 + }, + { + "x": 481.3110046386719, + "y": 261.95599365234375 + }, + { + "x": 477.1239929199219, + "y": 261.8240051269531 + }, + { + "x": 472.9410095214844, + "y": 261.6050109863281 + }, + { + "x": 468.7640075683594, + "y": 261.2980041503906 + }, + { + "x": 464.593994140625, + "y": 260.90399169921875 + }, + { + "x": 460.4330139160156, + "y": 260.4219970703125 + }, + { + "x": 456.2829895019531, + "y": 259.85400390625 + }, + { + "x": 452.14599609375, + "y": 259.1990051269531 + }, + { + "x": 448.02301025390625, + "y": 258.4570007324219 + }, + { + "x": 443.9169921875, + "y": 257.6289978027344 + }, + { + "x": 439.8290100097656, + "y": 256.7149963378906 + }, + { + "x": 435.7619934082031, + "y": 255.71600341796875 + }, + { + "x": 431.71600341796875, + "y": 254.6320037841797 + }, + { + "x": 427.6929931640625, + "y": 253.46299743652344 + }, + { + "x": 423.6960144042969, + "y": 252.21099853515625 + }, + { + "x": 419.72601318359375, + "y": 250.875 + }, + { + "x": 415.7850036621094, + "y": 249.45599365234375 + }, + { + "x": 411.875, + "y": 247.9550018310547 + }, + { + "x": 407.9960021972656, + "y": 246.3719940185547 + }, + { + "x": 404.1520080566406, + "y": 244.70899963378906 + }, + { + "x": 400.343994140625, + "y": 242.96499633789062 + }, + { + "x": 396.5719909667969, + "y": 241.14199829101562 + }, + { + "x": 392.8399963378906, + "y": 239.24000549316406 + }, + { + "x": 389.14898681640625, + "y": 237.26100158691406 + }, + { + "x": 385.5, + "y": 235.2050018310547 + }, + { + "x": 381.8940124511719, + "y": 233.07200622558594 + }, + { + "x": 378.3340148925781, + "y": 230.86500549316406 + }, + { + "x": 374.8210144042969, + "y": 228.58399963378906 + }, + { + "x": 371.35699462890625, + "y": 226.22900390625 + }, + { + "x": 367.9419860839844, + "y": 223.80299377441406 + }, + { + "x": 364.5799865722656, + "y": 221.30499267578125 + }, + { + "x": 361.2699890136719, + "y": 218.73800659179688 + }, + { + "x": 358.0150146484375, + "y": 216.1020050048828 + }, + { + "x": 354.81500244140625, + "y": 213.3990020751953 + }, + { + "x": 351.6730041503906, + "y": 210.6280059814453 + }, + { + "x": 348.5899963378906, + "y": 207.79299926757812 + }, + { + "x": 345.5669860839844, + "y": 204.8939971923828 + }, + { + "x": 342.6050109863281, + "y": 201.9320068359375 + }, + { + "x": 339.70599365234375, + "y": 198.90899658203125 + }, + { + "x": 338.9079895019531, + "y": 198.1060028076172 + }, + { + "x": 336.1419982910156, + "y": 195 + } + ], + "isCurve": true, + "animated": false, + "tooltip": "", + "icon": null, + "zIndex": 0 + }, + { + "id": "3.(a -> b)[0]", + "src": "3.a", + "srcArrow": "none", + "dst": "3.b", + "dstArrow": "triangle", + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "stroke": "B1", + "borderRadius": 10, + "label": "", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N2", + "italic": true, + "bold": false, + "underline": false, + "labelWidth": 0, + "labelHeight": 0, + "labelPosition": "", + "labelPercentage": 0, + "link": "", + "route": [ + { + "x": 931.4099731445312, + "y": -186.21800231933594 + }, + { + "x": 936.197021484375, + "y": -185.53700256347656 + }, + { + "x": 942.385986328125, + "y": -184.45700073242188 + }, + { + "x": 948.5380249023438, + "y": -183.18299865722656 + }, + { + "x": 954.6480102539062, + "y": -181.71600341796875 + }, + { + "x": 960.7080078125, + "y": -180.05799865722656 + }, + { + "x": 966.7130126953125, + "y": -178.21099853515625 + }, + { + "x": 972.656982421875, + "y": -176.17599487304688 + }, + { + "x": 978.5349731445312, + "y": -173.9550018310547 + }, + { + "x": 984.3389892578125, + "y": -171.5500030517578 + }, + { + "x": 990.0659790039062, + "y": -168.96499633789062 + }, + { + "x": 995.7080078125, + "y": -166.2010040283203 + }, + { + "x": 1001.260009765625, + "y": -163.26100158691406 + }, + { + "x": 1006.718017578125, + "y": -160.1479949951172 + }, + { + "x": 1012.0750122070312, + "y": -156.86500549316406 + }, + { + "x": 1017.3259887695312, + "y": -153.41600036621094 + }, + { + "x": 1022.4669799804688, + "y": -149.80299377441406 + }, + { + "x": 1027.490966796875, + "y": -146.031005859375 + }, + { + "x": 1032.39404296875, + "y": -142.1020050048828 + }, + { + "x": 1037.1719970703125, + "y": -138.02200317382812 + }, + { + "x": 1041.8189697265625, + "y": -133.79299926757812 + }, + { + "x": 1046.3310546875, + "y": -129.42100524902344 + }, + { + "x": 1050.7030029296875, + "y": -124.90899658203125 + }, + { + "x": 1054.9320068359375, + "y": -120.26200103759766 + }, + { + "x": 1059.011962890625, + "y": -115.48400115966797 + }, + { + "x": 1062.9410400390625, + "y": -110.58100128173828 + }, + { + "x": 1066.7130126953125, + "y": -105.55699920654297 + }, + { + "x": 1070.3260498046875, + "y": -100.41600036621094 + }, + { + "x": 1073.7750244140625, + "y": -95.16500091552734 + }, + { + "x": 1077.0579833984375, + "y": -89.80799865722656 + }, + { + "x": 1080.1710205078125, + "y": -84.3499984741211 + }, + { + "x": 1083.1109619140625, + "y": -78.7979965209961 + }, + { + "x": 1085.875, + "y": -73.15499877929688 + }, + { + "x": 1088.4610595703125, + "y": -67.42900085449219 + }, + { + "x": 1090.864990234375, + "y": -61.624000549316406 + }, + { + "x": 1093.0860595703125, + "y": -55.74700164794922 + }, + { + "x": 1095.1209716796875, + "y": -49.803001403808594 + }, + { + "x": 1096.968017578125, + "y": -43.79800033569336 + }, + { + "x": 1098.6259765625, + "y": -37.73699951171875 + }, + { + "x": 1100.093017578125, + "y": -31.628000259399414 + }, + { + "x": 1101.366943359375, + "y": -25.47599983215332 + }, + { + "x": 1102.447021484375, + "y": -19.285999298095703 + }, + { + "x": 1103.3330078125, + "y": -13.065999984741211 + }, + { + "x": 1104.02197265625, + "y": -6.821000099182129 + }, + { + "x": 1104.5150146484375, + "y": -0.5580000281333923 + }, + { + "x": 1104.81103515625, + "y": 5.7170000076293945 + }, + { + "x": 1104.9100341796875, + "y": 12 + }, + { + "x": 1104.81103515625, + "y": 18.281999588012695 + }, + { + "x": 1104.5150146484375, + "y": 24.558000564575195 + }, + { + "x": 1104.02197265625, + "y": 30.820999145507812 + }, + { + "x": 1103.3330078125, + "y": 37.066001892089844 + }, + { + "x": 1102.447021484375, + "y": 43.2859992980957 + }, + { + "x": 1101.366943359375, + "y": 49.47600173950195 + }, + { + "x": 1100.093017578125, + "y": 55.62799835205078 + }, + { + "x": 1098.6259765625, + "y": 61.73699951171875 + }, + { + "x": 1096.968017578125, + "y": 67.7979965209961 + }, + { + "x": 1095.1209716796875, + "y": 73.8030014038086 + }, + { + "x": 1093.0860595703125, + "y": 79.74700164794922 + }, + { + "x": 1090.864990234375, + "y": 85.6240005493164 + }, + { + "x": 1088.4610595703125, + "y": 91.42900085449219 + }, + { + "x": 1085.875, + "y": 97.15499877929688 + }, + { + "x": 1083.1109619140625, + "y": 102.7979965209961 + }, + { + "x": 1080.1710205078125, + "y": 108.3499984741211 + }, + { + "x": 1077.0579833984375, + "y": 113.80799865722656 + }, + { + "x": 1073.7750244140625, + "y": 119.16500091552734 + }, + { + "x": 1070.3260498046875, + "y": 124.41600036621094 + }, + { + "x": 1066.7130126953125, + "y": 129.5570068359375 + }, + { + "x": 1062.9410400390625, + "y": 134.58099365234375 + }, + { + "x": 1059.011962890625, + "y": 139.48399353027344 + }, + { + "x": 1054.9320068359375, + "y": 144.26199340820312 + }, + { + "x": 1050.7030029296875, + "y": 148.90899658203125 + }, + { + "x": 1046.3310546875, + "y": 153.42100524902344 + }, + { + "x": 1041.8189697265625, + "y": 157.79299926757812 + }, + { + "x": 1037.1719970703125, + "y": 162.02200317382812 + }, + { + "x": 1032.39404296875, + "y": 166.1020050048828 + }, + { + "x": 1027.490966796875, + "y": 170.031005859375 + }, + { + "x": 1022.4669799804688, + "y": 173.80299377441406 + }, + { + "x": 1017.3259887695312, + "y": 177.41600036621094 + }, + { + "x": 1012.0750122070312, + "y": 180.86500549316406 + }, + { + "x": 1006.718017578125, + "y": 184.1479949951172 + }, + { + "x": 1001.260009765625, + "y": 187.26100158691406 + }, + { + "x": 995.7080078125, + "y": 190.2010040283203 + }, + { + "x": 990.0659790039062, + "y": 192.96499633789062 + }, + { + "x": 984.3389892578125, + "y": 195.5500030517578 + }, + { + "x": 978.5349731445312, + "y": 197.9550018310547 + }, + { + "x": 972.656982421875, + "y": 200.17599487304688 + }, + { + "x": 966.7130126953125, + "y": 202.21099853515625 + }, + { + "x": 960.7080078125, + "y": 204.05799865722656 + }, + { + "x": 954.6480102539062, + "y": 205.71600341796875 + }, + { + "x": 948.5380249023438, + "y": 207.18299865722656 + }, + { + "x": 942.385986328125, + "y": 208.45700073242188 + }, + { + "x": 936.197021484375, + "y": 209.53700256347656 + }, + { + "x": 931.4099731445312, + "y": 210.21800231933594 + } + ], + "isCurve": true, + "animated": false, + "tooltip": "", + "icon": null, + "zIndex": 0 + }, + { + "id": "4.(a -> b)[0]", + "src": "4.a", + "srcArrow": "none", + "dst": "4.b", + "dstArrow": "triangle", + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "stroke": "B1", + "borderRadius": 10, + "label": "", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N2", + "italic": true, + "bold": false, + "underline": false, + "labelWidth": 0, + "labelHeight": 0, + "labelPosition": "", + "labelPercentage": 0, + "link": "", + "route": [ + { + "x": 1004.4099731445312, + "y": -186.23399353027344 + }, + { + "x": 1005.052978515625, + "y": -186.1490020751953 + }, + { + "x": 1007.1259765625, + "y": -185.85400390625 + }, + { + "x": 1009.197021484375, + "y": -185.53700256347656 + }, + { + "x": 1011.2630004882812, + "y": -185.19900512695312 + }, + { + "x": 1013.3270263671875, + "y": -184.83900451660156 + }, + { + "x": 1015.385986328125, + "y": -184.45700073242188 + }, + { + "x": 1017.4409790039062, + "y": -184.0540008544922 + }, + { + "x": 1019.4920043945312, + "y": -183.62899780273438 + }, + { + "x": 1021.5380249023438, + "y": -183.18299865722656 + }, + { + "x": 1023.5800170898438, + "y": -182.71499633789062 + }, + { + "x": 1025.615966796875, + "y": -182.2259979248047 + }, + { + "x": 1027.64794921875, + "y": -181.71600341796875 + }, + { + "x": 1029.6729736328125, + "y": -181.18499755859375 + }, + { + "x": 1031.6939697265625, + "y": -180.6320037841797 + }, + { + "x": 1033.7080078125, + "y": -180.05799865722656 + }, + { + "x": 1035.7159423828125, + "y": -179.46299743652344 + }, + { + "x": 1037.718017578125, + "y": -178.84800720214844 + }, + { + "x": 1039.7130126953125, + "y": -178.21099853515625 + }, + { + "x": 1041.7020263671875, + "y": -177.55299377441406 + }, + { + "x": 1043.6829833984375, + "y": -176.875 + }, + { + "x": 1045.656982421875, + "y": -176.17599487304688 + }, + { + "x": 1047.6240234375, + "y": -175.45599365234375 + }, + { + "x": 1049.5830078125, + "y": -174.71600341796875 + }, + { + "x": 1051.5350341796875, + "y": -173.9550018310547 + }, + { + "x": 1053.47802734375, + "y": -173.1739959716797 + }, + { + "x": 1055.4129638671875, + "y": -172.3719940185547 + }, + { + "x": 1057.3389892578125, + "y": -171.5500030517578 + }, + { + "x": 1059.2569580078125, + "y": -170.70899963378906 + }, + { + "x": 1061.166015625, + "y": -169.8470001220703 + }, + { + "x": 1063.0660400390625, + "y": -168.96499633789062 + }, + { + "x": 1064.9560546875, + "y": -168.06300354003906 + }, + { + "x": 1066.8370361328125, + "y": -167.14199829101562 + }, + { + "x": 1068.7080078125, + "y": -166.2010040283203 + }, + { + "x": 1070.5689697265625, + "y": -165.24000549316406 + }, + { + "x": 1072.4200439453125, + "y": -164.25999450683594 + }, + { + "x": 1074.260009765625, + "y": -163.26100158691406 + }, + { + "x": 1076.0899658203125, + "y": -162.24200439453125 + }, + { + "x": 1077.9100341796875, + "y": -161.2050018310547 + }, + { + "x": 1079.718017578125, + "y": -160.1479949951172 + }, + { + "x": 1081.5150146484375, + "y": -159.07200622558594 + }, + { + "x": 1083.301025390625, + "y": -157.97799682617188 + }, + { + "x": 1085.074951171875, + "y": -156.86500549316406 + }, + { + "x": 1086.8370361328125, + "y": -155.73399353027344 + }, + { + "x": 1088.5880126953125, + "y": -154.58399963378906 + }, + { + "x": 1090.3260498046875, + "y": -153.41600036621094 + }, + { + "x": 1092.052001953125, + "y": -152.22900390625 + }, + { + "x": 1093.7659912109375, + "y": -151.02499389648438 + }, + { + "x": 1095.467041015625, + "y": -149.80299377441406 + }, + { + "x": 1097.155029296875, + "y": -148.56300354003906 + }, + { + "x": 1098.8289794921875, + "y": -147.30499267578125 + }, + { + "x": 1100.490966796875, + "y": -146.031005859375 + }, + { + "x": 1102.1390380859375, + "y": -144.73800659179688 + }, + { + "x": 1103.7740478515625, + "y": -143.4290008544922 + }, + { + "x": 1105.39404296875, + "y": -142.1020050048828 + }, + { + "x": 1107.0009765625, + "y": -140.75900268554688 + }, + { + "x": 1108.593994140625, + "y": -139.3990020751953 + }, + { + "x": 1110.1719970703125, + "y": -138.02200317382812 + }, + { + "x": 1111.7359619140625, + "y": -136.6280059814453 + }, + { + "x": 1113.2850341796875, + "y": -135.218994140625 + }, + { + "x": 1114.8189697265625, + "y": -133.79299926757812 + }, + { + "x": 1116.3380126953125, + "y": -132.3520050048828 + }, + { + "x": 1117.842041015625, + "y": -130.8939971923828 + }, + { + "x": 1119.3310546875, + "y": -129.42100524902344 + }, + { + "x": 1120.803955078125, + "y": -127.93199920654297 + }, + { + "x": 1122.261962890625, + "y": -126.4280014038086 + }, + { + "x": 1123.7030029296875, + "y": -124.90899658203125 + }, + { + "x": 1125.1290283203125, + "y": -123.375 + }, + { + "x": 1124.509033203125, + "y": -124.10600280761719 + }, + { + "x": 1127.2750244140625, + "y": -121 + } + ], + "isCurve": true, + "animated": false, + "tooltip": "", + "icon": null, + "zIndex": 0 + }, + { + "id": "4.(b -> c)[0]", + "src": "4.b", + "srcArrow": "none", + "dst": "4.c", + "dstArrow": "triangle", + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "stroke": "B1", + "borderRadius": 10, + "label": "", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N2", + "italic": true, + "bold": false, + "underline": false, + "labelWidth": 0, + "labelHeight": 0, + "labelPosition": "", + "labelPercentage": 0, + "link": "", + "route": [ + { + "x": 1166.3509521484375, + "y": -55 + }, + { + "x": 1166.7850341796875, + "y": -53.77299880981445 + }, + { + "x": 1167.4630126953125, + "y": -51.79100036621094 + }, + { + "x": 1168.1209716796875, + "y": -49.803001403808594 + }, + { + "x": 1168.758056640625, + "y": -47.80799865722656 + }, + { + "x": 1169.3740234375, + "y": -45.805999755859375 + }, + { + "x": 1169.968017578125, + "y": -43.79800033569336 + }, + { + "x": 1170.5419921875, + "y": -41.78300094604492 + }, + { + "x": 1171.094970703125, + "y": -39.76300048828125 + }, + { + "x": 1171.6259765625, + "y": -37.73699951171875 + }, + { + "x": 1172.136962890625, + "y": -35.70600128173828 + }, + { + "x": 1172.625, + "y": -33.66999816894531 + }, + { + "x": 1173.093017578125, + "y": -31.628000259399414 + }, + { + "x": 1173.5389404296875, + "y": -29.582000732421875 + }, + { + "x": 1173.9639892578125, + "y": -27.5310001373291 + }, + { + "x": 1174.366943359375, + "y": -25.47599983215332 + }, + { + "x": 1174.7490234375, + "y": -23.416000366210938 + }, + { + "x": 1175.1090087890625, + "y": -21.35300064086914 + }, + { + "x": 1175.447021484375, + "y": -19.285999298095703 + }, + { + "x": 1175.7640380859375, + "y": -17.215999603271484 + }, + { + "x": 1176.0589599609375, + "y": -15.142999649047852 + }, + { + "x": 1176.3330078125, + "y": -13.065999984741211 + }, + { + "x": 1176.583984375, + "y": -10.987000465393066 + }, + { + "x": 1176.81396484375, + "y": -8.904999732971191 + }, + { + "x": 1177.02197265625, + "y": -6.821000099182129 + }, + { + "x": 1177.2080078125, + "y": -4.735000133514404 + }, + { + "x": 1177.373046875, + "y": -2.6470000743865967 + }, + { + "x": 1177.5150146484375, + "y": -0.5580000281333923 + }, + { + "x": 1177.635986328125, + "y": 1.531999945640564 + }, + { + "x": 1177.7340087890625, + "y": 3.624000072479248 + }, + { + "x": 1177.81103515625, + "y": 5.7170000076293945 + }, + { + "x": 1177.865966796875, + "y": 7.810999870300293 + }, + { + "x": 1177.8990478515625, + "y": 9.904999732971191 + }, + { + "x": 1177.9100341796875, + "y": 11.99899959564209 + }, + { + "x": 1177.8990478515625, + "y": 14.093999862670898 + }, + { + "x": 1177.865966796875, + "y": 16.187999725341797 + }, + { + "x": 1177.81103515625, + "y": 18.281999588012695 + }, + { + "x": 1177.7340087890625, + "y": 20.375 + }, + { + "x": 1177.635986328125, + "y": 22.466999053955078 + }, + { + "x": 1177.5150146484375, + "y": 24.558000564575195 + }, + { + "x": 1177.373046875, + "y": 26.64699935913086 + }, + { + "x": 1177.2080078125, + "y": 28.735000610351562 + }, + { + "x": 1177.02197265625, + "y": 30.820999145507812 + }, + { + "x": 1176.81396484375, + "y": 32.904998779296875 + }, + { + "x": 1176.583984375, + "y": 34.98699951171875 + }, + { + "x": 1176.3330078125, + "y": 37.066001892089844 + }, + { + "x": 1176.0589599609375, + "y": 39.143001556396484 + }, + { + "x": 1175.7640380859375, + "y": 41.215999603271484 + }, + { + "x": 1175.447021484375, + "y": 43.2859992980957 + }, + { + "x": 1175.1090087890625, + "y": 45.35300064086914 + }, + { + "x": 1174.7490234375, + "y": 47.41600036621094 + }, + { + "x": 1174.366943359375, + "y": 49.47600173950195 + }, + { + "x": 1173.9639892578125, + "y": 51.53099822998047 + }, + { + "x": 1173.5389404296875, + "y": 53.582000732421875 + }, + { + "x": 1173.093017578125, + "y": 55.62799835205078 + }, + { + "x": 1172.625, + "y": 57.66999816894531 + }, + { + "x": 1172.136962890625, + "y": 59.70600128173828 + }, + { + "x": 1171.6259765625, + "y": 61.73699951171875 + }, + { + "x": 1171.094970703125, + "y": 63.76300048828125 + }, + { + "x": 1170.5419921875, + "y": 65.78299713134766 + }, + { + "x": 1169.968017578125, + "y": 67.7979965209961 + }, + { + "x": 1169.3740234375, + "y": 69.80599975585938 + }, + { + "x": 1168.758056640625, + "y": 71.80799865722656 + }, + { + "x": 1168.1209716796875, + "y": 73.8030014038086 + }, + { + "x": 1167.4630126953125, + "y": 75.79100036621094 + }, + { + "x": 1167.7440185546875, + "y": 75.08100128173828 + }, + { + "x": 1166.3509521484375, + "y": 78.9990005493164 + } + ], + "isCurve": true, + "animated": false, + "tooltip": "", + "icon": null, + "zIndex": 0 + }, + { + "id": "4.(c -> d)[0]", + "src": "4.c", + "srcArrow": "none", + "dst": "4.d", + "dstArrow": "triangle", + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "stroke": "B1", + "borderRadius": 10, + "label": "", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N2", + "italic": true, + "bold": false, + "underline": false, + "labelWidth": 0, + "labelHeight": 0, + "labelPosition": "", + "labelPercentage": 0, + "link": "", + "route": [ { - "x": 80.47599792480469, - "y": -128.2429962158203 + "x": 1127.2750244140625, + "y": 144.99899291992188 }, { - "x": 82.822998046875, - "y": -125.46900177001953 + "x": 1126.5389404296875, + "y": 145.8260040283203 }, { - "x": 85.11799621582031, - "y": -122.71299743652344 + "x": 1125.1290283203125, + "y": 147.375 }, { - "x": 87.36399841308594, - "y": -119.97899627685547 + "x": 1123.7030029296875, + "y": 148.90899658203125 }, { - "x": 89.56199645996094, - "y": -117.26799774169922 + "x": 1122.261962890625, + "y": 150.42799377441406 }, { - "x": 91.71700286865234, - "y": -114.58300018310547 + "x": 1120.803955078125, + "y": 151.9320068359375 }, { - "x": 93.83000183105469, - "y": -111.92500305175781 + "x": 1119.3310546875, + "y": 153.42100524902344 }, { - "x": 95.90399932861328, - "y": -109.29499816894531 + "x": 1117.842041015625, + "y": 154.8939971923828 }, { - "x": 97.94200134277344, - "y": -106.69599914550781 + "x": 1116.3380126953125, + "y": 156.3520050048828 }, { - "x": 99.947998046875, - "y": -104.12799835205078 + "x": 1114.8189697265625, + "y": 157.79299926757812 }, { - "x": 101.92400360107422, - "y": -101.59300231933594 + "x": 1113.2850341796875, + "y": 159.218994140625 }, { - "x": 103.8740005493164, - "y": -99.09100341796875 + "x": 1111.7359619140625, + "y": 160.6280059814453 }, { - "x": 105.79900360107422, - "y": -96.62300109863281 + "x": 1110.1719970703125, + "y": 162.02200317382812 }, { - "x": 107.7030029296875, - "y": -94.19000244140625 + "x": 1108.593994140625, + "y": 163.3990020751953 }, { - "x": 109.58999633789062, - "y": -91.79299926757812 + "x": 1107.0009765625, + "y": 164.75900268554688 }, { - "x": 111.46199798583984, - "y": -89.43000030517578 + "x": 1105.39404296875, + "y": 166.1020050048828 }, { - "x": 113.3219985961914, - "y": -87.10299682617188 + "x": 1103.7740478515625, + "y": 167.4290008544922 }, { - "x": 115.1729965209961, - "y": -84.81199645996094 + "x": 1102.1390380859375, + "y": 168.73800659179688 }, { - "x": 117.01899719238281, - "y": -82.55599975585938 + "x": 1100.490966796875, + "y": 170.031005859375 }, { - "x": 118.86100006103516, - "y": -80.33399963378906 + "x": 1098.8289794921875, + "y": 171.30499267578125 }, { - "x": 120.7030029296875, - "y": -78.14700317382812 + "x": 1097.155029296875, + "y": 172.56300354003906 }, { - "x": 122.5479965209961, - "y": -75.99299621582031 + "x": 1095.467041015625, + "y": 173.80299377441406 }, { - "x": 124.39700317382812, - "y": -73.87100219726562 + "x": 1093.7659912109375, + "y": 175.02499389648438 }, { - "x": 126.25499725341797, - "y": -71.77999877929688 + "x": 1092.052001953125, + "y": 176.22900390625 }, { - "x": 128.1230010986328, - "y": -69.72000122070312 + "x": 1090.3260498046875, + "y": 177.41600036621094 }, { - "x": 130.0050048828125, - "y": -67.68800354003906 + "x": 1088.5880126953125, + "y": 178.58399963378906 }, { - "x": 131.9010009765625, - "y": -65.68299865722656 + "x": 1086.8370361328125, + "y": 179.73399353027344 }, { - "x": 133.81500244140625, - "y": -63.70399856567383 + "x": 1085.074951171875, + "y": 180.86500549316406 }, { - "x": 135.74899291992188, - "y": -61.749000549316406 + "x": 1083.301025390625, + "y": 181.97799682617188 }, { - "x": 137.70399475097656, - "y": -59.814998626708984 + "x": 1081.5150146484375, + "y": 183.07200622558594 }, { - "x": 139.68299865722656, - "y": -57.9010009765625 + "x": 1079.718017578125, + "y": 184.1479949951172 }, { - "x": 141.68800354003906, - "y": -56.005001068115234 + "x": 1077.9100341796875, + "y": 185.2050018310547 }, { - "x": 143.72000122070312, - "y": -54.12300109863281 + "x": 1076.0899658203125, + "y": 186.24200439453125 }, { - "x": 145.77999877929688, - "y": -52.255001068115234 + "x": 1074.260009765625, + "y": 187.26100158691406 }, { - "x": 147.87100219726562, - "y": -50.39699935913086 + "x": 1072.4200439453125, + "y": 188.25999450683594 }, { - "x": 149.9929962158203, - "y": -48.54800033569336 + "x": 1070.5689697265625, + "y": 189.24000549316406 }, { - "x": 152.14700317382812, - "y": -46.702999114990234 + "x": 1068.7080078125, + "y": 190.2010040283203 }, { - "x": 154.33399963378906, - "y": -44.861000061035156 + "x": 1066.8370361328125, + "y": 191.14199829101562 }, { - "x": 156.55599975585938, - "y": -43.01900100708008 + "x": 1064.9560546875, + "y": 192.06300354003906 }, { - "x": 158.81199645996094, - "y": -41.17300033569336 + "x": 1063.0660400390625, + "y": 192.96499633789062 }, { - "x": 161.10299682617188, - "y": -39.321998596191406 + "x": 1061.166015625, + "y": 193.8470001220703 }, { - "x": 163.42999267578125, - "y": -37.46200180053711 + "x": 1059.2569580078125, + "y": 194.70899963378906 }, { - "x": 165.79299926757812, - "y": -35.59000015258789 + "x": 1057.3389892578125, + "y": 195.5500030517578 }, { - "x": 168.19000244140625, - "y": -33.702999114990234 + "x": 1055.4129638671875, + "y": 196.3719940185547 }, { - "x": 170.6230010986328, - "y": -31.798999786376953 + "x": 1053.47802734375, + "y": 197.1739959716797 }, { - "x": 173.09100341796875, - "y": -29.874000549316406 + "x": 1051.5350341796875, + "y": 197.9550018310547 }, { - "x": 175.59300231933594, - "y": -27.923999786376953 + "x": 1049.5830078125, + "y": 198.71600341796875 }, { - "x": 178.1280059814453, - "y": -25.947999954223633 + "x": 1047.6240234375, + "y": 199.45599365234375 }, { - "x": 180.6959991455078, - "y": -23.941999435424805 + "x": 1045.656982421875, + "y": 200.17599487304688 }, { - "x": 183.2949981689453, - "y": -21.90399932861328 + "x": 1043.6829833984375, + "y": 200.875 }, { - "x": 185.9250030517578, - "y": -19.829999923706055 + "x": 1041.7020263671875, + "y": 201.55299377441406 }, { - "x": 188.58299255371094, - "y": -17.716999053955078 + "x": 1039.7130126953125, + "y": 202.21099853515625 }, { - "x": 191.26800537109375, - "y": -15.562000274658203 + "x": 1037.718017578125, + "y": 202.84800720214844 }, { - "x": 193.97900390625, - "y": -13.36400032043457 + "x": 1035.7159423828125, + "y": 203.46299743652344 }, { - "x": 196.71299743652344, - "y": -11.118000030517578 + "x": 1033.7080078125, + "y": 204.05799865722656 }, { - "x": 199.468994140625, - "y": -8.822999954223633 + "x": 1031.6939697265625, + "y": 204.6320037841797 }, { - "x": 202.2429962158203, - "y": -6.47599983215332 + "x": 1029.6729736328125, + "y": 205.18499755859375 }, { - "x": 205.03500366210938, - "y": -4.074999809265137 + "x": 1027.64794921875, + "y": 205.71600341796875 }, { - "x": 207.83999633789062, - "y": -1.6160000562667847 + "x": 1025.615966796875, + "y": 206.2259979248047 }, { - "x": 210.65699768066406, - "y": 0.8999999761581421 + "x": 1023.5800170898438, + "y": 206.71499633789062 }, { - "x": 213.48300170898438, - "y": 3.4790000915527344 + "x": 1021.5380249023438, + "y": 207.18299865722656 }, { - "x": 216.31500244140625, - "y": 6.122000217437744 + "x": 1019.4920043945312, + "y": 207.62899780273438 }, { - "x": 219.1490020751953, - "y": 8.829000473022461 + "x": 1017.4409790039062, + "y": 208.0540008544922 }, { - "x": 221.98300170898438, - "y": 11.604000091552734 + "x": 1015.385986328125, + "y": 208.45700073242188 }, { - "x": 224.81300354003906, - "y": 14.446999549865723 + "x": 1013.3270263671875, + "y": 208.83900451660156 }, { - "x": 227.63499450683594, - "y": 17.361000061035156 + "x": 1011.2630004882812, + "y": 209.19900512695312 }, { - "x": 230.44700622558594, - "y": 20.34600067138672 + "x": 1009.197021484375, + "y": 209.53700256347656 }, { - "x": 233.2449951171875, - "y": 23.40399932861328 + "x": 1007.1259765625, + "y": 209.85400390625 }, { - "x": 236.0019989013672, - "y": 14.156999588012695 + "x": 1009.031005859375, + "y": 209.6060028076172 }, { - "x": 238.16799926757812, - "y": 29 + "x": 1004.9099731445312, + "y": 210.16799926757812 } ], "isCurve": true, @@ -887,10 +4223,10 @@ "zIndex": 0 }, { - "id": "1.(b -> c)[0]", - "src": "1.b", + "id": "4.(d -> e)[0]", + "src": "4.d", "srcArrow": "none", - "dst": "1.c", + "dst": "4.e", "dstArrow": "triangle", "opacity": 1, "strokeDash": 0, @@ -912,344 +4248,284 @@ "link": "", "route": [ { - "x": 238.16799926757812, - "y": 95 - }, - { - "x": 235.8699951171875, - "y": 97.6449966430664 - }, - { - "x": 233.2449951171875, - "y": 100.59500122070312 - }, - { - "x": 230.44700622558594, - "y": 103.65299987792969 - }, - { - "x": 227.63499450683594, - "y": 106.63800048828125 - }, - { - "x": 224.81300354003906, - "y": 109.552001953125 - }, - { - "x": 221.98300170898438, - "y": 112.3949966430664 - }, - { - "x": 219.1490020751953, - "y": 115.16999816894531 + "x": 950.9099731445312, + "y": 210.16799926757812 }, { - "x": 216.31500244140625, - "y": 117.87699890136719 + "x": 950.7670288085938, + "y": 210.1490020751953 }, { - "x": 213.48300170898438, - "y": 120.5199966430664 + "x": 948.6929931640625, + "y": 209.85400390625 }, { - "x": 210.65699768066406, - "y": 123.0989990234375 + "x": 946.6229858398438, + "y": 209.53700256347656 }, { - "x": 207.83999633789062, - "y": 125.61599731445312 + "x": 944.5560302734375, + "y": 209.19900512695312 }, { - "x": 205.03500366210938, - "y": 128.0749969482422 + "x": 942.4929809570312, + "y": 208.83900451660156 }, { - "x": 202.2429962158203, - "y": 130.4759979248047 + "x": 940.4329833984375, + "y": 208.45700073242188 }, { - "x": 199.468994140625, - "y": 132.822998046875 + "x": 938.3779907226562, + "y": 208.0540008544922 }, { - "x": 196.71299743652344, - "y": 135.1179962158203 + "x": 936.3270263671875, + "y": 207.62899780273438 }, { - "x": 193.97900390625, - "y": 137.36399841308594 + "x": 934.281005859375, + "y": 207.18299865722656 }, { - "x": 191.26800537109375, - "y": 139.56199645996094 + "x": 932.239013671875, + "y": 206.71499633789062 }, { - "x": 188.58299255371094, - "y": 141.7169952392578 + "x": 930.2030029296875, + "y": 206.2259979248047 }, { - "x": 185.9250030517578, - "y": 143.8300018310547 + "x": 928.1719970703125, + "y": 205.71600341796875 }, { - "x": 183.2949981689453, - "y": 145.9040069580078 + "x": 926.14599609375, + "y": 205.18499755859375 }, { - "x": 180.6959991455078, - "y": 147.94200134277344 + "x": 924.1259765625, + "y": 204.6320037841797 }, { - "x": 178.1280059814453, - "y": 149.947998046875 + "x": 922.1110229492188, + "y": 204.05799865722656 }, { - "x": 175.59300231933594, - "y": 151.9239959716797 + "x": 920.10302734375, + "y": 203.46299743652344 }, { - "x": 173.09100341796875, - "y": 153.87399291992188 + "x": 918.1019897460938, + "y": 202.84800720214844 }, { - "x": 170.6230010986328, - "y": 155.7989959716797 + "x": 916.1060180664062, + "y": 202.21099853515625 }, { - "x": 168.19000244140625, - "y": 157.7030029296875 + "x": 914.1179809570312, + "y": 201.55299377441406 }, { - "x": 165.79299926757812, - "y": 159.58999633789062 + "x": 912.135986328125, + "y": 200.875 }, { - "x": 163.42999267578125, - "y": 161.46200561523438 + "x": 910.1619873046875, + "y": 200.17599487304688 }, { - "x": 161.10299682617188, - "y": 163.32200622558594 + "x": 908.1950073242188, + "y": 199.45599365234375 }, { - "x": 158.81199645996094, - "y": 165.17300415039062 + "x": 906.2360229492188, + "y": 198.71600341796875 }, { - "x": 156.55599975585938, - "y": 167.0189971923828 + "x": 904.2849731445312, + "y": 197.9550018310547 }, { - "x": 154.33399963378906, - "y": 168.86099243164062 + "x": 902.3419799804688, + "y": 197.1739959716797 }, { - "x": 152.14700317382812, - "y": 170.7030029296875 + "x": 900.406982421875, + "y": 196.3719940185547 }, { - "x": 149.9929962158203, - "y": 172.54800415039062 + "x": 898.47998046875, + "y": 195.5500030517578 }, { - "x": 147.87100219726562, - "y": 174.39700317382812 + "x": 896.56201171875, + "y": 194.70899963378906 }, { - "x": 145.77999877929688, - "y": 176.2550048828125 + "x": 894.6539916992188, + "y": 193.8470001220703 }, { - "x": 143.72000122070312, - "y": 178.1230010986328 + "x": 892.7540283203125, + "y": 192.96499633789062 }, { - "x": 141.68800354003906, - "y": 180.0050048828125 + "x": 890.8629760742188, + "y": 192.06300354003906 }, { - "x": 139.68299865722656, - "y": 181.9010009765625 + "x": 888.9829711914062, + "y": 191.14199829101562 }, { - "x": 137.70399475097656, - "y": 183.81500244140625 + "x": 887.1119995117188, + "y": 190.2010040283203 }, { - "x": 135.74899291992188, - "y": 185.74899291992188 + "x": 885.25, + "y": 189.24000549316406 }, { - "x": 133.81500244140625, - "y": 187.70399475097656 + "x": 883.4000244140625, + "y": 188.25999450683594 }, { - "x": 131.9010009765625, - "y": 189.68299865722656 + "x": 881.5590209960938, + "y": 187.26100158691406 }, { - "x": 130.0050048828125, - "y": 191.68800354003906 + "x": 879.72900390625, + "y": 186.24200439453125 }, { - "x": 128.1230010986328, - "y": 193.72000122070312 + "x": 877.9099731445312, + "y": 185.2050018310547 }, { - "x": 126.25499725341797, - "y": 195.77999877929688 + "x": 876.1010131835938, + "y": 184.1479949951172 }, { - "x": 124.39700317382812, - "y": 197.87100219726562 + "x": 874.3040161132812, + "y": 183.07200622558594 }, { - "x": 122.5479965209961, - "y": 199.9929962158203 + "x": 872.5189819335938, + "y": 181.97799682617188 }, { - "x": 120.7030029296875, - "y": 202.14700317382812 + "x": 870.7440185546875, + "y": 180.86500549316406 }, { - "x": 118.86100006103516, - "y": 204.33399963378906 + "x": 868.9819946289062, + "y": 179.73399353027344 }, { - "x": 117.01899719238281, - "y": 206.55599975585938 + "x": 867.2310180664062, + "y": 178.58399963378906 }, { - "x": 115.1729965209961, - "y": 208.81199645996094 + "x": 865.4929809570312, + "y": 177.41600036621094 }, { - "x": 113.3219985961914, - "y": 211.10299682617188 + "x": 863.7670288085938, + "y": 176.22900390625 }, { - "x": 111.46199798583984, - "y": 213.42999267578125 + "x": 862.052978515625, + "y": 175.02499389648438 }, { - "x": 109.58999633789062, - "y": 215.79299926757812 + "x": 860.35302734375, + "y": 173.80299377441406 }, { - "x": 107.7030029296875, - "y": 218.19000244140625 + "x": 858.6649780273438, + "y": 172.56300354003906 }, { - "x": 105.79900360107422, - "y": 220.6230010986328 + "x": 856.989990234375, + "y": 171.30499267578125 }, { - "x": 103.8740005493164, - "y": 223.09100341796875 + "x": 855.3280029296875, + "y": 170.031005859375 }, { - "x": 101.92400360107422, - "y": 225.59300231933594 + "x": 853.6799926757812, + "y": 168.73800659179688 }, { - "x": 99.947998046875, - "y": 228.1280059814453 + "x": 852.0460205078125, + "y": 167.4290008544922 }, { - "x": 97.94200134277344, - "y": 230.6959991455078 + "x": 850.4249877929688, + "y": 166.1020050048828 }, { - "x": 95.90399932861328, - "y": 233.2949981689453 + "x": 848.8179931640625, + "y": 164.75900268554688 }, { - "x": 93.83000183105469, - "y": 235.9250030517578 + "x": 847.2260131835938, + "y": 163.3990020751953 }, { - "x": 91.71700286865234, - "y": 238.58299255371094 + "x": 845.64697265625, + "y": 162.02200317382812 }, { - "x": 89.56199645996094, - "y": 241.26800537109375 + "x": 844.083984375, + "y": 160.6280059814453 }, { - "x": 87.36399841308594, - "y": 243.97900390625 + "x": 842.5339965820312, + "y": 159.218994140625 }, { - "x": 85.11799621582031, - "y": 246.71299743652344 + "x": 841, + "y": 157.79299926757812 }, { - "x": 82.822998046875, - "y": 249.468994140625 + "x": 839.4810180664062, + "y": 156.3520050048828 }, { - "x": 80.47599792480469, - "y": 252.2429962158203 + "x": 837.9769897460938, + "y": 154.8939971923828 }, { - "x": 78.07499694824219, - "y": 255.03500366210938 + "x": 836.4879760742188, + "y": 153.42100524902344 }, { - "x": 75.61599731445312, - "y": 257.8399963378906 + "x": 835.0150146484375, + "y": 151.9320068359375 }, { - "x": 73.0989990234375, - "y": 260.6570129394531 + "x": 833.5579833984375, + "y": 150.42799377441406 }, { - "x": 70.5199966430664, - "y": 263.4830017089844 + "x": 832.1160278320312, + "y": 148.90899658203125 }, { - "x": 67.87699890136719, - "y": 266.31500244140625 + "x": 830.6900024414062, + "y": 147.375 }, { - "x": 65.16999816894531, - "y": 269.14898681640625 + "x": 831.3099975585938, + "y": 148.1060028076172 }, { - "x": 62.39500045776367, - "y": 271.9830017089844 - }, - { - "x": 59.551998138427734, - "y": 274.81298828125 - }, - { - "x": 56.63800048828125, - "y": 277.635009765625 - }, - { - "x": 53.65299987792969, - "y": 280.4469909667969 - }, - { - "x": 50.595001220703125, - "y": 283.2449951171875 - }, - { - "x": 47.4640007019043, - "y": 286.0249938964844 - }, - { - "x": 44.257999420166016, - "y": 288.7829895019531 - }, - { - "x": 53.402000427246094, - "y": 291.8280029296875 - }, - { - "x": 38.5, - "y": 293.53399658203125 + "x": 828.5449829101562, + "y": 145 } ], "isCurve": true, @@ -1259,10 +4535,10 @@ "zIndex": 0 }, { - "id": "1.(c -> d)[0]", - "src": "1.c", + "id": "4.(e -> f)[0]", + "src": "4.e", "srcArrow": "none", - "dst": "1.d", + "dst": "4.f", "dstArrow": "triangle", "opacity": 1, "strokeDash": 0, @@ -1284,344 +4560,272 @@ "link": "", "route": [ { - "x": -14.49899959564209, - "y": 293.53399658203125 - }, - { - "x": -17.191999435424805, - "y": 291.3429870605469 - }, - { - "x": -20.257999420166016, - "y": 288.7829895019531 - }, - { - "x": -23.464000701904297, - "y": 286.0249938964844 - }, - { - "x": -26.594999313354492, - "y": 283.2449951171875 - }, - { - "x": -29.652999877929688, - "y": 280.4469909667969 - }, - { - "x": -32.63800048828125, - "y": 277.635009765625 - }, - { - "x": -35.551998138427734, - "y": 274.81298828125 - }, - { - "x": -38.39500045776367, - "y": 271.9830017089844 - }, - { - "x": -41.16999816894531, - "y": 269.14898681640625 - }, - { - "x": -43.87699890136719, - "y": 266.31500244140625 - }, - { - "x": -46.52000045776367, - "y": 263.4830017089844 - }, - { - "x": -49.0989990234375, - "y": 260.6570129394531 - }, - { - "x": -51.61600112915039, - "y": 257.8399963378906 - }, - { - "x": -54.07500076293945, - "y": 255.03500366210938 - }, - { - "x": -56.47600173950195, - "y": 252.2429962158203 - }, - { - "x": -58.823001861572266, - "y": 249.468994140625 - }, - { - "x": -61.11800003051758, - "y": 246.71299743652344 - }, - { - "x": -63.36399841308594, - "y": 243.97900390625 + "x": 789.468994140625, + "y": 79 }, { - "x": -65.56199645996094, - "y": 241.26800537109375 + "x": 789.0339965820312, + "y": 77.77300262451172 }, { - "x": -67.71700286865234, - "y": 238.58299255371094 + "x": 788.3560180664062, + "y": 75.79100036621094 }, { - "x": -69.83000183105469, - "y": 235.9250030517578 + "x": 787.697998046875, + "y": 73.8030014038086 }, { - "x": -71.90399932861328, - "y": 233.2949981689453 + "x": 787.06201171875, + "y": 71.80799865722656 }, { - "x": -73.94200134277344, - "y": 230.6959991455078 + "x": 786.4459838867188, + "y": 69.80599975585938 }, { - "x": -75.947998046875, - "y": 228.1280059814453 + "x": 785.8510131835938, + "y": 67.7979965209961 }, { - "x": -77.92400360107422, - "y": 225.59300231933594 + "x": 785.2769775390625, + "y": 65.78299713134766 }, { - "x": -79.8740005493164, - "y": 223.09100341796875 + "x": 784.7239990234375, + "y": 63.76300048828125 }, { - "x": -81.79900360107422, - "y": 220.6230010986328 + "x": 784.1929931640625, + "y": 61.73699951171875 }, { - "x": -83.7030029296875, - "y": 218.19000244140625 + "x": 783.6829833984375, + "y": 59.70600128173828 }, { - "x": -85.58999633789062, - "y": 215.79299926757812 + "x": 783.1939697265625, + "y": 57.66999816894531 }, { - "x": -87.46199798583984, - "y": 213.42999267578125 + "x": 782.7260131835938, + "y": 55.62799835205078 }, { - "x": -89.3219985961914, - "y": 211.10299682617188 + "x": 782.280029296875, + "y": 53.582000732421875 }, { - "x": -91.1729965209961, - "y": 208.81199645996094 + "x": 781.85498046875, + "y": 51.53099822998047 }, { - "x": -93.01899719238281, - "y": 206.55599975585938 + "x": 781.4520263671875, + "y": 49.47600173950195 }, { - "x": -94.86100006103516, - "y": 204.33399963378906 + "x": 781.0709838867188, + "y": 47.41600036621094 }, { - "x": -96.7030029296875, - "y": 202.14700317382812 + "x": 780.7100219726562, + "y": 45.35300064086914 }, { - "x": -98.5479965209961, - "y": 199.9929962158203 + "x": 780.3720092773438, + "y": 43.2859992980957 }, { - "x": -100.39700317382812, - "y": 197.87100219726562 + "x": 780.0549926757812, + "y": 41.215999603271484 }, { - "x": -102.25499725341797, - "y": 195.77999877929688 + "x": 779.760009765625, + "y": 39.143001556396484 }, { - "x": -104.12300109863281, - "y": 193.72000122070312 + "x": 779.4869995117188, + "y": 37.066001892089844 }, { - "x": -106.00499725341797, - "y": 191.68800354003906 + "x": 779.2349853515625, + "y": 34.98699951171875 }, { - "x": -107.9010009765625, - "y": 189.68299865722656 + "x": 779.0050048828125, + "y": 32.904998779296875 }, { - "x": -109.81500244140625, - "y": 187.70399475097656 + "x": 778.7969970703125, + "y": 30.820999145507812 }, { - "x": -111.7490005493164, - "y": 185.74899291992188 + "x": 778.6110229492188, + "y": 28.735000610351562 }, { - "x": -113.7040023803711, - "y": 183.81500244140625 + "x": 778.447021484375, + "y": 26.64699935913086 }, { - "x": -115.68299865722656, - "y": 181.9010009765625 + "x": 778.3040161132812, + "y": 24.558000564575195 }, { - "x": -117.68800354003906, - "y": 180.0050048828125 + "x": 778.1840209960938, + "y": 22.466999053955078 }, { - "x": -119.72000122070312, - "y": 178.1230010986328 + "x": 778.0850219726562, + "y": 20.375 }, { - "x": -121.77999877929688, - "y": 176.2550048828125 + "x": 778.0079956054688, + "y": 18.281999588012695 }, { - "x": -123.87100219726562, - "y": 174.39700317382812 + "x": 777.9539794921875, + "y": 16.187999725341797 }, { - "x": -125.99299621582031, - "y": 172.54800415039062 + "x": 777.9210205078125, + "y": 14.093999862670898 }, { - "x": -128.14700317382812, - "y": 170.7030029296875 + "x": 777.9099731445312, + "y": 12 }, { - "x": -130.33399963378906, - "y": 168.86099243164062 + "x": 777.9210205078125, + "y": 9.904999732971191 }, { - "x": -132.55599975585938, - "y": 167.0189971923828 + "x": 777.9539794921875, + "y": 7.810999870300293 }, { - "x": -134.81199645996094, - "y": 165.17300415039062 + "x": 778.0079956054688, + "y": 5.7170000076293945 }, { - "x": -137.10299682617188, - "y": 163.32200622558594 + "x": 778.0850219726562, + "y": 3.624000072479248 }, { - "x": -139.42999267578125, - "y": 161.46200561523438 + "x": 778.1840209960938, + "y": 1.531999945640564 }, { - "x": -141.79299926757812, - "y": 159.58999633789062 + "x": 778.3040161132812, + "y": -0.5580000281333923 }, { - "x": -144.19000244140625, - "y": 157.7030029296875 + "x": 778.447021484375, + "y": -2.6470000743865967 }, { - "x": -146.6230010986328, - "y": 155.7989959716797 + "x": 778.6110229492188, + "y": -4.735000133514404 }, { - "x": -149.09100341796875, - "y": 153.87399291992188 + "x": 778.7969970703125, + "y": -6.821000099182129 }, { - "x": -151.59300231933594, - "y": 151.9239959716797 + "x": 779.0050048828125, + "y": -8.904999732971191 }, { - "x": -154.1280059814453, - "y": 149.947998046875 + "x": 779.2349853515625, + "y": -10.987000465393066 }, { - "x": -156.6959991455078, - "y": 147.94200134277344 + "x": 779.4869995117188, + "y": -13.065999984741211 }, { - "x": -159.2949981689453, - "y": 145.9040069580078 + "x": 779.760009765625, + "y": -15.142999649047852 }, { - "x": -161.9250030517578, - "y": 143.8300018310547 + "x": 780.0549926757812, + "y": -17.215999603271484 }, { - "x": -164.58299255371094, - "y": 141.7169952392578 + "x": 780.3720092773438, + "y": -19.285999298095703 }, { - "x": -167.26800537109375, - "y": 139.56199645996094 + "x": 780.7100219726562, + "y": -21.35300064086914 }, { - "x": -169.97900390625, - "y": 137.36399841308594 + "x": 781.0709838867188, + "y": -23.416000366210938 }, { - "x": -172.71299743652344, - "y": 135.1179962158203 + "x": 781.4520263671875, + "y": -25.47599983215332 }, { - "x": -175.468994140625, - "y": 132.822998046875 + "x": 781.85498046875, + "y": -27.5310001373291 }, { - "x": -178.2429962158203, - "y": 130.4759979248047 + "x": 782.280029296875, + "y": -29.582000732421875 }, { - "x": -181.03500366210938, - "y": 128.0749969482422 + "x": 782.7260131835938, + "y": -31.628000259399414 }, { - "x": -183.83999633789062, - "y": 125.61599731445312 + "x": 783.1939697265625, + "y": -33.66999816894531 }, { - "x": -186.65699768066406, - "y": 123.0989990234375 + "x": 783.6829833984375, + "y": -35.70600128173828 }, { - "x": -189.48300170898438, - "y": 120.5199966430664 + "x": 784.1929931640625, + "y": -37.73699951171875 }, { - "x": -192.31500244140625, - "y": 117.87699890136719 + "x": 784.7239990234375, + "y": -39.76300048828125 }, { - "x": -195.1490020751953, - "y": 115.16999816894531 + "x": 785.2769775390625, + "y": -41.78300094604492 }, { - "x": -197.98300170898438, - "y": 112.3949966430664 + "x": 785.8510131835938, + "y": -43.79800033569336 }, { - "x": -200.81300354003906, - "y": 109.552001953125 + "x": 786.4459838867188, + "y": -45.805999755859375 }, { - "x": -203.63499450683594, - "y": 106.63800048828125 + "x": 787.06201171875, + "y": -47.80799865722656 }, { - "x": -206.44700622558594, - "y": 103.65299987792969 + "x": 787.697998046875, + "y": -49.803001403808594 }, { - "x": -209.2449951171875, - "y": 100.59500122070312 + "x": 788.3560180664062, + "y": -51.79100036621094 }, { - "x": -212.0019989013672, - "y": 109.84200286865234 + "x": 788.0750122070312, + "y": -51.08100128173828 }, { - "x": -214.16799926757812, - "y": 95 + "x": 789.468994140625, + "y": -55 } ], "isCurve": true, @@ -1631,10 +4835,10 @@ "zIndex": 0 }, { - "id": "2.(a -> b)[0]", - "src": "2.a", + "id": "5.(a -> b)[0]", + "src": "5.a", "srcArrow": "none", - "dst": "2.b", + "dst": "5.b", "dstArrow": "triangle", "opacity": 1, "strokeDash": 0, @@ -1656,1280 +4860,1312 @@ "link": "", "route": [ { - "x": 588.7650146484375, - "y": -180 + "x": 1423.8199462890625, + "y": -167.13400268554688 }, { - "x": 591.4769897460938, - "y": -164.81300354003906 + "x": 1424.8780517578125, + "y": -166.9929962158203 }, { - "x": 595.7459716796875, - "y": -158.0500030517578 + "x": 1427.364990234375, + "y": -166.6320037841797 }, { - "x": 600.72802734375, - "y": -155.43899536132812 + "x": 1429.8470458984375, + "y": -166.23800659179688 }, { - "x": 605.6060180664062, - "y": -152.73399353027344 + "x": 1432.323974609375, + "y": -165.81399536132812 }, { - "x": 610.3790283203125, - "y": -149.9409942626953 + "x": 1434.7960205078125, + "y": -165.35899353027344 }, { - "x": 615.0449829101562, - "y": -147.0659942626953 + "x": 1437.261962890625, + "y": -164.8719940185547 }, { - "x": 619.60302734375, - "y": -144.11500549316406 + "x": 1439.720947265625, + "y": -164.35499572753906 }, { - "x": 624.0540161132812, - "y": -141.09100341796875 + "x": 1442.1739501953125, + "y": -163.8070068359375 }, { - "x": 628.39697265625, - "y": -138.0019989013672 + "x": 1444.6199951171875, + "y": -163.22799682617188 }, { - "x": 632.6320190429688, - "y": -134.85299682617188 + "x": 1447.0579833984375, + "y": -162.6179962158203 }, { - "x": 636.7589721679688, - "y": -131.6479949951172 + "x": 1449.488037109375, + "y": -161.97799682617188 }, { - "x": 640.7789916992188, - "y": -128.39199829101562 + "x": 1451.9100341796875, + "y": -161.3070068359375 }, { - "x": 644.6929931640625, - "y": -125.09100341796875 + "x": 1454.323974609375, + "y": -160.6060028076172 }, { - "x": 648.5020141601562, - "y": -121.75 + "x": 1456.72802734375, + "y": -159.87399291992188 }, { - "x": 652.2059936523438, - "y": -118.37300109863281 + "x": 1459.123046875, + "y": -159.11300659179688 }, { - "x": 655.8090209960938, - "y": -114.96499633789062 + "x": 1461.509033203125, + "y": -158.3209991455078 }, { - "x": 659.3099975585938, - "y": -111.53099822998047 + "x": 1463.884033203125, + "y": -157.49899291992188 }, { - "x": 662.7130126953125, - "y": -108.0739974975586 + "x": 1466.248046875, + "y": -156.6479949951172 }, { - "x": 666.0189819335938, - "y": -104.5989990234375 + "x": 1468.60205078125, + "y": -155.76699829101562 }, { - "x": 669.22998046875, - "y": -101.11100006103516 + "x": 1470.9449462890625, + "y": -154.8560028076172 }, { - "x": 672.3499755859375, - "y": -97.61100006103516 + "x": 1473.2760009765625, + "y": -153.91700744628906 }, { - "x": 675.3800048828125, - "y": -94.1050033569336 + "x": 1475.594970703125, + "y": -152.947998046875 }, { - "x": 678.323974609375, - "y": -90.59600067138672 + "x": 1477.9010009765625, + "y": -151.94900512695312 }, { - "x": 681.1840209960938, - "y": -87.08599853515625 + "x": 1480.1949462890625, + "y": -150.9219970703125 }, { - "x": 683.9639892578125, - "y": -83.5790023803711 + "x": 1482.4759521484375, + "y": -149.86700439453125 }, { - "x": 686.666015625, - "y": -80.0770034790039 + "x": 1484.7430419921875, + "y": -148.78199768066406 }, { - "x": 689.2940063476562, - "y": -76.58399963378906 + "x": 1486.9959716796875, + "y": -147.66900634765625 }, { - "x": 691.8510131835938, - "y": -73.0999984741211 + "x": 1489.2359619140625, + "y": -146.5279998779297 }, { - "x": 694.3400268554688, - "y": -69.62799835205078 + "x": 1491.4610595703125, + "y": -145.35899353027344 }, { - "x": 696.7659912109375, - "y": -66.16899871826172 + "x": 1493.6710205078125, + "y": -144.16299438476562 }, { - "x": 699.1309814453125, - "y": -62.72700119018555 + "x": 1495.864990234375, + "y": -142.93800354003906 }, { - "x": 701.4390258789062, - "y": -59.29999923706055 + "x": 1498.0439453125, + "y": -141.68600463867188 }, { - "x": 703.6939697265625, - "y": -55.89099884033203 + "x": 1500.2080078125, + "y": -140.40699768066406 }, { - "x": 705.8980102539062, - "y": -52.500999450683594 + "x": 1502.35498046875, + "y": -139.10000610351562 }, { - "x": 708.0560302734375, - "y": -49.130001068115234 + "x": 1504.4849853515625, + "y": -137.76699829101562 }, { - "x": 710.1719970703125, - "y": -45.777000427246094 + "x": 1506.5989990234375, + "y": -136.40699768066406 }, { - "x": 712.2470092773438, - "y": -42.444000244140625 + "x": 1508.6949462890625, + "y": -135.02000427246094 }, { - "x": 714.2869873046875, - "y": -39.130001068115234 + "x": 1510.7740478515625, + "y": -133.60800170898438 }, { - "x": 716.2940063476562, - "y": -35.834999084472656 + "x": 1512.833984375, + "y": -132.16900634765625 }, { - "x": 718.27099609375, - "y": -32.55799865722656 + "x": 1514.876953125, + "y": -130.7050018310547 }, { - "x": 720.2219848632812, - "y": -29.29800033569336 + "x": 1516.9010009765625, + "y": -129.21499633789062 }, { - "x": 722.1500244140625, - "y": -26.054000854492188 + "x": 1518.906005859375, + "y": -127.6989974975586 }, { - "x": 724.0570068359375, - "y": -22.826000213623047 + "x": 1520.8919677734375, + "y": -126.15899658203125 }, { - "x": 725.947021484375, - "y": -19.611000061035156 + "x": 1522.8580322265625, + "y": -124.59400177001953 }, { - "x": 727.8209838867188, - "y": -16.406999588012695 + "x": 1524.8050537109375, + "y": -123.00399780273438 }, { - "x": 729.6840209960938, - "y": -13.21399974822998 + "x": 1526.73095703125, + "y": -121.38999938964844 }, { - "x": 731.5360107421875, - "y": -10.029000282287598 + "x": 1528.636962890625, + "y": -119.7509994506836 }, { - "x": 733.3800048828125, - "y": -6.848999977111816 + "x": 1530.52197265625, + "y": -118.08899688720703 }, { - "x": 735.218994140625, - "y": -3.6740000247955322 + "x": 1532.385986328125, + "y": -116.40399932861328 }, { - "x": 737.052978515625, - "y": -0.49900001287460327 + "x": 1534.22900390625, + "y": -114.69499969482422 }, { - "x": 738.885009765625, - "y": 2.6760001182556152 + "x": 1536.050048828125, + "y": -112.96299743652344 }, { - "x": 740.7160034179688, - "y": 5.855999946594238 + "x": 1537.8499755859375, + "y": -111.20800018310547 }, { - "x": 742.5479736328125, - "y": 9.043000221252441 + "x": 1539.626953125, + "y": -109.43099975585938 }, { - "x": 744.3800048828125, - "y": 12.239999771118164 + "x": 1541.3819580078125, + "y": -107.63200378417969 }, { - "x": 746.2139892578125, - "y": 15.449000358581543 + "x": 1543.114013671875, + "y": -105.81099700927734 }, { - "x": 748.051025390625, - "y": 18.673999786376953 + "x": 1544.822021484375, + "y": -103.96800231933594 }, { - "x": 749.8909912109375, - "y": 21.917999267578125 + "x": 1546.508056640625, + "y": -102.10399627685547 }, { - "x": 751.7329711914062, - "y": 25.18400001525879 + "x": 1548.1700439453125, + "y": -100.21800231933594 }, { - "x": 753.5780029296875, - "y": 28.47599983215332 + "x": 1549.8079833984375, + "y": -98.31199645996094 }, { - "x": 755.426025390625, - "y": 31.795000076293945 + "x": 1551.4219970703125, + "y": -96.38600158691406 }, { - "x": 757.2750244140625, - "y": 35.145999908447266 + "x": 1553.011962890625, + "y": -94.43900299072266 }, { - "x": 759.1259765625, - "y": 38.53200149536133 + "x": 1554.5780029296875, + "y": -92.4729995727539 }, { - "x": 760.9760131835938, - "y": 41.95500183105469 + "x": 1556.1180419921875, + "y": -90.48699951171875 }, { - "x": 762.823974609375, - "y": 45.41899871826172 + "x": 1557.633056640625, + "y": -88.48200225830078 }, { - "x": 764.6699829101562, - "y": 48.926998138427734 + "x": 1559.123046875, + "y": -86.45800018310547 }, { - "x": 766.510986328125, - "y": 52.481998443603516 + "x": 1560.5880126953125, + "y": -84.41600036621094 }, { - "x": 768.344970703125, - "y": 56.08599853515625 + "x": 1562.0260009765625, + "y": -82.3550033569336 }, { - "x": 770.1690063476562, - "y": 59.74300003051758 + "x": 1563.43896484375, + "y": -80.2760009765625 }, { - "x": 771.9829711914062, - "y": 63.45500183105469 + "x": 1564.824951171875, + "y": -78.18000030517578 }, { - "x": 773.781982421875, - "y": 67.2249984741211 + "x": 1566.18505859375, + "y": -76.06700134277344 }, { - "x": 775.5640258789062, - "y": 71.05500030517578 + "x": 1567.51904296875, + "y": -73.93599700927734 }, { - "x": 777.3259887695312, - "y": 74.9469985961914 + "x": 1568.824951171875, + "y": -71.78900146484375 }, { - "x": 779.0650024414062, - "y": 78.90299987792969 + "x": 1570.10498046875, + "y": -69.6259994506836 }, { - "x": 780.7760009765625, - "y": 82.9260025024414 + "x": 1571.3570556640625, + "y": -67.4469985961914 }, { - "x": 782.4580078125, - "y": 87.01699829101562 + "x": 1571.447998046875, + "y": -67.36699676513672 }, { - "x": 784.10498046875, - "y": 91.1780014038086 - }, + "x": 1573.4189453125, + "y": -63.70500183105469 + } + ], + "isCurve": true, + "animated": false, + "tooltip": "", + "icon": null, + "zIndex": 0 + }, + { + "id": "5.(b -> c)[0]", + "src": "5.b", + "srcArrow": "none", + "dst": "5.c", + "dstArrow": "triangle", + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "stroke": "B1", + "borderRadius": 10, + "label": "", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N2", + "italic": true, + "bold": false, + "underline": false, + "labelWidth": 0, + "labelHeight": 0, + "labelPosition": "", + "labelPercentage": 0, + "link": "", + "route": [ { - "x": 785.7150268554688, - "y": 95.41000366210938 + "x": 1595.23095703125, + "y": 2.2939999103546143 }, { - "x": 787.281982421875, - "y": 99.71399688720703 + "x": 1595.4119873046875, + "y": 3.5399999618530273 }, { - "x": 788.802978515625, - "y": 104.09100341796875 + "x": 1595.7430419921875, + "y": 6.031000137329102 }, { - "x": 790.2739868164062, - "y": 108.54199981689453 + "x": 1596.0419921875, + "y": 8.527000427246094 }, { - "x": 791.6890258789062, - "y": 113.06800079345703 + "x": 1596.31005859375, + "y": 11.024999618530273 }, { - "x": 793.0460205078125, - "y": 117.66799926757812 + "x": 1596.5469970703125, + "y": 13.527999877929688 }, { - "x": 794.3380126953125, - "y": 122.34300231933594 + "x": 1596.751953125, + "y": 16.031999588012695 }, { - "x": 795.5609741210938, - "y": 127.09300231933594 + "x": 1596.925048828125, + "y": 18.540000915527344 }, { - "x": 796.7119750976562, - "y": 131.91600036621094 + "x": 1597.0670166015625, + "y": 21.048999786376953 }, { - "x": 797.7839965820312, - "y": 136.81300354003906 + "x": 1597.177978515625, + "y": 23.559999465942383 }, { - "x": 798.7730102539062, - "y": 141.78199768066406 + "x": 1597.2569580078125, + "y": 26.07200050354004 }, { - "x": 799.6749877929688, - "y": 146.82200622558594 + "x": 1597.303955078125, + "y": 28.584999084472656 }, { - "x": 800.4840087890625, - "y": 151.93099975585938 + "x": 1597.3199462890625, + "y": 31.097999572753906 }, { - "x": 801.1959838867188, - "y": 157.10800170898438 + "x": 1597.303955078125, + "y": 33.611000061035156 }, { - "x": 801.8070068359375, - "y": 162.3509979248047 + "x": 1597.2569580078125, + "y": 36.124000549316406 }, { - "x": 802.3099975585938, - "y": 167.656005859375 + "x": 1597.177978515625, + "y": 38.63600158691406 }, { - "x": 802.7030029296875, - "y": 173.02200317382812 + "x": 1597.0670166015625, + "y": 41.14699935913086 }, { - "x": 802.97998046875, - "y": 178.4459991455078 + "x": 1596.925048828125, + "y": 43.65599822998047 }, { - "x": 803.135986328125, - "y": 183.9239959716797 + "x": 1596.751953125, + "y": 46.16299819946289 }, { - "x": 803.1690063476562, - "y": 189.45399475097656 + "x": 1596.5469970703125, + "y": 48.667999267578125 }, { - "x": 803.072021484375, - "y": 195.031005859375 + "x": 1596.31005859375, + "y": 51.16999816894531 }, { - "x": 802.843017578125, - "y": 200.65199279785156 + "x": 1596.0419921875, + "y": 53.66899871826172 }, { - "x": 826.1510009765625, - "y": 204.91200256347656 + "x": 1595.7430419921875, + "y": 56.16400146484375 }, { - "x": 818.8070068359375, - "y": 217.99099731445312 - } - ], - "isCurve": true, - "animated": false, - "tooltip": "", - "icon": null, - "zIndex": 0 - }, - { - "id": "2.(b -> c)[0]", - "src": "2.b", - "srcArrow": "none", - "dst": "2.c", - "dstArrow": "triangle", - "opacity": 1, - "strokeDash": 0, - "strokeWidth": 2, - "stroke": "B1", - "borderRadius": 10, - "label": "", - "fontSize": 16, - "fontFamily": "DEFAULT", - "language": "", - "color": "N2", - "italic": true, - "bold": false, - "underline": false, - "labelWidth": 0, - "labelHeight": 0, - "labelPosition": "", - "labelPercentage": 0, - "link": "", - "route": [ - { - "x": 818.8070068359375, - "y": 225.0070037841797 + "x": 1595.4119873046875, + "y": 58.65599822998047 }, { - "x": 801.5159912109375, - "y": 218.5030059814453 + "x": 1595.050048828125, + "y": 61.143001556396484 }, { - "x": 792.5969848632812, - "y": 218.3979949951172 + "x": 1594.656982421875, + "y": 63.625 }, { - "x": 787.843994140625, - "y": 221.40699768066406 + "x": 1594.2330322265625, + "y": 66.10199737548828 }, { - "x": 783.06201171875, - "y": 224.2790069580078 + "x": 1593.7769775390625, + "y": 68.5739974975586 }, { - "x": 778.2570190429688, - "y": 227.01600646972656 + "x": 1593.291015625, + "y": 71.04000091552734 }, { - "x": 773.4349975585938, - "y": 229.6199951171875 + "x": 1592.77294921875, + "y": 73.4990005493164 }, { - "x": 768.5989990234375, - "y": 232.0919952392578 + "x": 1592.2249755859375, + "y": 75.9520034790039 }, { - "x": 763.7559814453125, - "y": 234.43499755859375 + "x": 1591.64599609375, + "y": 78.39800262451172 }, { - "x": 758.9089965820312, - "y": 236.6510009765625 + "x": 1591.0360107421875, + "y": 80.83599853515625 }, { - "x": 754.0640258789062, - "y": 238.74400329589844 + "x": 1590.39599609375, + "y": 83.26599884033203 }, { - "x": 749.2239990234375, - "y": 240.71600341796875 + "x": 1589.7249755859375, + "y": 85.68800354003906 }, { - "x": 744.39501953125, - "y": 242.56900024414062 + "x": 1589.0240478515625, + "y": 88.10199737548828 }, { - "x": 739.5800170898438, - "y": 244.30799865722656 + "x": 1588.29296875, + "y": 90.50599670410156 }, { - "x": 734.781982421875, - "y": 245.93600463867188 + "x": 1587.531005859375, + "y": 92.9010009765625 }, { - "x": 730.0050048828125, - "y": 247.45599365234375 + "x": 1586.739013671875, + "y": 95.28700256347656 }, { - "x": 725.2520141601562, - "y": 248.8719940185547 + "x": 1585.91796875, + "y": 97.66200256347656 }, { - "x": 720.5269775390625, - "y": 250.18699645996094 + "x": 1585.0670166015625, + "y": 100.0260009765625 }, { - "x": 715.8330078125, - "y": 251.40499877929688 + "x": 1584.18603515625, + "y": 102.37999725341797 }, { - "x": 711.1699829101562, - "y": 252.531005859375 + "x": 1583.2750244140625, + "y": 104.7229995727539 }, { - "x": 706.5430297851562, - "y": 253.5679931640625 + "x": 1582.3349609375, + "y": 107.05400085449219 }, { - "x": 701.9530029296875, - "y": 254.52000427246094 + "x": 1581.365966796875, + "y": 109.37300109863281 }, { - "x": 697.4019775390625, - "y": 255.39100646972656 + "x": 1580.3680419921875, + "y": 111.67900085449219 }, { - "x": 692.8900146484375, - "y": 256.1860046386719 + "x": 1579.3409423828125, + "y": 113.9729995727539 }, { - "x": 688.4210205078125, - "y": 256.9079895019531 + "x": 1578.2850341796875, + "y": 116.25399780273438 }, { - "x": 683.9940185546875, - "y": 257.56201171875 + "x": 1577.2010498046875, + "y": 118.52100372314453 }, { - "x": 679.6099853515625, - "y": 258.1510009765625 + "x": 1576.0880126953125, + "y": 120.77400207519531 }, { - "x": 675.27001953125, - "y": 258.67999267578125 + "x": 1574.947021484375, + "y": 123.01399993896484 }, { - "x": 670.9749755859375, - "y": 259.15301513671875 + "x": 1573.7779541015625, + "y": 125.23899841308594 }, { - "x": 666.7230224609375, - "y": 259.572998046875 + "x": 1572.5810546875, + "y": 127.4489974975586 }, { - "x": 662.5150146484375, - "y": 259.9440002441406 + "x": 1571.3570556640625, + "y": 129.64300537109375 }, { - "x": 658.3510131835938, - "y": 260.27099609375 + "x": 1570.10498046875, + "y": 131.82200622558594 }, { - "x": 654.22998046875, - "y": 260.5570068359375 + "x": 1568.824951171875, + "y": 133.98599243164062 }, { - "x": 650.1500244140625, - "y": 260.80499267578125 + "x": 1567.51904296875, + "y": 136.13299560546875 }, { - "x": 646.1119995117188, - "y": 261.0190124511719 + "x": 1566.18505859375, + "y": 138.26300048828125 }, { - "x": 642.1129760742188, - "y": 261.2019958496094 + "x": 1564.824951171875, + "y": 140.3769989013672 }, { - "x": 638.1519775390625, - "y": 261.3580017089844 + "x": 1563.43896484375, + "y": 142.47300720214844 }, { - "x": 634.22802734375, - "y": 261.489013671875 + "x": 1562.0260009765625, + "y": 144.552001953125 }, { - "x": 630.3380126953125, - "y": 261.5979919433594 + "x": 1560.5880126953125, + "y": 146.61199951171875 }, { - "x": 626.4810180664062, - "y": 261.68798828125 + "x": 1559.123046875, + "y": 148.65499877929688 }, { - "x": 622.6539916992188, - "y": 261.7619934082031 + "x": 1557.633056640625, + "y": 150.6790008544922 }, { - "x": 618.8560180664062, - "y": 261.8219909667969 + "x": 1556.1180419921875, + "y": 152.6840057373047 }, { - "x": 615.0830078125, - "y": 261.8699951171875 + "x": 1554.5780029296875, + "y": 154.6699981689453 }, { - "x": 611.3330078125, - "y": 261.9070129394531 + "x": 1553.011962890625, + "y": 156.63600158691406 }, { - "x": 607.60400390625, - "y": 261.9360046386719 + "x": 1551.4219970703125, + "y": 158.58299255371094 }, { - "x": 603.8920288085938, - "y": 261.9580078125 + "x": 1549.8079833984375, + "y": 160.50900268554688 }, { - "x": 600.1959838867188, - "y": 261.9739990234375 + "x": 1548.1700439453125, + "y": 162.4149932861328 }, { - "x": 596.510986328125, - "y": 261.9849853515625 + "x": 1546.508056640625, + "y": 164.3000030517578 }, { - "x": 592.8350219726562, - "y": 261.9930114746094 + "x": 1544.822021484375, + "y": 166.16400146484375 }, { - "x": 589.166015625, - "y": 261.99700927734375 + "x": 1543.114013671875, + "y": 168.0070037841797 }, { - "x": 585.5, - "y": 261.9989929199219 + "x": 1544.261962890625, + "y": 166.83799743652344 }, { - "x": 581.8330078125, - "y": 261.99700927734375 - }, + "x": 1541.376953125, + "y": 169.83299255371094 + } + ], + "isCurve": true, + "animated": false, + "tooltip": "", + "icon": null, + "zIndex": 0 + }, + { + "id": "5.(c -> d)[0]", + "src": "5.c", + "srcArrow": "none", + "dst": "5.d", + "dstArrow": "triangle", + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "stroke": "B1", + "borderRadius": 10, + "label": "", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N2", + "italic": true, + "bold": false, + "underline": false, + "labelWidth": 0, + "labelHeight": 0, + "labelPosition": "", + "labelPercentage": 0, + "link": "", + "route": [ { - "x": 578.1640014648438, - "y": 261.9930114746094 + "x": 1488.376953125, + "y": 209.16299438476562 }, { - "x": 574.4879760742188, - "y": 261.9849853515625 + "x": 1486.9959716796875, + "y": 209.86599731445312 }, { - "x": 570.802978515625, - "y": 261.9739990234375 + "x": 1484.7430419921875, + "y": 210.97900390625 }, { - "x": 567.1069946289062, - "y": 261.9580078125 + "x": 1482.4759521484375, + "y": 212.06300354003906 }, { - "x": 563.39501953125, - "y": 261.9360046386719 + "x": 1480.1949462890625, + "y": 213.11900329589844 }, { - "x": 559.666015625, - "y": 261.9070129394531 + "x": 1477.9010009765625, + "y": 214.14599609375 }, { - "x": 555.916015625, - "y": 261.8699951171875 + "x": 1475.594970703125, + "y": 215.1439971923828 }, { - "x": 552.1430053710938, - "y": 261.8219909667969 + "x": 1473.2760009765625, + "y": 216.11300659179688 }, { - "x": 548.344970703125, - "y": 261.7619934082031 + "x": 1470.9449462890625, + "y": 217.05299377441406 }, { - "x": 544.5180053710938, - "y": 261.68798828125 + "x": 1468.60205078125, + "y": 217.96400451660156 }, { - "x": 540.6610107421875, - "y": 261.5979919433594 + "x": 1466.248046875, + "y": 218.84500122070312 }, { - "x": 536.77099609375, - "y": 261.489013671875 + "x": 1463.884033203125, + "y": 219.6959991455078 }, { - "x": 532.8469848632812, - "y": 261.3580017089844 + "x": 1461.509033203125, + "y": 220.51699829101562 }, { - "x": 528.885986328125, - "y": 261.2019958496094 + "x": 1459.123046875, + "y": 221.3090057373047 }, { - "x": 524.8870239257812, - "y": 261.0190124511719 + "x": 1456.72802734375, + "y": 222.0709991455078 }, { - "x": 520.8489990234375, - "y": 260.80499267578125 + "x": 1454.323974609375, + "y": 222.802001953125 }, { - "x": 516.7689819335938, - "y": 260.5570068359375 + "x": 1451.9100341796875, + "y": 223.5030059814453 }, { - "x": 512.6480102539062, - "y": 260.27099609375 + "x": 1449.488037109375, + "y": 224.1739959716797 }, { - "x": 508.4840087890625, - "y": 259.9440002441406 + "x": 1447.0579833984375, + "y": 224.81399536132812 }, { - "x": 504.2760009765625, - "y": 259.572998046875 + "x": 1444.6199951171875, + "y": 225.4239959716797 }, { - "x": 500.02398681640625, - "y": 259.15301513671875 + "x": 1442.1739501953125, + "y": 226.0030059814453 }, { - "x": 495.72900390625, - "y": 258.67999267578125 + "x": 1439.720947265625, + "y": 226.55099487304688 }, { - "x": 491.3890075683594, - "y": 258.1510009765625 + "x": 1437.261962890625, + "y": 227.06900024414062 }, { - "x": 487.0050048828125, - "y": 257.56201171875 + "x": 1434.7960205078125, + "y": 227.55499267578125 }, { - "x": 482.5780029296875, - "y": 256.9079895019531 + "x": 1432.323974609375, + "y": 228.01100158691406 }, { - "x": 478.1090087890625, - "y": 256.1860046386719 + "x": 1429.8470458984375, + "y": 228.43499755859375 }, { - "x": 473.59698486328125, - "y": 255.39100646972656 + "x": 1427.364990234375, + "y": 228.8280029296875 }, { - "x": 469.0459899902344, - "y": 254.52000427246094 + "x": 1424.8780517578125, + "y": 229.19000244140625 }, { - "x": 464.45599365234375, - "y": 253.5679931640625 + "x": 1422.385986328125, + "y": 229.52099609375 }, { - "x": 459.8290100097656, - "y": 252.531005859375 + "x": 1419.8909912109375, + "y": 229.82000732421875 }, { - "x": 455.1659851074219, - "y": 251.40499877929688 + "x": 1417.3919677734375, + "y": 230.08799743652344 }, { - "x": 450.47198486328125, - "y": 250.18699645996094 + "x": 1414.8900146484375, + "y": 230.3249969482422 }, { - "x": 445.74700927734375, - "y": 248.8719940185547 + "x": 1412.385009765625, + "y": 230.52999877929688 }, { - "x": 440.9939880371094, - "y": 247.45599365234375 + "x": 1409.8780517578125, + "y": 230.7030029296875 }, { - "x": 436.2170104980469, - "y": 245.93600463867188 + "x": 1407.3690185546875, + "y": 230.84500122070312 }, { - "x": 431.41900634765625, - "y": 244.30799865722656 + "x": 1404.8580322265625, + "y": 230.95599365234375 }, { - "x": 426.60400390625, - "y": 242.56900024414062 + "x": 1402.345947265625, + "y": 231.03500366210938 }, { - "x": 421.7749938964844, - "y": 240.71600341796875 + "x": 1399.8330078125, + "y": 231.08200073242188 }, { - "x": 416.93499755859375, - "y": 238.74400329589844 + "x": 1397.3199462890625, + "y": 231.09800720214844 }, { - "x": 412.0899963378906, - "y": 236.6510009765625 + "x": 1394.8070068359375, + "y": 231.08200073242188 }, { - "x": 407.2430114746094, - "y": 234.43499755859375 + "x": 1392.2939453125, + "y": 231.03500366210938 }, { - "x": 402.3999938964844, - "y": 232.0919952392578 + "x": 1389.781982421875, + "y": 230.95599365234375 }, { - "x": 397.5639953613281, - "y": 229.6199951171875 + "x": 1387.27099609375, + "y": 230.84500122070312 }, { - "x": 392.74200439453125, - "y": 227.01600646972656 + "x": 1384.761962890625, + "y": 230.7030029296875 }, { - "x": 387.93701171875, - "y": 224.2790069580078 + "x": 1382.2540283203125, + "y": 230.52999877929688 }, { - "x": 383.1549987792969, - "y": 221.40699768066406 + "x": 1379.75, + "y": 230.3249969482422 }, { - "x": 378.4020080566406, - "y": 218.3979949951172 + "x": 1377.2469482421875, + "y": 230.08799743652344 }, { - "x": 359.8290100097656, - "y": 237.91799926757812 + "x": 1374.7490234375, + "y": 229.82000732421875 }, { - "x": 352.1919860839844, - "y": 225.0070037841797 - } - ], - "isCurve": true, - "animated": false, - "tooltip": "", - "icon": null, - "zIndex": 0 - }, - { - "id": "3.(a -> b)[0]", - "src": "3.a", - "srcArrow": "none", - "dst": "3.b", - "dstArrow": "triangle", - "opacity": 1, - "strokeDash": 0, - "strokeWidth": 2, - "stroke": "B1", - "borderRadius": 10, - "label": "", - "fontSize": 16, - "fontFamily": "DEFAULT", - "language": "", - "color": "N2", - "italic": true, - "bold": false, - "underline": false, - "labelWidth": 0, - "labelHeight": 0, - "labelPosition": "", - "labelPercentage": 0, - "link": "", - "route": [ + "x": 1372.2530517578125, + "y": 229.52099609375 + }, { - "x": 1183.0059814453125, - "y": -255 + "x": 1369.761962890625, + "y": 229.19000244140625 }, { - "x": 1187.0770263671875, - "y": -239.71200561523438 + "x": 1367.2750244140625, + "y": 228.8280029296875 }, { - "x": 1193.4759521484375, - "y": -232.74899291992188 + "x": 1364.7919921875, + "y": 228.43499755859375 }, { - "x": 1200.93505859375, - "y": -229.8090057373047 + "x": 1362.31494140625, + "y": 228.01100158691406 }, { - "x": 1208.2259521484375, - "y": -226.64999389648438 + "x": 1359.843994140625, + "y": 227.55499267578125 }, { - "x": 1215.343017578125, - "y": -223.28399658203125 + "x": 1357.3780517578125, + "y": 227.06900024414062 }, { - "x": 1222.281005859375, - "y": -219.72000122070312 + "x": 1354.91796875, + "y": 226.55099487304688 }, { - "x": 1229.0350341796875, - "y": -215.96800231933594 + "x": 1352.4659423828125, + "y": 226.0030059814453 }, { - "x": 1235.6009521484375, - "y": -212.03799438476562 + "x": 1350.02001953125, + "y": 225.4239959716797 }, { - "x": 1241.9759521484375, - "y": -207.94000244140625 + "x": 1347.58203125, + "y": 224.81399536132812 }, { - "x": 1248.157958984375, - "y": -203.68499755859375 + "x": 1345.1519775390625, + "y": 224.1739959716797 }, { - "x": 1254.14404296875, - "y": -199.28199768066406 + "x": 1342.72900390625, + "y": 223.5030059814453 }, { - "x": 1259.9329833984375, - "y": -194.74099731445312 + "x": 1340.3160400390625, + "y": 222.802001953125 }, { - "x": 1265.52197265625, - "y": -190.07200622558594 + "x": 1337.9119873046875, + "y": 222.0709991455078 }, { - "x": 1270.9129638671875, - "y": -185.28500366210938 + "x": 1335.5159912109375, + "y": 221.3090057373047 }, { - "x": 1276.10498046875, - "y": -180.38800048828125 + "x": 1333.1309814453125, + "y": 220.51699829101562 }, { - "x": 1281.0970458984375, - "y": -175.39100646972656 + "x": 1330.7559814453125, + "y": 219.6959991455078 }, { - "x": 1285.8919677734375, - "y": -170.30299377441406 + "x": 1328.3909912109375, + "y": 218.84500122070312 }, { - "x": 1290.489013671875, - "y": -165.1320037841797 + "x": 1326.0369873046875, + "y": 217.96400451660156 }, { - "x": 1294.8919677734375, - "y": -159.88600158691406 + "x": 1323.6949462890625, + "y": 217.05299377441406 }, { - "x": 1299.10205078125, - "y": -154.57400512695312 + "x": 1321.364013671875, + "y": 216.11300659179688 }, { - "x": 1303.1199951171875, - "y": -149.2030029296875 + "x": 1319.0450439453125, + "y": 215.1439971923828 }, { - "x": 1306.9510498046875, - "y": -143.781005859375 + "x": 1316.739013671875, + "y": 214.14599609375 }, { - "x": 1310.5970458984375, - "y": -138.31300354003906 + "x": 1314.4449462890625, + "y": 213.11900329589844 }, { - "x": 1314.06201171875, - "y": -132.80799865722656 + "x": 1312.1639404296875, + "y": 212.06300354003906 }, { - "x": 1317.3480224609375, - "y": -127.2699966430664 + "x": 1309.89697265625, + "y": 210.97900390625 }, { - "x": 1320.4599609375, - "y": -121.70500183105469 + "x": 1310.470947265625, + "y": 211.30099487304688 }, { - "x": 1323.4010009765625, - "y": -116.11900329589844 + "x": 1306.762939453125, + "y": 209.41700744628906 + } + ], + "isCurve": true, + "animated": false, + "tooltip": "", + "icon": null, + "zIndex": 0 + }, + { + "id": "5.(d -> e)[0]", + "src": "5.d", + "srcArrow": "none", + "dst": "5.e", + "dstArrow": "triangle", + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "stroke": "B1", + "borderRadius": 10, + "label": "", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N2", + "italic": true, + "bold": false, + "underline": false, + "labelWidth": 0, + "labelHeight": 0, + "labelPosition": "", + "labelPercentage": 0, + "link": "", + "route": [ + { + "x": 1252.762939453125, + "y": 169.30799865722656 }, { - "x": 1326.176025390625, - "y": -110.51699829101562 + "x": 1251.5260009765625, + "y": 168.0070037841797 }, { - "x": 1328.7879638671875, - "y": -104.9020004272461 + "x": 1249.8170166015625, + "y": 166.16400146484375 }, { - "x": 1331.241943359375, - "y": -99.27999877929688 + "x": 1248.1319580078125, + "y": 164.3000030517578 }, { - "x": 1333.54296875, - "y": -93.65299987792969 + "x": 1246.469970703125, + "y": 162.4149932861328 }, { - "x": 1335.6939697265625, - "y": -88.0260009765625 + "x": 1244.8310546875, + "y": 160.50900268554688 }, { - "x": 1337.698974609375, - "y": -82.39900207519531 + "x": 1243.217041015625, + "y": 158.58299255371094 }, { - "x": 1339.56396484375, - "y": -76.7770004272461 + "x": 1241.626953125, + "y": 156.63600158691406 }, { - "x": 1341.291015625, - "y": -71.16100311279297 + "x": 1240.06201171875, + "y": 154.6699981689453 }, { - "x": 1342.885986328125, - "y": -65.552001953125 + "x": 1238.52197265625, + "y": 152.6840057373047 }, { - "x": 1344.35205078125, - "y": -59.952999114990234 + "x": 1237.0059814453125, + "y": 150.6790008544922 }, { - "x": 1345.6920166015625, - "y": -54.362998962402344 + "x": 1235.5159912109375, + "y": 148.65499877929688 }, { - "x": 1346.9110107421875, - "y": -48.78300094604492 + "x": 1234.052001953125, + "y": 146.61199951171875 }, { - "x": 1348.011962890625, - "y": -43.2140007019043 + "x": 1232.613037109375, + "y": 144.552001953125 }, { - "x": 1348.998046875, - "y": -37.65599822998047 + "x": 1231.2010498046875, + "y": 142.47300720214844 }, { - "x": 1349.8719482421875, - "y": -32.10900115966797 + "x": 1229.81396484375, + "y": 140.3769989013672 }, { - "x": 1350.635986328125, - "y": -26.570999145507812 + "x": 1228.4539794921875, + "y": 138.26300048828125 }, { - "x": 1351.2939453125, - "y": -21.04199981689453 + "x": 1227.1209716796875, + "y": 136.13299560546875 }, { - "x": 1351.845947265625, - "y": -15.522000312805176 + "x": 1225.81396484375, + "y": 133.98599243164062 }, { - "x": 1352.2960205078125, - "y": -10.008000373840332 + "x": 1224.5350341796875, + "y": 131.82200622558594 }, { - "x": 1352.64404296875, - "y": -4.500999927520752 + "x": 1223.282958984375, + "y": 129.64300537109375 }, { - "x": 1352.8919677734375, - "y": 1.0010000467300415 + "x": 1222.0579833984375, + "y": 127.4489974975586 }, { - "x": 1353.041015625, - "y": 6.500999927520752 + "x": 1220.862060546875, + "y": 125.23899841308594 }, { - "x": 1353.0899658203125, - "y": 12 + "x": 1219.6929931640625, + "y": 123.01399993896484 }, { - "x": 1353.041015625, - "y": 17.49799919128418 + "x": 1218.552001953125, + "y": 120.77400207519531 }, { - "x": 1352.8919677734375, - "y": 22.99799919128418 + "x": 1217.43896484375, + "y": 118.52100372314453 }, { - "x": 1352.64404296875, - "y": 28.500999450683594 + "x": 1216.35400390625, + "y": 116.25399780273438 }, { - "x": 1352.2960205078125, - "y": 34.007999420166016 + "x": 1215.2989501953125, + "y": 113.9729995727539 }, { - "x": 1351.845947265625, - "y": 39.52199935913086 + "x": 1214.27197265625, + "y": 111.67900085449219 }, { - "x": 1351.2939453125, - "y": 45.04199981689453 + "x": 1213.27294921875, + "y": 109.37300109863281 }, { - "x": 1350.635986328125, - "y": 50.57099914550781 + "x": 1212.303955078125, + "y": 107.05400085449219 }, { - "x": 1349.8719482421875, - "y": 56.10900115966797 + "x": 1211.364990234375, + "y": 104.7229995727539 }, { - "x": 1348.998046875, - "y": 61.65599822998047 + "x": 1210.4539794921875, + "y": 102.37999725341797 }, { - "x": 1348.011962890625, - "y": 67.21399688720703 + "x": 1209.572998046875, + "y": 100.0260009765625 }, { - "x": 1346.9110107421875, - "y": 72.78299713134766 + "x": 1208.7220458984375, + "y": 97.66200256347656 }, { - "x": 1345.6920166015625, - "y": 78.36299896240234 + "x": 1207.9000244140625, + "y": 95.28700256347656 }, { - "x": 1344.35205078125, - "y": 83.9530029296875 + "x": 1207.1090087890625, + "y": 92.9010009765625 }, { - "x": 1342.885986328125, - "y": 89.552001953125 + "x": 1206.3470458984375, + "y": 90.50599670410156 }, { - "x": 1341.291015625, - "y": 95.16100311279297 + "x": 1205.614990234375, + "y": 88.10199737548828 }, { - "x": 1339.56396484375, - "y": 100.7770004272461 + "x": 1204.9139404296875, + "y": 85.68800354003906 }, { - "x": 1337.698974609375, - "y": 106.39900207519531 + "x": 1204.2430419921875, + "y": 83.26599884033203 }, { - "x": 1335.6939697265625, - "y": 112.0260009765625 + "x": 1203.60302734375, + "y": 80.83599853515625 }, { - "x": 1333.54296875, - "y": 117.65299987792969 + "x": 1202.9930419921875, + "y": 78.39800262451172 }, { - "x": 1331.241943359375, - "y": 123.27999877929688 + "x": 1202.4139404296875, + "y": 75.9520034790039 }, { - "x": 1328.7879638671875, - "y": 128.90199279785156 + "x": 1201.865966796875, + "y": 73.4990005493164 }, { - "x": 1326.176025390625, - "y": 134.51699829101562 + "x": 1201.3489990234375, + "y": 71.04000091552734 }, { - "x": 1323.4010009765625, - "y": 140.11900329589844 + "x": 1200.862060546875, + "y": 68.5739974975586 }, { - "x": 1320.4599609375, - "y": 145.7050018310547 + "x": 1200.406982421875, + "y": 66.10199737548828 }, { - "x": 1317.3480224609375, - "y": 151.27000427246094 + "x": 1199.9830322265625, + "y": 63.625 }, { - "x": 1314.06201171875, - "y": 156.80799865722656 + "x": 1199.5889892578125, + "y": 61.143001556396484 }, { - "x": 1310.5970458984375, - "y": 162.31300354003906 + "x": 1199.22802734375, + "y": 58.65599822998047 }, { - "x": 1306.9510498046875, - "y": 167.781005859375 + "x": 1198.89697265625, + "y": 56.16400146484375 }, { - "x": 1303.1199951171875, - "y": 173.2030029296875 + "x": 1198.5980224609375, + "y": 53.66899871826172 }, { - "x": 1299.10205078125, - "y": 178.57400512695312 + "x": 1198.3299560546875, + "y": 51.16999816894531 }, { - "x": 1294.8919677734375, - "y": 183.88600158691406 + "x": 1198.093017578125, + "y": 48.667999267578125 }, { - "x": 1290.489013671875, - "y": 189.1320037841797 + "x": 1197.887939453125, + "y": 46.16299819946289 }, { - "x": 1285.8919677734375, - "y": 194.30299377441406 + "x": 1197.7139892578125, + "y": 43.65599822998047 }, { - "x": 1281.0970458984375, - "y": 199.39100646972656 + "x": 1197.572021484375, + "y": 41.14699935913086 }, { - "x": 1276.10498046875, - "y": 204.38800048828125 + "x": 1197.4620361328125, + "y": 38.63600158691406 }, { - "x": 1270.9129638671875, - "y": 209.28500366210938 + "x": 1197.383056640625, + "y": 36.124000549316406 }, { - "x": 1265.52197265625, - "y": 214.07200622558594 + "x": 1197.3360595703125, + "y": 33.611000061035156 }, { - "x": 1259.9329833984375, - "y": 218.74099731445312 + "x": 1197.3199462890625, + "y": 31.097999572753906 }, { - "x": 1254.14404296875, - "y": 223.28199768066406 + "x": 1197.3360595703125, + "y": 28.584999084472656 }, { - "x": 1248.157958984375, - "y": 227.68499755859375 + "x": 1197.383056640625, + "y": 26.07200050354004 }, { - "x": 1241.9759521484375, - "y": 231.94000244140625 + "x": 1197.4620361328125, + "y": 23.559999465942383 }, { - "x": 1235.6009521484375, - "y": 236.03799438476562 + "x": 1197.572021484375, + "y": 21.048999786376953 }, { - "x": 1229.0350341796875, - "y": 239.96800231933594 + "x": 1197.7139892578125, + "y": 18.540000915527344 }, { - "x": 1222.281005859375, - "y": 243.72000122070312 + "x": 1197.887939453125, + "y": 16.031999588012695 }, { - "x": 1215.343017578125, - "y": 247.28399658203125 + "x": 1198.093017578125, + "y": 13.527999877929688 }, { - "x": 1208.2259521484375, - "y": 250.64999389648438 + "x": 1198.3299560546875, + "y": 11.024999618530273 }, { - "x": 1200.93505859375, - "y": 253.8090057373047 + "x": 1198.5980224609375, + "y": 8.527000427246094 }, { - "x": 1193.4759521484375, - "y": 256.7489929199219 + "x": 1198.89697265625, + "y": 6.031000137329102 }, { - "x": 1198.0040283203125, - "y": 278.7250061035156 + "x": 1198.81005859375, + "y": 6.409999847412109 }, { - "x": 1183.0059814453125, - "y": 279 + "x": 1199.4090576171875, + "y": 2.2939999103546143 } ], "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 6505cf6e6b..35f09dec2b 100644 --- a/e2etests/testdata/txtar/cycle-diagram/elk/sketch.exp.svg +++ b/e2etests/testdata/txtar/cycle-diagram/elk/sketch.exp.svg @@ -1,10 +1,10 @@ -abcdabcab - + .d2-2546323388 .fill-N1{fill:#0A0F25;} + .d2-2546323388 .fill-N2{fill:#676C7E;} + .d2-2546323388 .fill-N3{fill:#9499AB;} + .d2-2546323388 .fill-N4{fill:#CFD2DD;} + .d2-2546323388 .fill-N5{fill:#DEE1EB;} + .d2-2546323388 .fill-N6{fill:#EEF1F8;} + .d2-2546323388 .fill-N7{fill:#FFFFFF;} + .d2-2546323388 .fill-B1{fill:#0D32B2;} + .d2-2546323388 .fill-B2{fill:#0D32B2;} + .d2-2546323388 .fill-B3{fill:#E3E9FD;} + .d2-2546323388 .fill-B4{fill:#E3E9FD;} + .d2-2546323388 .fill-B5{fill:#EDF0FD;} + .d2-2546323388 .fill-B6{fill:#F7F8FE;} + .d2-2546323388 .fill-AA2{fill:#4A6FF3;} + .d2-2546323388 .fill-AA4{fill:#EDF0FD;} + .d2-2546323388 .fill-AA5{fill:#F7F8FE;} + .d2-2546323388 .fill-AB4{fill:#EDF0FD;} + .d2-2546323388 .fill-AB5{fill:#F7F8FE;} + .d2-2546323388 .stroke-N1{stroke:#0A0F25;} + .d2-2546323388 .stroke-N2{stroke:#676C7E;} + .d2-2546323388 .stroke-N3{stroke:#9499AB;} + .d2-2546323388 .stroke-N4{stroke:#CFD2DD;} + .d2-2546323388 .stroke-N5{stroke:#DEE1EB;} + .d2-2546323388 .stroke-N6{stroke:#EEF1F8;} + .d2-2546323388 .stroke-N7{stroke:#FFFFFF;} + .d2-2546323388 .stroke-B1{stroke:#0D32B2;} + .d2-2546323388 .stroke-B2{stroke:#0D32B2;} + .d2-2546323388 .stroke-B3{stroke:#E3E9FD;} + .d2-2546323388 .stroke-B4{stroke:#E3E9FD;} + .d2-2546323388 .stroke-B5{stroke:#EDF0FD;} + .d2-2546323388 .stroke-B6{stroke:#F7F8FE;} + .d2-2546323388 .stroke-AA2{stroke:#4A6FF3;} + .d2-2546323388 .stroke-AA4{stroke:#EDF0FD;} + .d2-2546323388 .stroke-AA5{stroke:#F7F8FE;} + .d2-2546323388 .stroke-AB4{stroke:#EDF0FD;} + .d2-2546323388 .stroke-AB5{stroke:#F7F8FE;} + .d2-2546323388 .background-color-N1{background-color:#0A0F25;} + .d2-2546323388 .background-color-N2{background-color:#676C7E;} + .d2-2546323388 .background-color-N3{background-color:#9499AB;} + .d2-2546323388 .background-color-N4{background-color:#CFD2DD;} + .d2-2546323388 .background-color-N5{background-color:#DEE1EB;} + .d2-2546323388 .background-color-N6{background-color:#EEF1F8;} + .d2-2546323388 .background-color-N7{background-color:#FFFFFF;} + .d2-2546323388 .background-color-B1{background-color:#0D32B2;} + .d2-2546323388 .background-color-B2{background-color:#0D32B2;} + .d2-2546323388 .background-color-B3{background-color:#E3E9FD;} + .d2-2546323388 .background-color-B4{background-color:#E3E9FD;} + .d2-2546323388 .background-color-B5{background-color:#EDF0FD;} + .d2-2546323388 .background-color-B6{background-color:#F7F8FE;} + .d2-2546323388 .background-color-AA2{background-color:#4A6FF3;} + .d2-2546323388 .background-color-AA4{background-color:#EDF0FD;} + .d2-2546323388 .background-color-AA5{background-color:#F7F8FE;} + .d2-2546323388 .background-color-AB4{background-color:#EDF0FD;} + .d2-2546323388 .background-color-AB5{background-color:#F7F8FE;} + .d2-2546323388 .color-N1{color:#0A0F25;} + .d2-2546323388 .color-N2{color:#676C7E;} + .d2-2546323388 .color-N3{color:#9499AB;} + .d2-2546323388 .color-N4{color:#CFD2DD;} + .d2-2546323388 .color-N5{color:#DEE1EB;} + .d2-2546323388 .color-N6{color:#EEF1F8;} + .d2-2546323388 .color-N7{color:#FFFFFF;} + .d2-2546323388 .color-B1{color:#0D32B2;} + .d2-2546323388 .color-B2{color:#0D32B2;} + .d2-2546323388 .color-B3{color:#E3E9FD;} + .d2-2546323388 .color-B4{color:#E3E9FD;} + .d2-2546323388 .color-B5{color:#EDF0FD;} + .d2-2546323388 .color-B6{color:#F7F8FE;} + .d2-2546323388 .color-AA2{color:#4A6FF3;} + .d2-2546323388 .color-AA4{color:#EDF0FD;} + .d2-2546323388 .color-AA5{color:#F7F8FE;} + .d2-2546323388 .color-AB4{color:#EDF0FD;} + .d2-2546323388 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker-d2-2546323388);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker-d2-2546323388);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright-d2-2546323388);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright-d2-2546323388);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright-d2-2546323388);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright-d2-2546323388);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark-d2-2546323388);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright-d2-2546323388);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright-d2-2546323388);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright-d2-2546323388);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright-d2-2546323388);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker-d2-2546323388);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark-d2-2546323388);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal-d2-2546323388);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal-d2-2546323388);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright-d2-2546323388);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright-d2-2546323388);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright-d2-2546323388);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>abcdabcababcdefabcde + - - - - - - - - + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/e2etests/txtar.txt b/e2etests/txtar.txt index 61edb0372c..22aa62931f 100644 --- a/e2etests/txtar.txt +++ b/e2etests/txtar.txt @@ -788,4 +788,12 @@ b -> c: { 3: "" { shape: cycle a -> b +} +4: "" { + shape: cycle + a -> b -> c -> d -> e -> f +} +5: "" { + shape: cycle + a -> b -> c -> d -> e } \ No newline at end of file From adf3c651e2fe1f2e11a011cc3d35e1373d138dd7 Mon Sep 17 00:00:00 2001 From: Mayank Mohapatra <125661248+Mayank77maruti@users.noreply.github.com> Date: Sat, 8 Mar 2025 10:42:17 +0000 Subject: [PATCH 67/73] try --- d2layouts/d2cycle/layout.go | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/d2layouts/d2cycle/layout.go b/d2layouts/d2cycle/layout.go index 73f6635517..6cee125be1 100644 --- a/d2layouts/d2cycle/layout.go +++ b/d2layouts/d2cycle/layout.go @@ -41,12 +41,22 @@ func Layout(ctx context.Context, g *d2graph.Graph, layout d2graph.LayoutGraph) e func calculateRadius(objects []*d2graph.Object) float64 { numObjects := float64(len(objects)) - maxSize := 0.0 + if numObjects == 0 { + return MIN_RADIUS + } + + maxDiagonal := 0.0 for _, obj := range objects { - size := math.Max(obj.Box.Width, obj.Box.Height) - maxSize = math.Max(maxSize, size) + // Calculate the diagonal of the object's bounding box + diagonal := math.Sqrt(obj.Box.Width*obj.Box.Width + obj.Box.Height*obj.Box.Height) + if diagonal > maxDiagonal { + maxDiagonal = diagonal + } } - minRadius := (maxSize/2.0 + PADDING) / math.Sin(math.Pi/numObjects) + + // Required chord length: sum of two radii (maxDiagonal/2) + padding + requiredChordLength := maxDiagonal + PADDING + minRadius := requiredChordLength / (2 * math.Sin(math.Pi/numObjects)) return math.Max(minRadius, MIN_RADIUS) } From d594af3f4af6382226d5d718f297d7a184e7eb7a Mon Sep 17 00:00:00 2001 From: Mayank Mohapatra <125661248+Mayank77maruti@users.noreply.github.com> Date: Sat, 8 Mar 2025 10:56:38 +0000 Subject: [PATCH 68/73] try --- d2layouts/d2cycle/layout.go | 54 ++++--- .../txtar/cycle-diagram/dagre/board.exp.json | 60 +++---- .../txtar/cycle-diagram/dagre/sketch.exp.svg | 152 +++++++++--------- .../txtar/cycle-diagram/elk/board.exp.json | 60 +++---- .../txtar/cycle-diagram/elk/sketch.exp.svg | 152 +++++++++--------- 5 files changed, 242 insertions(+), 236 deletions(-) diff --git a/d2layouts/d2cycle/layout.go b/d2layouts/d2cycle/layout.go index 6cee125be1..642344a44c 100644 --- a/d2layouts/d2cycle/layout.go +++ b/d2layouts/d2cycle/layout.go @@ -14,7 +14,7 @@ import ( const ( MIN_RADIUS = 200 PADDING = 20 - MIN_SEGMENT_LEN = 10 + MIN_SEGMENT_LEN = 10.0 // Changed to float64 ARC_STEPS = 100 ) @@ -41,22 +41,12 @@ func Layout(ctx context.Context, g *d2graph.Graph, layout d2graph.LayoutGraph) e func calculateRadius(objects []*d2graph.Object) float64 { numObjects := float64(len(objects)) - if numObjects == 0 { - return MIN_RADIUS - } - - maxDiagonal := 0.0 + maxSize := 0.0 for _, obj := range objects { - // Calculate the diagonal of the object's bounding box - diagonal := math.Sqrt(obj.Box.Width*obj.Box.Width + obj.Box.Height*obj.Box.Height) - if diagonal > maxDiagonal { - maxDiagonal = diagonal - } + size := math.Max(obj.Box.Width, obj.Box.Height) + maxSize = math.Max(maxSize, size) } - - // Required chord length: sum of two radii (maxDiagonal/2) + padding - requiredChordLength := maxDiagonal + PADDING - minRadius := requiredChordLength / (2 * math.Sin(math.Pi/numObjects)) + minRadius := (maxSize/2.0 + PADDING) / math.Sin(math.Pi/numObjects) return math.Max(minRadius, MIN_RADIUS) } @@ -83,14 +73,27 @@ func createCircularArc(edge *d2graph.Edge) { srcCenter := edge.Src.Center() dstCenter := edge.Dst.Center() + // Calculate the angle of each object from the origin (0,0) srcAngle := math.Atan2(srcCenter.Y, srcCenter.X) dstAngle := math.Atan2(dstCenter.Y, dstCenter.X) + + // Determine the shortest arc direction 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) + // Use the average radius for a smooth circular arc + srcRadius := math.Hypot(srcCenter.X, srcCenter.Y) + dstRadius := math.Hypot(dstCenter.X, dstCenter.Y) + arcRadius := (srcRadius + dstRadius) / 2 + // Create a perfectly circular arc with more points for smoothness path := make([]*geo.Point, 0, ARC_STEPS+1) for i := 0; i <= ARC_STEPS; i++ { t := float64(i) / float64(ARC_STEPS) @@ -99,27 +102,31 @@ func createCircularArc(edge *d2graph.Edge) { y := arcRadius * math.Sin(angle) path = append(path, geo.NewPoint(x, y)) } + + // Ensure the path starts and ends at the centers path[0] = srcCenter path[len(path)-1] = dstCenter - // Clamp endpoints to the boundaries of the source and destination boxes. + // Find precise intersection points with object boundaries _, 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 points that are inside the objects' boxes path = trimPathPoints(path, edge.Src.Box) path = trimPathPoints(path, edge.Dst.Box) edge.Route = path edge.IsCurve = true + // Adjust the final segment for proper arrow rendering if len(edge.Route) >= 2 { lastIndex := len(edge.Route) - 1 lastPoint := edge.Route[lastIndex] secondLastPoint := edge.Route[lastIndex-1] + // Calculate tangent at the intersection point (perpendicular to radius) tangentX := -lastPoint.Y tangentY := lastPoint.X mag := math.Hypot(tangentX, tangentY) @@ -127,8 +134,8 @@ func createCircularArc(edge *d2graph.Edge) { tangentX /= mag tangentY /= mag } - const MIN_SEGMENT_LEN = 4.159 + // Check if final segment needs adjustment dx := lastPoint.X - secondLastPoint.X dy := lastPoint.Y - secondLastPoint.Y segLength := math.Hypot(dx, dy) @@ -136,9 +143,8 @@ func createCircularArc(edge *d2graph.Edge) { currentDirX := dx / segLength currentDirY := dy / segLength - // 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 + // If segment is too short or not aligned with the tangent + if segLength < MIN_SEGMENT_LEN || (currentDirX*tangentX+currentDirY*tangentY) < 0.99 { adjustLength := MIN_SEGMENT_LEN // Now float64 if segLength >= MIN_SEGMENT_LEN { adjustLength = segLength // Both are float64 now @@ -335,4 +341,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 a44184a6d5..e073c49a72 100644 --- a/e2etests/testdata/txtar/cycle-diagram/dagre/board.exp.json +++ b/e2etests/testdata/txtar/cycle-diagram/dagre/board.exp.json @@ -1408,8 +1408,8 @@ "y": -37.47600173950195 }, { - "x": 196.5659942626953, - "y": -37.10100173950195 + "x": 195.6020050048828, + "y": -42.86199951171875 }, { "x": 197.2519989013672, @@ -1772,8 +1772,8 @@ "y": 197.53700256347656 }, { - "x": 30.621999740600586, - "y": 197.6790008544922 + "x": 36.4109992980957, + "y": 196.90499877929688 }, { "x": 26.5, @@ -2136,8 +2136,8 @@ "y": 37.47600173950195 }, { - "x": -196.5659942626953, - "y": 37.10100173950195 + "x": -195.6020050048828, + "y": 42.86199951171875 }, { "x": -197.2519989013672, @@ -2516,8 +2516,8 @@ "y": 111.8030014038086 }, { - "x": 702.8259887695312, - "y": 113.08100128173828 + "x": 704.7830200195312, + "y": 107.5770034790039 }, { "x": 701.4329833984375, @@ -2880,8 +2880,8 @@ "y": 186.90899658203125 }, { - "x": 366.4079895019531, - "y": 186.1060028076172 + "x": 370.2919921875, + "y": 190.46800231933594 }, { "x": 363.6419982910156, @@ -3284,8 +3284,8 @@ "y": 196.45700073242188 }, { - "x": 1003.2860107421875, - "y": 197.53700256347656 + "x": 1008.4110107421875, + "y": 196.89300537109375 }, { "x": 998.5, @@ -3596,8 +3596,8 @@ "y": -135.375 }, { - "x": 1231.5989990234375, - "y": -136.1060028076172 + "x": 1227.7139892578125, + "y": -140.46800231933594 }, { "x": 1234.364990234375, @@ -3896,8 +3896,8 @@ "y": 63.79100036621094 }, { - "x": 1274.833984375, - "y": 63.08100128173828 + "x": 1276.7900390625, + "y": 57.57699966430664 }, { "x": 1273.43994140625, @@ -4208,8 +4208,8 @@ "y": 197.85400390625 }, { - "x": 1116.1199951171875, - "y": 197.6060028076172 + "x": 1121.907958984375, + "y": 196.8179931640625 }, { "x": 1112, @@ -4520,8 +4520,8 @@ "y": 135.375 }, { - "x": 938.4000244140625, - "y": 136.1060028076172 + "x": 942.2849731445312, + "y": 140.46800231933594 }, { "x": 935.6339721679688, @@ -4820,8 +4820,8 @@ "y": -63.79100036621094 }, { - "x": 895.1649780273438, - "y": -63.08100128173828 + "x": 893.208984375, + "y": -57.57699966430664 }, { "x": 896.5590209960938, @@ -5160,8 +5160,8 @@ "y": -78.54499816894531 }, { - "x": 1718.126953125, - "y": -78.46499633789062 + "x": 1715.3590087890625, + "y": -83.60800170898438 }, { "x": 1720.0989990234375, @@ -5492,8 +5492,8 @@ "y": 156.90899658203125 }, { - "x": 1690.9420166015625, - "y": 155.73899841308594 + "x": 1694.9930419921875, + "y": 151.53199768066406 }, { "x": 1688.0570068359375, @@ -5832,8 +5832,8 @@ "y": 199.88099670410156 }, { - "x": 1457.1510009765625, - "y": 200.20199584960938 + "x": 1462.3590087890625, + "y": 202.8470001220703 }, { "x": 1453.4420166015625, @@ -6160,8 +6160,8 @@ "y": -5.065999984741211 }, { - "x": 1345.489013671875, - "y": -4.686999797821045 + "x": 1344.64794921875, + "y": 1.0920000076293945 }, { "x": 1346.0880126953125, diff --git a/e2etests/testdata/txtar/cycle-diagram/dagre/sketch.exp.svg b/e2etests/testdata/txtar/cycle-diagram/dagre/sketch.exp.svg index b1b31e77f0..966687b6b4 100644 --- a/e2etests/testdata/txtar/cycle-diagram/dagre/sketch.exp.svg +++ b/e2etests/testdata/txtar/cycle-diagram/dagre/sketch.exp.svg @@ -1,9 +1,9 @@ -abcdabcababcdefabcde + .d2-359737804 .fill-N1{fill:#0A0F25;} + .d2-359737804 .fill-N2{fill:#676C7E;} + .d2-359737804 .fill-N3{fill:#9499AB;} + .d2-359737804 .fill-N4{fill:#CFD2DD;} + .d2-359737804 .fill-N5{fill:#DEE1EB;} + .d2-359737804 .fill-N6{fill:#EEF1F8;} + .d2-359737804 .fill-N7{fill:#FFFFFF;} + .d2-359737804 .fill-B1{fill:#0D32B2;} + .d2-359737804 .fill-B2{fill:#0D32B2;} + .d2-359737804 .fill-B3{fill:#E3E9FD;} + .d2-359737804 .fill-B4{fill:#E3E9FD;} + .d2-359737804 .fill-B5{fill:#EDF0FD;} + .d2-359737804 .fill-B6{fill:#F7F8FE;} + .d2-359737804 .fill-AA2{fill:#4A6FF3;} + .d2-359737804 .fill-AA4{fill:#EDF0FD;} + .d2-359737804 .fill-AA5{fill:#F7F8FE;} + .d2-359737804 .fill-AB4{fill:#EDF0FD;} + .d2-359737804 .fill-AB5{fill:#F7F8FE;} + .d2-359737804 .stroke-N1{stroke:#0A0F25;} + .d2-359737804 .stroke-N2{stroke:#676C7E;} + .d2-359737804 .stroke-N3{stroke:#9499AB;} + .d2-359737804 .stroke-N4{stroke:#CFD2DD;} + .d2-359737804 .stroke-N5{stroke:#DEE1EB;} + .d2-359737804 .stroke-N6{stroke:#EEF1F8;} + .d2-359737804 .stroke-N7{stroke:#FFFFFF;} + .d2-359737804 .stroke-B1{stroke:#0D32B2;} + .d2-359737804 .stroke-B2{stroke:#0D32B2;} + .d2-359737804 .stroke-B3{stroke:#E3E9FD;} + .d2-359737804 .stroke-B4{stroke:#E3E9FD;} + .d2-359737804 .stroke-B5{stroke:#EDF0FD;} + .d2-359737804 .stroke-B6{stroke:#F7F8FE;} + .d2-359737804 .stroke-AA2{stroke:#4A6FF3;} + .d2-359737804 .stroke-AA4{stroke:#EDF0FD;} + .d2-359737804 .stroke-AA5{stroke:#F7F8FE;} + .d2-359737804 .stroke-AB4{stroke:#EDF0FD;} + .d2-359737804 .stroke-AB5{stroke:#F7F8FE;} + .d2-359737804 .background-color-N1{background-color:#0A0F25;} + .d2-359737804 .background-color-N2{background-color:#676C7E;} + .d2-359737804 .background-color-N3{background-color:#9499AB;} + .d2-359737804 .background-color-N4{background-color:#CFD2DD;} + .d2-359737804 .background-color-N5{background-color:#DEE1EB;} + .d2-359737804 .background-color-N6{background-color:#EEF1F8;} + .d2-359737804 .background-color-N7{background-color:#FFFFFF;} + .d2-359737804 .background-color-B1{background-color:#0D32B2;} + .d2-359737804 .background-color-B2{background-color:#0D32B2;} + .d2-359737804 .background-color-B3{background-color:#E3E9FD;} + .d2-359737804 .background-color-B4{background-color:#E3E9FD;} + .d2-359737804 .background-color-B5{background-color:#EDF0FD;} + .d2-359737804 .background-color-B6{background-color:#F7F8FE;} + .d2-359737804 .background-color-AA2{background-color:#4A6FF3;} + .d2-359737804 .background-color-AA4{background-color:#EDF0FD;} + .d2-359737804 .background-color-AA5{background-color:#F7F8FE;} + .d2-359737804 .background-color-AB4{background-color:#EDF0FD;} + .d2-359737804 .background-color-AB5{background-color:#F7F8FE;} + .d2-359737804 .color-N1{color:#0A0F25;} + .d2-359737804 .color-N2{color:#676C7E;} + .d2-359737804 .color-N3{color:#9499AB;} + .d2-359737804 .color-N4{color:#CFD2DD;} + .d2-359737804 .color-N5{color:#DEE1EB;} + .d2-359737804 .color-N6{color:#EEF1F8;} + .d2-359737804 .color-N7{color:#FFFFFF;} + .d2-359737804 .color-B1{color:#0D32B2;} + .d2-359737804 .color-B2{color:#0D32B2;} + .d2-359737804 .color-B3{color:#E3E9FD;} + .d2-359737804 .color-B4{color:#E3E9FD;} + .d2-359737804 .color-B5{color:#EDF0FD;} + .d2-359737804 .color-B6{color:#F7F8FE;} + .d2-359737804 .color-AA2{color:#4A6FF3;} + .d2-359737804 .color-AA4{color:#EDF0FD;} + .d2-359737804 .color-AA5{color:#F7F8FE;} + .d2-359737804 .color-AB4{color:#EDF0FD;} + .d2-359737804 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker-d2-359737804);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker-d2-359737804);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright-d2-359737804);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright-d2-359737804);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright-d2-359737804);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright-d2-359737804);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark-d2-359737804);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright-d2-359737804);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright-d2-359737804);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright-d2-359737804);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright-d2-359737804);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker-d2-359737804);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark-d2-359737804);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal-d2-359737804);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal-d2-359737804);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright-d2-359737804);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright-d2-359737804);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright-d2-359737804);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>abcdabcababcdefabcde diff --git a/e2etests/testdata/txtar/cycle-diagram/elk/board.exp.json b/e2etests/testdata/txtar/cycle-diagram/elk/board.exp.json index bc4abcf553..112d4573c0 100644 --- a/e2etests/testdata/txtar/cycle-diagram/elk/board.exp.json +++ b/e2etests/testdata/txtar/cycle-diagram/elk/board.exp.json @@ -1408,8 +1408,8 @@ "y": -25.47599983215332 }, { - "x": 208.5659942626953, - "y": -25.10099983215332 + "x": 207.6020050048828, + "y": -30.86199951171875 }, { "x": 209.2519989013672, @@ -1772,8 +1772,8 @@ "y": 209.53700256347656 }, { - "x": 42.62200164794922, - "y": 209.6790008544922 + "x": 48.4109992980957, + "y": 208.90499877929688 }, { "x": 38.5, @@ -2136,8 +2136,8 @@ "y": 49.47600173950195 }, { - "x": -184.5659942626953, - "y": 49.10100173950195 + "x": -183.6020050048828, + "y": 54.86199951171875 }, { "x": -185.2519989013672, @@ -2516,8 +2516,8 @@ "y": 123.8030014038086 }, { - "x": 675.3259887695312, - "y": 125.08100128173828 + "x": 677.2830200195312, + "y": 119.5770034790039 }, { "x": 673.9329833984375, @@ -2880,8 +2880,8 @@ "y": 198.90899658203125 }, { - "x": 338.9079895019531, - "y": 198.1060028076172 + "x": 342.7919921875, + "y": 202.46800231933594 }, { "x": 336.1419982910156, @@ -3284,8 +3284,8 @@ "y": 208.45700073242188 }, { - "x": 936.197021484375, - "y": 209.53700256347656 + "x": 941.3209838867188, + "y": 208.89300537109375 }, { "x": 931.4099731445312, @@ -3596,8 +3596,8 @@ "y": -123.375 }, { - "x": 1124.509033203125, - "y": -124.10600280761719 + "x": 1120.625, + "y": -128.46800231933594 }, { "x": 1127.2750244140625, @@ -3896,8 +3896,8 @@ "y": 75.79100036621094 }, { - "x": 1167.7440185546875, - "y": 75.08100128173828 + "x": 1169.7010498046875, + "y": 69.5770034790039 }, { "x": 1166.3509521484375, @@ -4208,8 +4208,8 @@ "y": 209.85400390625 }, { - "x": 1009.031005859375, - "y": 209.6060028076172 + "x": 1014.8179931640625, + "y": 208.8179931640625 }, { "x": 1004.9099731445312, @@ -4520,8 +4520,8 @@ "y": 147.375 }, { - "x": 831.3099975585938, - "y": 148.1060028076172 + "x": 835.1950073242188, + "y": 152.46800231933594 }, { "x": 828.5449829101562, @@ -4820,8 +4820,8 @@ "y": -51.79100036621094 }, { - "x": 788.0750122070312, - "y": -51.08100128173828 + "x": 786.1190185546875, + "y": -45.57699966430664 }, { "x": 789.468994140625, @@ -5160,8 +5160,8 @@ "y": -67.4469985961914 }, { - "x": 1571.447998046875, - "y": -67.36699676513672 + "x": 1568.678955078125, + "y": -72.51000213623047 }, { "x": 1573.4189453125, @@ -5492,8 +5492,8 @@ "y": 168.0070037841797 }, { - "x": 1544.261962890625, - "y": 166.83799743652344 + "x": 1548.31396484375, + "y": 162.6300048828125 }, { "x": 1541.376953125, @@ -5832,8 +5832,8 @@ "y": 210.97900390625 }, { - "x": 1310.470947265625, - "y": 211.30099487304688 + "x": 1315.678955078125, + "y": 213.94500732421875 }, { "x": 1306.762939453125, @@ -6160,8 +6160,8 @@ "y": 6.031000137329102 }, { - "x": 1198.81005859375, - "y": 6.409999847412109 + "x": 1197.968994140625, + "y": 12.1899995803833 }, { "x": 1199.4090576171875, diff --git a/e2etests/testdata/txtar/cycle-diagram/elk/sketch.exp.svg b/e2etests/testdata/txtar/cycle-diagram/elk/sketch.exp.svg index 35f09dec2b..a1eaa35770 100644 --- a/e2etests/testdata/txtar/cycle-diagram/elk/sketch.exp.svg +++ b/e2etests/testdata/txtar/cycle-diagram/elk/sketch.exp.svg @@ -1,9 +1,9 @@ -abcdabcababcdefabcde + .d2-3450658605 .fill-N1{fill:#0A0F25;} + .d2-3450658605 .fill-N2{fill:#676C7E;} + .d2-3450658605 .fill-N3{fill:#9499AB;} + .d2-3450658605 .fill-N4{fill:#CFD2DD;} + .d2-3450658605 .fill-N5{fill:#DEE1EB;} + .d2-3450658605 .fill-N6{fill:#EEF1F8;} + .d2-3450658605 .fill-N7{fill:#FFFFFF;} + .d2-3450658605 .fill-B1{fill:#0D32B2;} + .d2-3450658605 .fill-B2{fill:#0D32B2;} + .d2-3450658605 .fill-B3{fill:#E3E9FD;} + .d2-3450658605 .fill-B4{fill:#E3E9FD;} + .d2-3450658605 .fill-B5{fill:#EDF0FD;} + .d2-3450658605 .fill-B6{fill:#F7F8FE;} + .d2-3450658605 .fill-AA2{fill:#4A6FF3;} + .d2-3450658605 .fill-AA4{fill:#EDF0FD;} + .d2-3450658605 .fill-AA5{fill:#F7F8FE;} + .d2-3450658605 .fill-AB4{fill:#EDF0FD;} + .d2-3450658605 .fill-AB5{fill:#F7F8FE;} + .d2-3450658605 .stroke-N1{stroke:#0A0F25;} + .d2-3450658605 .stroke-N2{stroke:#676C7E;} + .d2-3450658605 .stroke-N3{stroke:#9499AB;} + .d2-3450658605 .stroke-N4{stroke:#CFD2DD;} + .d2-3450658605 .stroke-N5{stroke:#DEE1EB;} + .d2-3450658605 .stroke-N6{stroke:#EEF1F8;} + .d2-3450658605 .stroke-N7{stroke:#FFFFFF;} + .d2-3450658605 .stroke-B1{stroke:#0D32B2;} + .d2-3450658605 .stroke-B2{stroke:#0D32B2;} + .d2-3450658605 .stroke-B3{stroke:#E3E9FD;} + .d2-3450658605 .stroke-B4{stroke:#E3E9FD;} + .d2-3450658605 .stroke-B5{stroke:#EDF0FD;} + .d2-3450658605 .stroke-B6{stroke:#F7F8FE;} + .d2-3450658605 .stroke-AA2{stroke:#4A6FF3;} + .d2-3450658605 .stroke-AA4{stroke:#EDF0FD;} + .d2-3450658605 .stroke-AA5{stroke:#F7F8FE;} + .d2-3450658605 .stroke-AB4{stroke:#EDF0FD;} + .d2-3450658605 .stroke-AB5{stroke:#F7F8FE;} + .d2-3450658605 .background-color-N1{background-color:#0A0F25;} + .d2-3450658605 .background-color-N2{background-color:#676C7E;} + .d2-3450658605 .background-color-N3{background-color:#9499AB;} + .d2-3450658605 .background-color-N4{background-color:#CFD2DD;} + .d2-3450658605 .background-color-N5{background-color:#DEE1EB;} + .d2-3450658605 .background-color-N6{background-color:#EEF1F8;} + .d2-3450658605 .background-color-N7{background-color:#FFFFFF;} + .d2-3450658605 .background-color-B1{background-color:#0D32B2;} + .d2-3450658605 .background-color-B2{background-color:#0D32B2;} + .d2-3450658605 .background-color-B3{background-color:#E3E9FD;} + .d2-3450658605 .background-color-B4{background-color:#E3E9FD;} + .d2-3450658605 .background-color-B5{background-color:#EDF0FD;} + .d2-3450658605 .background-color-B6{background-color:#F7F8FE;} + .d2-3450658605 .background-color-AA2{background-color:#4A6FF3;} + .d2-3450658605 .background-color-AA4{background-color:#EDF0FD;} + .d2-3450658605 .background-color-AA5{background-color:#F7F8FE;} + .d2-3450658605 .background-color-AB4{background-color:#EDF0FD;} + .d2-3450658605 .background-color-AB5{background-color:#F7F8FE;} + .d2-3450658605 .color-N1{color:#0A0F25;} + .d2-3450658605 .color-N2{color:#676C7E;} + .d2-3450658605 .color-N3{color:#9499AB;} + .d2-3450658605 .color-N4{color:#CFD2DD;} + .d2-3450658605 .color-N5{color:#DEE1EB;} + .d2-3450658605 .color-N6{color:#EEF1F8;} + .d2-3450658605 .color-N7{color:#FFFFFF;} + .d2-3450658605 .color-B1{color:#0D32B2;} + .d2-3450658605 .color-B2{color:#0D32B2;} + .d2-3450658605 .color-B3{color:#E3E9FD;} + .d2-3450658605 .color-B4{color:#E3E9FD;} + .d2-3450658605 .color-B5{color:#EDF0FD;} + .d2-3450658605 .color-B6{color:#F7F8FE;} + .d2-3450658605 .color-AA2{color:#4A6FF3;} + .d2-3450658605 .color-AA4{color:#EDF0FD;} + .d2-3450658605 .color-AA5{color:#F7F8FE;} + .d2-3450658605 .color-AB4{color:#EDF0FD;} + .d2-3450658605 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker-d2-3450658605);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker-d2-3450658605);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright-d2-3450658605);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright-d2-3450658605);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright-d2-3450658605);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright-d2-3450658605);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark-d2-3450658605);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright-d2-3450658605);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright-d2-3450658605);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright-d2-3450658605);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright-d2-3450658605);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker-d2-3450658605);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark-d2-3450658605);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal-d2-3450658605);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal-d2-3450658605);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright-d2-3450658605);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright-d2-3450658605);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright-d2-3450658605);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>abcdabcababcdefabcde From 3e697b5e23ceb6422ac3fc8125e4789763b7417a Mon Sep 17 00:00:00 2001 From: Mayank Mohapatra <125661248+Mayank77maruti@users.noreply.github.com> Date: Sat, 8 Mar 2025 10:57:43 +0000 Subject: [PATCH 69/73] try --- d2layouts/d2cycle/layout.go | 36 ++--- .../txtar/cycle-diagram/dagre/board.exp.json | 60 +++---- .../txtar/cycle-diagram/dagre/sketch.exp.svg | 152 +++++++++--------- .../txtar/cycle-diagram/elk/board.exp.json | 60 +++---- .../txtar/cycle-diagram/elk/sketch.exp.svg | 152 +++++++++--------- 5 files changed, 222 insertions(+), 238 deletions(-) diff --git a/d2layouts/d2cycle/layout.go b/d2layouts/d2cycle/layout.go index 642344a44c..73f6635517 100644 --- a/d2layouts/d2cycle/layout.go +++ b/d2layouts/d2cycle/layout.go @@ -14,7 +14,7 @@ import ( const ( MIN_RADIUS = 200 PADDING = 20 - MIN_SEGMENT_LEN = 10.0 // Changed to float64 + MIN_SEGMENT_LEN = 10 ARC_STEPS = 100 ) @@ -73,27 +73,14 @@ func createCircularArc(edge *d2graph.Edge) { srcCenter := edge.Src.Center() dstCenter := edge.Dst.Center() - // Calculate the angle of each object from the origin (0,0) srcAngle := math.Atan2(srcCenter.Y, srcCenter.X) dstAngle := math.Atan2(dstCenter.Y, dstCenter.X) - - // Determine the shortest arc direction if dstAngle < srcAngle { - if srcAngle - dstAngle > math.Pi { - dstAngle += 2 * math.Pi - } - } else { - if dstAngle - srcAngle > math.Pi { - srcAngle += 2 * math.Pi - } + dstAngle += 2 * math.Pi } - // Use the average radius for a smooth circular arc - srcRadius := math.Hypot(srcCenter.X, srcCenter.Y) - dstRadius := math.Hypot(dstCenter.X, dstCenter.Y) - arcRadius := (srcRadius + dstRadius) / 2 + arcRadius := math.Hypot(srcCenter.X, srcCenter.Y) - // Create a perfectly circular arc with more points for smoothness path := make([]*geo.Point, 0, ARC_STEPS+1) for i := 0; i <= ARC_STEPS; i++ { t := float64(i) / float64(ARC_STEPS) @@ -102,31 +89,27 @@ func createCircularArc(edge *d2graph.Edge) { y := arcRadius * math.Sin(angle) path = append(path, geo.NewPoint(x, y)) } - - // Ensure the path starts and ends at the centers path[0] = srcCenter path[len(path)-1] = dstCenter - // Find precise intersection points with object boundaries + // Clamp endpoints to the boundaries of the source and destination 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 points that are inside the objects' boxes + // Trim redundant path points that fall inside node boundaries. path = trimPathPoints(path, edge.Src.Box) path = trimPathPoints(path, edge.Dst.Box) edge.Route = path edge.IsCurve = true - // Adjust the final segment for proper arrow rendering if len(edge.Route) >= 2 { lastIndex := len(edge.Route) - 1 lastPoint := edge.Route[lastIndex] secondLastPoint := edge.Route[lastIndex-1] - // Calculate tangent at the intersection point (perpendicular to radius) tangentX := -lastPoint.Y tangentY := lastPoint.X mag := math.Hypot(tangentX, tangentY) @@ -134,8 +117,8 @@ func createCircularArc(edge *d2graph.Edge) { tangentX /= mag tangentY /= mag } + const MIN_SEGMENT_LEN = 4.159 - // Check if final segment needs adjustment dx := lastPoint.X - secondLastPoint.X dy := lastPoint.Y - secondLastPoint.Y segLength := math.Hypot(dx, dy) @@ -143,8 +126,9 @@ func createCircularArc(edge *d2graph.Edge) { currentDirX := dx / segLength currentDirY := dy / segLength - // If segment is too short or not aligned with the tangent - if segLength < MIN_SEGMENT_LEN || (currentDirX*tangentX+currentDirY*tangentY) < 0.99 { + // 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 @@ -341,4 +325,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 e073c49a72..a44184a6d5 100644 --- a/e2etests/testdata/txtar/cycle-diagram/dagre/board.exp.json +++ b/e2etests/testdata/txtar/cycle-diagram/dagre/board.exp.json @@ -1408,8 +1408,8 @@ "y": -37.47600173950195 }, { - "x": 195.6020050048828, - "y": -42.86199951171875 + "x": 196.5659942626953, + "y": -37.10100173950195 }, { "x": 197.2519989013672, @@ -1772,8 +1772,8 @@ "y": 197.53700256347656 }, { - "x": 36.4109992980957, - "y": 196.90499877929688 + "x": 30.621999740600586, + "y": 197.6790008544922 }, { "x": 26.5, @@ -2136,8 +2136,8 @@ "y": 37.47600173950195 }, { - "x": -195.6020050048828, - "y": 42.86199951171875 + "x": -196.5659942626953, + "y": 37.10100173950195 }, { "x": -197.2519989013672, @@ -2516,8 +2516,8 @@ "y": 111.8030014038086 }, { - "x": 704.7830200195312, - "y": 107.5770034790039 + "x": 702.8259887695312, + "y": 113.08100128173828 }, { "x": 701.4329833984375, @@ -2880,8 +2880,8 @@ "y": 186.90899658203125 }, { - "x": 370.2919921875, - "y": 190.46800231933594 + "x": 366.4079895019531, + "y": 186.1060028076172 }, { "x": 363.6419982910156, @@ -3284,8 +3284,8 @@ "y": 196.45700073242188 }, { - "x": 1008.4110107421875, - "y": 196.89300537109375 + "x": 1003.2860107421875, + "y": 197.53700256347656 }, { "x": 998.5, @@ -3596,8 +3596,8 @@ "y": -135.375 }, { - "x": 1227.7139892578125, - "y": -140.46800231933594 + "x": 1231.5989990234375, + "y": -136.1060028076172 }, { "x": 1234.364990234375, @@ -3896,8 +3896,8 @@ "y": 63.79100036621094 }, { - "x": 1276.7900390625, - "y": 57.57699966430664 + "x": 1274.833984375, + "y": 63.08100128173828 }, { "x": 1273.43994140625, @@ -4208,8 +4208,8 @@ "y": 197.85400390625 }, { - "x": 1121.907958984375, - "y": 196.8179931640625 + "x": 1116.1199951171875, + "y": 197.6060028076172 }, { "x": 1112, @@ -4520,8 +4520,8 @@ "y": 135.375 }, { - "x": 942.2849731445312, - "y": 140.46800231933594 + "x": 938.4000244140625, + "y": 136.1060028076172 }, { "x": 935.6339721679688, @@ -4820,8 +4820,8 @@ "y": -63.79100036621094 }, { - "x": 893.208984375, - "y": -57.57699966430664 + "x": 895.1649780273438, + "y": -63.08100128173828 }, { "x": 896.5590209960938, @@ -5160,8 +5160,8 @@ "y": -78.54499816894531 }, { - "x": 1715.3590087890625, - "y": -83.60800170898438 + "x": 1718.126953125, + "y": -78.46499633789062 }, { "x": 1720.0989990234375, @@ -5492,8 +5492,8 @@ "y": 156.90899658203125 }, { - "x": 1694.9930419921875, - "y": 151.53199768066406 + "x": 1690.9420166015625, + "y": 155.73899841308594 }, { "x": 1688.0570068359375, @@ -5832,8 +5832,8 @@ "y": 199.88099670410156 }, { - "x": 1462.3590087890625, - "y": 202.8470001220703 + "x": 1457.1510009765625, + "y": 200.20199584960938 }, { "x": 1453.4420166015625, @@ -6160,8 +6160,8 @@ "y": -5.065999984741211 }, { - "x": 1344.64794921875, - "y": 1.0920000076293945 + "x": 1345.489013671875, + "y": -4.686999797821045 }, { "x": 1346.0880126953125, diff --git a/e2etests/testdata/txtar/cycle-diagram/dagre/sketch.exp.svg b/e2etests/testdata/txtar/cycle-diagram/dagre/sketch.exp.svg index 966687b6b4..b1b31e77f0 100644 --- a/e2etests/testdata/txtar/cycle-diagram/dagre/sketch.exp.svg +++ b/e2etests/testdata/txtar/cycle-diagram/dagre/sketch.exp.svg @@ -1,9 +1,9 @@ -abcdabcababcdefabcde + .d2-3510071088 .fill-N1{fill:#0A0F25;} + .d2-3510071088 .fill-N2{fill:#676C7E;} + .d2-3510071088 .fill-N3{fill:#9499AB;} + .d2-3510071088 .fill-N4{fill:#CFD2DD;} + .d2-3510071088 .fill-N5{fill:#DEE1EB;} + .d2-3510071088 .fill-N6{fill:#EEF1F8;} + .d2-3510071088 .fill-N7{fill:#FFFFFF;} + .d2-3510071088 .fill-B1{fill:#0D32B2;} + .d2-3510071088 .fill-B2{fill:#0D32B2;} + .d2-3510071088 .fill-B3{fill:#E3E9FD;} + .d2-3510071088 .fill-B4{fill:#E3E9FD;} + .d2-3510071088 .fill-B5{fill:#EDF0FD;} + .d2-3510071088 .fill-B6{fill:#F7F8FE;} + .d2-3510071088 .fill-AA2{fill:#4A6FF3;} + .d2-3510071088 .fill-AA4{fill:#EDF0FD;} + .d2-3510071088 .fill-AA5{fill:#F7F8FE;} + .d2-3510071088 .fill-AB4{fill:#EDF0FD;} + .d2-3510071088 .fill-AB5{fill:#F7F8FE;} + .d2-3510071088 .stroke-N1{stroke:#0A0F25;} + .d2-3510071088 .stroke-N2{stroke:#676C7E;} + .d2-3510071088 .stroke-N3{stroke:#9499AB;} + .d2-3510071088 .stroke-N4{stroke:#CFD2DD;} + .d2-3510071088 .stroke-N5{stroke:#DEE1EB;} + .d2-3510071088 .stroke-N6{stroke:#EEF1F8;} + .d2-3510071088 .stroke-N7{stroke:#FFFFFF;} + .d2-3510071088 .stroke-B1{stroke:#0D32B2;} + .d2-3510071088 .stroke-B2{stroke:#0D32B2;} + .d2-3510071088 .stroke-B3{stroke:#E3E9FD;} + .d2-3510071088 .stroke-B4{stroke:#E3E9FD;} + .d2-3510071088 .stroke-B5{stroke:#EDF0FD;} + .d2-3510071088 .stroke-B6{stroke:#F7F8FE;} + .d2-3510071088 .stroke-AA2{stroke:#4A6FF3;} + .d2-3510071088 .stroke-AA4{stroke:#EDF0FD;} + .d2-3510071088 .stroke-AA5{stroke:#F7F8FE;} + .d2-3510071088 .stroke-AB4{stroke:#EDF0FD;} + .d2-3510071088 .stroke-AB5{stroke:#F7F8FE;} + .d2-3510071088 .background-color-N1{background-color:#0A0F25;} + .d2-3510071088 .background-color-N2{background-color:#676C7E;} + .d2-3510071088 .background-color-N3{background-color:#9499AB;} + .d2-3510071088 .background-color-N4{background-color:#CFD2DD;} + .d2-3510071088 .background-color-N5{background-color:#DEE1EB;} + .d2-3510071088 .background-color-N6{background-color:#EEF1F8;} + .d2-3510071088 .background-color-N7{background-color:#FFFFFF;} + .d2-3510071088 .background-color-B1{background-color:#0D32B2;} + .d2-3510071088 .background-color-B2{background-color:#0D32B2;} + .d2-3510071088 .background-color-B3{background-color:#E3E9FD;} + .d2-3510071088 .background-color-B4{background-color:#E3E9FD;} + .d2-3510071088 .background-color-B5{background-color:#EDF0FD;} + .d2-3510071088 .background-color-B6{background-color:#F7F8FE;} + .d2-3510071088 .background-color-AA2{background-color:#4A6FF3;} + .d2-3510071088 .background-color-AA4{background-color:#EDF0FD;} + .d2-3510071088 .background-color-AA5{background-color:#F7F8FE;} + .d2-3510071088 .background-color-AB4{background-color:#EDF0FD;} + .d2-3510071088 .background-color-AB5{background-color:#F7F8FE;} + .d2-3510071088 .color-N1{color:#0A0F25;} + .d2-3510071088 .color-N2{color:#676C7E;} + .d2-3510071088 .color-N3{color:#9499AB;} + .d2-3510071088 .color-N4{color:#CFD2DD;} + .d2-3510071088 .color-N5{color:#DEE1EB;} + .d2-3510071088 .color-N6{color:#EEF1F8;} + .d2-3510071088 .color-N7{color:#FFFFFF;} + .d2-3510071088 .color-B1{color:#0D32B2;} + .d2-3510071088 .color-B2{color:#0D32B2;} + .d2-3510071088 .color-B3{color:#E3E9FD;} + .d2-3510071088 .color-B4{color:#E3E9FD;} + .d2-3510071088 .color-B5{color:#EDF0FD;} + .d2-3510071088 .color-B6{color:#F7F8FE;} + .d2-3510071088 .color-AA2{color:#4A6FF3;} + .d2-3510071088 .color-AA4{color:#EDF0FD;} + .d2-3510071088 .color-AA5{color:#F7F8FE;} + .d2-3510071088 .color-AB4{color:#EDF0FD;} + .d2-3510071088 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker-d2-3510071088);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker-d2-3510071088);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright-d2-3510071088);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright-d2-3510071088);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright-d2-3510071088);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright-d2-3510071088);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark-d2-3510071088);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright-d2-3510071088);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright-d2-3510071088);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright-d2-3510071088);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright-d2-3510071088);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker-d2-3510071088);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark-d2-3510071088);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal-d2-3510071088);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal-d2-3510071088);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright-d2-3510071088);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright-d2-3510071088);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright-d2-3510071088);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>abcdabcababcdefabcde diff --git a/e2etests/testdata/txtar/cycle-diagram/elk/board.exp.json b/e2etests/testdata/txtar/cycle-diagram/elk/board.exp.json index 112d4573c0..bc4abcf553 100644 --- a/e2etests/testdata/txtar/cycle-diagram/elk/board.exp.json +++ b/e2etests/testdata/txtar/cycle-diagram/elk/board.exp.json @@ -1408,8 +1408,8 @@ "y": -25.47599983215332 }, { - "x": 207.6020050048828, - "y": -30.86199951171875 + "x": 208.5659942626953, + "y": -25.10099983215332 }, { "x": 209.2519989013672, @@ -1772,8 +1772,8 @@ "y": 209.53700256347656 }, { - "x": 48.4109992980957, - "y": 208.90499877929688 + "x": 42.62200164794922, + "y": 209.6790008544922 }, { "x": 38.5, @@ -2136,8 +2136,8 @@ "y": 49.47600173950195 }, { - "x": -183.6020050048828, - "y": 54.86199951171875 + "x": -184.5659942626953, + "y": 49.10100173950195 }, { "x": -185.2519989013672, @@ -2516,8 +2516,8 @@ "y": 123.8030014038086 }, { - "x": 677.2830200195312, - "y": 119.5770034790039 + "x": 675.3259887695312, + "y": 125.08100128173828 }, { "x": 673.9329833984375, @@ -2880,8 +2880,8 @@ "y": 198.90899658203125 }, { - "x": 342.7919921875, - "y": 202.46800231933594 + "x": 338.9079895019531, + "y": 198.1060028076172 }, { "x": 336.1419982910156, @@ -3284,8 +3284,8 @@ "y": 208.45700073242188 }, { - "x": 941.3209838867188, - "y": 208.89300537109375 + "x": 936.197021484375, + "y": 209.53700256347656 }, { "x": 931.4099731445312, @@ -3596,8 +3596,8 @@ "y": -123.375 }, { - "x": 1120.625, - "y": -128.46800231933594 + "x": 1124.509033203125, + "y": -124.10600280761719 }, { "x": 1127.2750244140625, @@ -3896,8 +3896,8 @@ "y": 75.79100036621094 }, { - "x": 1169.7010498046875, - "y": 69.5770034790039 + "x": 1167.7440185546875, + "y": 75.08100128173828 }, { "x": 1166.3509521484375, @@ -4208,8 +4208,8 @@ "y": 209.85400390625 }, { - "x": 1014.8179931640625, - "y": 208.8179931640625 + "x": 1009.031005859375, + "y": 209.6060028076172 }, { "x": 1004.9099731445312, @@ -4520,8 +4520,8 @@ "y": 147.375 }, { - "x": 835.1950073242188, - "y": 152.46800231933594 + "x": 831.3099975585938, + "y": 148.1060028076172 }, { "x": 828.5449829101562, @@ -4820,8 +4820,8 @@ "y": -51.79100036621094 }, { - "x": 786.1190185546875, - "y": -45.57699966430664 + "x": 788.0750122070312, + "y": -51.08100128173828 }, { "x": 789.468994140625, @@ -5160,8 +5160,8 @@ "y": -67.4469985961914 }, { - "x": 1568.678955078125, - "y": -72.51000213623047 + "x": 1571.447998046875, + "y": -67.36699676513672 }, { "x": 1573.4189453125, @@ -5492,8 +5492,8 @@ "y": 168.0070037841797 }, { - "x": 1548.31396484375, - "y": 162.6300048828125 + "x": 1544.261962890625, + "y": 166.83799743652344 }, { "x": 1541.376953125, @@ -5832,8 +5832,8 @@ "y": 210.97900390625 }, { - "x": 1315.678955078125, - "y": 213.94500732421875 + "x": 1310.470947265625, + "y": 211.30099487304688 }, { "x": 1306.762939453125, @@ -6160,8 +6160,8 @@ "y": 6.031000137329102 }, { - "x": 1197.968994140625, - "y": 12.1899995803833 + "x": 1198.81005859375, + "y": 6.409999847412109 }, { "x": 1199.4090576171875, diff --git a/e2etests/testdata/txtar/cycle-diagram/elk/sketch.exp.svg b/e2etests/testdata/txtar/cycle-diagram/elk/sketch.exp.svg index a1eaa35770..35f09dec2b 100644 --- a/e2etests/testdata/txtar/cycle-diagram/elk/sketch.exp.svg +++ b/e2etests/testdata/txtar/cycle-diagram/elk/sketch.exp.svg @@ -1,9 +1,9 @@ -abcdabcababcdefabcde + .d2-2546323388 .fill-N1{fill:#0A0F25;} + .d2-2546323388 .fill-N2{fill:#676C7E;} + .d2-2546323388 .fill-N3{fill:#9499AB;} + .d2-2546323388 .fill-N4{fill:#CFD2DD;} + .d2-2546323388 .fill-N5{fill:#DEE1EB;} + .d2-2546323388 .fill-N6{fill:#EEF1F8;} + .d2-2546323388 .fill-N7{fill:#FFFFFF;} + .d2-2546323388 .fill-B1{fill:#0D32B2;} + .d2-2546323388 .fill-B2{fill:#0D32B2;} + .d2-2546323388 .fill-B3{fill:#E3E9FD;} + .d2-2546323388 .fill-B4{fill:#E3E9FD;} + .d2-2546323388 .fill-B5{fill:#EDF0FD;} + .d2-2546323388 .fill-B6{fill:#F7F8FE;} + .d2-2546323388 .fill-AA2{fill:#4A6FF3;} + .d2-2546323388 .fill-AA4{fill:#EDF0FD;} + .d2-2546323388 .fill-AA5{fill:#F7F8FE;} + .d2-2546323388 .fill-AB4{fill:#EDF0FD;} + .d2-2546323388 .fill-AB5{fill:#F7F8FE;} + .d2-2546323388 .stroke-N1{stroke:#0A0F25;} + .d2-2546323388 .stroke-N2{stroke:#676C7E;} + .d2-2546323388 .stroke-N3{stroke:#9499AB;} + .d2-2546323388 .stroke-N4{stroke:#CFD2DD;} + .d2-2546323388 .stroke-N5{stroke:#DEE1EB;} + .d2-2546323388 .stroke-N6{stroke:#EEF1F8;} + .d2-2546323388 .stroke-N7{stroke:#FFFFFF;} + .d2-2546323388 .stroke-B1{stroke:#0D32B2;} + .d2-2546323388 .stroke-B2{stroke:#0D32B2;} + .d2-2546323388 .stroke-B3{stroke:#E3E9FD;} + .d2-2546323388 .stroke-B4{stroke:#E3E9FD;} + .d2-2546323388 .stroke-B5{stroke:#EDF0FD;} + .d2-2546323388 .stroke-B6{stroke:#F7F8FE;} + .d2-2546323388 .stroke-AA2{stroke:#4A6FF3;} + .d2-2546323388 .stroke-AA4{stroke:#EDF0FD;} + .d2-2546323388 .stroke-AA5{stroke:#F7F8FE;} + .d2-2546323388 .stroke-AB4{stroke:#EDF0FD;} + .d2-2546323388 .stroke-AB5{stroke:#F7F8FE;} + .d2-2546323388 .background-color-N1{background-color:#0A0F25;} + .d2-2546323388 .background-color-N2{background-color:#676C7E;} + .d2-2546323388 .background-color-N3{background-color:#9499AB;} + .d2-2546323388 .background-color-N4{background-color:#CFD2DD;} + .d2-2546323388 .background-color-N5{background-color:#DEE1EB;} + .d2-2546323388 .background-color-N6{background-color:#EEF1F8;} + .d2-2546323388 .background-color-N7{background-color:#FFFFFF;} + .d2-2546323388 .background-color-B1{background-color:#0D32B2;} + .d2-2546323388 .background-color-B2{background-color:#0D32B2;} + .d2-2546323388 .background-color-B3{background-color:#E3E9FD;} + .d2-2546323388 .background-color-B4{background-color:#E3E9FD;} + .d2-2546323388 .background-color-B5{background-color:#EDF0FD;} + .d2-2546323388 .background-color-B6{background-color:#F7F8FE;} + .d2-2546323388 .background-color-AA2{background-color:#4A6FF3;} + .d2-2546323388 .background-color-AA4{background-color:#EDF0FD;} + .d2-2546323388 .background-color-AA5{background-color:#F7F8FE;} + .d2-2546323388 .background-color-AB4{background-color:#EDF0FD;} + .d2-2546323388 .background-color-AB5{background-color:#F7F8FE;} + .d2-2546323388 .color-N1{color:#0A0F25;} + .d2-2546323388 .color-N2{color:#676C7E;} + .d2-2546323388 .color-N3{color:#9499AB;} + .d2-2546323388 .color-N4{color:#CFD2DD;} + .d2-2546323388 .color-N5{color:#DEE1EB;} + .d2-2546323388 .color-N6{color:#EEF1F8;} + .d2-2546323388 .color-N7{color:#FFFFFF;} + .d2-2546323388 .color-B1{color:#0D32B2;} + .d2-2546323388 .color-B2{color:#0D32B2;} + .d2-2546323388 .color-B3{color:#E3E9FD;} + .d2-2546323388 .color-B4{color:#E3E9FD;} + .d2-2546323388 .color-B5{color:#EDF0FD;} + .d2-2546323388 .color-B6{color:#F7F8FE;} + .d2-2546323388 .color-AA2{color:#4A6FF3;} + .d2-2546323388 .color-AA4{color:#EDF0FD;} + .d2-2546323388 .color-AA5{color:#F7F8FE;} + .d2-2546323388 .color-AB4{color:#EDF0FD;} + .d2-2546323388 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker-d2-2546323388);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker-d2-2546323388);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright-d2-2546323388);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright-d2-2546323388);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright-d2-2546323388);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright-d2-2546323388);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark-d2-2546323388);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright-d2-2546323388);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright-d2-2546323388);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright-d2-2546323388);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright-d2-2546323388);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker-d2-2546323388);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark-d2-2546323388);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal-d2-2546323388);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal-d2-2546323388);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright-d2-2546323388);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright-d2-2546323388);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright-d2-2546323388);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>abcdabcababcdefabcde From 95e0aaedd9e8b52746de2283f4486e71c8967e79 Mon Sep 17 00:00:00 2001 From: Mayank Mohapatra <125661248+Mayank77maruti@users.noreply.github.com> Date: Sat, 8 Mar 2025 11:02:38 +0000 Subject: [PATCH 70/73] try --- d2layouts/d2cycle/layout.go | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/d2layouts/d2cycle/layout.go b/d2layouts/d2cycle/layout.go index 73f6635517..fbe855391b 100644 --- a/d2layouts/d2cycle/layout.go +++ b/d2layouts/d2cycle/layout.go @@ -39,7 +39,12 @@ func Layout(ctx context.Context, g *d2graph.Graph, layout d2graph.LayoutGraph) e return nil } +// calculateRadius now guards against a division-by-zero error when there is only one object. func calculateRadius(objects []*d2graph.Object) float64 { + if len(objects) < 2 { + // When there is a single object, we can simply use MIN_RADIUS. + return MIN_RADIUS + } numObjects := float64(len(objects)) maxSize := 0.0 for _, obj := range objects { From dfc4e4bc3d691468a56d272ec04a41f9d1a72c0d Mon Sep 17 00:00:00 2001 From: Mayank Mohapatra <125661248+Mayank77maruti@users.noreply.github.com> Date: Sat, 8 Mar 2025 11:05:04 +0000 Subject: [PATCH 71/73] try --- d2layouts/d2cycle/layout.go | 16 +- .../txtar/cycle-diagram/dagre/board.exp.json | 4876 +++++++++-------- .../txtar/cycle-diagram/dagre/sketch.exp.svg | 194 +- .../txtar/cycle-diagram/elk/board.exp.json | 4876 +++++++++-------- .../txtar/cycle-diagram/elk/sketch.exp.svg | 194 +- 5 files changed, 5237 insertions(+), 4919 deletions(-) diff --git a/d2layouts/d2cycle/layout.go b/d2layouts/d2cycle/layout.go index fbe855391b..b1943b9eb9 100644 --- a/d2layouts/d2cycle/layout.go +++ b/d2layouts/d2cycle/layout.go @@ -39,10 +39,11 @@ func Layout(ctx context.Context, g *d2graph.Graph, layout d2graph.LayoutGraph) e return nil } -// calculateRadius now guards against a division-by-zero error when there is only one object. +// calculateRadius computes the required radius such that the chord between +// adjacent objects is at least (maxSize + 2*PADDING). We multiply the resulting +// radius by 1.1 (10% extra) to provide additional separation and avoid overlapping. func calculateRadius(objects []*d2graph.Object) float64 { if len(objects) < 2 { - // When there is a single object, we can simply use MIN_RADIUS. return MIN_RADIUS } numObjects := float64(len(objects)) @@ -51,8 +52,13 @@ func calculateRadius(objects []*d2graph.Object) float64 { size := math.Max(obj.Box.Width, obj.Box.Height) maxSize = math.Max(maxSize, size) } + // The chord between adjacent centers is 2*radius*sin(π/n). To ensure that + // chord >= maxSize + 2*PADDING, we require: + // radius >= (maxSize/2 + PADDING) / sin(π/n) minRadius := (maxSize/2.0 + PADDING) / math.Sin(math.Pi/numObjects) - return math.Max(minRadius, MIN_RADIUS) + // Use MIN_RADIUS as a lower bound and then add a 10% extra margin. + radius := math.Max(minRadius, MIN_RADIUS) + return radius * 1.1 } func positionObjects(objects []*d2graph.Object, radius float64) { @@ -60,7 +66,7 @@ func positionObjects(objects []*d2graph.Object, radius float64) { angleOffset := -math.Pi / 2 for i, obj := range objects { - angle := angleOffset + (2 * math.Pi * float64(i) / numObjects) + angle := angleOffset + (2*math.Pi*float64(i)/numObjects) x := radius * math.Cos(angle) y := radius * math.Sin(angle) obj.TopLeft = geo.NewPoint( @@ -167,7 +173,7 @@ func clampPointOutsideBox(box *geo.Box, path []*geo.Point, startIdx int) (int, * } return i, path[i] } - return len(path) - 1, path[len(path)-1] + return len(path)-1, path[len(path)-1] } // clampPointOutsideBoxReverse works similarly but in reverse order. diff --git a/e2etests/testdata/txtar/cycle-diagram/dagre/board.exp.json b/e2etests/testdata/txtar/cycle-diagram/dagre/board.exp.json index a44184a6d5..d35a95a783 100644 --- a/e2etests/testdata/txtar/cycle-diagram/dagre/board.exp.json +++ b/e2etests/testdata/txtar/cycle-diagram/dagre/board.exp.json @@ -18,8 +18,8 @@ "x": 0, "y": 0 }, - "width": 453, - "height": 466, + "width": 493, + "height": 506, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -57,7 +57,7 @@ "type": "rectangle", "pos": { "x": -26, - "y": -233 + "y": -253 }, "width": 53, "height": 66, @@ -98,7 +98,7 @@ "id": "1.b", "type": "rectangle", "pos": { - "x": 173, + "x": 193, "y": -33 }, "width": 53, @@ -141,7 +141,7 @@ "type": "rectangle", "pos": { "x": -26, - "y": 167 + "y": 187 }, "width": 53, "height": 66, @@ -182,7 +182,7 @@ "id": "1.d", "type": "rectangle", "pos": { - "x": -227, + "x": -247, "y": -32 }, "width": 54, @@ -224,11 +224,11 @@ "id": "2", "type": "cycle", "pos": { - "x": 513, - "y": 50 + "x": 553, + "y": 55 }, - "width": 399, - "height": 366, + "width": 434, + "height": 396, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -265,8 +265,8 @@ "id": "2.a", "type": "rectangle", "pos": { - "x": 486, - "y": -183 + "x": 526, + "y": -198 }, "width": 53, "height": 66, @@ -307,8 +307,8 @@ "id": "2.b", "type": "rectangle", "pos": { - "x": 659, - "y": 116 + "x": 717, + "y": 131 }, "width": 53, "height": 66, @@ -349,8 +349,8 @@ "id": "2.c", "type": "rectangle", "pos": { - "x": 313, - "y": 117 + "x": 335, + "y": 132 }, "width": 53, "height": 66, @@ -391,11 +391,11 @@ "id": "3", "type": "cycle", "pos": { - "x": 972, + "x": 1047, "y": 0 }, "width": 53, - "height": 466, + "height": 506, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -432,8 +432,8 @@ "id": "3.a", "type": "rectangle", "pos": { - "x": 945, - "y": -233 + "x": 1020, + "y": -253 }, "width": 53, "height": 66, @@ -474,8 +474,8 @@ "id": "3.b", "type": "rectangle", "pos": { - "x": 945, - "y": 167 + "x": 1020, + "y": 187 }, "width": 53, "height": 66, @@ -516,11 +516,11 @@ "id": "4", "type": "cycle", "pos": { - "x": 1085, + "x": 1160, "y": 0 }, - "width": 399, - "height": 466, + "width": 434, + "height": 506, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -557,8 +557,8 @@ "id": "4.a", "type": "rectangle", "pos": { - "x": 1058, - "y": -233 + "x": 1133, + "y": -253 }, "width": 53, "height": 66, @@ -599,8 +599,8 @@ "id": "4.b", "type": "rectangle", "pos": { - "x": 1231, - "y": -133 + "x": 1324, + "y": -143 }, "width": 53, "height": 66, @@ -641,8 +641,8 @@ "id": "4.c", "type": "rectangle", "pos": { - "x": 1231, - "y": 66 + "x": 1324, + "y": 76 }, "width": 53, "height": 66, @@ -683,8 +683,8 @@ "id": "4.d", "type": "rectangle", "pos": { - "x": 1058, - "y": 167 + "x": 1133, + "y": 187 }, "width": 54, "height": 66, @@ -725,8 +725,8 @@ "id": "4.e", "type": "rectangle", "pos": { - "x": 885, - "y": 67 + "x": 942, + "y": 77 }, "width": 53, "height": 66, @@ -767,8 +767,8 @@ "id": "4.f", "type": "rectangle", "pos": { - "x": 886, - "y": -133 + "x": 943, + "y": -143 }, "width": 51, "height": 66, @@ -809,11 +809,11 @@ "id": "5", "type": "cycle", "pos": { - "x": 1544, - "y": 20 + "x": 1654, + "y": 22 }, - "width": 433, - "height": 427, + "width": 471, + "height": 463, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -850,8 +850,8 @@ "id": "5.a", "type": "rectangle", "pos": { - "x": 1517, - "y": -213 + "x": 1627, + "y": -231 }, "width": 53, "height": 66, @@ -892,8 +892,8 @@ "id": "5.b", "type": "rectangle", "pos": { - "x": 1707, - "y": -74 + "x": 1836, + "y": -78 }, "width": 53, "height": 66, @@ -934,8 +934,8 @@ "id": "5.c", "type": "rectangle", "pos": { - "x": 1635, - "y": 148 + "x": 1756, + "y": 166 }, "width": 53, "height": 66, @@ -976,8 +976,8 @@ "id": "5.d", "type": "rectangle", "pos": { - "x": 1399, - "y": 148 + "x": 1497, + "y": 166 }, "width": 54, "height": 66, @@ -1018,8 +1018,8 @@ "id": "5.e", "type": "rectangle", "pos": { - "x": 1327, - "y": -74 + "x": 1418, + "y": -78 }, "width": 53, "height": 66, @@ -1085,334 +1085,342 @@ "route": [ { "x": 26.5, - "y": -198.22999572753906 + "y": -218.39199829101562 }, { - "x": 28.18000030517578, - "y": -198.00399780273438 + "x": 27.572999954223633, + "y": -218.26499938964844 }, { - "x": 31.285999298095703, - "y": -197.53700256347656 + "x": 30.99799919128418, + "y": -217.80499267578125 }, { - "x": 34.3849983215332, - "y": -197.02099609375 + "x": 34.415000915527344, + "y": -217.29100036621094 }, { - "x": 37.47600173950195, - "y": -196.45700073242188 + "x": 37.82400131225586, + "y": -216.7239990234375 }, { - "x": 40.55699920654297, - "y": -195.843994140625 + "x": 41.222999572753906, + "y": -216.10299682617188 }, { - "x": 43.62799835205078, - "y": -195.18299865722656 + "x": 44.612998962402344, + "y": -215.4290008544922 }, { - "x": 46.68899917602539, - "y": -194.47300720214844 + "x": 47.99100112915039, + "y": -214.7010040283203 }, { - "x": 49.73699951171875, - "y": -193.71600341796875 + "x": 51.356998443603516, + "y": -213.92100524902344 }, { - "x": 52.77399826049805, - "y": -192.91099548339844 + "x": 54.71099853515625, + "y": -213.08799743652344 }, { - "x": 55.79800033569336, - "y": -192.05799865722656 + "x": 58.051998138427734, + "y": -212.20199584960938 }, { - "x": 58.80799865722656, - "y": -191.1580047607422 + "x": 61.37799835205078, + "y": -211.26400756835938 }, { - "x": 61.803001403808594, - "y": -190.21099853515625 + "x": 64.68800354003906, + "y": -210.2740020751953 }, { - "x": 64.78299713134766, - "y": -189.2169952392578 + "x": 67.98300170898438, + "y": -209.23199462890625 }, { - "x": 67.74700164794922, - "y": -188.17599487304688 + "x": 71.26100158691406, + "y": -208.13800048828125 }, { - "x": 70.69400024414062, - "y": -187.08799743652344 + "x": 74.52200317382812, + "y": -206.9929962158203 }, { - "x": 73.6240005493164, - "y": -185.9550018310547 + "x": 77.76399993896484, + "y": -205.7969970703125 }, { - "x": 76.53600311279297, - "y": -184.77499389648438 + "x": 80.98699951171875, + "y": -204.5500030517578 }, { - "x": 79.42900085449219, - "y": -183.5500030517578 + "x": 84.19000244140625, + "y": -203.2530059814453 }, { - "x": 82.302001953125, - "y": -182.27999877929688 + "x": 87.37200164794922, + "y": -201.906005859375 }, { - "x": 85.15499877929688, - "y": -180.96499633789062 + "x": 90.53299713134766, + "y": -200.50799560546875 }, { - "x": 87.98699951171875, - "y": -179.60499572753906 + "x": 93.6709976196289, + "y": -199.06100463867188 }, { - "x": 90.7979965209961, - "y": -178.2010040283203 + "x": 96.78600311279297, + "y": -197.5659942626953 }, { - "x": 93.58499908447266, - "y": -176.7530059814453 + "x": 99.87699890136719, + "y": -196.02099609375 }, { - "x": 96.3499984741211, - "y": -175.26100158691406 + "x": 102.94400024414062, + "y": -194.42799377441406 }, { - "x": 99.09100341796875, - "y": -173.7259979248047 + "x": 105.98500061035156, + "y": -192.78700256347656 }, { - "x": 101.80799865722656, - "y": -172.1479949951172 + "x": 109, + "y": -191.09800720214844 }, { - "x": 104.4990005493164, - "y": -170.5279998779297 + "x": 111.98899841308594, + "y": -189.36300659179688 }, { - "x": 107.16500091552734, - "y": -168.86500549316406 + "x": 114.9489974975586, + "y": -187.5800018310547 }, { - "x": 109.80400085449219, - "y": -167.16099548339844 + "x": 117.88099670410156, + "y": -185.7519989013672 }, { - "x": 112.41600036621094, - "y": -165.41600036621094 + "x": 120.78500366210938, + "y": -183.8769989013672 }, { - "x": 115.0009994506836, - "y": -163.62899780273438 + "x": 123.65799713134766, + "y": -181.95700073242188 }, { - "x": 117.55699920654297, - "y": -161.80299377441406 + "x": 126.5009994506836, + "y": -179.99200439453125 }, { - "x": 120.08399963378906, - "y": -159.93600463867188 + "x": 129.31199645996094, + "y": -177.98300170898438 }, { - "x": 122.58100128173828, - "y": -158.031005859375 + "x": 132.0919952392578, + "y": -175.92999267578125 }, { - "x": 125.0479965209961, - "y": -156.08599853515625 + "x": 134.83900451660156, + "y": -173.83399963378906 }, { - "x": 127.48400115966797, - "y": -154.1020050048828 + "x": 137.55299377441406, + "y": -171.69400024414062 }, { - "x": 129.88900756835938, - "y": -152.08099365234375 + "x": 140.23300170898438, + "y": -169.51199340820312 }, { - "x": 132.26199340820312, - "y": -150.02200317382812 + "x": 142.8780059814453, + "y": -167.28900146484375 }, { - "x": 134.6020050048828, - "y": -147.92599487304688 + "x": 145.48800659179688, + "y": -165.0240020751953 }, { - "x": 136.90899658203125, - "y": -145.79299926757812 + "x": 148.06199645996094, + "y": -162.71800231933594 }, { - "x": 139.1820068359375, - "y": -143.625 + "x": 150.60000610351562, + "y": -160.3730010986328 }, { - "x": 141.42100524902344, - "y": -141.42100524902344 + "x": 153.10000610351562, + "y": -157.98699951171875 }, { - "x": 143.625, - "y": -139.1820068359375 + "x": 155.56300354003906, + "y": -155.56300354003906 }, { - "x": 145.79299926757812, - "y": -136.90899658203125 + "x": 157.98699951171875, + "y": -153.10000610351562 }, { - "x": 147.92599487304688, - "y": -134.6020050048828 + "x": 160.3730010986328, + "y": -150.60000610351562 }, { - "x": 150.02200317382812, - "y": -132.26199340820312 + "x": 162.71800231933594, + "y": -148.06199645996094 }, { - "x": 152.08099365234375, - "y": -129.88900756835938 + "x": 165.0240020751953, + "y": -145.48800659179688 }, { - "x": 154.1020050048828, - "y": -127.48400115966797 + "x": 167.28900146484375, + "y": -142.8780059814453 }, { - "x": 156.08599853515625, - "y": -125.0479965209961 + "x": 169.51199340820312, + "y": -140.23300170898438 }, { - "x": 158.031005859375, - "y": -122.58100128173828 + "x": 171.69400024414062, + "y": -137.55299377441406 }, { - "x": 159.93600463867188, - "y": -120.08399963378906 + "x": 173.83399963378906, + "y": -134.83900451660156 }, { - "x": 161.80299377441406, - "y": -117.55699920654297 + "x": 175.92999267578125, + "y": -132.0919952392578 }, { - "x": 163.62899780273438, - "y": -115.0009994506836 + "x": 177.98300170898438, + "y": -129.31199645996094 }, { - "x": 165.41600036621094, - "y": -112.41600036621094 + "x": 179.99200439453125, + "y": -126.5009994506836 }, { - "x": 167.16099548339844, - "y": -109.80400085449219 + "x": 181.95700073242188, + "y": -123.65799713134766 }, { - "x": 168.86500549316406, - "y": -107.16500091552734 + "x": 183.8769989013672, + "y": -120.78500366210938 }, { - "x": 170.5279998779297, - "y": -104.4990005493164 + "x": 185.7519989013672, + "y": -117.88099670410156 }, { - "x": 172.1479949951172, - "y": -101.80799865722656 + "x": 187.5800018310547, + "y": -114.9489974975586 }, { - "x": 173.7259979248047, - "y": -99.09100341796875 + "x": 189.36300659179688, + "y": -111.98899841308594 }, { - "x": 175.26100158691406, - "y": -96.3499984741211 + "x": 191.09800720214844, + "y": -109 }, { - "x": 176.7530059814453, - "y": -93.58499908447266 + "x": 192.78700256347656, + "y": -105.98500061035156 }, { - "x": 178.2010040283203, - "y": -90.7979965209961 + "x": 194.42799377441406, + "y": -102.94400024414062 }, { - "x": 179.60499572753906, - "y": -87.98699951171875 + "x": 196.02099609375, + "y": -99.87699890136719 }, { - "x": 180.96499633789062, - "y": -85.15499877929688 + "x": 197.5659942626953, + "y": -96.78600311279297 }, { - "x": 182.27999877929688, - "y": -82.302001953125 + "x": 199.06100463867188, + "y": -93.6709976196289 }, { - "x": 183.5500030517578, - "y": -79.42900085449219 + "x": 200.50799560546875, + "y": -90.53299713134766 }, { - "x": 184.77499389648438, - "y": -76.53600311279297 + "x": 201.906005859375, + "y": -87.37200164794922 }, { - "x": 185.9550018310547, - "y": -73.6240005493164 + "x": 203.2530059814453, + "y": -84.19000244140625 }, { - "x": 187.08799743652344, - "y": -70.69400024414062 + "x": 204.5500030517578, + "y": -80.98699951171875 }, { - "x": 188.17599487304688, - "y": -67.74700164794922 + "x": 205.7969970703125, + "y": -77.76399993896484 }, { - "x": 189.2169952392578, - "y": -64.78299713134766 + "x": 206.9929962158203, + "y": -74.52200317382812 }, { - "x": 190.21099853515625, - "y": -61.803001403808594 + "x": 208.13800048828125, + "y": -71.26100158691406 }, { - "x": 191.1580047607422, - "y": -58.80799865722656 + "x": 209.23199462890625, + "y": -67.98300170898438 }, { - "x": 192.05799865722656, - "y": -55.79800033569336 + "x": 210.2740020751953, + "y": -64.68800354003906 }, { - "x": 192.91099548339844, - "y": -52.77399826049805 + "x": 211.26400756835938, + "y": -61.37799835205078 }, { - "x": 193.71600341796875, - "y": -49.73699951171875 + "x": 212.20199584960938, + "y": -58.051998138427734 }, { - "x": 194.47300720214844, - "y": -46.68899917602539 + "x": 213.08799743652344, + "y": -54.71099853515625 }, { - "x": 195.18299865722656, - "y": -43.62799835205078 + "x": 213.92100524902344, + "y": -51.356998443603516 }, { - "x": 195.843994140625, - "y": -40.55699920654297 + "x": 214.7010040283203, + "y": -47.99100112915039 }, { - "x": 196.45700073242188, - "y": -37.47600173950195 + "x": 215.4290008544922, + "y": -44.612998962402344 }, { - "x": 196.5659942626953, - "y": -37.10100173950195 + "x": 216.10299682617188, + "y": -41.222999572753906 }, { - "x": 197.2519989013672, + "x": 216.7239990234375, + "y": -37.82400131225586 + }, + { + "x": 216.8800048828125, + "y": -37.111000061035156 + }, + { + "x": 217.50399780273438, "y": -33 } ], @@ -1448,336 +1456,344 @@ "link": "", "route": [ { - "x": 197.2519989013672, + "x": 217.50399780273438, "y": 33 }, { - "x": 197.02099609375, - "y": 34.3849983215332 + "x": 217.29100036621094, + "y": 34.415000915527344 + }, + { + "x": 216.7239990234375, + "y": 37.82400131225586 + }, + { + "x": 216.10299682617188, + "y": 41.222999572753906 }, { - "x": 196.45700073242188, - "y": 37.47600173950195 + "x": 215.4290008544922, + "y": 44.612998962402344 }, { - "x": 195.843994140625, - "y": 40.55699920654297 + "x": 214.7010040283203, + "y": 47.99100112915039 }, { - "x": 195.18299865722656, - "y": 43.62799835205078 + "x": 213.92100524902344, + "y": 51.356998443603516 }, { - "x": 194.47300720214844, - "y": 46.68899917602539 + "x": 213.08799743652344, + "y": 54.71099853515625 }, { - "x": 193.71600341796875, - "y": 49.73699951171875 + "x": 212.20199584960938, + "y": 58.051998138427734 }, { - "x": 192.91099548339844, - "y": 52.77399826049805 + "x": 211.26400756835938, + "y": 61.37799835205078 }, { - "x": 192.05799865722656, - "y": 55.79800033569336 + "x": 210.2740020751953, + "y": 64.68800354003906 }, { - "x": 191.1580047607422, - "y": 58.80799865722656 + "x": 209.23199462890625, + "y": 67.98300170898438 }, { - "x": 190.21099853515625, - "y": 61.803001403808594 + "x": 208.13800048828125, + "y": 71.26100158691406 }, { - "x": 189.2169952392578, - "y": 64.78299713134766 + "x": 206.9929962158203, + "y": 74.52200317382812 }, { - "x": 188.17599487304688, - "y": 67.74700164794922 + "x": 205.7969970703125, + "y": 77.76399993896484 }, { - "x": 187.08799743652344, - "y": 70.69400024414062 + "x": 204.5500030517578, + "y": 80.98699951171875 }, { - "x": 185.9550018310547, - "y": 73.6240005493164 + "x": 203.2530059814453, + "y": 84.19000244140625 }, { - "x": 184.77499389648438, - "y": 76.53600311279297 + "x": 201.906005859375, + "y": 87.37200164794922 }, { - "x": 183.5500030517578, - "y": 79.42900085449219 + "x": 200.50799560546875, + "y": 90.53299713134766 }, { - "x": 182.27999877929688, - "y": 82.302001953125 + "x": 199.06100463867188, + "y": 93.6709976196289 }, { - "x": 180.96499633789062, - "y": 85.15499877929688 + "x": 197.5659942626953, + "y": 96.78600311279297 }, { - "x": 179.60499572753906, - "y": 87.98699951171875 + "x": 196.02099609375, + "y": 99.87699890136719 }, { - "x": 178.2010040283203, - "y": 90.7979965209961 + "x": 194.42799377441406, + "y": 102.94400024414062 }, { - "x": 176.7530059814453, - "y": 93.58499908447266 + "x": 192.78700256347656, + "y": 105.98500061035156 }, { - "x": 175.26100158691406, - "y": 96.3499984741211 + "x": 191.09800720214844, + "y": 109 }, { - "x": 173.7259979248047, - "y": 99.09100341796875 + "x": 189.36300659179688, + "y": 111.98899841308594 }, { - "x": 172.1479949951172, - "y": 101.80799865722656 + "x": 187.5800018310547, + "y": 114.9489974975586 }, { - "x": 170.5279998779297, - "y": 104.4990005493164 + "x": 185.7519989013672, + "y": 117.88099670410156 }, { - "x": 168.86500549316406, - "y": 107.16500091552734 + "x": 183.8769989013672, + "y": 120.78500366210938 }, { - "x": 167.16099548339844, - "y": 109.80400085449219 + "x": 181.95700073242188, + "y": 123.65799713134766 }, { - "x": 165.41600036621094, - "y": 112.41600036621094 + "x": 179.99200439453125, + "y": 126.5009994506836 }, { - "x": 163.62899780273438, - "y": 115.0009994506836 + "x": 177.98300170898438, + "y": 129.31199645996094 }, { - "x": 161.80299377441406, - "y": 117.55699920654297 + "x": 175.92999267578125, + "y": 132.0919952392578 }, { - "x": 159.93600463867188, - "y": 120.08399963378906 + "x": 173.83399963378906, + "y": 134.83900451660156 }, { - "x": 158.031005859375, - "y": 122.58100128173828 + "x": 171.69400024414062, + "y": 137.55299377441406 }, { - "x": 156.08599853515625, - "y": 125.0479965209961 + "x": 169.51199340820312, + "y": 140.23300170898438 }, { - "x": 154.1020050048828, - "y": 127.48400115966797 + "x": 167.28900146484375, + "y": 142.8780059814453 }, { - "x": 152.08099365234375, - "y": 129.88900756835938 + "x": 165.0240020751953, + "y": 145.48800659179688 }, { - "x": 150.02200317382812, - "y": 132.26199340820312 + "x": 162.71800231933594, + "y": 148.06199645996094 }, { - "x": 147.92599487304688, - "y": 134.6020050048828 + "x": 160.3730010986328, + "y": 150.60000610351562 }, { - "x": 145.79299926757812, - "y": 136.90899658203125 + "x": 157.98699951171875, + "y": 153.10000610351562 }, { - "x": 143.625, - "y": 139.1820068359375 + "x": 155.56300354003906, + "y": 155.56300354003906 }, { - "x": 141.42100524902344, - "y": 141.42100524902344 + "x": 153.10000610351562, + "y": 157.98699951171875 }, { - "x": 139.1820068359375, - "y": 143.625 + "x": 150.60000610351562, + "y": 160.3730010986328 }, { - "x": 136.90899658203125, - "y": 145.79299926757812 + "x": 148.06199645996094, + "y": 162.71800231933594 }, { - "x": 134.6020050048828, - "y": 147.92599487304688 + "x": 145.48800659179688, + "y": 165.0240020751953 }, { - "x": 132.26199340820312, - "y": 150.02200317382812 + "x": 142.8780059814453, + "y": 167.28900146484375 }, { - "x": 129.88900756835938, - "y": 152.08099365234375 + "x": 140.23300170898438, + "y": 169.51199340820312 }, { - "x": 127.48400115966797, - "y": 154.1020050048828 + "x": 137.55299377441406, + "y": 171.69400024414062 }, { - "x": 125.0479965209961, - "y": 156.08599853515625 + "x": 134.83900451660156, + "y": 173.83399963378906 }, { - "x": 122.58100128173828, - "y": 158.031005859375 + "x": 132.0919952392578, + "y": 175.92999267578125 }, { - "x": 120.08399963378906, - "y": 159.93600463867188 + "x": 129.31199645996094, + "y": 177.98300170898438 }, { - "x": 117.55699920654297, - "y": 161.80299377441406 + "x": 126.5009994506836, + "y": 179.99200439453125 }, { - "x": 115.0009994506836, - "y": 163.62899780273438 + "x": 123.65799713134766, + "y": 181.95700073242188 }, { - "x": 112.41600036621094, - "y": 165.41600036621094 + "x": 120.78500366210938, + "y": 183.8769989013672 }, { - "x": 109.80400085449219, - "y": 167.16099548339844 + "x": 117.88099670410156, + "y": 185.7519989013672 }, { - "x": 107.16500091552734, - "y": 168.86500549316406 + "x": 114.9489974975586, + "y": 187.5800018310547 }, { - "x": 104.4990005493164, - "y": 170.5279998779297 + "x": 111.98899841308594, + "y": 189.36300659179688 }, { - "x": 101.80799865722656, - "y": 172.1479949951172 + "x": 109, + "y": 191.09800720214844 }, { - "x": 99.09100341796875, - "y": 173.7259979248047 + "x": 105.98500061035156, + "y": 192.78700256347656 }, { - "x": 96.3499984741211, - "y": 175.26100158691406 + "x": 102.94400024414062, + "y": 194.42799377441406 }, { - "x": 93.58499908447266, - "y": 176.7530059814453 + "x": 99.87699890136719, + "y": 196.02099609375 }, { - "x": 90.7979965209961, - "y": 178.2010040283203 + "x": 96.78600311279297, + "y": 197.5659942626953 }, { - "x": 87.98699951171875, - "y": 179.60499572753906 + "x": 93.6709976196289, + "y": 199.06100463867188 }, { - "x": 85.15499877929688, - "y": 180.96499633789062 + "x": 90.53299713134766, + "y": 200.50799560546875 }, { - "x": 82.302001953125, - "y": 182.27999877929688 + "x": 87.37200164794922, + "y": 201.906005859375 }, { - "x": 79.42900085449219, - "y": 183.5500030517578 + "x": 84.19000244140625, + "y": 203.2530059814453 }, { - "x": 76.53600311279297, - "y": 184.77499389648438 + "x": 80.98699951171875, + "y": 204.5500030517578 }, { - "x": 73.6240005493164, - "y": 185.9550018310547 + "x": 77.76399993896484, + "y": 205.7969970703125 }, { - "x": 70.69400024414062, - "y": 187.08799743652344 + "x": 74.52200317382812, + "y": 206.9929962158203 }, { - "x": 67.74700164794922, - "y": 188.17599487304688 + "x": 71.26100158691406, + "y": 208.13800048828125 }, { - "x": 64.78299713134766, - "y": 189.2169952392578 + "x": 67.98300170898438, + "y": 209.23199462890625 }, { - "x": 61.803001403808594, - "y": 190.21099853515625 + "x": 64.68800354003906, + "y": 210.2740020751953 }, { - "x": 58.80799865722656, - "y": 191.1580047607422 + "x": 61.37799835205078, + "y": 211.26400756835938 }, { - "x": 55.79800033569336, - "y": 192.05799865722656 + "x": 58.051998138427734, + "y": 212.20199584960938 }, { - "x": 52.77399826049805, - "y": 192.91099548339844 + "x": 54.71099853515625, + "y": 213.08799743652344 }, { - "x": 49.73699951171875, - "y": 193.71600341796875 + "x": 51.356998443603516, + "y": 213.92100524902344 }, { - "x": 46.68899917602539, - "y": 194.47300720214844 + "x": 47.99100112915039, + "y": 214.7010040283203 }, { - "x": 43.62799835205078, - "y": 195.18299865722656 + "x": 44.612998962402344, + "y": 215.4290008544922 }, { - "x": 40.55699920654297, - "y": 195.843994140625 + "x": 41.222999572753906, + "y": 216.10299682617188 }, { - "x": 37.47600173950195, - "y": 196.45700073242188 + "x": 37.82400131225586, + "y": 216.7239990234375 }, { - "x": 34.3849983215332, - "y": 197.02099609375 + "x": 34.415000915527344, + "y": 217.29100036621094 }, { - "x": 31.285999298095703, - "y": 197.53700256347656 + "x": 30.99799919128418, + "y": 217.80499267578125 }, { - "x": 30.621999740600586, - "y": 197.6790008544922 + "x": 30.628000259399414, + "y": 217.89100646972656 }, { "x": 26.5, - "y": 198.22999572753906 + "y": 218.39199829101562 } ], "isCurve": true, @@ -1813,334 +1829,342 @@ "route": [ { "x": -26.499000549316406, - "y": 198.22999572753906 + "y": 218.39199829101562 + }, + { + "x": -27.572999954223633, + "y": 218.26499938964844 }, { - "x": -28.18000030517578, - "y": 198.00399780273438 + "x": -30.99799919128418, + "y": 217.80499267578125 }, { - "x": -31.285999298095703, - "y": 197.53700256347656 + "x": -34.415000915527344, + "y": 217.29100036621094 }, { - "x": -34.3849983215332, - "y": 197.02099609375 + "x": -37.82400131225586, + "y": 216.7239990234375 }, { - "x": -37.47600173950195, - "y": 196.45700073242188 + "x": -41.222999572753906, + "y": 216.10299682617188 }, { - "x": -40.55699920654297, - "y": 195.843994140625 + "x": -44.612998962402344, + "y": 215.4290008544922 }, { - "x": -43.62799835205078, - "y": 195.18299865722656 + "x": -47.99100112915039, + "y": 214.7010040283203 }, { - "x": -46.68899917602539, - "y": 194.47300720214844 + "x": -51.356998443603516, + "y": 213.92100524902344 }, { - "x": -49.73699951171875, - "y": 193.71600341796875 + "x": -54.71099853515625, + "y": 213.08799743652344 }, { - "x": -52.77399826049805, - "y": 192.91099548339844 + "x": -58.051998138427734, + "y": 212.20199584960938 }, { - "x": -55.79800033569336, - "y": 192.05799865722656 + "x": -61.37799835205078, + "y": 211.26400756835938 }, { - "x": -58.80799865722656, - "y": 191.1580047607422 + "x": -64.68800354003906, + "y": 210.2740020751953 }, { - "x": -61.803001403808594, - "y": 190.21099853515625 + "x": -67.98300170898438, + "y": 209.23199462890625 }, { - "x": -64.78299713134766, - "y": 189.2169952392578 + "x": -71.26100158691406, + "y": 208.13800048828125 }, { - "x": -67.74700164794922, - "y": 188.17599487304688 + "x": -74.52200317382812, + "y": 206.9929962158203 }, { - "x": -70.69400024414062, - "y": 187.08799743652344 + "x": -77.76399993896484, + "y": 205.7969970703125 }, { - "x": -73.6240005493164, - "y": 185.9550018310547 + "x": -80.98699951171875, + "y": 204.5500030517578 }, { - "x": -76.53600311279297, - "y": 184.77499389648438 + "x": -84.19000244140625, + "y": 203.2530059814453 }, { - "x": -79.42900085449219, - "y": 183.5500030517578 + "x": -87.37200164794922, + "y": 201.906005859375 }, { - "x": -82.302001953125, - "y": 182.27999877929688 + "x": -90.53299713134766, + "y": 200.50799560546875 }, { - "x": -85.15499877929688, - "y": 180.96499633789062 + "x": -93.6709976196289, + "y": 199.06100463867188 }, { - "x": -87.98699951171875, - "y": 179.60499572753906 + "x": -96.78600311279297, + "y": 197.5659942626953 }, { - "x": -90.7979965209961, - "y": 178.2010040283203 + "x": -99.87699890136719, + "y": 196.02099609375 }, { - "x": -93.58499908447266, - "y": 176.7530059814453 + "x": -102.94400024414062, + "y": 194.42799377441406 }, { - "x": -96.3499984741211, - "y": 175.26100158691406 + "x": -105.98500061035156, + "y": 192.78700256347656 }, { - "x": -99.09100341796875, - "y": 173.7259979248047 + "x": -109, + "y": 191.09800720214844 }, { - "x": -101.80799865722656, - "y": 172.1479949951172 + "x": -111.98899841308594, + "y": 189.36300659179688 }, { - "x": -104.4990005493164, - "y": 170.5279998779297 + "x": -114.9489974975586, + "y": 187.5800018310547 }, { - "x": -107.16500091552734, - "y": 168.86500549316406 + "x": -117.88099670410156, + "y": 185.7519989013672 }, { - "x": -109.80400085449219, - "y": 167.16099548339844 + "x": -120.78500366210938, + "y": 183.8769989013672 }, { - "x": -112.41600036621094, - "y": 165.41600036621094 + "x": -123.65799713134766, + "y": 181.95700073242188 }, { - "x": -115.0009994506836, - "y": 163.62899780273438 + "x": -126.5009994506836, + "y": 179.99200439453125 }, { - "x": -117.55699920654297, - "y": 161.80299377441406 + "x": -129.31199645996094, + "y": 177.98300170898438 }, { - "x": -120.08399963378906, - "y": 159.93600463867188 + "x": -132.0919952392578, + "y": 175.92999267578125 }, { - "x": -122.58100128173828, - "y": 158.031005859375 + "x": -134.83900451660156, + "y": 173.83399963378906 }, { - "x": -125.0479965209961, - "y": 156.08599853515625 + "x": -137.55299377441406, + "y": 171.69400024414062 }, { - "x": -127.48400115966797, - "y": 154.1020050048828 + "x": -140.23300170898438, + "y": 169.51199340820312 }, { - "x": -129.88900756835938, - "y": 152.08099365234375 + "x": -142.8780059814453, + "y": 167.28900146484375 }, { - "x": -132.26199340820312, - "y": 150.02200317382812 + "x": -145.48800659179688, + "y": 165.0240020751953 }, { - "x": -134.6020050048828, - "y": 147.92599487304688 + "x": -148.06199645996094, + "y": 162.71800231933594 }, { - "x": -136.90899658203125, - "y": 145.79299926757812 + "x": -150.60000610351562, + "y": 160.3730010986328 }, { - "x": -139.1820068359375, - "y": 143.625 + "x": -153.10000610351562, + "y": 157.98699951171875 }, { - "x": -141.42100524902344, - "y": 141.42100524902344 + "x": -155.56300354003906, + "y": 155.56300354003906 }, { - "x": -143.625, - "y": 139.1820068359375 + "x": -157.98699951171875, + "y": 153.10000610351562 }, { - "x": -145.79299926757812, - "y": 136.90899658203125 + "x": -160.3730010986328, + "y": 150.60000610351562 }, { - "x": -147.92599487304688, - "y": 134.6020050048828 + "x": -162.71800231933594, + "y": 148.06199645996094 }, { - "x": -150.02200317382812, - "y": 132.26199340820312 + "x": -165.0240020751953, + "y": 145.48800659179688 }, { - "x": -152.08099365234375, - "y": 129.88900756835938 + "x": -167.28900146484375, + "y": 142.8780059814453 }, { - "x": -154.1020050048828, - "y": 127.48400115966797 + "x": -169.51199340820312, + "y": 140.23300170898438 }, { - "x": -156.08599853515625, - "y": 125.0479965209961 + "x": -171.69400024414062, + "y": 137.55299377441406 }, { - "x": -158.031005859375, - "y": 122.58100128173828 + "x": -173.83399963378906, + "y": 134.83900451660156 }, { - "x": -159.93600463867188, - "y": 120.08399963378906 + "x": -175.92999267578125, + "y": 132.0919952392578 }, { - "x": -161.80299377441406, - "y": 117.55699920654297 + "x": -177.98300170898438, + "y": 129.31199645996094 }, { - "x": -163.62899780273438, - "y": 115.0009994506836 + "x": -179.99200439453125, + "y": 126.5009994506836 }, { - "x": -165.41600036621094, - "y": 112.41600036621094 + "x": -181.95700073242188, + "y": 123.65799713134766 }, { - "x": -167.16099548339844, - "y": 109.80400085449219 + "x": -183.8769989013672, + "y": 120.78500366210938 }, { - "x": -168.86500549316406, - "y": 107.16500091552734 + "x": -185.7519989013672, + "y": 117.88099670410156 }, { - "x": -170.5279998779297, - "y": 104.4990005493164 + "x": -187.5800018310547, + "y": 114.9489974975586 }, { - "x": -172.1479949951172, - "y": 101.80799865722656 + "x": -189.36300659179688, + "y": 111.98899841308594 }, { - "x": -173.7259979248047, - "y": 99.09100341796875 + "x": -191.09800720214844, + "y": 109 }, { - "x": -175.26100158691406, - "y": 96.3499984741211 + "x": -192.78700256347656, + "y": 105.98500061035156 }, { - "x": -176.7530059814453, - "y": 93.58499908447266 + "x": -194.42799377441406, + "y": 102.94400024414062 }, { - "x": -178.2010040283203, - "y": 90.7979965209961 + "x": -196.02099609375, + "y": 99.87699890136719 }, { - "x": -179.60499572753906, - "y": 87.98699951171875 + "x": -197.5659942626953, + "y": 96.78600311279297 }, { - "x": -180.96499633789062, - "y": 85.15499877929688 + "x": -199.06100463867188, + "y": 93.6709976196289 }, { - "x": -182.27999877929688, - "y": 82.302001953125 + "x": -200.50799560546875, + "y": 90.53299713134766 }, { - "x": -183.5500030517578, - "y": 79.42900085449219 + "x": -201.906005859375, + "y": 87.37200164794922 }, { - "x": -184.77499389648438, - "y": 76.53600311279297 + "x": -203.2530059814453, + "y": 84.19000244140625 }, { - "x": -185.9550018310547, - "y": 73.6240005493164 + "x": -204.5500030517578, + "y": 80.98699951171875 }, { - "x": -187.08799743652344, - "y": 70.69400024414062 + "x": -205.7969970703125, + "y": 77.76399993896484 }, { - "x": -188.17599487304688, - "y": 67.74700164794922 + "x": -206.9929962158203, + "y": 74.52200317382812 }, { - "x": -189.2169952392578, - "y": 64.78299713134766 + "x": -208.13800048828125, + "y": 71.26100158691406 }, { - "x": -190.21099853515625, - "y": 61.803001403808594 + "x": -209.23199462890625, + "y": 67.98300170898438 }, { - "x": -191.1580047607422, - "y": 58.80799865722656 + "x": -210.2740020751953, + "y": 64.68800354003906 }, { - "x": -192.05799865722656, - "y": 55.79800033569336 + "x": -211.26400756835938, + "y": 61.37799835205078 }, { - "x": -192.91099548339844, - "y": 52.77399826049805 + "x": -212.20199584960938, + "y": 58.051998138427734 }, { - "x": -193.71600341796875, - "y": 49.73699951171875 + "x": -213.08799743652344, + "y": 54.71099853515625 }, { - "x": -194.47300720214844, - "y": 46.68899917602539 + "x": -213.92100524902344, + "y": 51.356998443603516 }, { - "x": -195.18299865722656, - "y": 43.62799835205078 + "x": -214.7010040283203, + "y": 47.99100112915039 }, { - "x": -195.843994140625, - "y": 40.55699920654297 + "x": -215.4290008544922, + "y": 44.612998962402344 }, { - "x": -196.45700073242188, - "y": 37.47600173950195 + "x": -216.10299682617188, + "y": 41.222999572753906 }, { - "x": -196.5659942626953, - "y": 37.10100173950195 + "x": -216.7239990234375, + "y": 37.82400131225586 }, { - "x": -197.2519989013672, + "x": -216.8800048828125, + "y": 37.111000061035156 + }, + { + "x": -217.50399780273438, "y": 33 } ], @@ -2176,352 +2200,360 @@ "link": "", "route": [ { - "x": 539.5, - "y": -148.2259979248047 + "x": 579.5, + "y": -163.38900756835938 + }, + { + "x": 580.572998046875, + "y": -163.26499938964844 + }, + { + "x": 585.1380004882812, + "y": -162.63900756835938 }, { - "x": 542.2160034179688, - "y": -147.85400390625 + "x": 589.6890258789062, + "y": -161.91900634765625 }, { - "x": 546.35302734375, - "y": -147.19900512695312 + "x": 594.2230224609375, + "y": -161.10299682617188 }, { - "x": 550.4760131835938, - "y": -146.45700073242188 + "x": 598.739990234375, + "y": -160.19200134277344 }, { - "x": 554.5819702148438, - "y": -145.62899780273438 + "x": 603.2369995117188, + "y": -159.18699645996094 }, { - "x": 558.6699829101562, - "y": -144.71499633789062 + "x": 607.7109985351562, + "y": -158.08799743652344 }, { - "x": 562.7369995117188, - "y": -143.71600341796875 + "x": 612.1619873046875, + "y": -156.89500427246094 }, { - "x": 566.7830200195312, - "y": -142.6320037841797 + "x": 616.5859985351562, + "y": -155.61000061035156 }, { - "x": 570.8060302734375, - "y": -141.46299743652344 + "x": 620.9829711914062, + "y": -154.23199462890625 }, { - "x": 574.802978515625, - "y": -140.21099853515625 + "x": 625.3499755859375, + "y": -152.76199340820312 }, { - "x": 578.7730102539062, - "y": -138.875 + "x": 629.6849975585938, + "y": -151.20199584960938 }, { - "x": 582.7139892578125, - "y": -137.45599365234375 + "x": 633.9869995117188, + "y": -149.5500030517578 }, { - "x": 586.6240234375, - "y": -135.9550018310547 + "x": 638.2529907226562, + "y": -147.8090057373047 }, { - "x": 590.5029907226562, - "y": -134.3719940185547 + "x": 642.4819946289062, + "y": -145.97999572753906 }, { - "x": 594.3469848632812, - "y": -132.70899963378906 + "x": 646.6710205078125, + "y": -144.06100463867188 }, { - "x": 598.155029296875, - "y": -130.96499633789062 + "x": 650.8189697265625, + "y": -142.05599975585938 }, { - "x": 601.927001953125, - "y": -129.14199829101562 + "x": 654.9249877929688, + "y": -139.96400451660156 }, { - "x": 605.6589965820312, - "y": -127.23999786376953 + "x": 658.9849853515625, + "y": -137.78700256347656 }, { - "x": 609.3499755859375, - "y": -125.26100158691406 + "x": 663, + "y": -135.52499389648438 }, { - "x": 613, - "y": -123.20500183105469 + "x": 666.9650268554688, + "y": -133.17999267578125 }, { - "x": 616.60498046875, - "y": -121.0719985961914 + "x": 670.8809814453125, + "y": -130.7519989013672 }, { - "x": 620.1649780273438, - "y": -118.86499786376953 + "x": 674.7459716796875, + "y": -128.24200439453125 }, { - "x": 623.677978515625, - "y": -116.58399963378906 + "x": 678.5560302734375, + "y": -125.6520004272461 }, { - "x": 627.1420288085938, - "y": -114.22899627685547 + "x": 682.31201171875, + "y": -122.98300170898438 }, { - "x": 630.5570068359375, - "y": -111.8030014038086 + "x": 686.010986328125, + "y": -120.23600006103516 }, { - "x": 633.9190063476562, - "y": -109.30500030517578 + "x": 689.6519775390625, + "y": -117.41200256347656 }, { - "x": 637.22900390625, - "y": -106.73799896240234 + "x": 693.2329711914062, + "y": -114.51200103759766 }, { - "x": 640.4840087890625, - "y": -104.10199737548828 + "x": 696.7520141601562, + "y": -111.53800201416016 }, { - "x": 643.6840209960938, - "y": -101.39900207519531 + "x": 700.2080078125, + "y": -108.49099731445312 }, { - "x": 646.8259887695312, - "y": -98.62799835205078 + "x": 703.5999755859375, + "y": -105.37300109863281 }, { - "x": 649.9089965820312, - "y": -95.79299926757812 + "x": 706.9249877929688, + "y": -102.18299865722656 }, { - "x": 652.9320068359375, - "y": -92.89399719238281 + "x": 710.1829833984375, + "y": -98.92500305175781 }, { - "x": 655.8939819335938, - "y": -89.93199920654297 + "x": 713.3729858398438, + "y": -95.5999984741211 }, { - "x": 658.7930297851562, - "y": -86.90899658203125 + "x": 716.4910278320312, + "y": -92.20800018310547 }, { - "x": 661.6279907226562, - "y": -83.82599639892578 + "x": 719.5380249023438, + "y": -88.75199890136719 }, { - "x": 664.3989868164062, - "y": -80.68399810791016 + "x": 722.5120239257812, + "y": -85.23300170898438 }, { - "x": 667.1019897460938, - "y": -77.48400115966797 + "x": 725.4119873046875, + "y": -81.6520004272461 }, { - "x": 669.7379760742188, - "y": -74.22899627685547 + "x": 728.2360229492188, + "y": -78.01100158691406 }, { - "x": 672.3049926757812, - "y": -70.91899871826172 + "x": 730.9829711914062, + "y": -74.31199645996094 }, { - "x": 674.802978515625, - "y": -67.55699920654297 + "x": 733.6519775390625, + "y": -70.55599975585938 }, { - "x": 677.22900390625, - "y": -64.14199829101562 + "x": 736.2420043945312, + "y": -66.74600219726562 }, { - "x": 679.583984375, - "y": -60.678001403808594 + "x": 738.7520141601562, + "y": -62.88100051879883 }, { - "x": 681.864990234375, - "y": -57.165000915527344 + "x": 741.1799926757812, + "y": -58.96500015258789 }, { - "x": 684.072021484375, - "y": -53.60499954223633 + "x": 743.5250244140625, + "y": -55 }, { - "x": 686.2050170898438, - "y": -50 + "x": 745.7869873046875, + "y": -50.98500061035156 }, { - "x": 688.260986328125, - "y": -46.349998474121094 + "x": 747.9639892578125, + "y": -46.92499923706055 }, { - "x": 690.239990234375, - "y": -42.659000396728516 + "x": 750.0560302734375, + "y": -42.819000244140625 }, { - "x": 692.1420288085938, - "y": -38.926998138427734 + "x": 752.0609741210938, + "y": -38.67100143432617 }, { - "x": 693.9650268554688, - "y": -35.154998779296875 + "x": 753.97998046875, + "y": -34.481998443603516 }, { - "x": 695.708984375, - "y": -31.347000122070312 + "x": 755.8090209960938, + "y": -30.253000259399414 }, { - "x": 697.3720092773438, - "y": -27.503000259399414 + "x": 757.5499877929688, + "y": -25.98699951171875 }, { - "x": 698.9550170898438, - "y": -23.624000549316406 + "x": 759.2020263671875, + "y": -21.684999465942383 }, { - "x": 700.4559936523438, - "y": -19.714000701904297 + "x": 760.7620239257812, + "y": -17.350000381469727 }, { - "x": 701.875, - "y": -15.77299976348877 + "x": 762.2319946289062, + "y": -12.982999801635742 }, { - "x": 703.2109985351562, - "y": -11.803000450134277 + "x": 763.6099853515625, + "y": -8.586000442504883 }, { - "x": 704.4630126953125, - "y": -7.806000232696533 + "x": 764.89501953125, + "y": -4.1620001792907715 }, { - "x": 705.6320190429688, - "y": -3.7829999923706055 + "x": 766.0880126953125, + "y": 0.2879999876022339 }, { - "x": 706.7160034179688, - "y": 0.2619999945163727 + "x": 767.18701171875, + "y": 4.76200008392334 }, { - "x": 707.7150268554688, - "y": 4.328999996185303 + "x": 768.1920166015625, + "y": 9.258999824523926 }, { - "x": 708.6290283203125, - "y": 8.416999816894531 + "x": 769.10302734375, + "y": 13.776000022888184 }, { - "x": 709.4569702148438, - "y": 12.52299976348877 + "x": 769.9190063476562, + "y": 18.309999465942383 }, { - "x": 710.198974609375, - "y": 16.645999908447266 + "x": 770.6389770507812, + "y": 22.861000061035156 }, { - "x": 710.85400390625, - "y": 20.783000946044922 + "x": 771.2650146484375, + "y": 27.426000595092773 }, { - "x": 711.4219970703125, - "y": 24.933000564575195 + "x": 771.7940063476562, + "y": 32.00299835205078 }, { - "x": 711.9039916992188, - "y": 29.0939998626709 + "x": 772.22802734375, + "y": 36.59000015258789 }, { - "x": 712.2979736328125, - "y": 33.263999938964844 + "x": 772.5650024414062, + "y": 41.18600082397461 }, { - "x": 712.60498046875, - "y": 37.441001892089844 + "x": 772.8070068359375, + "y": 45.7869987487793 }, { - "x": 712.823974609375, - "y": 41.624000549316406 + "x": 772.9509887695312, + "y": 50.391998291015625 }, { - "x": 712.9559936523438, - "y": 45.81100082397461 + "x": 773, + "y": 55 }, { - "x": 713, - "y": 50 + "x": 772.9509887695312, + "y": 59.606998443603516 }, { - "x": 712.9559936523438, - "y": 54.1879997253418 + "x": 772.8070068359375, + "y": 64.21199798583984 }, { - "x": 712.823974609375, - "y": 58.375 + "x": 772.5650024414062, + "y": 68.81300354003906 }, { - "x": 712.60498046875, - "y": 62.55799865722656 + "x": 772.22802734375, + "y": 73.40899658203125 }, { - "x": 712.2979736328125, - "y": 66.73500061035156 + "x": 771.7940063476562, + "y": 77.99600219726562 }, { - "x": 711.9039916992188, - "y": 70.90499877929688 + "x": 771.2650146484375, + "y": 82.572998046875 }, { - "x": 711.4219970703125, - "y": 75.06600189208984 + "x": 770.6389770507812, + "y": 87.13800048828125 }, { - "x": 710.85400390625, - "y": 79.21600341796875 + "x": 769.9190063476562, + "y": 91.68900299072266 }, { - "x": 710.198974609375, - "y": 83.35299682617188 + "x": 769.10302734375, + "y": 96.2229995727539 }, { - "x": 709.4569702148438, - "y": 87.47599792480469 + "x": 768.1920166015625, + "y": 100.73999786376953 }, { - "x": 708.6290283203125, - "y": 91.58200073242188 + "x": 767.18701171875, + "y": 105.23699951171875 }, { - "x": 707.7150268554688, - "y": 95.66999816894531 + "x": 766.0880126953125, + "y": 109.71099853515625 }, { - "x": 706.7160034179688, - "y": 99.73699951171875 + "x": 764.89501953125, + "y": 114.16200256347656 }, { - "x": 705.6320190429688, - "y": 103.78299713134766 + "x": 763.6099853515625, + "y": 118.58599853515625 }, { - "x": 704.4630126953125, - "y": 107.80599975585938 + "x": 762.2319946289062, + "y": 122.98300170898438 }, { - "x": 703.2109985351562, - "y": 111.8030014038086 + "x": 760.7620239257812, + "y": 127.3499984741211 }, { - "x": 702.8259887695312, - "y": 113.08100128173828 + "x": 760.5369873046875, + "y": 128.10400390625 }, { - "x": 701.4329833984375, - "y": 116.9990005493164 + "x": 759.0809936523438, + "y": 131.99899291992188 } ], "isCurve": true, @@ -2556,336 +2588,344 @@ "link": "", "route": [ { - "x": 662.3569946289062, - "y": 182.99899291992188 + "x": 720.1740112304688, + "y": 197.99899291992188 + }, + { + "x": 719.5380249023438, + "y": 198.7519989013672 + }, + { + "x": 716.4910278320312, + "y": 202.20799255371094 }, { - "x": 661.6279907226562, - "y": 183.8260040283203 + "x": 713.3729858398438, + "y": 205.60000610351562 }, { - "x": 658.7930297851562, - "y": 186.90899658203125 + "x": 710.1829833984375, + "y": 208.9250030517578 }, { - "x": 655.8939819335938, - "y": 189.9320068359375 + "x": 706.9249877929688, + "y": 212.18299865722656 }, { - "x": 652.9320068359375, - "y": 192.8939971923828 + "x": 703.5999755859375, + "y": 215.3730010986328 }, { - "x": 649.9089965820312, - "y": 195.79299926757812 + "x": 700.2080078125, + "y": 218.49099731445312 }, { - "x": 646.8259887695312, - "y": 198.6280059814453 + "x": 696.7520141601562, + "y": 221.53799438476562 }, { - "x": 643.6840209960938, - "y": 201.3990020751953 + "x": 693.2329711914062, + "y": 224.51199340820312 }, { - "x": 640.4840087890625, - "y": 204.1020050048828 + "x": 689.6519775390625, + "y": 227.41200256347656 }, { - "x": 637.22900390625, - "y": 206.73800659179688 + "x": 686.010986328125, + "y": 230.23599243164062 }, { - "x": 633.9190063476562, - "y": 209.30499267578125 + "x": 682.31201171875, + "y": 232.98300170898438 }, { - "x": 630.5570068359375, - "y": 211.80299377441406 + "x": 678.5560302734375, + "y": 235.65199279785156 }, { - "x": 627.1420288085938, - "y": 214.22900390625 + "x": 674.7459716796875, + "y": 238.24200439453125 }, { - "x": 623.677978515625, - "y": 216.58399963378906 + "x": 670.8809814453125, + "y": 240.7519989013672 }, { - "x": 620.1649780273438, - "y": 218.86500549316406 + "x": 666.9650268554688, + "y": 243.17999267578125 }, { - "x": 616.60498046875, - "y": 221.07200622558594 + "x": 663, + "y": 245.52499389648438 }, { - "x": 613, - "y": 223.2050018310547 + "x": 658.9849853515625, + "y": 247.78700256347656 }, { - "x": 609.3499755859375, - "y": 225.26100158691406 + "x": 654.9249877929688, + "y": 249.96400451660156 }, { - "x": 605.6589965820312, - "y": 227.24000549316406 + "x": 650.8189697265625, + "y": 252.05599975585938 }, { - "x": 601.927001953125, - "y": 229.14199829101562 + "x": 646.6710205078125, + "y": 254.06100463867188 }, { - "x": 598.155029296875, - "y": 230.96499633789062 + "x": 642.4819946289062, + "y": 255.97999572753906 }, { - "x": 594.3469848632812, - "y": 232.70899963378906 + "x": 638.2529907226562, + "y": 257.8089904785156 }, { - "x": 590.5029907226562, - "y": 234.3719940185547 + "x": 633.9869995117188, + "y": 259.54998779296875 }, { - "x": 586.6240234375, - "y": 235.9550018310547 + "x": 629.6849975585938, + "y": 261.2019958496094 }, { - "x": 582.7139892578125, - "y": 237.45599365234375 + "x": 625.3499755859375, + "y": 262.7619934082031 }, { - "x": 578.7730102539062, - "y": 238.875 + "x": 620.9829711914062, + "y": 264.23199462890625 }, { - "x": 574.802978515625, - "y": 240.21099853515625 + "x": 616.5859985351562, + "y": 265.6099853515625 }, { - "x": 570.8060302734375, - "y": 241.46299743652344 + "x": 612.1619873046875, + "y": 266.8949890136719 }, { - "x": 566.7830200195312, - "y": 242.6320037841797 + "x": 607.7109985351562, + "y": 268.0880126953125 }, { - "x": 562.7369995117188, - "y": 243.71600341796875 + "x": 603.2369995117188, + "y": 269.18701171875 }, { - "x": 558.6699829101562, - "y": 244.71499633789062 + "x": 598.739990234375, + "y": 270.1919860839844 }, { - "x": 554.5819702148438, - "y": 245.62899780273438 + "x": 594.2230224609375, + "y": 271.1029968261719 }, { - "x": 550.4760131835938, - "y": 246.45700073242188 + "x": 589.6890258789062, + "y": 271.91900634765625 }, { - "x": 546.35302734375, - "y": 247.19900512695312 + "x": 585.1380004882812, + "y": 272.6390075683594 }, { - "x": 542.2160034179688, - "y": 247.85400390625 + "x": 580.572998046875, + "y": 273.2650146484375 }, { - "x": 538.0659790039062, - "y": 248.4219970703125 + "x": 575.9959716796875, + "y": 273.79400634765625 }, { - "x": 533.905029296875, - "y": 248.9040069580078 + "x": 571.4089965820312, + "y": 274.2279968261719 }, { - "x": 529.7349853515625, - "y": 249.29800415039062 + "x": 566.81298828125, + "y": 274.56500244140625 }, { - "x": 525.5579833984375, - "y": 249.60499572753906 + "x": 562.2119750976562, + "y": 274.8070068359375 }, { - "x": 521.375, - "y": 249.82400512695312 + "x": 557.6069946289062, + "y": 274.95098876953125 }, { - "x": 517.18798828125, - "y": 249.95599365234375 + "x": 553, + "y": 275 }, { - "x": 513, - "y": 250 + "x": 548.3920288085938, + "y": 274.95098876953125 }, { - "x": 508.8110046386719, - "y": 249.95599365234375 + "x": 543.7869873046875, + "y": 274.8070068359375 }, { - "x": 504.6239929199219, - "y": 249.82400512695312 + "x": 539.1859741210938, + "y": 274.56500244140625 }, { - "x": 500.4410095214844, - "y": 249.60499572753906 + "x": 534.5900268554688, + "y": 274.2279968261719 }, { - "x": 496.2640075683594, - "y": 249.29800415039062 + "x": 530.0029907226562, + "y": 273.79400634765625 }, { - "x": 492.093994140625, - "y": 248.9040069580078 + "x": 525.426025390625, + "y": 273.2650146484375 }, { - "x": 487.9330139160156, - "y": 248.4219970703125 + "x": 520.8610229492188, + "y": 272.6390075683594 }, { - "x": 483.7829895019531, - "y": 247.85400390625 + "x": 516.3099975585938, + "y": 271.91900634765625 }, { - "x": 479.64599609375, - "y": 247.19900512695312 + "x": 511.7760009765625, + "y": 271.1029968261719 }, { - "x": 475.52301025390625, - "y": 246.45700073242188 + "x": 507.2590026855469, + "y": 270.1919860839844 }, { - "x": 471.4169921875, - "y": 245.62899780273438 + "x": 502.7619934082031, + "y": 269.18701171875 }, { - "x": 467.3290100097656, - "y": 244.71499633789062 + "x": 498.2879943847656, + "y": 268.0880126953125 }, { - "x": 463.2619934082031, - "y": 243.71600341796875 + "x": 493.8370056152344, + "y": 266.8949890136719 }, { - "x": 459.21600341796875, - "y": 242.6320037841797 + "x": 489.4129943847656, + "y": 265.6099853515625 }, { - "x": 455.1929931640625, - "y": 241.46299743652344 + "x": 485.0159912109375, + "y": 264.23199462890625 }, { - "x": 451.1960144042969, - "y": 240.21099853515625 + "x": 480.64898681640625, + "y": 262.7619934082031 }, { - "x": 447.22601318359375, - "y": 238.875 + "x": 476.3139953613281, + "y": 261.2019958496094 }, { - "x": 443.2850036621094, - "y": 237.45599365234375 + "x": 472.0119934082031, + "y": 259.54998779296875 }, { - "x": 439.375, - "y": 235.9550018310547 + "x": 467.7460021972656, + "y": 257.8089904785156 }, { - "x": 435.4960021972656, - "y": 234.3719940185547 + "x": 463.5169982910156, + "y": 255.97999572753906 }, { - "x": 431.6520080566406, - "y": 232.70899963378906 + "x": 459.3280029296875, + "y": 254.06100463867188 }, { - "x": 427.843994140625, - "y": 230.96499633789062 + "x": 455.17999267578125, + "y": 252.05599975585938 }, { - "x": 424.0719909667969, - "y": 229.14199829101562 + "x": 451.0740051269531, + "y": 249.96400451660156 }, { - "x": 420.3399963378906, - "y": 227.24000549316406 + "x": 447.0140075683594, + "y": 247.78700256347656 }, { - "x": 416.64898681640625, - "y": 225.26100158691406 + "x": 443, + "y": 245.52499389648438 }, { - "x": 413, - "y": 223.2050018310547 + "x": 439.03399658203125, + "y": 243.17999267578125 }, { - "x": 409.3940124511719, - "y": 221.07200622558594 + "x": 435.1180114746094, + "y": 240.7519989013672 }, { - "x": 405.8340148925781, - "y": 218.86500549316406 + "x": 431.25299072265625, + "y": 238.24200439453125 }, { - "x": 402.3210144042969, - "y": 216.58399963378906 + "x": 427.4429931640625, + "y": 235.65199279785156 }, { - "x": 398.85699462890625, - "y": 214.22900390625 + "x": 423.68701171875, + "y": 232.98300170898438 }, { - "x": 395.4419860839844, - "y": 211.80299377441406 + "x": 419.9880065917969, + "y": 230.23599243164062 }, { - "x": 392.0799865722656, - "y": 209.30499267578125 + "x": 416.34698486328125, + "y": 227.41200256347656 }, { - "x": 388.7699890136719, - "y": 206.73800659179688 + "x": 412.7659912109375, + "y": 224.51199340820312 }, { - "x": 385.5150146484375, - "y": 204.1020050048828 + "x": 409.24700927734375, + "y": 221.53799438476562 }, { - "x": 382.31500244140625, - "y": 201.3990020751953 + "x": 405.7909851074219, + "y": 218.49099731445312 }, { - "x": 379.1730041503906, - "y": 198.6280059814453 + "x": 402.39898681640625, + "y": 215.3730010986328 }, { - "x": 376.0899963378906, - "y": 195.79299926757812 + "x": 399.0740051269531, + "y": 212.18299865722656 }, { - "x": 373.0669860839844, - "y": 192.8939971923828 + "x": 395.8160095214844, + "y": 208.9250030517578 }, { - "x": 370.1050109863281, - "y": 189.9320068359375 + "x": 392.6260070800781, + "y": 205.60000610351562 }, { - "x": 367.20599365234375, - "y": 186.90899658203125 + "x": 389.50799560546875, + "y": 202.20799255371094 }, { - "x": 366.4079895019531, - "y": 186.1060028076172 + "x": 388.52801513671875, + "y": 201.16000366210938 }, { - "x": 363.6419982910156, - "y": 183 + "x": 385.82501220703125, + "y": 198 } ], "isCurve": true, @@ -2920,376 +2960,384 @@ "link": "", "route": [ { - "x": 998.5, - "y": -198.21800231933594 + "x": 1073.5, + "y": -218.38299560546875 }, { - "x": 1003.2860107421875, - "y": -197.53700256347656 + "x": 1074.572998046875, + "y": -218.26499938964844 }, { - "x": 1009.4760131835938, - "y": -196.45700073242188 + "x": 1081.4150390625, + "y": -217.29100036621094 }, { - "x": 1015.6279907226562, - "y": -195.18299865722656 + "x": 1088.2230224609375, + "y": -216.10299682617188 }, { - "x": 1021.7369995117188, - "y": -193.71600341796875 + "x": 1094.990966796875, + "y": -214.7010040283203 }, { - "x": 1027.7979736328125, - "y": -192.05799865722656 + "x": 1101.7110595703125, + "y": -213.08799743652344 }, { - "x": 1033.802978515625, - "y": -190.21099853515625 + "x": 1108.3780517578125, + "y": -211.26400756835938 }, { - "x": 1039.7469482421875, - "y": -188.17599487304688 + "x": 1114.9830322265625, + "y": -209.23199462890625 }, { - "x": 1045.6240234375, - "y": -185.9550018310547 + "x": 1121.52197265625, + "y": -206.9929962158203 }, { - "x": 1051.428955078125, - "y": -183.5500030517578 + "x": 1127.987060546875, + "y": -204.5500030517578 }, { - "x": 1057.155029296875, - "y": -180.96499633789062 + "x": 1134.3719482421875, + "y": -201.906005859375 }, { - "x": 1062.7979736328125, - "y": -178.2010040283203 + "x": 1140.6710205078125, + "y": -199.06100463867188 }, { - "x": 1068.3499755859375, - "y": -175.26100158691406 + "x": 1146.876953125, + "y": -196.02099609375 }, { - "x": 1073.8079833984375, - "y": -172.1479949951172 + "x": 1152.9849853515625, + "y": -192.78700256347656 }, { - "x": 1079.1650390625, - "y": -168.86500549316406 + "x": 1158.989013671875, + "y": -189.36300659179688 }, { - "x": 1084.416015625, - "y": -165.41600036621094 + "x": 1164.8809814453125, + "y": -185.7519989013672 }, { - "x": 1089.5570068359375, - "y": -161.80299377441406 + "x": 1170.657958984375, + "y": -181.95700073242188 }, { - "x": 1094.5810546875, - "y": -158.031005859375 + "x": 1176.31201171875, + "y": -177.98300170898438 }, { - "x": 1099.4840087890625, - "y": -154.1020050048828 + "x": 1181.8389892578125, + "y": -173.83399963378906 }, { - "x": 1104.261962890625, - "y": -150.02200317382812 + "x": 1187.2330322265625, + "y": -169.51199340820312 }, { - "x": 1108.9090576171875, - "y": -145.79299926757812 + "x": 1192.488037109375, + "y": -165.0240020751953 }, { - "x": 1113.4210205078125, - "y": -141.42100524902344 + "x": 1197.5999755859375, + "y": -160.3730010986328 }, { - "x": 1117.79296875, - "y": -136.90899658203125 + "x": 1202.56298828125, + "y": -155.56300354003906 }, { - "x": 1122.02197265625, - "y": -132.26199340820312 + "x": 1207.373046875, + "y": -150.60000610351562 }, { - "x": 1126.10205078125, - "y": -127.48400115966797 + "x": 1212.0240478515625, + "y": -145.48800659179688 }, { - "x": 1130.031005859375, - "y": -122.58100128173828 + "x": 1216.511962890625, + "y": -140.23300170898438 }, { - "x": 1133.802978515625, - "y": -117.55699920654297 + "x": 1220.833984375, + "y": -134.83900451660156 }, { - "x": 1137.416015625, - "y": -112.41600036621094 + "x": 1224.9830322265625, + "y": -129.31199645996094 }, { - "x": 1140.864990234375, - "y": -107.16500091552734 + "x": 1228.95703125, + "y": -123.65799713134766 }, { - "x": 1144.14794921875, - "y": -101.80799865722656 + "x": 1232.751953125, + "y": -117.88099670410156 }, { - "x": 1147.260986328125, - "y": -96.3499984741211 + "x": 1236.363037109375, + "y": -111.98899841308594 }, { - "x": 1150.2010498046875, - "y": -90.7979965209961 + "x": 1239.7869873046875, + "y": -105.98500061035156 }, { - "x": 1152.9649658203125, - "y": -85.15499877929688 + "x": 1243.02099609375, + "y": -99.87699890136719 }, { - "x": 1155.550048828125, - "y": -79.42900085449219 + "x": 1246.06103515625, + "y": -93.6709976196289 }, { - "x": 1157.9549560546875, - "y": -73.6240005493164 + "x": 1248.906005859375, + "y": -87.37200164794922 }, { - "x": 1160.176025390625, - "y": -67.74700164794922 + "x": 1251.550048828125, + "y": -80.98699951171875 }, { - "x": 1162.2110595703125, - "y": -61.803001403808594 + "x": 1253.9930419921875, + "y": -74.52200317382812 }, { - "x": 1164.0579833984375, - "y": -55.79800033569336 + "x": 1256.2320556640625, + "y": -67.98300170898438 }, { - "x": 1165.7159423828125, - "y": -49.73699951171875 + "x": 1258.2640380859375, + "y": -61.37799835205078 }, { - "x": 1167.1829833984375, - "y": -43.62799835205078 + "x": 1260.0880126953125, + "y": -54.71099853515625 }, { - "x": 1168.45703125, - "y": -37.47600173950195 + "x": 1261.7010498046875, + "y": -47.99100112915039 }, { - "x": 1169.5369873046875, - "y": -31.285999298095703 + "x": 1263.10302734375, + "y": -41.222999572753906 }, { - "x": 1170.4219970703125, - "y": -25.06599998474121 + "x": 1264.291015625, + "y": -34.415000915527344 }, { - "x": 1171.112060546875, - "y": -18.820999145507812 + "x": 1265.2650146484375, + "y": -27.572999954223633 }, { - "x": 1171.60498046875, - "y": -12.557999610900879 + "x": 1266.02294921875, + "y": -20.702999114990234 }, { - "x": 1171.9010009765625, - "y": -6.2820000648498535 + "x": 1266.56494140625, + "y": -13.812999725341797 }, { - "x": 1172, + "x": 1266.8909912109375, + "y": -6.909999847412109 + }, + { + "x": 1267, "y": 0 }, { - "x": 1171.9010009765625, - "y": 6.2820000648498535 + "x": 1266.8909912109375, + "y": 6.909999847412109 }, { - "x": 1171.60498046875, - "y": 12.557999610900879 + "x": 1266.56494140625, + "y": 13.812999725341797 }, { - "x": 1171.112060546875, - "y": 18.820999145507812 + "x": 1266.02294921875, + "y": 20.702999114990234 }, { - "x": 1170.4219970703125, - "y": 25.06599998474121 + "x": 1265.2650146484375, + "y": 27.572999954223633 }, { - "x": 1169.5369873046875, - "y": 31.285999298095703 + "x": 1264.291015625, + "y": 34.415000915527344 }, { - "x": 1168.45703125, - "y": 37.47600173950195 + "x": 1263.10302734375, + "y": 41.222999572753906 }, { - "x": 1167.1829833984375, - "y": 43.62799835205078 + "x": 1261.7010498046875, + "y": 47.99100112915039 }, { - "x": 1165.7159423828125, - "y": 49.73699951171875 + "x": 1260.0880126953125, + "y": 54.71099853515625 }, { - "x": 1164.0579833984375, - "y": 55.79800033569336 + "x": 1258.2640380859375, + "y": 61.37799835205078 }, { - "x": 1162.2110595703125, - "y": 61.803001403808594 + "x": 1256.2320556640625, + "y": 67.98300170898438 }, { - "x": 1160.176025390625, - "y": 67.74700164794922 + "x": 1253.9930419921875, + "y": 74.52200317382812 }, { - "x": 1157.9549560546875, - "y": 73.6240005493164 + "x": 1251.550048828125, + "y": 80.98699951171875 }, { - "x": 1155.550048828125, - "y": 79.42900085449219 + "x": 1248.906005859375, + "y": 87.37200164794922 }, { - "x": 1152.9649658203125, - "y": 85.15499877929688 + "x": 1246.06103515625, + "y": 93.6709976196289 }, { - "x": 1150.2010498046875, - "y": 90.7979965209961 + "x": 1243.02099609375, + "y": 99.87699890136719 }, { - "x": 1147.260986328125, - "y": 96.3499984741211 + "x": 1239.7869873046875, + "y": 105.98500061035156 }, { - "x": 1144.14794921875, - "y": 101.80799865722656 + "x": 1236.363037109375, + "y": 111.98899841308594 }, { - "x": 1140.864990234375, - "y": 107.16500091552734 + "x": 1232.751953125, + "y": 117.88099670410156 }, { - "x": 1137.416015625, - "y": 112.41600036621094 + "x": 1228.95703125, + "y": 123.65799713134766 }, { - "x": 1133.802978515625, - "y": 117.55699920654297 + "x": 1224.9830322265625, + "y": 129.31199645996094 }, { - "x": 1130.031005859375, - "y": 122.58100128173828 + "x": 1220.833984375, + "y": 134.83900451660156 }, { - "x": 1126.10205078125, - "y": 127.48400115966797 + "x": 1216.511962890625, + "y": 140.23300170898438 }, { - "x": 1122.02197265625, - "y": 132.26199340820312 + "x": 1212.0240478515625, + "y": 145.48800659179688 }, { - "x": 1117.79296875, - "y": 136.90899658203125 + "x": 1207.373046875, + "y": 150.60000610351562 }, { - "x": 1113.4210205078125, - "y": 141.42100524902344 + "x": 1202.56298828125, + "y": 155.56300354003906 }, { - "x": 1108.9090576171875, - "y": 145.79299926757812 + "x": 1197.5999755859375, + "y": 160.3730010986328 }, { - "x": 1104.261962890625, - "y": 150.02200317382812 + "x": 1192.488037109375, + "y": 165.0240020751953 }, { - "x": 1099.4840087890625, - "y": 154.1020050048828 + "x": 1187.2330322265625, + "y": 169.51199340820312 }, { - "x": 1094.5810546875, - "y": 158.031005859375 + "x": 1181.8389892578125, + "y": 173.83399963378906 }, { - "x": 1089.5570068359375, - "y": 161.80299377441406 + "x": 1176.31201171875, + "y": 177.98300170898438 }, { - "x": 1084.416015625, - "y": 165.41600036621094 + "x": 1170.657958984375, + "y": 181.95700073242188 }, { - "x": 1079.1650390625, - "y": 168.86500549316406 + "x": 1164.8809814453125, + "y": 185.7519989013672 }, { - "x": 1073.8079833984375, - "y": 172.1479949951172 + "x": 1158.989013671875, + "y": 189.36300659179688 }, { - "x": 1068.3499755859375, - "y": 175.26100158691406 + "x": 1152.9849853515625, + "y": 192.78700256347656 }, { - "x": 1062.7979736328125, - "y": 178.2010040283203 + "x": 1146.876953125, + "y": 196.02099609375 }, { - "x": 1057.155029296875, - "y": 180.96499633789062 + "x": 1140.6710205078125, + "y": 199.06100463867188 }, { - "x": 1051.428955078125, - "y": 183.5500030517578 + "x": 1134.3719482421875, + "y": 201.906005859375 }, { - "x": 1045.6240234375, - "y": 185.9550018310547 + "x": 1127.987060546875, + "y": 204.5500030517578 }, { - "x": 1039.7469482421875, - "y": 188.17599487304688 + "x": 1121.52197265625, + "y": 206.9929962158203 }, { - "x": 1033.802978515625, - "y": 190.21099853515625 + "x": 1114.9830322265625, + "y": 209.23199462890625 }, { - "x": 1027.7979736328125, - "y": 192.05799865722656 + "x": 1108.3780517578125, + "y": 211.26400756835938 }, { - "x": 1021.7369995117188, - "y": 193.71600341796875 + "x": 1101.7110595703125, + "y": 213.08799743652344 }, { - "x": 1015.6279907226562, - "y": 195.18299865722656 + "x": 1094.990966796875, + "y": 214.7010040283203 }, { - "x": 1009.4760131835938, - "y": 196.45700073242188 + "x": 1088.2230224609375, + "y": 216.10299682617188 }, { - "x": 1003.2860107421875, - "y": 197.53700256347656 + "x": 1081.4150390625, + "y": 217.29100036621094 }, { - "x": 998.5, - "y": 198.21800231933594 + "x": 1077.6280517578125, + "y": 217.8820037841797 + }, + { + "x": 1073.5, + "y": 218.38299560546875 } ], "isCurve": true, @@ -3324,284 +3372,296 @@ "link": "", "route": [ { - "x": 1111.5, - "y": -198.23399353027344 + "x": 1186.5, + "y": -218.39500427246094 + }, + { + "x": 1187.572998046875, + "y": -218.26499938964844 + }, + { + "x": 1189.8570556640625, + "y": -217.96400451660156 + }, + { + "x": 1192.137939453125, + "y": -217.63900756835938 }, { - "x": 1112.1429443359375, - "y": -198.1490020751953 + "x": 1194.4150390625, + "y": -217.29100036621094 }, { - "x": 1114.2159423828125, - "y": -197.85400390625 + "x": 1196.68896484375, + "y": -216.91900634765625 }, { - "x": 1116.2860107421875, - "y": -197.53700256347656 + "x": 1198.9580078125, + "y": -216.5229949951172 }, { - "x": 1118.35302734375, - "y": -197.19900512695312 + "x": 1201.2230224609375, + "y": -216.10299682617188 }, { - "x": 1120.416015625, - "y": -196.83900451660156 + "x": 1203.4840087890625, + "y": -215.65899658203125 }, { - "x": 1122.4759521484375, - "y": -196.45700073242188 + "x": 1205.739990234375, + "y": -215.19200134277344 }, { - "x": 1124.531005859375, - "y": -196.0540008544922 + "x": 1207.990966796875, + "y": -214.7010040283203 }, { - "x": 1126.58203125, - "y": -195.62899780273438 + "x": 1210.237060546875, + "y": -214.18699645996094 }, { - "x": 1128.6280517578125, - "y": -195.18299865722656 + "x": 1212.47705078125, + "y": -213.6490020751953 }, { - "x": 1130.6700439453125, - "y": -194.71499633789062 + "x": 1214.7110595703125, + "y": -213.08799743652344 }, { - "x": 1132.7060546875, - "y": -194.2259979248047 + "x": 1216.93994140625, + "y": -212.5030059814453 }, { - "x": 1134.737060546875, - "y": -193.71600341796875 + "x": 1219.1619873046875, + "y": -211.89500427246094 }, { - "x": 1136.762939453125, - "y": -193.18499755859375 + "x": 1221.3780517578125, + "y": -211.26400756835938 }, { - "x": 1138.782958984375, - "y": -192.6320037841797 + "x": 1223.5860595703125, + "y": -210.61000061035156 }, { - "x": 1140.7979736328125, - "y": -192.05799865722656 + "x": 1225.7879638671875, + "y": -209.9320068359375 }, { - "x": 1142.8060302734375, - "y": -191.46299743652344 + "x": 1227.9830322265625, + "y": -209.23199462890625 }, { - "x": 1144.8079833984375, - "y": -190.84800720214844 + "x": 1230.1710205078125, + "y": -208.50900268554688 }, { - "x": 1146.802978515625, - "y": -190.21099853515625 + "x": 1232.3499755859375, + "y": -207.76199340820312 }, { - "x": 1148.791015625, - "y": -189.55299377441406 + "x": 1234.52197265625, + "y": -206.9929962158203 }, { - "x": 1150.77294921875, - "y": -188.875 + "x": 1236.68505859375, + "y": -206.20199584960938 }, { - "x": 1152.7469482421875, - "y": -188.17599487304688 + "x": 1238.8399658203125, + "y": -205.38699340820312 }, { - "x": 1154.7139892578125, - "y": -187.45599365234375 + "x": 1240.987060546875, + "y": -204.5500030517578 }, { - "x": 1156.6729736328125, - "y": -186.71600341796875 + "x": 1243.1240234375, + "y": -203.6909942626953 }, { - "x": 1158.6240234375, - "y": -185.9550018310547 + "x": 1245.2530517578125, + "y": -202.8090057373047 }, { - "x": 1160.5679931640625, - "y": -185.1739959716797 + "x": 1247.3719482421875, + "y": -201.906005859375 }, { - "x": 1162.5030517578125, - "y": -184.3719940185547 + "x": 1249.4820556640625, + "y": -200.97999572753906 }, { - "x": 1164.428955078125, - "y": -183.5500030517578 + "x": 1251.5810546875, + "y": -200.031005859375 }, { - "x": 1166.3470458984375, - "y": -182.70899963378906 + "x": 1253.6710205078125, + "y": -199.06100463867188 }, { - "x": 1168.2559814453125, - "y": -181.8470001220703 + "x": 1255.75, + "y": -198.07000732421875 }, { - "x": 1170.155029296875, - "y": -180.96499633789062 + "x": 1257.8189697265625, + "y": -197.05599975585938 }, { - "x": 1172.0460205078125, - "y": -180.06300354003906 + "x": 1259.876953125, + "y": -196.02099609375 }, { - "x": 1173.927001953125, - "y": -179.14199829101562 + "x": 1261.925048828125, + "y": -194.96400451660156 }, { - "x": 1175.7979736328125, - "y": -178.2010040283203 + "x": 1263.9610595703125, + "y": -193.88600158691406 }, { - "x": 1177.6590576171875, - "y": -177.24000549316406 + "x": 1265.9849853515625, + "y": -192.78700256347656 }, { - "x": 1179.510009765625, - "y": -176.25999450683594 + "x": 1267.998046875, + "y": -191.66700744628906 }, { - "x": 1181.3499755859375, - "y": -175.26100158691406 + "x": 1270, + "y": -190.52499389648438 }, { - "x": 1183.1800537109375, - "y": -174.24200439453125 + "x": 1271.989013671875, + "y": -189.36300659179688 }, { - "x": 1185, - "y": -173.2050018310547 + "x": 1273.9649658203125, + "y": -188.17999267578125 }, { - "x": 1186.8079833984375, - "y": -172.1479949951172 + "x": 1275.9300537109375, + "y": -186.9759979248047 }, { - "x": 1188.60498046875, - "y": -171.07200622558594 + "x": 1277.8809814453125, + "y": -185.7519989013672 }, { - "x": 1190.3909912109375, - "y": -169.97799682617188 + "x": 1279.8199462890625, + "y": -184.5070037841797 }, { - "x": 1192.1650390625, - "y": -168.86500549316406 + "x": 1281.7459716796875, + "y": -183.24200439453125 }, { - "x": 1193.927001953125, - "y": -167.73399353027344 + "x": 1283.657958984375, + "y": -181.95700073242188 }, { - "x": 1195.677978515625, - "y": -166.58399963378906 + "x": 1285.5560302734375, + "y": -180.65199279785156 }, { - "x": 1197.416015625, - "y": -165.41600036621094 + "x": 1287.4410400390625, + "y": -179.3280029296875 }, { - "x": 1199.1419677734375, - "y": -164.22900390625 + "x": 1289.31201171875, + "y": -177.98300170898438 }, { - "x": 1200.85595703125, - "y": -163.02499389648438 + "x": 1291.1689453125, + "y": -176.61900329589844 }, { - "x": 1202.5570068359375, - "y": -161.80299377441406 + "x": 1293.010986328125, + "y": -175.23599243164062 }, { - "x": 1204.2440185546875, - "y": -160.56300354003906 + "x": 1294.8389892578125, + "y": -173.83399963378906 }, { - "x": 1205.9189453125, - "y": -159.30499267578125 + "x": 1296.6519775390625, + "y": -172.41200256347656 }, { - "x": 1207.5810546875, - "y": -158.031005859375 + "x": 1298.449951171875, + "y": -170.9720001220703 }, { - "x": 1209.22900390625, - "y": -156.73800659179688 + "x": 1300.2330322265625, + "y": -169.51199340820312 }, { - "x": 1210.864013671875, - "y": -155.4290008544922 + "x": 1302, + "y": -168.03500366210938 }, { - "x": 1212.4840087890625, - "y": -154.1020050048828 + "x": 1303.751953125, + "y": -166.53799438476562 }, { - "x": 1214.0909423828125, - "y": -152.75900268554688 + "x": 1305.488037109375, + "y": -165.0240020751953 }, { - "x": 1215.6839599609375, - "y": -151.3990020751953 + "x": 1307.2080078125, + "y": -163.49099731445312 }, { - "x": 1217.261962890625, - "y": -150.02200317382812 + "x": 1308.9119873046875, + "y": -161.9409942626953 }, { - "x": 1218.8260498046875, - "y": -148.6280059814453 + "x": 1310.5999755859375, + "y": -160.3730010986328 }, { - "x": 1220.375, - "y": -147.218994140625 + "x": 1312.27099609375, + "y": -158.78700256347656 }, { - "x": 1221.9090576171875, - "y": -145.79299926757812 + "x": 1313.925048828125, + "y": -157.18299865722656 }, { - "x": 1223.427978515625, - "y": -144.3520050048828 + "x": 1315.56298828125, + "y": -155.56300354003906 }, { - "x": 1224.9320068359375, - "y": -142.8939971923828 + "x": 1317.1829833984375, + "y": -153.9250030517578 }, { - "x": 1226.4210205078125, - "y": -141.42100524902344 + "x": 1318.7869873046875, + "y": -152.27099609375 }, { - "x": 1227.89404296875, - "y": -139.9320068359375 + "x": 1320.373046875, + "y": -150.60000610351562 }, { - "x": 1229.35205078125, - "y": -138.42799377441406 + "x": 1321.9410400390625, + "y": -148.91200256347656 }, { - "x": 1230.79296875, - "y": -136.90899658203125 + "x": 1323.490966796875, + "y": -147.20799255371094 }, { - "x": 1232.218994140625, - "y": -135.375 + "x": 1325.0240478515625, + "y": -145.48800659179688 }, { - "x": 1231.5989990234375, - "y": -136.1060028076172 + "x": 1324.47802734375, + "y": -146.16000366210938 }, { - "x": 1234.364990234375, - "y": -133 + "x": 1327.1810302734375, + "y": -143 } ], "isCurve": true, @@ -3636,272 +3696,288 @@ "link": "", "route": [ { - "x": 1273.43994140625, - "y": -67 + "x": 1366.0830078125, + "y": -77 + }, + { + "x": 1366.2020263671875, + "y": -76.68499755859375 + }, + { + "x": 1366.9930419921875, + "y": -74.52200317382812 }, { - "x": 1273.875, - "y": -65.77300262451172 + "x": 1367.761962890625, + "y": -72.3499984741211 }, { - "x": 1274.552978515625, - "y": -63.79100036621094 + "x": 1368.509033203125, + "y": -70.1709976196289 }, { - "x": 1275.2110595703125, - "y": -61.803001403808594 + "x": 1369.2320556640625, + "y": -67.98300170898438 }, { - "x": 1275.8480224609375, - "y": -59.80799865722656 + "x": 1369.9320068359375, + "y": -65.78800201416016 }, { - "x": 1276.4630126953125, - "y": -57.805999755859375 + "x": 1370.6099853515625, + "y": -63.58599853515625 }, { - "x": 1277.0579833984375, - "y": -55.79800033569336 + "x": 1371.2640380859375, + "y": -61.37799835205078 }, { - "x": 1277.6319580078125, - "y": -53.78300094604492 + "x": 1371.89501953125, + "y": -59.1619987487793 }, { - "x": 1278.18505859375, - "y": -51.76300048828125 + "x": 1372.5030517578125, + "y": -56.939998626708984 }, { - "x": 1278.7159423828125, - "y": -49.73699951171875 + "x": 1373.0880126953125, + "y": -54.71099853515625 }, { - "x": 1279.2259521484375, - "y": -47.70600128173828 + "x": 1373.6490478515625, + "y": -52.47700119018555 }, { - "x": 1279.7149658203125, - "y": -45.66999816894531 + "x": 1374.18701171875, + "y": -50.23699951171875 }, { - "x": 1280.1829833984375, - "y": -43.62799835205078 + "x": 1374.7010498046875, + "y": -47.99100112915039 }, { - "x": 1280.6290283203125, - "y": -41.582000732421875 + "x": 1375.1920166015625, + "y": -45.7400016784668 }, { - "x": 1281.053955078125, - "y": -39.53099822998047 + "x": 1375.6590576171875, + "y": -43.48400115966797 }, { - "x": 1281.45703125, - "y": -37.47600173950195 + "x": 1376.10302734375, + "y": -41.222999572753906 }, { - "x": 1281.8389892578125, - "y": -35.41600036621094 + "x": 1376.52294921875, + "y": -38.95800018310547 }, { - "x": 1282.198974609375, - "y": -33.35300064086914 + "x": 1376.9189453125, + "y": -36.68899917602539 }, { - "x": 1282.5369873046875, - "y": -31.285999298095703 + "x": 1377.291015625, + "y": -34.415000915527344 }, { - "x": 1282.85400390625, - "y": -29.215999603271484 + "x": 1377.6390380859375, + "y": -32.13800048828125 }, { - "x": 1283.1490478515625, - "y": -27.14299964904785 + "x": 1377.9639892578125, + "y": -29.85700035095215 }, { - "x": 1283.4219970703125, - "y": -25.06599998474121 + "x": 1378.2650146484375, + "y": -27.572999954223633 }, { - "x": 1283.6739501953125, - "y": -22.98699951171875 + "x": 1378.5419921875, + "y": -25.285999298095703 }, { - "x": 1283.904052734375, - "y": -20.905000686645508 + "x": 1378.7939453125, + "y": -22.996000289916992 }, { - "x": 1284.112060546875, - "y": -18.820999145507812 + "x": 1379.02294921875, + "y": -20.702999114990234 }, { - "x": 1284.2979736328125, - "y": -16.735000610351562 + "x": 1379.22802734375, + "y": -18.409000396728516 }, { - "x": 1284.4620361328125, - "y": -14.647000312805176 + "x": 1379.4090576171875, + "y": -16.11199951171875 }, { - "x": 1284.60498046875, - "y": -12.557999610900879 + "x": 1379.56494140625, + "y": -13.812999725341797 }, { - "x": 1284.7249755859375, - "y": -10.467000007629395 + "x": 1379.697998046875, + "y": -11.512999534606934 }, { - "x": 1284.823974609375, - "y": -8.375 + "x": 1379.8070068359375, + "y": -9.211999893188477 }, { - "x": 1284.9010009765625, - "y": -6.2820000648498535 + "x": 1379.8909912109375, + "y": -6.909999847412109 }, { - "x": 1284.9560546875, - "y": -4.188000202178955 + "x": 1379.9510498046875, + "y": -4.60699987411499 }, { - "x": 1284.989013671875, - "y": -2.0940001010894775 + "x": 1379.987060546875, + "y": -2.302999973297119 }, { - "x": 1285, + "x": 1380, "y": 0 }, { - "x": 1284.989013671875, - "y": 2.0940001010894775 + "x": 1379.987060546875, + "y": 2.302999973297119 }, { - "x": 1284.9560546875, - "y": 4.188000202178955 + "x": 1379.9510498046875, + "y": 4.60699987411499 }, { - "x": 1284.9010009765625, - "y": 6.2820000648498535 + "x": 1379.8909912109375, + "y": 6.909999847412109 }, { - "x": 1284.823974609375, - "y": 8.375 + "x": 1379.8070068359375, + "y": 9.211999893188477 }, { - "x": 1284.7249755859375, - "y": 10.467000007629395 + "x": 1379.697998046875, + "y": 11.512999534606934 }, { - "x": 1284.60498046875, - "y": 12.557999610900879 + "x": 1379.56494140625, + "y": 13.812999725341797 }, { - "x": 1284.4620361328125, - "y": 14.647000312805176 + "x": 1379.4090576171875, + "y": 16.11199951171875 }, { - "x": 1284.2979736328125, - "y": 16.735000610351562 + "x": 1379.22802734375, + "y": 18.409000396728516 }, { - "x": 1284.112060546875, - "y": 18.820999145507812 + "x": 1379.02294921875, + "y": 20.702999114990234 }, { - "x": 1283.904052734375, - "y": 20.905000686645508 + "x": 1378.7939453125, + "y": 22.996000289916992 }, { - "x": 1283.6739501953125, - "y": 22.98699951171875 + "x": 1378.5419921875, + "y": 25.285999298095703 }, { - "x": 1283.4219970703125, - "y": 25.06599998474121 + "x": 1378.2650146484375, + "y": 27.572999954223633 }, { - "x": 1283.1490478515625, - "y": 27.14299964904785 + "x": 1377.9639892578125, + "y": 29.85700035095215 }, { - "x": 1282.85400390625, - "y": 29.215999603271484 + "x": 1377.6390380859375, + "y": 32.13800048828125 }, { - "x": 1282.5369873046875, - "y": 31.285999298095703 + "x": 1377.291015625, + "y": 34.415000915527344 }, { - "x": 1282.198974609375, - "y": 33.35300064086914 + "x": 1376.9189453125, + "y": 36.68899917602539 }, { - "x": 1281.8389892578125, - "y": 35.41600036621094 + "x": 1376.52294921875, + "y": 38.95800018310547 }, { - "x": 1281.45703125, - "y": 37.47600173950195 + "x": 1376.10302734375, + "y": 41.222999572753906 }, { - "x": 1281.053955078125, - "y": 39.53099822998047 + "x": 1375.6590576171875, + "y": 43.48400115966797 }, { - "x": 1280.6290283203125, - "y": 41.582000732421875 + "x": 1375.1920166015625, + "y": 45.7400016784668 }, { - "x": 1280.1829833984375, - "y": 43.62799835205078 + "x": 1374.7010498046875, + "y": 47.99100112915039 }, { - "x": 1279.7149658203125, - "y": 45.66999816894531 + "x": 1374.18701171875, + "y": 50.23699951171875 }, { - "x": 1279.2259521484375, - "y": 47.70600128173828 + "x": 1373.6490478515625, + "y": 52.47700119018555 }, { - "x": 1278.7159423828125, - "y": 49.73699951171875 + "x": 1373.0880126953125, + "y": 54.71099853515625 }, { - "x": 1278.18505859375, - "y": 51.76300048828125 + "x": 1372.5030517578125, + "y": 56.939998626708984 }, { - "x": 1277.6319580078125, - "y": 53.78300094604492 + "x": 1371.89501953125, + "y": 59.1619987487793 }, { - "x": 1277.0579833984375, - "y": 55.79800033569336 + "x": 1371.2640380859375, + "y": 61.37799835205078 }, { - "x": 1276.4630126953125, - "y": 57.805999755859375 + "x": 1370.6099853515625, + "y": 63.58599853515625 }, { - "x": 1275.8480224609375, - "y": 59.80799865722656 + "x": 1369.9320068359375, + "y": 65.78800201416016 }, { - "x": 1275.2110595703125, - "y": 61.803001403808594 + "x": 1369.2320556640625, + "y": 67.98300170898438 }, { - "x": 1274.552978515625, - "y": 63.79100036621094 + "x": 1368.509033203125, + "y": 70.1709976196289 }, { - "x": 1274.833984375, - "y": 63.08100128173828 + "x": 1367.761962890625, + "y": 72.3499984741211 }, { - "x": 1273.43994140625, - "y": 66.9990005493164 + "x": 1366.9930419921875, + "y": 74.52200317382812 + }, + { + "x": 1367.5379638671875, + "y": 73.10399627685547 + }, + { + "x": 1366.0830078125, + "y": 76.9990005493164 } ], "isCurve": true, @@ -3936,284 +4012,296 @@ "link": "", "route": [ { - "x": 1234.364990234375, - "y": 132.99899291992188 + "x": 1327.1810302734375, + "y": 142.99899291992188 + }, + { + "x": 1326.5379638671875, + "y": 143.7519989013672 + }, + { + "x": 1325.0240478515625, + "y": 145.48800659179688 + }, + { + "x": 1323.490966796875, + "y": 147.20799255371094 }, { - "x": 1233.6280517578125, - "y": 133.8260040283203 + "x": 1321.9410400390625, + "y": 148.91200256347656 }, { - "x": 1232.218994140625, - "y": 135.375 + "x": 1320.373046875, + "y": 150.60000610351562 }, { - "x": 1230.79296875, - "y": 136.90899658203125 + "x": 1318.7869873046875, + "y": 152.27099609375 }, { - "x": 1229.35205078125, - "y": 138.42799377441406 + "x": 1317.1829833984375, + "y": 153.9250030517578 }, { - "x": 1227.89404296875, - "y": 139.9320068359375 + "x": 1315.56298828125, + "y": 155.56300354003906 }, { - "x": 1226.4210205078125, - "y": 141.42100524902344 + "x": 1313.925048828125, + "y": 157.18299865722656 }, { - "x": 1224.9320068359375, - "y": 142.8939971923828 + "x": 1312.27099609375, + "y": 158.78700256347656 }, { - "x": 1223.427978515625, - "y": 144.3520050048828 + "x": 1310.5999755859375, + "y": 160.3730010986328 }, { - "x": 1221.9090576171875, - "y": 145.79299926757812 + "x": 1308.9119873046875, + "y": 161.9409942626953 }, { - "x": 1220.375, - "y": 147.218994140625 + "x": 1307.2080078125, + "y": 163.49099731445312 }, { - "x": 1218.8260498046875, - "y": 148.6280059814453 + "x": 1305.488037109375, + "y": 165.0240020751953 }, { - "x": 1217.261962890625, - "y": 150.02200317382812 + "x": 1303.751953125, + "y": 166.53799438476562 }, { - "x": 1215.6839599609375, - "y": 151.3990020751953 + "x": 1302, + "y": 168.03500366210938 }, { - "x": 1214.0909423828125, - "y": 152.75900268554688 + "x": 1300.2330322265625, + "y": 169.51199340820312 }, { - "x": 1212.4840087890625, - "y": 154.1020050048828 + "x": 1298.449951171875, + "y": 170.9720001220703 }, { - "x": 1210.864013671875, - "y": 155.4290008544922 + "x": 1296.6519775390625, + "y": 172.41200256347656 }, { - "x": 1209.22900390625, - "y": 156.73800659179688 + "x": 1294.8389892578125, + "y": 173.83399963378906 }, { - "x": 1207.5810546875, - "y": 158.031005859375 + "x": 1293.010986328125, + "y": 175.23599243164062 }, { - "x": 1205.9189453125, - "y": 159.30499267578125 + "x": 1291.1689453125, + "y": 176.61900329589844 }, { - "x": 1204.2440185546875, - "y": 160.56300354003906 + "x": 1289.31201171875, + "y": 177.98300170898438 }, { - "x": 1202.5570068359375, - "y": 161.80299377441406 + "x": 1287.4410400390625, + "y": 179.3280029296875 }, { - "x": 1200.85595703125, - "y": 163.02499389648438 + "x": 1285.5560302734375, + "y": 180.65199279785156 }, { - "x": 1199.1419677734375, - "y": 164.22900390625 + "x": 1283.657958984375, + "y": 181.95700073242188 }, { - "x": 1197.416015625, - "y": 165.41600036621094 + "x": 1281.7459716796875, + "y": 183.24200439453125 }, { - "x": 1195.677978515625, - "y": 166.58399963378906 + "x": 1279.8199462890625, + "y": 184.5070037841797 }, { - "x": 1193.927001953125, - "y": 167.73399353027344 + "x": 1277.8809814453125, + "y": 185.7519989013672 }, { - "x": 1192.1650390625, - "y": 168.86500549316406 + "x": 1275.9300537109375, + "y": 186.9759979248047 }, { - "x": 1190.3909912109375, - "y": 169.97799682617188 + "x": 1273.9649658203125, + "y": 188.17999267578125 }, { - "x": 1188.60498046875, - "y": 171.07200622558594 + "x": 1271.989013671875, + "y": 189.36300659179688 }, { - "x": 1186.8079833984375, - "y": 172.1479949951172 + "x": 1270, + "y": 190.52499389648438 }, { - "x": 1185, - "y": 173.2050018310547 + "x": 1267.998046875, + "y": 191.66700744628906 }, { - "x": 1183.1800537109375, - "y": 174.24200439453125 + "x": 1265.9849853515625, + "y": 192.78700256347656 }, { - "x": 1181.3499755859375, - "y": 175.26100158691406 + "x": 1263.9610595703125, + "y": 193.88600158691406 }, { - "x": 1179.510009765625, - "y": 176.25999450683594 + "x": 1261.925048828125, + "y": 194.96400451660156 }, { - "x": 1177.6590576171875, - "y": 177.24000549316406 + "x": 1259.876953125, + "y": 196.02099609375 }, { - "x": 1175.7979736328125, - "y": 178.2010040283203 + "x": 1257.8189697265625, + "y": 197.05599975585938 }, { - "x": 1173.927001953125, - "y": 179.14199829101562 + "x": 1255.75, + "y": 198.07000732421875 }, { - "x": 1172.0460205078125, - "y": 180.06300354003906 + "x": 1253.6710205078125, + "y": 199.06100463867188 }, { - "x": 1170.155029296875, - "y": 180.96499633789062 + "x": 1251.5810546875, + "y": 200.031005859375 }, { - "x": 1168.2559814453125, - "y": 181.8470001220703 + "x": 1249.4820556640625, + "y": 200.97999572753906 }, { - "x": 1166.3470458984375, - "y": 182.70899963378906 + "x": 1247.3719482421875, + "y": 201.906005859375 }, { - "x": 1164.428955078125, - "y": 183.5500030517578 + "x": 1245.2530517578125, + "y": 202.8090057373047 }, { - "x": 1162.5030517578125, - "y": 184.3719940185547 + "x": 1243.1240234375, + "y": 203.6909942626953 }, { - "x": 1160.5679931640625, - "y": 185.1739959716797 + "x": 1240.987060546875, + "y": 204.5500030517578 }, { - "x": 1158.6240234375, - "y": 185.9550018310547 + "x": 1238.8399658203125, + "y": 205.38699340820312 }, { - "x": 1156.6729736328125, - "y": 186.71600341796875 + "x": 1236.68505859375, + "y": 206.20199584960938 }, { - "x": 1154.7139892578125, - "y": 187.45599365234375 + "x": 1234.52197265625, + "y": 206.9929962158203 }, { - "x": 1152.7469482421875, - "y": 188.17599487304688 + "x": 1232.3499755859375, + "y": 207.76199340820312 }, { - "x": 1150.77294921875, - "y": 188.875 + "x": 1230.1710205078125, + "y": 208.50900268554688 }, { - "x": 1148.791015625, - "y": 189.55299377441406 + "x": 1227.9830322265625, + "y": 209.23199462890625 }, { - "x": 1146.802978515625, - "y": 190.21099853515625 + "x": 1225.7879638671875, + "y": 209.9320068359375 }, { - "x": 1144.8079833984375, - "y": 190.84800720214844 + "x": 1223.5860595703125, + "y": 210.61000061035156 }, { - "x": 1142.8060302734375, - "y": 191.46299743652344 + "x": 1221.3780517578125, + "y": 211.26400756835938 }, { - "x": 1140.7979736328125, - "y": 192.05799865722656 + "x": 1219.1619873046875, + "y": 211.89500427246094 }, { - "x": 1138.782958984375, - "y": 192.6320037841797 + "x": 1216.93994140625, + "y": 212.5030059814453 }, { - "x": 1136.762939453125, - "y": 193.18499755859375 + "x": 1214.7110595703125, + "y": 213.08799743652344 }, { - "x": 1134.737060546875, - "y": 193.71600341796875 + "x": 1212.47705078125, + "y": 213.6490020751953 }, { - "x": 1132.7060546875, - "y": 194.2259979248047 + "x": 1210.237060546875, + "y": 214.18699645996094 }, { - "x": 1130.6700439453125, - "y": 194.71499633789062 + "x": 1207.990966796875, + "y": 214.7010040283203 }, { - "x": 1128.6280517578125, - "y": 195.18299865722656 + "x": 1205.739990234375, + "y": 215.19200134277344 }, { - "x": 1126.58203125, - "y": 195.62899780273438 + "x": 1203.4840087890625, + "y": 215.65899658203125 }, { - "x": 1124.531005859375, - "y": 196.0540008544922 + "x": 1201.2230224609375, + "y": 216.10299682617188 }, { - "x": 1122.4759521484375, - "y": 196.45700073242188 + "x": 1198.9580078125, + "y": 216.5229949951172 }, { - "x": 1120.416015625, - "y": 196.83900451660156 + "x": 1196.68896484375, + "y": 216.91900634765625 }, { - "x": 1118.35302734375, - "y": 197.19900512695312 + "x": 1194.4150390625, + "y": 217.29100036621094 }, { - "x": 1116.2860107421875, - "y": 197.53700256347656 + "x": 1192.137939453125, + "y": 217.63900756835938 }, { - "x": 1114.2159423828125, - "y": 197.85400390625 + "x": 1189.8570556640625, + "y": 217.96400451660156 }, { - "x": 1116.1199951171875, - "y": 197.6060028076172 + "x": 1191.126953125, + "y": 217.82400512695312 }, { - "x": 1112, - "y": 198.16799926757812 + "x": 1187, + "y": 218.33399963378906 } ], "isCurve": true, @@ -4248,284 +4336,296 @@ "link": "", "route": [ { - "x": 1058, - "y": 198.16799926757812 + "x": 1133, + "y": 218.33399963378906 + }, + { + "x": 1132.426025390625, + "y": 218.26499938964844 + }, + { + "x": 1130.1419677734375, + "y": 217.96400451660156 + }, + { + "x": 1127.8609619140625, + "y": 217.63900756835938 }, { - "x": 1057.85595703125, - "y": 198.1490020751953 + "x": 1125.583984375, + "y": 217.29100036621094 }, { - "x": 1055.782958984375, - "y": 197.85400390625 + "x": 1123.31005859375, + "y": 216.91900634765625 }, { - "x": 1053.7130126953125, - "y": 197.53700256347656 + "x": 1121.041015625, + "y": 216.5229949951172 }, { - "x": 1051.64599609375, - "y": 197.19900512695312 + "x": 1118.7760009765625, + "y": 216.10299682617188 }, { - "x": 1049.5830078125, - "y": 196.83900451660156 + "x": 1116.5150146484375, + "y": 215.65899658203125 }, { - "x": 1047.52294921875, - "y": 196.45700073242188 + "x": 1114.259033203125, + "y": 215.19200134277344 }, { - "x": 1045.468017578125, - "y": 196.0540008544922 + "x": 1112.008056640625, + "y": 214.7010040283203 }, { - "x": 1043.4169921875, - "y": 195.62899780273438 + "x": 1109.761962890625, + "y": 214.18699645996094 }, { - "x": 1041.3709716796875, - "y": 195.18299865722656 + "x": 1107.52197265625, + "y": 213.6490020751953 }, { - "x": 1039.3289794921875, - "y": 194.71499633789062 + "x": 1105.2879638671875, + "y": 213.08799743652344 }, { - "x": 1037.29296875, - "y": 194.2259979248047 + "x": 1103.0589599609375, + "y": 212.5030059814453 }, { - "x": 1035.261962890625, - "y": 193.71600341796875 + "x": 1100.8370361328125, + "y": 211.89500427246094 }, { - "x": 1033.2359619140625, - "y": 193.18499755859375 + "x": 1098.6209716796875, + "y": 211.26400756835938 }, { - "x": 1031.2159423828125, - "y": 192.6320037841797 + "x": 1096.4129638671875, + "y": 210.61000061035156 }, { - "x": 1029.2010498046875, - "y": 192.05799865722656 + "x": 1094.2110595703125, + "y": 209.9320068359375 }, { - "x": 1027.1929931640625, - "y": 191.46299743652344 + "x": 1092.0159912109375, + "y": 209.23199462890625 }, { - "x": 1025.1910400390625, - "y": 190.84800720214844 + "x": 1089.8280029296875, + "y": 208.50900268554688 }, { - "x": 1023.1959838867188, - "y": 190.21099853515625 + "x": 1087.6490478515625, + "y": 207.76199340820312 }, { - "x": 1021.2080078125, - "y": 189.55299377441406 + "x": 1085.47705078125, + "y": 206.9929962158203 }, { - "x": 1019.2260131835938, - "y": 188.875 + "x": 1083.31396484375, + "y": 206.20199584960938 }, { - "x": 1017.2520141601562, - "y": 188.17599487304688 + "x": 1081.1590576171875, + "y": 205.38699340820312 }, { - "x": 1015.2849731445312, - "y": 187.45599365234375 + "x": 1079.011962890625, + "y": 204.5500030517578 }, { - "x": 1013.3259887695312, - "y": 186.71600341796875 + "x": 1076.875, + "y": 203.6909942626953 }, { - "x": 1011.375, - "y": 185.9550018310547 + "x": 1074.7459716796875, + "y": 202.8090057373047 }, { - "x": 1009.4310302734375, - "y": 185.1739959716797 + "x": 1072.626953125, + "y": 201.906005859375 }, { - "x": 1007.4959716796875, - "y": 184.3719940185547 + "x": 1070.5169677734375, + "y": 200.97999572753906 }, { - "x": 1005.5700073242188, - "y": 183.5500030517578 + "x": 1068.41796875, + "y": 200.031005859375 }, { - "x": 1003.6519775390625, - "y": 182.70899963378906 + "x": 1066.3280029296875, + "y": 199.06100463867188 }, { - "x": 1001.7429809570312, - "y": 181.8470001220703 + "x": 1064.2490234375, + "y": 198.07000732421875 }, { - "x": 999.843994140625, - "y": 180.96499633789062 + "x": 1062.1800537109375, + "y": 197.05599975585938 }, { - "x": 997.9530029296875, - "y": 180.06300354003906 + "x": 1060.1219482421875, + "y": 196.02099609375 }, { - "x": 996.072021484375, - "y": 179.14199829101562 + "x": 1058.073974609375, + "y": 194.96400451660156 }, { - "x": 994.2009887695312, - "y": 178.2010040283203 + "x": 1056.0379638671875, + "y": 193.88600158691406 }, { - "x": 992.3400268554688, - "y": 177.24000549316406 + "x": 1054.0140380859375, + "y": 192.78700256347656 }, { - "x": 990.489013671875, - "y": 176.25999450683594 + "x": 1052.0009765625, + "y": 191.66700744628906 }, { - "x": 988.6489868164062, - "y": 175.26100158691406 + "x": 1050, + "y": 190.52499389648438 }, { - "x": 986.8189697265625, - "y": 174.24200439453125 + "x": 1048.010009765625, + "y": 189.36300659179688 }, { - "x": 985, - "y": 173.2050018310547 + "x": 1046.0340576171875, + "y": 188.17999267578125 }, { - "x": 983.1909790039062, - "y": 172.1479949951172 + "x": 1044.0689697265625, + "y": 186.9759979248047 }, { - "x": 981.3939819335938, - "y": 171.07200622558594 + "x": 1042.1180419921875, + "y": 185.7519989013672 }, { - "x": 979.6079711914062, - "y": 169.97799682617188 + "x": 1040.178955078125, + "y": 184.5070037841797 }, { - "x": 977.833984375, - "y": 168.86500549316406 + "x": 1038.2530517578125, + "y": 183.24200439453125 }, { - "x": 976.072021484375, - "y": 167.73399353027344 + "x": 1036.3409423828125, + "y": 181.95700073242188 }, { - "x": 974.3209838867188, - "y": 166.58399963378906 + "x": 1034.4429931640625, + "y": 180.65199279785156 }, { - "x": 972.5830078125, - "y": 165.41600036621094 + "x": 1032.5579833984375, + "y": 179.3280029296875 }, { - "x": 970.8569946289062, - "y": 164.22900390625 + "x": 1030.68701171875, + "y": 177.98300170898438 }, { - "x": 969.1430053710938, - "y": 163.02499389648438 + "x": 1028.8299560546875, + "y": 176.61900329589844 }, { - "x": 967.4420166015625, - "y": 161.80299377441406 + "x": 1026.988037109375, + "y": 175.23599243164062 }, { - "x": 965.7550048828125, - "y": 160.56300354003906 + "x": 1025.1600341796875, + "y": 173.83399963378906 }, { - "x": 964.0800170898438, - "y": 159.30499267578125 + "x": 1023.3469848632812, + "y": 172.41200256347656 }, { - "x": 962.4180297851562, - "y": 158.031005859375 + "x": 1021.5490112304688, + "y": 170.9720001220703 }, { - "x": 960.77001953125, - "y": 156.73800659179688 + "x": 1019.7659912109375, + "y": 169.51199340820312 }, { - "x": 959.135009765625, - "y": 155.4290008544922 + "x": 1017.9990234375, + "y": 168.03500366210938 }, { - "x": 957.5150146484375, - "y": 154.1020050048828 + "x": 1016.2470092773438, + "y": 166.53799438476562 }, { - "x": 955.9080200195312, - "y": 152.75900268554688 + "x": 1014.510986328125, + "y": 165.0240020751953 }, { - "x": 954.3150024414062, - "y": 151.3990020751953 + "x": 1012.791015625, + "y": 163.49099731445312 }, { - "x": 952.7369995117188, - "y": 150.02200317382812 + "x": 1011.0869750976562, + "y": 161.9409942626953 }, { - "x": 951.1729736328125, - "y": 148.6280059814453 + "x": 1009.3989868164062, + "y": 160.3730010986328 }, { - "x": 949.6240234375, - "y": 147.218994140625 + "x": 1007.72802734375, + "y": 158.78700256347656 }, { - "x": 948.0900268554688, - "y": 145.79299926757812 + "x": 1006.073974609375, + "y": 157.18299865722656 }, { - "x": 946.5709838867188, - "y": 144.3520050048828 + "x": 1004.4359741210938, + "y": 155.56300354003906 }, { - "x": 945.0670166015625, - "y": 142.8939971923828 + "x": 1002.8159790039062, + "y": 153.9250030517578 }, { - "x": 943.5780029296875, - "y": 141.42100524902344 + "x": 1001.2119750976562, + "y": 152.27099609375 }, { - "x": 942.10498046875, - "y": 139.9320068359375 + "x": 999.6259765625, + "y": 150.60000610351562 }, { - "x": 940.64697265625, - "y": 138.42799377441406 + "x": 998.0579833984375, + "y": 148.91200256347656 }, { - "x": 939.2059936523438, - "y": 136.90899658203125 + "x": 996.5079956054688, + "y": 147.20799255371094 }, { - "x": 937.780029296875, - "y": 135.375 + "x": 994.9749755859375, + "y": 145.48800659179688 }, { - "x": 938.4000244140625, - "y": 136.1060028076172 + "x": 995.52099609375, + "y": 146.16000366210938 }, { - "x": 935.6339721679688, - "y": 133 + "x": 992.8179931640625, + "y": 143 } ], "isCurve": true, @@ -4560,272 +4660,288 @@ "link": "", "route": [ { - "x": 896.5590209960938, - "y": 67 + "x": 953.916015625, + "y": 77 + }, + { + "x": 953.7969970703125, + "y": 76.68499755859375 + }, + { + "x": 953.0059814453125, + "y": 74.52200317382812 }, { - "x": 896.1240234375, - "y": 65.77300262451172 + "x": 952.2369995117188, + "y": 72.3499984741211 }, { - "x": 895.4459838867188, - "y": 63.79100036621094 + "x": 951.489990234375, + "y": 70.1709976196289 }, { - "x": 894.7880249023438, - "y": 61.803001403808594 + "x": 950.7670288085938, + "y": 67.98300170898438 }, { - "x": 894.1510009765625, - "y": 59.80799865722656 + "x": 950.0670166015625, + "y": 65.78800201416016 }, { - "x": 893.5360107421875, - "y": 57.805999755859375 + "x": 949.3889770507812, + "y": 63.58599853515625 }, { - "x": 892.9409790039062, - "y": 55.79800033569336 + "x": 948.7349853515625, + "y": 61.37799835205078 }, { - "x": 892.3670043945312, - "y": 53.78300094604492 + "x": 948.10400390625, + "y": 59.1619987487793 }, { - "x": 891.8140258789062, - "y": 51.76300048828125 + "x": 947.4959716796875, + "y": 56.939998626708984 }, { - "x": 891.2830200195312, - "y": 49.73699951171875 + "x": 946.9110107421875, + "y": 54.71099853515625 }, { - "x": 890.7730102539062, - "y": 47.70600128173828 + "x": 946.3499755859375, + "y": 52.47700119018555 }, { - "x": 890.2839965820312, - "y": 45.66999816894531 + "x": 945.81201171875, + "y": 50.23699951171875 }, { - "x": 889.8159790039062, - "y": 43.62799835205078 + "x": 945.2979736328125, + "y": 47.99100112915039 }, { - "x": 889.3699951171875, - "y": 41.582000732421875 + "x": 944.8070068359375, + "y": 45.7400016784668 }, { - "x": 888.9450073242188, - "y": 39.53099822998047 + "x": 944.3400268554688, + "y": 43.48400115966797 }, { - "x": 888.5419921875, - "y": 37.47600173950195 + "x": 943.89599609375, + "y": 41.222999572753906 }, { - "x": 888.1599731445312, - "y": 35.41600036621094 + "x": 943.4760131835938, + "y": 38.95800018310547 }, { - "x": 887.7999877929688, - "y": 33.35300064086914 + "x": 943.0800170898438, + "y": 36.68899917602539 }, { - "x": 887.4619750976562, - "y": 31.285999298095703 + "x": 942.7080078125, + "y": 34.415000915527344 }, { - "x": 887.14501953125, - "y": 29.215999603271484 + "x": 942.3599853515625, + "y": 32.13800048828125 }, { - "x": 886.8499755859375, - "y": 27.14299964904785 + "x": 942.0349731445312, + "y": 29.85700035095215 }, { - "x": 886.5770263671875, - "y": 25.06599998474121 + "x": 941.7340087890625, + "y": 27.572999954223633 }, { - "x": 886.3250122070312, - "y": 22.98699951171875 + "x": 941.4569702148438, + "y": 25.285999298095703 }, { - "x": 886.094970703125, - "y": 20.905000686645508 + "x": 941.2050170898438, + "y": 22.996000289916992 }, { - "x": 885.8870239257812, - "y": 18.820999145507812 + "x": 940.9760131835938, + "y": 20.702999114990234 }, { - "x": 885.7009887695312, - "y": 16.735000610351562 + "x": 940.77099609375, + "y": 18.409000396728516 }, { - "x": 885.5369873046875, - "y": 14.647000312805176 + "x": 940.5900268554688, + "y": 16.11199951171875 }, { - "x": 885.3939819335938, - "y": 12.557999610900879 + "x": 940.4340209960938, + "y": 13.812999725341797 }, { - "x": 885.2739868164062, - "y": 10.467000007629395 + "x": 940.301025390625, + "y": 11.512999534606934 }, { - "x": 885.1749877929688, - "y": 8.375 + "x": 940.1920166015625, + "y": 9.211999893188477 }, { - "x": 885.0980224609375, - "y": 6.2820000648498535 + "x": 940.1079711914062, + "y": 6.909999847412109 }, { - "x": 885.0430297851562, - "y": 4.188000202178955 + "x": 940.0479736328125, + "y": 4.60699987411499 }, { - "x": 885.010009765625, - "y": 2.0940001010894775 + "x": 940.0120239257812, + "y": 2.302999973297119 }, { - "x": 885, + "x": 940, "y": 0 }, { - "x": 885.010009765625, - "y": -2.0940001010894775 + "x": 940.0120239257812, + "y": -2.302999973297119 }, { - "x": 885.0430297851562, - "y": -4.188000202178955 + "x": 940.0479736328125, + "y": -4.60699987411499 }, { - "x": 885.0980224609375, - "y": -6.2820000648498535 + "x": 940.1079711914062, + "y": -6.909999847412109 }, { - "x": 885.1749877929688, - "y": -8.375 + "x": 940.1920166015625, + "y": -9.211999893188477 }, { - "x": 885.2739868164062, - "y": -10.467000007629395 + "x": 940.301025390625, + "y": -11.512999534606934 }, { - "x": 885.3939819335938, - "y": -12.557999610900879 + "x": 940.4340209960938, + "y": -13.812999725341797 }, { - "x": 885.5369873046875, - "y": -14.647000312805176 + "x": 940.5900268554688, + "y": -16.11199951171875 }, { - "x": 885.7009887695312, - "y": -16.735000610351562 + "x": 940.77099609375, + "y": -18.409000396728516 }, { - "x": 885.8870239257812, - "y": -18.820999145507812 + "x": 940.9760131835938, + "y": -20.702999114990234 }, { - "x": 886.094970703125, - "y": -20.905000686645508 + "x": 941.2050170898438, + "y": -22.996000289916992 }, { - "x": 886.3250122070312, - "y": -22.98699951171875 + "x": 941.4569702148438, + "y": -25.285999298095703 }, { - "x": 886.5770263671875, - "y": -25.06599998474121 + "x": 941.7340087890625, + "y": -27.572999954223633 }, { - "x": 886.8499755859375, - "y": -27.14299964904785 + "x": 942.0349731445312, + "y": -29.85700035095215 }, { - "x": 887.14501953125, - "y": -29.215999603271484 + "x": 942.3599853515625, + "y": -32.13800048828125 }, { - "x": 887.4619750976562, - "y": -31.285999298095703 + "x": 942.7080078125, + "y": -34.415000915527344 }, { - "x": 887.7999877929688, - "y": -33.35300064086914 + "x": 943.0800170898438, + "y": -36.68899917602539 }, { - "x": 888.1599731445312, - "y": -35.41600036621094 + "x": 943.4760131835938, + "y": -38.95800018310547 }, { - "x": 888.5419921875, - "y": -37.47600173950195 + "x": 943.89599609375, + "y": -41.222999572753906 }, { - "x": 888.9450073242188, - "y": -39.53099822998047 + "x": 944.3400268554688, + "y": -43.48400115966797 }, { - "x": 889.3699951171875, - "y": -41.582000732421875 + "x": 944.8070068359375, + "y": -45.7400016784668 }, { - "x": 889.8159790039062, - "y": -43.62799835205078 + "x": 945.2979736328125, + "y": -47.99100112915039 }, { - "x": 890.2839965820312, - "y": -45.66999816894531 + "x": 945.81201171875, + "y": -50.23699951171875 }, { - "x": 890.7730102539062, - "y": -47.70600128173828 + "x": 946.3499755859375, + "y": -52.47700119018555 }, { - "x": 891.2830200195312, - "y": -49.73699951171875 + "x": 946.9110107421875, + "y": -54.71099853515625 }, { - "x": 891.8140258789062, - "y": -51.76300048828125 + "x": 947.4959716796875, + "y": -56.939998626708984 }, { - "x": 892.3670043945312, - "y": -53.78300094604492 + "x": 948.10400390625, + "y": -59.1619987487793 }, { - "x": 892.9409790039062, - "y": -55.79800033569336 + "x": 948.7349853515625, + "y": -61.37799835205078 }, { - "x": 893.5360107421875, - "y": -57.805999755859375 + "x": 949.3889770507812, + "y": -63.58599853515625 }, { - "x": 894.1510009765625, - "y": -59.80799865722656 + "x": 950.0670166015625, + "y": -65.78800201416016 }, { - "x": 894.7880249023438, - "y": -61.803001403808594 + "x": 950.7670288085938, + "y": -67.98300170898438 }, { - "x": 895.4459838867188, - "y": -63.79100036621094 + "x": 951.489990234375, + "y": -70.1709976196289 }, { - "x": 895.1649780273438, - "y": -63.08100128173828 + "x": 952.2369995117188, + "y": -72.3499984741211 }, { - "x": 896.5590209960938, - "y": -67 + "x": 953.0059814453125, + "y": -74.52200317382812 + }, + { + "x": 952.4609985351562, + "y": -73.10399627685547 + }, + { + "x": 953.916015625, + "y": -77 } ], "isCurve": true, @@ -4860,312 +4976,324 @@ "link": "", "route": [ { - "x": 1570.5, - "y": -178.23199462890625 + "x": 1680.5, + "y": -196.39300537109375 }, { - "x": 1571.5579833984375, - "y": -178.0919952392578 + "x": 1681.572998046875, + "y": -196.26499938964844 }, { - "x": 1574.0450439453125, - "y": -177.72999572753906 + "x": 1684.31298828125, + "y": -195.9010009765625 }, { - "x": 1576.5269775390625, - "y": -177.33700561523438 + "x": 1687.0489501953125, + "y": -195.5030059814453 }, { - "x": 1579.0040283203125, - "y": -176.91200256347656 + "x": 1689.780029296875, + "y": -195.07000732421875 }, { - "x": 1581.4759521484375, - "y": -176.45700073242188 + "x": 1692.5050048828125, + "y": -194.60400390625 }, { - "x": 1583.9410400390625, - "y": -175.9709930419922 + "x": 1695.2230224609375, + "y": -194.10299682617188 }, { - "x": 1586.4010009765625, - "y": -175.4530029296875 + "x": 1697.93603515625, + "y": -193.5679931640625 }, { - "x": 1588.85400390625, - "y": -174.90499877929688 + "x": 1700.6409912109375, + "y": -192.9980010986328 }, { - "x": 1591.2989501953125, - "y": -174.3260040283203 + "x": 1703.3389892578125, + "y": -192.39500427246094 }, { - "x": 1593.737060546875, - "y": -173.71600341796875 + "x": 1706.029052734375, + "y": -191.75799560546875 }, { - "x": 1596.16796875, - "y": -173.0760040283203 + "x": 1708.7110595703125, + "y": -191.08799743652344 }, { - "x": 1598.5899658203125, - "y": -172.40499877929688 + "x": 1711.385009765625, + "y": -190.38299560546875 }, { - "x": 1601.0030517578125, - "y": -171.70399475097656 + "x": 1714.0489501953125, + "y": -189.64599609375 }, { - "x": 1603.407958984375, - "y": -170.9720001220703 + "x": 1716.7039794921875, + "y": -188.87399291992188 }, { - "x": 1605.802978515625, - "y": -170.21099853515625 + "x": 1719.3489990234375, + "y": -188.07000732421875 }, { - "x": 1608.18798828125, - "y": -169.41900634765625 + "x": 1721.9830322265625, + "y": -187.23199462890625 }, { - "x": 1610.56298828125, - "y": -168.59800720214844 + "x": 1724.6070556640625, + "y": -186.36099243164062 }, { - "x": 1612.927978515625, - "y": -167.74600219726562 + "x": 1727.219970703125, + "y": -185.45700073242188 }, { - "x": 1615.281982421875, - "y": -166.86500549316406 + "x": 1729.821044921875, + "y": -184.52099609375 }, { - "x": 1617.6240234375, - "y": -165.9550018310547 + "x": 1732.4100341796875, + "y": -183.552001953125 }, { - "x": 1619.9549560546875, - "y": -165.01499938964844 + "x": 1734.987060546875, + "y": -182.5500030517578 }, { - "x": 1622.2740478515625, - "y": -164.04600524902344 + "x": 1737.551025390625, + "y": -181.51600646972656 }, { - "x": 1624.5810546875, - "y": -163.04800415039062 + "x": 1740.10205078125, + "y": -180.4510040283203 }, { - "x": 1626.875, - "y": -162.02099609375 + "x": 1742.6390380859375, + "y": -179.35299682617188 }, { - "x": 1629.155029296875, - "y": -160.96499633789062 + "x": 1745.1619873046875, + "y": -178.22300720214844 }, { - "x": 1631.4229736328125, - "y": -159.88099670410156 + "x": 1747.6710205078125, + "y": -177.06100463867188 }, { - "x": 1633.676025390625, - "y": -158.76800537109375 + "x": 1750.1650390625, + "y": -175.86900329589844 }, { - "x": 1635.9150390625, - "y": -157.6269989013672 + "x": 1752.64404296875, + "y": -174.64500427246094 }, { - "x": 1638.1400146484375, - "y": -156.45799255371094 + "x": 1755.1070556640625, + "y": -173.38999938964844 }, { - "x": 1640.3499755859375, - "y": -155.26100158691406 + "x": 1757.553955078125, + "y": -172.10400390625 }, { - "x": 1642.5450439453125, - "y": -154.03599548339844 + "x": 1759.9849853515625, + "y": -170.78700256347656 }, { - "x": 1644.7239990234375, - "y": -152.78399658203125 + "x": 1762.4000244140625, + "y": -169.44000244140625 }, { - "x": 1646.886962890625, - "y": -151.5050048828125 + "x": 1764.7969970703125, + "y": -168.06300354003906 }, { - "x": 1649.0340576171875, - "y": -150.197998046875 + "x": 1767.176025390625, + "y": -166.65499877929688 }, { - "x": 1651.1650390625, - "y": -148.86500549316406 + "x": 1769.5379638671875, + "y": -165.21800231933594 }, { - "x": 1653.2779541015625, - "y": -147.5050048828125 + "x": 1771.8809814453125, + "y": -163.7519989013672 }, { - "x": 1655.375, - "y": -146.11900329589844 + "x": 1774.2060546875, + "y": -162.25599670410156 }, { - "x": 1657.4530029296875, - "y": -144.70599365234375 + "x": 1776.511962890625, + "y": -160.7310028076172 }, { - "x": 1659.5140380859375, - "y": -143.26699829101562 + "x": 1778.7989501953125, + "y": -159.177001953125 }, { - "x": 1661.5570068359375, - "y": -141.80299377441406 + "x": 1781.06494140625, + "y": -157.593994140625 }, { - "x": 1663.5799560546875, - "y": -140.31300354003906 + "x": 1783.31201171875, + "y": -155.98300170898438 }, { - "x": 1665.5860595703125, - "y": -138.79800415039062 + "x": 1785.5389404296875, + "y": -154.343994140625 }, { - "x": 1667.571044921875, - "y": -137.2570037841797 + "x": 1787.7440185546875, + "y": -152.677001953125 }, { - "x": 1669.5379638671875, - "y": -135.69200134277344 + "x": 1789.928955078125, + "y": -150.98300170898438 }, { - "x": 1671.4840087890625, - "y": -134.1020050048828 + "x": 1792.092041015625, + "y": -149.26100158691406 }, { - "x": 1673.4110107421875, - "y": -132.48800659179688 + "x": 1794.2330322265625, + "y": -147.51199340820312 }, { - "x": 1675.3170166015625, - "y": -130.85000610351562 + "x": 1796.35205078125, + "y": -145.73699951171875 }, { - "x": 1677.2020263671875, - "y": -129.18800354003906 + "x": 1798.447998046875, + "y": -143.93499755859375 }, { - "x": 1679.0660400390625, - "y": -127.50199890136719 + "x": 1800.52197265625, + "y": -142.10699462890625 }, { - "x": 1680.9090576171875, - "y": -125.79299926757812 + "x": 1802.572998046875, + "y": -140.2519989013672 }, { - "x": 1682.72998046875, - "y": -124.06099700927734 + "x": 1804.5999755859375, + "y": -138.3730010986328 }, { - "x": 1684.529052734375, - "y": -122.30699920654297 + "x": 1806.60302734375, + "y": -136.4669952392578 }, { - "x": 1686.3070068359375, - "y": -120.52899932861328 + "x": 1808.58203125, + "y": -134.53700256347656 }, { - "x": 1688.06103515625, - "y": -118.7300033569336 + "x": 1810.5369873046875, + "y": -132.58200073242188 }, { - "x": 1689.79296875, - "y": -116.90899658203125 + "x": 1812.467041015625, + "y": -130.60299682617188 }, { - "x": 1691.501953125, - "y": -115.06600189208984 + "x": 1814.373046875, + "y": -128.60000610351562 }, { - "x": 1693.18798828125, - "y": -113.2020034790039 + "x": 1816.251953125, + "y": -126.572998046875 }, { - "x": 1694.8499755859375, - "y": -111.31700134277344 + "x": 1818.1070556640625, + "y": -124.52200317382812 }, { - "x": 1696.488037109375, - "y": -109.41100311279297 + "x": 1819.93505859375, + "y": -122.447998046875 }, { - "x": 1698.10205078125, - "y": -107.48400115966797 + "x": 1821.737060546875, + "y": -120.35199737548828 }, { - "x": 1699.6920166015625, - "y": -105.53800201416016 + "x": 1823.511962890625, + "y": -118.23300170898438 }, { - "x": 1701.2569580078125, - "y": -103.57099914550781 + "x": 1825.260986328125, + "y": -116.09200286865234 }, { - "x": 1702.7979736328125, - "y": -101.58599853515625 + "x": 1826.9830322265625, + "y": -113.92900085449219 }, { - "x": 1704.31298828125, - "y": -99.58000183105469 + "x": 1828.677001953125, + "y": -111.74400329589844 }, { - "x": 1705.802978515625, - "y": -97.55699920654297 + "x": 1830.343994140625, + "y": -109.53900146484375 }, { - "x": 1707.2669677734375, - "y": -95.51399993896484 + "x": 1831.9830322265625, + "y": -107.31199645996094 }, { - "x": 1708.7060546875, - "y": -93.4530029296875 + "x": 1833.593994140625, + "y": -105.06500244140625 }, { - "x": 1710.1190185546875, - "y": -91.375 + "x": 1835.177001953125, + "y": -102.79900360107422 }, { - "x": 1711.5050048828125, - "y": -89.27799987792969 + "x": 1836.73095703125, + "y": -100.51200103759766 }, { - "x": 1712.864990234375, - "y": -87.16500091552734 + "x": 1838.2559814453125, + "y": -98.20600128173828 }, { - "x": 1714.197998046875, - "y": -85.03399658203125 + "x": 1839.751953125, + "y": -95.88099670410156 }, { - "x": 1715.5050048828125, - "y": -82.88700103759766 + "x": 1841.218017578125, + "y": -93.53800201416016 }, { - "x": 1716.7840576171875, - "y": -80.7239990234375 + "x": 1842.655029296875, + "y": -91.1760025024414 }, { - "x": 1718.0360107421875, - "y": -78.54499816894531 + "x": 1844.06298828125, + "y": -88.7969970703125 }, { - "x": 1718.126953125, - "y": -78.46499633789062 + "x": 1845.43994140625, + "y": -86.4000015258789 }, { - "x": 1720.0989990234375, - "y": -74.8030014038086 + "x": 1846.7869873046875, + "y": -83.98500061035156 + }, + { + "x": 1848.10400390625, + "y": -81.55400085449219 + }, + { + "x": 1847.5439453125, + "y": -82.6780014038086 + }, + { + "x": 1849.4530029296875, + "y": -78.98300170898438 } ], "isCurve": true, @@ -5200,304 +5328,312 @@ "link": "", "route": [ { - "x": 1741.9110107421875, - "y": -8.803000450134277 + "x": 1871.197021484375, + "y": -12.982999801635742 + }, + { + "x": 1871.5030517578125, + "y": -11.048999786376953 + }, + { + "x": 1871.9010009765625, + "y": -8.312999725341797 }, { - "x": 1742.092041015625, - "y": -7.558000087738037 + "x": 1872.2650146484375, + "y": -5.572999954223633 }, { - "x": 1742.4219970703125, - "y": -5.065999984741211 + "x": 1872.593994140625, + "y": -2.828000068664551 }, { - "x": 1742.7220458984375, - "y": -2.571000099182129 + "x": 1872.8890380859375, + "y": -0.07900000363588333 }, { - "x": 1742.989990234375, - "y": -0.07199999690055847 + "x": 1873.1490478515625, + "y": 2.671999931335449 }, { - "x": 1743.2259521484375, - "y": 2.428999900817871 + "x": 1873.3740234375, + "y": 5.427999973297119 }, { - "x": 1743.4310302734375, - "y": 4.934000015258789 + "x": 1873.56494140625, + "y": 8.185999870300293 }, { - "x": 1743.60498046875, - "y": 7.440999984741211 + "x": 1873.7220458984375, + "y": 10.946000099182129 }, { - "x": 1743.7469482421875, - "y": 9.951000213623047 + "x": 1873.843017578125, + "y": 13.708000183105469 }, { - "x": 1743.8570556640625, - "y": 12.461000442504883 + "x": 1873.9300537109375, + "y": 16.47100067138672 }, { - "x": 1743.93603515625, - "y": 14.972999572753906 + "x": 1873.9820556640625, + "y": 19.235000610351562 }, { - "x": 1743.9840087890625, - "y": 17.486000061035156 + "x": 1874, + "y": 22 }, { - "x": 1744, - "y": 20 + "x": 1873.9820556640625, + "y": 24.763999938964844 }, { - "x": 1743.9840087890625, - "y": 22.51300048828125 + "x": 1873.9300537109375, + "y": 27.527999877929688 }, { - "x": 1743.93603515625, - "y": 25.025999069213867 + "x": 1873.843017578125, + "y": 30.291000366210938 }, { - "x": 1743.8570556640625, - "y": 27.538000106811523 + "x": 1873.7220458984375, + "y": 33.053001403808594 }, { - "x": 1743.7469482421875, - "y": 30.04800033569336 + "x": 1873.56494140625, + "y": 35.8129997253418 }, { - "x": 1743.60498046875, - "y": 32.55799865722656 + "x": 1873.3740234375, + "y": 38.57099914550781 }, { - "x": 1743.4310302734375, - "y": 35.064998626708984 + "x": 1873.1490478515625, + "y": 41.32699966430664 }, { - "x": 1743.2259521484375, - "y": 37.56999969482422 + "x": 1872.8890380859375, + "y": 44.07899856567383 }, { - "x": 1742.989990234375, - "y": 40.071998596191406 + "x": 1872.593994140625, + "y": 46.827999114990234 }, { - "x": 1742.7220458984375, - "y": 42.57099914550781 + "x": 1872.2650146484375, + "y": 49.573001861572266 }, { - "x": 1742.4219970703125, - "y": 45.066001892089844 + "x": 1871.9010009765625, + "y": 52.3129997253418 }, { - "x": 1742.092041015625, - "y": 47.55799865722656 + "x": 1871.5030517578125, + "y": 55.04899978637695 }, { - "x": 1741.72998046875, - "y": 50.04499816894531 + "x": 1871.0699462890625, + "y": 57.779998779296875 }, { - "x": 1741.3370361328125, - "y": 52.527000427246094 + "x": 1870.60400390625, + "y": 60.505001068115234 }, { - "x": 1740.9119873046875, - "y": 55.00400161743164 + "x": 1870.10302734375, + "y": 63.222999572753906 }, { - "x": 1740.45703125, - "y": 57.47600173950195 + "x": 1869.5679931640625, + "y": 65.93599700927734 }, { - "x": 1739.970947265625, - "y": 59.941001892089844 + "x": 1868.998046875, + "y": 68.64099884033203 }, { - "x": 1739.4530029296875, - "y": 62.4010009765625 + "x": 1868.39501953125, + "y": 71.33899688720703 }, { - "x": 1738.905029296875, - "y": 64.85399627685547 + "x": 1867.758056640625, + "y": 74.02899932861328 }, { - "x": 1738.3260498046875, - "y": 67.29900360107422 + "x": 1867.0880126953125, + "y": 76.71099853515625 }, { - "x": 1737.7159423828125, - "y": 69.73699951171875 + "x": 1866.383056640625, + "y": 79.38500213623047 }, { - "x": 1737.0760498046875, - "y": 72.16799926757812 + "x": 1865.64599609375, + "y": 82.04900360107422 }, { - "x": 1736.405029296875, - "y": 74.58999633789062 + "x": 1864.8740234375, + "y": 84.7040023803711 }, { - "x": 1735.7039794921875, - "y": 77.00299835205078 + "x": 1864.0699462890625, + "y": 87.3489990234375 }, { - "x": 1734.9720458984375, - "y": 79.40799713134766 + "x": 1863.2320556640625, + "y": 89.98300170898438 }, { - "x": 1734.2110595703125, - "y": 81.8030014038086 + "x": 1862.3609619140625, + "y": 92.60700225830078 }, { - "x": 1733.4189453125, - "y": 84.18800354003906 + "x": 1861.45703125, + "y": 95.22000122070312 }, { - "x": 1732.5980224609375, - "y": 86.56300354003906 + "x": 1860.52099609375, + "y": 97.82099914550781 }, { - "x": 1731.7459716796875, - "y": 88.9280014038086 + "x": 1859.552001953125, + "y": 100.41000366210938 }, { - "x": 1730.864990234375, - "y": 91.28199768066406 + "x": 1858.550048828125, + "y": 102.98699951171875 }, { - "x": 1729.9549560546875, - "y": 93.6240005493164 + "x": 1857.5159912109375, + "y": 105.5510025024414 }, { - "x": 1729.0150146484375, - "y": 95.95500183105469 + "x": 1856.4510498046875, + "y": 108.10199737548828 }, { - "x": 1728.0460205078125, - "y": 98.27400207519531 + "x": 1855.35302734375, + "y": 110.63899993896484 }, { - "x": 1727.0479736328125, - "y": 100.58100128173828 + "x": 1854.2230224609375, + "y": 113.16200256347656 }, { - "x": 1726.02099609375, - "y": 102.875 + "x": 1853.06103515625, + "y": 115.6709976196289 }, { - "x": 1724.9649658203125, - "y": 105.15499877929688 + "x": 1851.8690185546875, + "y": 118.16500091552734 }, { - "x": 1723.8809814453125, - "y": 107.4229965209961 + "x": 1850.64501953125, + "y": 120.64399719238281 }, { - "x": 1722.7679443359375, - "y": 109.6760025024414 + "x": 1849.3900146484375, + "y": 123.10700225830078 }, { - "x": 1721.626953125, - "y": 111.91500091552734 + "x": 1848.10400390625, + "y": 125.55400085449219 }, { - "x": 1720.4580078125, - "y": 114.13999938964844 + "x": 1846.7869873046875, + "y": 127.98500061035156 }, { - "x": 1719.260986328125, - "y": 116.3499984741211 + "x": 1845.43994140625, + "y": 130.39999389648438 }, { - "x": 1718.0360107421875, - "y": 118.54499816894531 + "x": 1844.06298828125, + "y": 132.7969970703125 }, { - "x": 1716.7840576171875, - "y": 120.7239990234375 + "x": 1842.655029296875, + "y": 135.17599487304688 }, { - "x": 1715.5050048828125, - "y": 122.88700103759766 + "x": 1841.218017578125, + "y": 137.53799438476562 }, { - "x": 1714.197998046875, - "y": 125.03399658203125 + "x": 1839.751953125, + "y": 139.88099670410156 }, { - "x": 1712.864990234375, - "y": 127.16500091552734 + "x": 1838.2559814453125, + "y": 142.20599365234375 }, { - "x": 1711.5050048828125, - "y": 129.2779998779297 + "x": 1836.73095703125, + "y": 144.51199340820312 }, { - "x": 1710.1190185546875, - "y": 131.375 + "x": 1835.177001953125, + "y": 146.7989959716797 }, { - "x": 1708.7060546875, - "y": 133.4530029296875 + "x": 1833.593994140625, + "y": 149.06500244140625 }, { - "x": 1707.2669677734375, - "y": 135.51400756835938 + "x": 1831.9830322265625, + "y": 151.31199645996094 }, { - "x": 1705.802978515625, - "y": 137.5570068359375 + "x": 1830.343994140625, + "y": 153.53900146484375 }, { - "x": 1704.31298828125, - "y": 139.5800018310547 + "x": 1828.677001953125, + "y": 155.74400329589844 }, { - "x": 1702.7979736328125, - "y": 141.58599853515625 + "x": 1826.9830322265625, + "y": 157.9290008544922 }, { - "x": 1701.2569580078125, - "y": 143.5709991455078 + "x": 1825.260986328125, + "y": 160.0919952392578 }, { - "x": 1699.6920166015625, - "y": 145.53799438476562 + "x": 1823.511962890625, + "y": 162.23300170898438 }, { - "x": 1698.10205078125, - "y": 147.48399353027344 + "x": 1821.737060546875, + "y": 164.3520050048828 }, { - "x": 1696.488037109375, - "y": 149.41099548339844 + "x": 1819.93505859375, + "y": 166.447998046875 }, { - "x": 1694.8499755859375, - "y": 151.31700134277344 + "x": 1818.1070556640625, + "y": 168.52200317382812 }, { - "x": 1693.18798828125, - "y": 153.20199584960938 + "x": 1816.251953125, + "y": 170.572998046875 }, { - "x": 1691.501953125, - "y": 155.0659942626953 + "x": 1814.373046875, + "y": 172.60000610351562 }, { - "x": 1689.79296875, - "y": 156.90899658203125 + "x": 1812.467041015625, + "y": 174.60299682617188 }, { - "x": 1690.9420166015625, - "y": 155.73899841308594 + "x": 1812.748046875, + "y": 174.36199951171875 }, { - "x": 1688.0570068359375, - "y": 158.73500061035156 + "x": 1809.81201171875, + "y": 177.30799865722656 } ], "isCurve": true, @@ -5532,312 +5668,320 @@ "link": "", "route": [ { - "x": 1635.0570068359375, - "y": 198.06399536132812 + "x": 1756.81201171875, + "y": 216.49400329589844 }, { - "x": 1633.676025390625, - "y": 198.76800537109375 + "x": 1755.1070556640625, + "y": 217.38999938964844 }, { - "x": 1631.4229736328125, - "y": 199.88099670410156 + "x": 1752.64404296875, + "y": 218.64500427246094 }, { - "x": 1629.155029296875, - "y": 200.96499633789062 + "x": 1750.1650390625, + "y": 219.86900329589844 }, { - "x": 1626.875, - "y": 202.02099609375 + "x": 1747.6710205078125, + "y": 221.06100463867188 }, { - "x": 1624.5810546875, - "y": 203.04800415039062 + "x": 1745.1619873046875, + "y": 222.22300720214844 }, { - "x": 1622.2740478515625, - "y": 204.04600524902344 + "x": 1742.6390380859375, + "y": 223.35299682617188 }, { - "x": 1619.9549560546875, - "y": 205.01499938964844 + "x": 1740.10205078125, + "y": 224.4510040283203 }, { - "x": 1617.6240234375, - "y": 205.9550018310547 + "x": 1737.551025390625, + "y": 225.51600646972656 }, { - "x": 1615.281982421875, - "y": 206.86500549316406 + "x": 1734.987060546875, + "y": 226.5500030517578 }, { - "x": 1612.927978515625, - "y": 207.74600219726562 + "x": 1732.4100341796875, + "y": 227.552001953125 }, { - "x": 1610.56298828125, - "y": 208.59800720214844 + "x": 1729.821044921875, + "y": 228.52099609375 }, { - "x": 1608.18798828125, - "y": 209.41900634765625 + "x": 1727.219970703125, + "y": 229.45700073242188 }, { - "x": 1605.802978515625, - "y": 210.21099853515625 + "x": 1724.6070556640625, + "y": 230.36099243164062 }, { - "x": 1603.407958984375, - "y": 210.9720001220703 + "x": 1721.9830322265625, + "y": 231.23199462890625 }, { - "x": 1601.0030517578125, - "y": 211.70399475097656 + "x": 1719.3489990234375, + "y": 232.07000732421875 }, { - "x": 1598.5899658203125, - "y": 212.40499877929688 + "x": 1716.7039794921875, + "y": 232.87399291992188 }, { - "x": 1596.16796875, - "y": 213.0760040283203 + "x": 1714.0489501953125, + "y": 233.64599609375 }, { - "x": 1593.737060546875, - "y": 213.71600341796875 + "x": 1711.385009765625, + "y": 234.38299560546875 }, { - "x": 1591.2989501953125, - "y": 214.3260040283203 + "x": 1708.7110595703125, + "y": 235.08799743652344 }, { - "x": 1588.85400390625, - "y": 214.90499877929688 + "x": 1706.029052734375, + "y": 235.75799560546875 }, { - "x": 1586.4010009765625, - "y": 215.4530029296875 + "x": 1703.3389892578125, + "y": 236.39500427246094 }, { - "x": 1583.9410400390625, - "y": 215.9709930419922 + "x": 1700.6409912109375, + "y": 236.9980010986328 }, { - "x": 1581.4759521484375, - "y": 216.45700073242188 + "x": 1697.93603515625, + "y": 237.5679931640625 }, { - "x": 1579.0040283203125, - "y": 216.91200256347656 + "x": 1695.2230224609375, + "y": 238.10299682617188 }, { - "x": 1576.5269775390625, - "y": 217.33700561523438 + "x": 1692.5050048828125, + "y": 238.60400390625 }, { - "x": 1574.0450439453125, - "y": 217.72999572753906 + "x": 1689.780029296875, + "y": 239.07000732421875 }, { - "x": 1571.5579833984375, - "y": 218.0919952392578 + "x": 1687.0489501953125, + "y": 239.5030059814453 }, { - "x": 1569.0660400390625, - "y": 218.4219970703125 + "x": 1684.31298828125, + "y": 239.9010009765625 }, { - "x": 1566.571044921875, - "y": 218.7220001220703 + "x": 1681.572998046875, + "y": 240.26499938964844 }, { - "x": 1564.072021484375, - "y": 218.99000549316406 + "x": 1678.8280029296875, + "y": 240.593994140625 }, { - "x": 1561.5699462890625, - "y": 219.2259979248047 + "x": 1676.0789794921875, + "y": 240.88900756835938 }, { - "x": 1559.06494140625, - "y": 219.43099975585938 + "x": 1673.3270263671875, + "y": 241.1490020751953 }, { - "x": 1556.5579833984375, - "y": 219.60499572753906 + "x": 1670.571044921875, + "y": 241.37399291992188 }, { - "x": 1554.0479736328125, - "y": 219.7469940185547 + "x": 1667.81298828125, + "y": 241.56500244140625 }, { - "x": 1551.5379638671875, - "y": 219.85699462890625 + "x": 1665.052978515625, + "y": 241.7220001220703 }, { - "x": 1549.0260009765625, - "y": 219.93600463867188 + "x": 1662.291015625, + "y": 241.84300231933594 }, { - "x": 1546.512939453125, - "y": 219.98399353027344 + "x": 1659.5279541015625, + "y": 241.92999267578125 }, { - "x": 1544, - "y": 220 + "x": 1656.7640380859375, + "y": 241.98199462890625 }, { - "x": 1541.4859619140625, - "y": 219.98399353027344 + "x": 1654, + "y": 242 }, { - "x": 1538.9730224609375, - "y": 219.93600463867188 + "x": 1651.2349853515625, + "y": 241.98199462890625 }, { - "x": 1536.4610595703125, - "y": 219.85699462890625 + "x": 1648.470947265625, + "y": 241.92999267578125 }, { - "x": 1533.9510498046875, - "y": 219.7469940185547 + "x": 1645.7080078125, + "y": 241.84300231933594 }, { - "x": 1531.4410400390625, - "y": 219.60499572753906 + "x": 1642.946044921875, + "y": 241.7220001220703 }, { - "x": 1528.9339599609375, - "y": 219.43099975585938 + "x": 1640.18603515625, + "y": 241.56500244140625 }, { - "x": 1526.428955078125, - "y": 219.2259979248047 + "x": 1637.427978515625, + "y": 241.37399291992188 }, { - "x": 1523.927001953125, - "y": 218.99000549316406 + "x": 1634.6719970703125, + "y": 241.1490020751953 }, { - "x": 1521.427978515625, - "y": 218.7220001220703 + "x": 1631.9200439453125, + "y": 240.88900756835938 }, { - "x": 1518.9329833984375, - "y": 218.4219970703125 + "x": 1629.1710205078125, + "y": 240.593994140625 }, { - "x": 1516.4410400390625, - "y": 218.0919952392578 + "x": 1626.426025390625, + "y": 240.26499938964844 }, { - "x": 1513.9539794921875, - "y": 217.72999572753906 + "x": 1623.68603515625, + "y": 239.9010009765625 }, { - "x": 1511.4720458984375, - "y": 217.33700561523438 + "x": 1620.949951171875, + "y": 239.5030059814453 }, { - "x": 1508.9949951171875, - "y": 216.91200256347656 + "x": 1618.218994140625, + "y": 239.07000732421875 }, { - "x": 1506.52294921875, - "y": 216.45700073242188 + "x": 1615.4940185546875, + "y": 238.60400390625 }, { - "x": 1504.0579833984375, - "y": 215.9709930419922 + "x": 1612.7760009765625, + "y": 238.10299682617188 }, { - "x": 1501.5980224609375, - "y": 215.4530029296875 + "x": 1610.06298828125, + "y": 237.5679931640625 }, { - "x": 1499.14501953125, - "y": 214.90499877929688 + "x": 1607.3580322265625, + "y": 236.9980010986328 }, { - "x": 1496.699951171875, - "y": 214.3260040283203 + "x": 1604.6600341796875, + "y": 236.39500427246094 }, { - "x": 1494.261962890625, - "y": 213.71600341796875 + "x": 1601.969970703125, + "y": 235.75799560546875 }, { - "x": 1491.8310546875, - "y": 213.0760040283203 + "x": 1599.2879638671875, + "y": 235.08799743652344 }, { - "x": 1489.4090576171875, - "y": 212.40499877929688 + "x": 1596.614013671875, + "y": 234.38299560546875 }, { - "x": 1486.9959716796875, - "y": 211.70399475097656 + "x": 1593.949951171875, + "y": 233.64599609375 }, { - "x": 1484.5909423828125, - "y": 210.9720001220703 + "x": 1591.2950439453125, + "y": 232.87399291992188 }, { - "x": 1482.196044921875, - "y": 210.21099853515625 + "x": 1588.6500244140625, + "y": 232.07000732421875 }, { - "x": 1479.81103515625, - "y": 209.41900634765625 + "x": 1586.0159912109375, + "y": 231.23199462890625 }, { - "x": 1477.43603515625, - "y": 208.59800720214844 + "x": 1583.3919677734375, + "y": 230.36099243164062 }, { - "x": 1475.071044921875, - "y": 207.74600219726562 + "x": 1580.779052734375, + "y": 229.45700073242188 }, { - "x": 1472.717041015625, - "y": 206.86500549316406 + "x": 1578.177978515625, + "y": 228.52099609375 }, { - "x": 1470.375, - "y": 205.9550018310547 + "x": 1575.5889892578125, + "y": 227.552001953125 }, { - "x": 1468.0439453125, - "y": 205.01499938964844 + "x": 1573.011962890625, + "y": 226.5500030517578 }, { - "x": 1465.7249755859375, - "y": 204.04600524902344 + "x": 1570.447998046875, + "y": 225.51600646972656 }, { - "x": 1463.41796875, - "y": 203.04800415039062 + "x": 1567.89697265625, + "y": 224.4510040283203 }, { - "x": 1461.1240234375, - "y": 202.02099609375 + "x": 1565.3599853515625, + "y": 223.35299682617188 }, { - "x": 1458.843994140625, - "y": 200.96499633789062 + "x": 1562.8370361328125, + "y": 222.22300720214844 }, { - "x": 1456.5760498046875, - "y": 199.88099670410156 + "x": 1560.3280029296875, + "y": 221.06100463867188 }, { - "x": 1457.1510009765625, - "y": 200.20199584960938 + "x": 1557.833984375, + "y": 219.86900329589844 }, { - "x": 1453.4420166015625, - "y": 198.31900024414062 + "x": 1555.35498046875, + "y": 218.64500427246094 + }, + { + "x": 1555.3690185546875, + "y": 218.69000244140625 + }, + { + "x": 1551.68701171875, + "y": 216.75599670410156 } ], "isCurve": true, @@ -5872,300 +6016,312 @@ "link": "", "route": [ { - "x": 1399.4420166015625, - "y": 158.20899963378906 + "x": 1497.68701171875, + "y": 176.80799865722656 + }, + { + "x": 1497.4620361328125, + "y": 176.58200073242188 + }, + { + "x": 1495.531982421875, + "y": 174.60299682617188 + }, + { + "x": 1493.6259765625, + "y": 172.60000610351562 }, { - "x": 1398.2060546875, - "y": 156.90899658203125 + "x": 1491.7469482421875, + "y": 170.572998046875 }, { - "x": 1396.4969482421875, - "y": 155.0659942626953 + "x": 1489.8919677734375, + "y": 168.52200317382812 }, { - "x": 1394.81103515625, - "y": 153.20199584960938 + "x": 1488.06396484375, + "y": 166.447998046875 }, { - "x": 1393.1490478515625, - "y": 151.31700134277344 + "x": 1486.261962890625, + "y": 164.3520050048828 }, { - "x": 1391.510986328125, - "y": 149.41099548339844 + "x": 1484.487060546875, + "y": 162.23300170898438 }, { - "x": 1389.89697265625, - "y": 147.48399353027344 + "x": 1482.738037109375, + "y": 160.0919952392578 }, { - "x": 1388.3070068359375, - "y": 145.53799438476562 + "x": 1481.0159912109375, + "y": 157.9290008544922 }, { - "x": 1386.741943359375, - "y": 143.5709991455078 + "x": 1479.322021484375, + "y": 155.74400329589844 }, { - "x": 1385.2010498046875, - "y": 141.58599853515625 + "x": 1477.655029296875, + "y": 153.53900146484375 }, { - "x": 1383.68603515625, - "y": 139.5800018310547 + "x": 1476.0159912109375, + "y": 151.31199645996094 }, { - "x": 1382.196044921875, - "y": 137.5570068359375 + "x": 1474.405029296875, + "y": 149.06500244140625 }, { - "x": 1380.7320556640625, - "y": 135.51400756835938 + "x": 1472.822021484375, + "y": 146.7989959716797 }, { - "x": 1379.29296875, - "y": 133.4530029296875 + "x": 1471.2679443359375, + "y": 144.51199340820312 }, { - "x": 1377.8800048828125, - "y": 131.375 + "x": 1469.7430419921875, + "y": 142.20599365234375 }, { - "x": 1376.4940185546875, - "y": 129.2779998779297 + "x": 1468.2469482421875, + "y": 139.88099670410156 }, { - "x": 1375.134033203125, - "y": 127.16500091552734 + "x": 1466.781005859375, + "y": 137.53799438476562 }, { - "x": 1373.801025390625, - "y": 125.03399658203125 + "x": 1465.343994140625, + "y": 135.17599487304688 }, { - "x": 1372.4940185546875, - "y": 122.88700103759766 + "x": 1463.93603515625, + "y": 132.7969970703125 }, { - "x": 1371.2149658203125, - "y": 120.7239990234375 + "x": 1462.5589599609375, + "y": 130.39999389648438 }, { - "x": 1369.9630126953125, - "y": 118.54499816894531 + "x": 1461.2120361328125, + "y": 127.98500061035156 }, { - "x": 1368.738037109375, - "y": 116.3499984741211 + "x": 1459.89501953125, + "y": 125.55400085449219 }, { - "x": 1367.541015625, - "y": 114.13999938964844 + "x": 1458.6090087890625, + "y": 123.10700225830078 }, { - "x": 1366.3719482421875, - "y": 111.91500091552734 + "x": 1457.35400390625, + "y": 120.64399719238281 }, { - "x": 1365.23095703125, - "y": 109.6760025024414 + "x": 1456.1300048828125, + "y": 118.16500091552734 }, { - "x": 1364.1180419921875, - "y": 107.4229965209961 + "x": 1454.93798828125, + "y": 115.6709976196289 }, { - "x": 1363.0340576171875, - "y": 105.15499877929688 + "x": 1453.7760009765625, + "y": 113.16200256347656 }, { - "x": 1361.97802734375, - "y": 102.875 + "x": 1452.64599609375, + "y": 110.63899993896484 }, { - "x": 1360.9510498046875, - "y": 100.58100128173828 + "x": 1451.5479736328125, + "y": 108.10199737548828 }, { - "x": 1359.9530029296875, - "y": 98.27400207519531 + "x": 1450.4830322265625, + "y": 105.5510025024414 }, { - "x": 1358.9840087890625, - "y": 95.95500183105469 + "x": 1449.448974609375, + "y": 102.98699951171875 }, { - "x": 1358.0439453125, - "y": 93.6240005493164 + "x": 1448.447021484375, + "y": 100.41000366210938 }, { - "x": 1357.134033203125, - "y": 91.28199768066406 + "x": 1447.47802734375, + "y": 97.82099914550781 }, { - "x": 1356.2530517578125, - "y": 88.9280014038086 + "x": 1446.5419921875, + "y": 95.22000122070312 }, { - "x": 1355.4010009765625, - "y": 86.56300354003906 + "x": 1445.637939453125, + "y": 92.60700225830078 }, { - "x": 1354.5799560546875, - "y": 84.18800354003906 + "x": 1444.7669677734375, + "y": 89.98300170898438 }, { - "x": 1353.7879638671875, - "y": 81.8030014038086 + "x": 1443.928955078125, + "y": 87.3489990234375 }, { - "x": 1353.0269775390625, - "y": 79.40799713134766 + "x": 1443.125, + "y": 84.7040023803711 }, { - "x": 1352.2950439453125, - "y": 77.00299835205078 + "x": 1442.35302734375, + "y": 82.04900360107422 }, { - "x": 1351.593994140625, - "y": 74.58999633789062 + "x": 1441.615966796875, + "y": 79.38500213623047 }, { - "x": 1350.9229736328125, - "y": 72.16799926757812 + "x": 1440.9110107421875, + "y": 76.71099853515625 }, { - "x": 1350.282958984375, - "y": 69.73699951171875 + "x": 1440.240966796875, + "y": 74.02899932861328 }, { - "x": 1349.6729736328125, - "y": 67.29900360107422 + "x": 1439.60400390625, + "y": 71.33899688720703 }, { - "x": 1349.093994140625, - "y": 64.85399627685547 + "x": 1439.0009765625, + "y": 68.64099884033203 }, { - "x": 1348.5460205078125, - "y": 62.4010009765625 + "x": 1438.4310302734375, + "y": 65.93599700927734 }, { - "x": 1348.0279541015625, - "y": 59.941001892089844 + "x": 1437.89599609375, + "y": 63.222999572753906 }, { - "x": 1347.5419921875, - "y": 57.47600173950195 + "x": 1437.39501953125, + "y": 60.505001068115234 }, { - "x": 1347.0870361328125, - "y": 55.00400161743164 + "x": 1436.928955078125, + "y": 57.779998779296875 }, { - "x": 1346.6619873046875, - "y": 52.527000427246094 + "x": 1436.4959716796875, + "y": 55.04899978637695 }, { - "x": 1346.26904296875, - "y": 50.04499816894531 + "x": 1436.0980224609375, + "y": 52.3129997253418 }, { - "x": 1345.906982421875, - "y": 47.55799865722656 + "x": 1435.7340087890625, + "y": 49.573001861572266 }, { - "x": 1345.5770263671875, - "y": 45.066001892089844 + "x": 1435.405029296875, + "y": 46.827999114990234 }, { - "x": 1345.2769775390625, - "y": 42.57099914550781 + "x": 1435.1099853515625, + "y": 44.07899856567383 }, { - "x": 1345.009033203125, - "y": 40.071998596191406 + "x": 1434.8499755859375, + "y": 41.32699966430664 }, { - "x": 1344.77294921875, - "y": 37.56999969482422 + "x": 1434.625, + "y": 38.57099914550781 }, { - "x": 1344.5679931640625, - "y": 35.064998626708984 + "x": 1434.4339599609375, + "y": 35.8129997253418 }, { - "x": 1344.39404296875, - "y": 32.55799865722656 + "x": 1434.2769775390625, + "y": 33.053001403808594 }, { - "x": 1344.251953125, - "y": 30.04800033569336 + "x": 1434.156005859375, + "y": 30.291000366210938 }, { - "x": 1344.1419677734375, - "y": 27.538000106811523 + "x": 1434.0689697265625, + "y": 27.527999877929688 }, { - "x": 1344.06298828125, - "y": 25.025999069213867 + "x": 1434.0169677734375, + "y": 24.763999938964844 }, { - "x": 1344.0150146484375, - "y": 22.51300048828125 + "x": 1434, + "y": 22 }, { - "x": 1344, - "y": 20 + "x": 1434.0169677734375, + "y": 19.235000610351562 }, { - "x": 1344.0150146484375, - "y": 17.486000061035156 + "x": 1434.0689697265625, + "y": 16.47100067138672 }, { - "x": 1344.06298828125, - "y": 14.972999572753906 + "x": 1434.156005859375, + "y": 13.708000183105469 }, { - "x": 1344.1419677734375, - "y": 12.461000442504883 + "x": 1434.2769775390625, + "y": 10.946000099182129 }, { - "x": 1344.251953125, - "y": 9.951000213623047 + "x": 1434.4339599609375, + "y": 8.185999870300293 }, { - "x": 1344.39404296875, - "y": 7.440999984741211 + "x": 1434.625, + "y": 5.427999973297119 }, { - "x": 1344.5679931640625, - "y": 4.934000015258789 + "x": 1434.8499755859375, + "y": 2.671999931335449 }, { - "x": 1344.77294921875, - "y": 2.428999900817871 + "x": 1435.1099853515625, + "y": -0.07900000363588333 }, { - "x": 1345.009033203125, - "y": -0.07199999690055847 + "x": 1435.405029296875, + "y": -2.828000068664551 }, { - "x": 1345.2769775390625, - "y": -2.571000099182129 + "x": 1435.7340087890625, + "y": -5.572999954223633 }, { - "x": 1345.5770263671875, - "y": -5.065999984741211 + "x": 1436.0980224609375, + "y": -8.312999725341797 }, { - "x": 1345.489013671875, - "y": -4.686999797821045 + "x": 1436.1409912109375, + "y": -8.876999855041504 }, { - "x": 1346.0880126953125, - "y": -8.803000450134277 + "x": 1436.802001953125, + "y": -12.982999801635742 } ], "isCurve": true, diff --git a/e2etests/testdata/txtar/cycle-diagram/dagre/sketch.exp.svg b/e2etests/testdata/txtar/cycle-diagram/dagre/sketch.exp.svg index b1b31e77f0..15bd39d32a 100644 --- a/e2etests/testdata/txtar/cycle-diagram/dagre/sketch.exp.svg +++ b/e2etests/testdata/txtar/cycle-diagram/dagre/sketch.exp.svg @@ -1,9 +1,9 @@ -abcdabcababcdefabcde - - - - - - - - - - - - - - - - - - - - - + .d2-1531132284 .fill-N1{fill:#0A0F25;} + .d2-1531132284 .fill-N2{fill:#676C7E;} + .d2-1531132284 .fill-N3{fill:#9499AB;} + .d2-1531132284 .fill-N4{fill:#CFD2DD;} + .d2-1531132284 .fill-N5{fill:#DEE1EB;} + .d2-1531132284 .fill-N6{fill:#EEF1F8;} + .d2-1531132284 .fill-N7{fill:#FFFFFF;} + .d2-1531132284 .fill-B1{fill:#0D32B2;} + .d2-1531132284 .fill-B2{fill:#0D32B2;} + .d2-1531132284 .fill-B3{fill:#E3E9FD;} + .d2-1531132284 .fill-B4{fill:#E3E9FD;} + .d2-1531132284 .fill-B5{fill:#EDF0FD;} + .d2-1531132284 .fill-B6{fill:#F7F8FE;} + .d2-1531132284 .fill-AA2{fill:#4A6FF3;} + .d2-1531132284 .fill-AA4{fill:#EDF0FD;} + .d2-1531132284 .fill-AA5{fill:#F7F8FE;} + .d2-1531132284 .fill-AB4{fill:#EDF0FD;} + .d2-1531132284 .fill-AB5{fill:#F7F8FE;} + .d2-1531132284 .stroke-N1{stroke:#0A0F25;} + .d2-1531132284 .stroke-N2{stroke:#676C7E;} + .d2-1531132284 .stroke-N3{stroke:#9499AB;} + .d2-1531132284 .stroke-N4{stroke:#CFD2DD;} + .d2-1531132284 .stroke-N5{stroke:#DEE1EB;} + .d2-1531132284 .stroke-N6{stroke:#EEF1F8;} + .d2-1531132284 .stroke-N7{stroke:#FFFFFF;} + .d2-1531132284 .stroke-B1{stroke:#0D32B2;} + .d2-1531132284 .stroke-B2{stroke:#0D32B2;} + .d2-1531132284 .stroke-B3{stroke:#E3E9FD;} + .d2-1531132284 .stroke-B4{stroke:#E3E9FD;} + .d2-1531132284 .stroke-B5{stroke:#EDF0FD;} + .d2-1531132284 .stroke-B6{stroke:#F7F8FE;} + .d2-1531132284 .stroke-AA2{stroke:#4A6FF3;} + .d2-1531132284 .stroke-AA4{stroke:#EDF0FD;} + .d2-1531132284 .stroke-AA5{stroke:#F7F8FE;} + .d2-1531132284 .stroke-AB4{stroke:#EDF0FD;} + .d2-1531132284 .stroke-AB5{stroke:#F7F8FE;} + .d2-1531132284 .background-color-N1{background-color:#0A0F25;} + .d2-1531132284 .background-color-N2{background-color:#676C7E;} + .d2-1531132284 .background-color-N3{background-color:#9499AB;} + .d2-1531132284 .background-color-N4{background-color:#CFD2DD;} + .d2-1531132284 .background-color-N5{background-color:#DEE1EB;} + .d2-1531132284 .background-color-N6{background-color:#EEF1F8;} + .d2-1531132284 .background-color-N7{background-color:#FFFFFF;} + .d2-1531132284 .background-color-B1{background-color:#0D32B2;} + .d2-1531132284 .background-color-B2{background-color:#0D32B2;} + .d2-1531132284 .background-color-B3{background-color:#E3E9FD;} + .d2-1531132284 .background-color-B4{background-color:#E3E9FD;} + .d2-1531132284 .background-color-B5{background-color:#EDF0FD;} + .d2-1531132284 .background-color-B6{background-color:#F7F8FE;} + .d2-1531132284 .background-color-AA2{background-color:#4A6FF3;} + .d2-1531132284 .background-color-AA4{background-color:#EDF0FD;} + .d2-1531132284 .background-color-AA5{background-color:#F7F8FE;} + .d2-1531132284 .background-color-AB4{background-color:#EDF0FD;} + .d2-1531132284 .background-color-AB5{background-color:#F7F8FE;} + .d2-1531132284 .color-N1{color:#0A0F25;} + .d2-1531132284 .color-N2{color:#676C7E;} + .d2-1531132284 .color-N3{color:#9499AB;} + .d2-1531132284 .color-N4{color:#CFD2DD;} + .d2-1531132284 .color-N5{color:#DEE1EB;} + .d2-1531132284 .color-N6{color:#EEF1F8;} + .d2-1531132284 .color-N7{color:#FFFFFF;} + .d2-1531132284 .color-B1{color:#0D32B2;} + .d2-1531132284 .color-B2{color:#0D32B2;} + .d2-1531132284 .color-B3{color:#E3E9FD;} + .d2-1531132284 .color-B4{color:#E3E9FD;} + .d2-1531132284 .color-B5{color:#EDF0FD;} + .d2-1531132284 .color-B6{color:#F7F8FE;} + .d2-1531132284 .color-AA2{color:#4A6FF3;} + .d2-1531132284 .color-AA4{color:#EDF0FD;} + .d2-1531132284 .color-AA5{color:#F7F8FE;} + .d2-1531132284 .color-AB4{color:#EDF0FD;} + .d2-1531132284 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker-d2-1531132284);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker-d2-1531132284);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright-d2-1531132284);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright-d2-1531132284);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright-d2-1531132284);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright-d2-1531132284);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark-d2-1531132284);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright-d2-1531132284);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright-d2-1531132284);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright-d2-1531132284);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright-d2-1531132284);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker-d2-1531132284);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark-d2-1531132284);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal-d2-1531132284);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal-d2-1531132284);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright-d2-1531132284);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright-d2-1531132284);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright-d2-1531132284);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>abcdabcababcdefabcde + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/e2etests/testdata/txtar/cycle-diagram/elk/board.exp.json b/e2etests/testdata/txtar/cycle-diagram/elk/board.exp.json index bc4abcf553..e740172e7d 100644 --- a/e2etests/testdata/txtar/cycle-diagram/elk/board.exp.json +++ b/e2etests/testdata/txtar/cycle-diagram/elk/board.exp.json @@ -18,8 +18,8 @@ "x": 12, "y": 12 }, - "width": 454, - "height": 466, + "width": 494, + "height": 507, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -57,7 +57,7 @@ "type": "rectangle", "pos": { "x": -14, - "y": -221 + "y": -241 }, "width": 53, "height": 66, @@ -98,7 +98,7 @@ "id": "1.b", "type": "rectangle", "pos": { - "x": 185, + "x": 205, "y": -21 }, "width": 53, @@ -141,7 +141,7 @@ "type": "rectangle", "pos": { "x": -14, - "y": 179 + "y": 199 }, "width": 53, "height": 66, @@ -182,7 +182,7 @@ "id": "1.d", "type": "rectangle", "pos": { - "x": -215, + "x": -235, "y": -20 }, "width": 54, @@ -224,11 +224,11 @@ "id": "2", "type": "cycle", "pos": { - "x": 485, - "y": 61 + "x": 525, + "y": 66 }, - "width": 400, - "height": 367, + "width": 435, + "height": 397, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -265,8 +265,8 @@ "id": "2.a", "type": "rectangle", "pos": { - "x": 459, - "y": -171 + "x": 499, + "y": -186 }, "width": 53, "height": 66, @@ -307,8 +307,8 @@ "id": "2.b", "type": "rectangle", "pos": { - "x": 632, - "y": 128 + "x": 689, + "y": 143 }, "width": 53, "height": 66, @@ -349,8 +349,8 @@ "id": "2.c", "type": "rectangle", "pos": { - "x": 285, - "y": 129 + "x": 308, + "y": 144 }, "width": 53, "height": 66, @@ -391,11 +391,11 @@ "id": "3", "type": "cycle", "pos": { - "x": 904, + "x": 979, "y": 12 }, "width": 53, - "height": 466, + "height": 507, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -432,8 +432,8 @@ "id": "3.a", "type": "rectangle", "pos": { - "x": 878, - "y": -221 + "x": 953, + "y": -241 }, "width": 53, "height": 66, @@ -474,8 +474,8 @@ "id": "3.b", "type": "rectangle", "pos": { - "x": 878, - "y": 179 + "x": 953, + "y": 199 }, "width": 53, "height": 66, @@ -516,11 +516,11 @@ "id": "4", "type": "cycle", "pos": { - "x": 977, + "x": 1052, "y": 12 }, - "width": 400, - "height": 466, + "width": 435, + "height": 507, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -557,8 +557,8 @@ "id": "4.a", "type": "rectangle", "pos": { - "x": 951, - "y": -221 + "x": 1026, + "y": -241 }, "width": 53, "height": 66, @@ -599,8 +599,8 @@ "id": "4.b", "type": "rectangle", "pos": { - "x": 1124, - "y": -121 + "x": 1216, + "y": -131 }, "width": 53, "height": 66, @@ -641,8 +641,8 @@ "id": "4.c", "type": "rectangle", "pos": { - "x": 1124, - "y": 78 + "x": 1216, + "y": 88 }, "width": 53, "height": 66, @@ -683,8 +683,8 @@ "id": "4.d", "type": "rectangle", "pos": { - "x": 950, - "y": 179 + "x": 1025, + "y": 199 }, "width": 54, "height": 66, @@ -725,8 +725,8 @@ "id": "4.e", "type": "rectangle", "pos": { - "x": 778, - "y": 79 + "x": 835, + "y": 89 }, "width": 53, "height": 66, @@ -767,8 +767,8 @@ "id": "4.f", "type": "rectangle", "pos": { - "x": 779, - "y": -121 + "x": 836, + "y": -131 }, "width": 51, "height": 66, @@ -809,11 +809,11 @@ "id": "5", "type": "cycle", "pos": { - "x": 1397, - "y": 31 + "x": 1506, + "y": 33 }, - "width": 434, - "height": 428, + "width": 472, + "height": 464, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -850,8 +850,8 @@ "id": "5.a", "type": "rectangle", "pos": { - "x": 1370, - "y": -201 + "x": 1480, + "y": -219 }, "width": 53, "height": 66, @@ -892,8 +892,8 @@ "id": "5.b", "type": "rectangle", "pos": { - "x": 1561, - "y": -63 + "x": 1689, + "y": -67 }, "width": 53, "height": 66, @@ -934,8 +934,8 @@ "id": "5.c", "type": "rectangle", "pos": { - "x": 1488, - "y": 159 + "x": 1609, + "y": 177 }, "width": 53, "height": 66, @@ -976,8 +976,8 @@ "id": "5.d", "type": "rectangle", "pos": { - "x": 1252, - "y": 159 + "x": 1350, + "y": 177 }, "width": 54, "height": 66, @@ -1018,8 +1018,8 @@ "id": "5.e", "type": "rectangle", "pos": { - "x": 1180, - "y": -63 + "x": 1270, + "y": -67 }, "width": 53, "height": 66, @@ -1085,334 +1085,342 @@ "route": [ { "x": 38.5, - "y": -186.22999572753906 + "y": -206.39199829101562 }, { - "x": 40.18000030517578, - "y": -186.00399780273438 + "x": 39.573001861572266, + "y": -206.26499938964844 }, { - "x": 43.2859992980957, - "y": -185.53700256347656 + "x": 42.99800109863281, + "y": -205.80499267578125 }, { - "x": 46.3849983215332, - "y": -185.02099609375 + "x": 46.415000915527344, + "y": -205.29100036621094 }, { - "x": 49.47600173950195, - "y": -184.45700073242188 + "x": 49.82400131225586, + "y": -204.7239990234375 }, { - "x": 52.55699920654297, - "y": -183.843994140625 + "x": 53.222999572753906, + "y": -204.10299682617188 }, { - "x": 55.62799835205078, - "y": -183.18299865722656 + "x": 56.612998962402344, + "y": -203.4290008544922 }, { - "x": 58.68899917602539, - "y": -182.47300720214844 + "x": 59.99100112915039, + "y": -202.7010040283203 }, { - "x": 61.73699951171875, - "y": -181.71600341796875 + "x": 63.356998443603516, + "y": -201.92100524902344 }, { - "x": 64.77400207519531, - "y": -180.91099548339844 + "x": 66.71099853515625, + "y": -201.08799743652344 }, { - "x": 67.7979965209961, - "y": -180.05799865722656 + "x": 70.052001953125, + "y": -200.20199584960938 }, { - "x": 70.80799865722656, - "y": -179.1580047607422 + "x": 73.37799835205078, + "y": -199.26400756835938 }, { - "x": 73.8030014038086, - "y": -178.21099853515625 + "x": 76.68800354003906, + "y": -198.2740020751953 }, { - "x": 76.78299713134766, - "y": -177.2169952392578 + "x": 79.98300170898438, + "y": -197.23199462890625 }, { - "x": 79.74700164794922, - "y": -176.17599487304688 + "x": 83.26100158691406, + "y": -196.13800048828125 }, { - "x": 82.69400024414062, - "y": -175.08799743652344 + "x": 86.52200317382812, + "y": -194.9929962158203 }, { - "x": 85.6240005493164, - "y": -173.9550018310547 + "x": 89.76399993896484, + "y": -193.7969970703125 }, { - "x": 88.53600311279297, - "y": -172.77499389648438 + "x": 92.98699951171875, + "y": -192.5500030517578 }, { - "x": 91.42900085449219, - "y": -171.5500030517578 + "x": 96.19000244140625, + "y": -191.2530059814453 }, { - "x": 94.302001953125, - "y": -170.27999877929688 + "x": 99.37200164794922, + "y": -189.906005859375 }, { - "x": 97.15499877929688, - "y": -168.96499633789062 + "x": 102.53299713134766, + "y": -188.50799560546875 }, { - "x": 99.98699951171875, - "y": -167.60499572753906 + "x": 105.6709976196289, + "y": -187.06100463867188 }, { - "x": 102.7979965209961, - "y": -166.2010040283203 + "x": 108.78600311279297, + "y": -185.5659942626953 }, { - "x": 105.58499908447266, - "y": -164.7530059814453 + "x": 111.87699890136719, + "y": -184.02099609375 }, { - "x": 108.3499984741211, - "y": -163.26100158691406 + "x": 114.94400024414062, + "y": -182.42799377441406 }, { - "x": 111.09100341796875, - "y": -161.7259979248047 + "x": 117.98500061035156, + "y": -180.78700256347656 }, { - "x": 113.80799865722656, - "y": -160.1479949951172 + "x": 121, + "y": -179.09800720214844 }, { - "x": 116.4990005493164, - "y": -158.5279998779297 + "x": 123.98899841308594, + "y": -177.36300659179688 }, { - "x": 119.16500091552734, - "y": -156.86500549316406 + "x": 126.9489974975586, + "y": -175.5800018310547 }, { - "x": 121.80400085449219, - "y": -155.16099548339844 + "x": 129.88099670410156, + "y": -173.7519989013672 }, { - "x": 124.41600036621094, - "y": -153.41600036621094 + "x": 132.78500366210938, + "y": -171.8769989013672 }, { - "x": 127.0009994506836, - "y": -151.62899780273438 + "x": 135.6580047607422, + "y": -169.95700073242188 }, { - "x": 129.5570068359375, - "y": -149.80299377441406 + "x": 138.50100708007812, + "y": -167.99200439453125 }, { - "x": 132.08399963378906, - "y": -147.93600463867188 + "x": 141.31199645996094, + "y": -165.98300170898438 }, { - "x": 134.58099365234375, - "y": -146.031005859375 + "x": 144.0919952392578, + "y": -163.92999267578125 }, { - "x": 137.04800415039062, - "y": -144.08599853515625 + "x": 146.83900451660156, + "y": -161.83399963378906 }, { - "x": 139.48399353027344, - "y": -142.1020050048828 + "x": 149.55299377441406, + "y": -159.69400024414062 }, { - "x": 141.88900756835938, - "y": -140.08099365234375 + "x": 152.23300170898438, + "y": -157.51199340820312 }, { - "x": 144.26199340820312, - "y": -138.02200317382812 + "x": 154.8780059814453, + "y": -155.28900146484375 }, { - "x": 146.6020050048828, - "y": -135.92599487304688 + "x": 157.48800659179688, + "y": -153.0240020751953 }, { - "x": 148.90899658203125, - "y": -133.79299926757812 + "x": 160.06199645996094, + "y": -150.71800231933594 }, { - "x": 151.1820068359375, - "y": -131.625 + "x": 162.60000610351562, + "y": -148.3730010986328 }, { - "x": 153.42100524902344, - "y": -129.42100524902344 + "x": 165.10000610351562, + "y": -145.98699951171875 }, { - "x": 155.625, - "y": -127.18199920654297 + "x": 167.56300354003906, + "y": -143.56300354003906 }, { - "x": 157.79299926757812, - "y": -124.90899658203125 + "x": 169.98699951171875, + "y": -141.10000610351562 }, { - "x": 159.92599487304688, - "y": -122.60199737548828 + "x": 172.3730010986328, + "y": -138.60000610351562 }, { - "x": 162.02200317382812, - "y": -120.26200103759766 + "x": 174.71800231933594, + "y": -136.06199645996094 }, { - "x": 164.08099365234375, - "y": -117.88899993896484 + "x": 177.0240020751953, + "y": -133.48800659179688 }, { - "x": 166.1020050048828, - "y": -115.48400115966797 + "x": 179.28900146484375, + "y": -130.8780059814453 }, { - "x": 168.08599853515625, - "y": -113.0479965209961 + "x": 181.51199340820312, + "y": -128.23300170898438 }, { - "x": 170.031005859375, - "y": -110.58100128173828 + "x": 183.69400024414062, + "y": -125.5530014038086 }, { - "x": 171.93600463867188, - "y": -108.08399963378906 + "x": 185.83399963378906, + "y": -122.83899688720703 }, { - "x": 173.80299377441406, - "y": -105.55699920654297 + "x": 187.92999267578125, + "y": -120.09200286865234 }, { - "x": 175.62899780273438, - "y": -103.0009994506836 + "x": 189.98300170898438, + "y": -117.31199645996094 }, { - "x": 177.41600036621094, - "y": -100.41600036621094 + "x": 191.99200439453125, + "y": -114.5009994506836 }, { - "x": 179.16099548339844, - "y": -97.80400085449219 + "x": 193.95700073242188, + "y": -111.65799713134766 }, { - "x": 180.86500549316406, - "y": -95.16500091552734 + "x": 195.8769989013672, + "y": -108.78500366210938 }, { - "x": 182.5279998779297, - "y": -92.4990005493164 + "x": 197.7519989013672, + "y": -105.88099670410156 }, { - "x": 184.1479949951172, - "y": -89.80799865722656 + "x": 199.5800018310547, + "y": -102.9489974975586 }, { - "x": 185.7259979248047, - "y": -87.09100341796875 + "x": 201.36300659179688, + "y": -99.98899841308594 }, { - "x": 187.26100158691406, - "y": -84.3499984741211 + "x": 203.09800720214844, + "y": -97 }, { - "x": 188.7530059814453, - "y": -81.58499908447266 + "x": 204.78700256347656, + "y": -93.98500061035156 }, { - "x": 190.2010040283203, - "y": -78.7979965209961 + "x": 206.42799377441406, + "y": -90.94400024414062 }, { - "x": 191.60499572753906, - "y": -75.98699951171875 + "x": 208.02099609375, + "y": -87.87699890136719 }, { - "x": 192.96499633789062, - "y": -73.15499877929688 + "x": 209.5659942626953, + "y": -84.78600311279297 }, { - "x": 194.27999877929688, - "y": -70.302001953125 + "x": 211.06100463867188, + "y": -81.6709976196289 }, { - "x": 195.5500030517578, - "y": -67.42900085449219 + "x": 212.50799560546875, + "y": -78.53299713134766 }, { - "x": 196.77499389648438, - "y": -64.53600311279297 + "x": 213.906005859375, + "y": -75.37200164794922 }, { - "x": 197.9550018310547, - "y": -61.624000549316406 + "x": 215.2530059814453, + "y": -72.19000244140625 }, { - "x": 199.08799743652344, - "y": -58.694000244140625 + "x": 216.5500030517578, + "y": -68.98699951171875 }, { - "x": 200.17599487304688, - "y": -55.74700164794922 + "x": 217.7969970703125, + "y": -65.76399993896484 }, { - "x": 201.2169952392578, - "y": -52.78300094604492 + "x": 218.9929962158203, + "y": -62.52199935913086 }, { - "x": 202.21099853515625, - "y": -49.803001403808594 + "x": 220.13800048828125, + "y": -59.26100158691406 }, { - "x": 203.1580047607422, - "y": -46.80799865722656 + "x": 221.23199462890625, + "y": -55.983001708984375 }, { - "x": 204.05799865722656, - "y": -43.79800033569336 + "x": 222.2740020751953, + "y": -52.6879997253418 }, { - "x": 204.91099548339844, - "y": -40.77399826049805 + "x": 223.26400756835938, + "y": -49.37799835205078 }, { - "x": 205.71600341796875, - "y": -37.73699951171875 + "x": 224.20199584960938, + "y": -46.051998138427734 }, { - "x": 206.47300720214844, - "y": -34.68899917602539 + "x": 225.08799743652344, + "y": -42.71099853515625 }, { - "x": 207.18299865722656, - "y": -31.628000259399414 + "x": 225.92100524902344, + "y": -39.356998443603516 }, { - "x": 207.843994140625, - "y": -28.55699920654297 + "x": 226.7010040283203, + "y": -35.99100112915039 }, { - "x": 208.45700073242188, - "y": -25.47599983215332 + "x": 227.4290008544922, + "y": -32.612998962402344 }, { - "x": 208.5659942626953, - "y": -25.10099983215332 + "x": 228.10299682617188, + "y": -29.222999572753906 }, { - "x": 209.2519989013672, + "x": 228.7239990234375, + "y": -25.823999404907227 + }, + { + "x": 228.8800048828125, + "y": -25.111000061035156 + }, + { + "x": 229.50399780273438, "y": -21 } ], @@ -1448,336 +1456,344 @@ "link": "", "route": [ { - "x": 209.2519989013672, + "x": 229.50399780273438, "y": 45 }, { - "x": 209.02099609375, - "y": 46.3849983215332 + "x": 229.29100036621094, + "y": 46.415000915527344 + }, + { + "x": 228.7239990234375, + "y": 49.82400131225586 + }, + { + "x": 228.10299682617188, + "y": 53.222999572753906 }, { - "x": 208.45700073242188, - "y": 49.47600173950195 + "x": 227.4290008544922, + "y": 56.612998962402344 }, { - "x": 207.843994140625, - "y": 52.55699920654297 + "x": 226.7010040283203, + "y": 59.99100112915039 }, { - "x": 207.18299865722656, - "y": 55.62799835205078 + "x": 225.92100524902344, + "y": 63.356998443603516 }, { - "x": 206.47300720214844, - "y": 58.68899917602539 + "x": 225.08799743652344, + "y": 66.71099853515625 }, { - "x": 205.71600341796875, - "y": 61.73699951171875 + "x": 224.20199584960938, + "y": 70.052001953125 }, { - "x": 204.91099548339844, - "y": 64.77400207519531 + "x": 223.26400756835938, + "y": 73.37799835205078 }, { - "x": 204.05799865722656, - "y": 67.7979965209961 + "x": 222.2740020751953, + "y": 76.68800354003906 }, { - "x": 203.1580047607422, - "y": 70.80799865722656 + "x": 221.23199462890625, + "y": 79.98300170898438 }, { - "x": 202.21099853515625, - "y": 73.8030014038086 + "x": 220.13800048828125, + "y": 83.26100158691406 }, { - "x": 201.2169952392578, - "y": 76.78299713134766 + "x": 218.9929962158203, + "y": 86.52200317382812 }, { - "x": 200.17599487304688, - "y": 79.74700164794922 + "x": 217.7969970703125, + "y": 89.76399993896484 }, { - "x": 199.08799743652344, - "y": 82.69400024414062 + "x": 216.5500030517578, + "y": 92.98699951171875 }, { - "x": 197.9550018310547, - "y": 85.6240005493164 + "x": 215.2530059814453, + "y": 96.19000244140625 }, { - "x": 196.77499389648438, - "y": 88.53600311279297 + "x": 213.906005859375, + "y": 99.37200164794922 }, { - "x": 195.5500030517578, - "y": 91.42900085449219 + "x": 212.50799560546875, + "y": 102.53299713134766 }, { - "x": 194.27999877929688, - "y": 94.302001953125 + "x": 211.06100463867188, + "y": 105.6709976196289 }, { - "x": 192.96499633789062, - "y": 97.15499877929688 + "x": 209.5659942626953, + "y": 108.78600311279297 }, { - "x": 191.60499572753906, - "y": 99.98699951171875 + "x": 208.02099609375, + "y": 111.87699890136719 }, { - "x": 190.2010040283203, - "y": 102.7979965209961 + "x": 206.42799377441406, + "y": 114.94400024414062 }, { - "x": 188.7530059814453, - "y": 105.58499908447266 + "x": 204.78700256347656, + "y": 117.98500061035156 }, { - "x": 187.26100158691406, - "y": 108.3499984741211 + "x": 203.09800720214844, + "y": 121 }, { - "x": 185.7259979248047, - "y": 111.09100341796875 + "x": 201.36300659179688, + "y": 123.98899841308594 }, { - "x": 184.1479949951172, - "y": 113.80799865722656 + "x": 199.5800018310547, + "y": 126.9489974975586 }, { - "x": 182.5279998779297, - "y": 116.4990005493164 + "x": 197.7519989013672, + "y": 129.88099670410156 }, { - "x": 180.86500549316406, - "y": 119.16500091552734 + "x": 195.8769989013672, + "y": 132.78500366210938 }, { - "x": 179.16099548339844, - "y": 121.80400085449219 + "x": 193.95700073242188, + "y": 135.6580047607422 }, { - "x": 177.41600036621094, - "y": 124.41600036621094 + "x": 191.99200439453125, + "y": 138.50100708007812 }, { - "x": 175.62899780273438, - "y": 127.0009994506836 + "x": 189.98300170898438, + "y": 141.31199645996094 }, { - "x": 173.80299377441406, - "y": 129.5570068359375 + "x": 187.92999267578125, + "y": 144.0919952392578 }, { - "x": 171.93600463867188, - "y": 132.08399963378906 + "x": 185.83399963378906, + "y": 146.83900451660156 }, { - "x": 170.031005859375, - "y": 134.58099365234375 + "x": 183.69400024414062, + "y": 149.55299377441406 }, { - "x": 168.08599853515625, - "y": 137.04800415039062 + "x": 181.51199340820312, + "y": 152.23300170898438 }, { - "x": 166.1020050048828, - "y": 139.48399353027344 + "x": 179.28900146484375, + "y": 154.8780059814453 }, { - "x": 164.08099365234375, - "y": 141.88900756835938 + "x": 177.0240020751953, + "y": 157.48800659179688 }, { - "x": 162.02200317382812, - "y": 144.26199340820312 + "x": 174.71800231933594, + "y": 160.06199645996094 }, { - "x": 159.92599487304688, - "y": 146.6020050048828 + "x": 172.3730010986328, + "y": 162.60000610351562 }, { - "x": 157.79299926757812, - "y": 148.90899658203125 + "x": 169.98699951171875, + "y": 165.10000610351562 }, { - "x": 155.625, - "y": 151.1820068359375 + "x": 167.56300354003906, + "y": 167.56300354003906 }, { - "x": 153.42100524902344, - "y": 153.42100524902344 + "x": 165.10000610351562, + "y": 169.98699951171875 }, { - "x": 151.1820068359375, - "y": 155.625 + "x": 162.60000610351562, + "y": 172.3730010986328 }, { - "x": 148.90899658203125, - "y": 157.79299926757812 + "x": 160.06199645996094, + "y": 174.71800231933594 }, { - "x": 146.6020050048828, - "y": 159.92599487304688 + "x": 157.48800659179688, + "y": 177.0240020751953 }, { - "x": 144.26199340820312, - "y": 162.02200317382812 + "x": 154.8780059814453, + "y": 179.28900146484375 }, { - "x": 141.88900756835938, - "y": 164.08099365234375 + "x": 152.23300170898438, + "y": 181.51199340820312 }, { - "x": 139.48399353027344, - "y": 166.1020050048828 + "x": 149.55299377441406, + "y": 183.69400024414062 }, { - "x": 137.04800415039062, - "y": 168.08599853515625 + "x": 146.83900451660156, + "y": 185.83399963378906 }, { - "x": 134.58099365234375, - "y": 170.031005859375 + "x": 144.0919952392578, + "y": 187.92999267578125 }, { - "x": 132.08399963378906, - "y": 171.93600463867188 + "x": 141.31199645996094, + "y": 189.98300170898438 }, { - "x": 129.5570068359375, - "y": 173.80299377441406 + "x": 138.50100708007812, + "y": 191.99200439453125 }, { - "x": 127.0009994506836, - "y": 175.62899780273438 + "x": 135.6580047607422, + "y": 193.95700073242188 }, { - "x": 124.41600036621094, - "y": 177.41600036621094 + "x": 132.78500366210938, + "y": 195.8769989013672 }, { - "x": 121.80400085449219, - "y": 179.16099548339844 + "x": 129.88099670410156, + "y": 197.7519989013672 }, { - "x": 119.16500091552734, - "y": 180.86500549316406 + "x": 126.9489974975586, + "y": 199.5800018310547 }, { - "x": 116.4990005493164, - "y": 182.5279998779297 + "x": 123.98899841308594, + "y": 201.36300659179688 }, { - "x": 113.80799865722656, - "y": 184.1479949951172 + "x": 121, + "y": 203.09800720214844 }, { - "x": 111.09100341796875, - "y": 185.7259979248047 + "x": 117.98500061035156, + "y": 204.78700256347656 }, { - "x": 108.3499984741211, - "y": 187.26100158691406 + "x": 114.94400024414062, + "y": 206.42799377441406 }, { - "x": 105.58499908447266, - "y": 188.7530059814453 + "x": 111.87699890136719, + "y": 208.02099609375 }, { - "x": 102.7979965209961, - "y": 190.2010040283203 + "x": 108.78600311279297, + "y": 209.5659942626953 }, { - "x": 99.98699951171875, - "y": 191.60499572753906 + "x": 105.6709976196289, + "y": 211.06100463867188 }, { - "x": 97.15499877929688, - "y": 192.96499633789062 + "x": 102.53299713134766, + "y": 212.50799560546875 }, { - "x": 94.302001953125, - "y": 194.27999877929688 + "x": 99.37200164794922, + "y": 213.906005859375 }, { - "x": 91.42900085449219, - "y": 195.5500030517578 + "x": 96.19000244140625, + "y": 215.2530059814453 }, { - "x": 88.53600311279297, - "y": 196.77499389648438 + "x": 92.98699951171875, + "y": 216.5500030517578 }, { - "x": 85.6240005493164, - "y": 197.9550018310547 + "x": 89.76399993896484, + "y": 217.7969970703125 }, { - "x": 82.69400024414062, - "y": 199.08799743652344 + "x": 86.52200317382812, + "y": 218.9929962158203 }, { - "x": 79.74700164794922, - "y": 200.17599487304688 + "x": 83.26100158691406, + "y": 220.13800048828125 }, { - "x": 76.78299713134766, - "y": 201.2169952392578 + "x": 79.98300170898438, + "y": 221.23199462890625 }, { - "x": 73.8030014038086, - "y": 202.21099853515625 + "x": 76.68800354003906, + "y": 222.2740020751953 }, { - "x": 70.80799865722656, - "y": 203.1580047607422 + "x": 73.37799835205078, + "y": 223.26400756835938 }, { - "x": 67.7979965209961, - "y": 204.05799865722656 + "x": 70.052001953125, + "y": 224.20199584960938 }, { - "x": 64.77400207519531, - "y": 204.91099548339844 + "x": 66.71099853515625, + "y": 225.08799743652344 }, { - "x": 61.73699951171875, - "y": 205.71600341796875 + "x": 63.356998443603516, + "y": 225.92100524902344 }, { - "x": 58.68899917602539, - "y": 206.47300720214844 + "x": 59.99100112915039, + "y": 226.7010040283203 }, { - "x": 55.62799835205078, - "y": 207.18299865722656 + "x": 56.612998962402344, + "y": 227.4290008544922 }, { - "x": 52.55699920654297, - "y": 207.843994140625 + "x": 53.222999572753906, + "y": 228.10299682617188 }, { - "x": 49.47600173950195, - "y": 208.45700073242188 + "x": 49.82400131225586, + "y": 228.7239990234375 }, { - "x": 46.3849983215332, - "y": 209.02099609375 + "x": 46.415000915527344, + "y": 229.29100036621094 }, { - "x": 43.2859992980957, - "y": 209.53700256347656 + "x": 42.99800109863281, + "y": 229.80499267578125 }, { - "x": 42.62200164794922, - "y": 209.6790008544922 + "x": 42.62799835205078, + "y": 229.89100646972656 }, { "x": 38.5, - "y": 210.22999572753906 + "y": 230.39199829101562 } ], "isCurve": true, @@ -1813,334 +1829,342 @@ "route": [ { "x": -14.49899959564209, - "y": 210.22999572753906 + "y": 230.39199829101562 + }, + { + "x": -15.572999954223633, + "y": 230.26499938964844 }, { - "x": -16.18000030517578, - "y": 210.00399780273438 + "x": -18.99799919128418, + "y": 229.80499267578125 }, { - "x": -19.285999298095703, - "y": 209.53700256347656 + "x": -22.415000915527344, + "y": 229.29100036621094 }, { - "x": -22.385000228881836, - "y": 209.02099609375 + "x": -25.823999404907227, + "y": 228.7239990234375 }, { - "x": -25.47599983215332, - "y": 208.45700073242188 + "x": -29.222999572753906, + "y": 228.10299682617188 }, { - "x": -28.55699920654297, - "y": 207.843994140625 + "x": -32.612998962402344, + "y": 227.4290008544922 }, { - "x": -31.628000259399414, - "y": 207.18299865722656 + "x": -35.99100112915039, + "y": 226.7010040283203 }, { - "x": -34.68899917602539, - "y": 206.47300720214844 + "x": -39.356998443603516, + "y": 225.92100524902344 }, { - "x": -37.73699951171875, - "y": 205.71600341796875 + "x": -42.71099853515625, + "y": 225.08799743652344 }, { - "x": -40.77399826049805, - "y": 204.91099548339844 + "x": -46.051998138427734, + "y": 224.20199584960938 }, { - "x": -43.79800033569336, - "y": 204.05799865722656 + "x": -49.37799835205078, + "y": 223.26400756835938 }, { - "x": -46.80799865722656, - "y": 203.1580047607422 + "x": -52.6879997253418, + "y": 222.2740020751953 }, { - "x": -49.803001403808594, - "y": 202.21099853515625 + "x": -55.983001708984375, + "y": 221.23199462890625 }, { - "x": -52.78300094604492, - "y": 201.2169952392578 + "x": -59.26100158691406, + "y": 220.13800048828125 }, { - "x": -55.74700164794922, - "y": 200.17599487304688 + "x": -62.52199935913086, + "y": 218.9929962158203 }, { - "x": -58.694000244140625, - "y": 199.08799743652344 + "x": -65.76399993896484, + "y": 217.7969970703125 }, { - "x": -61.624000549316406, - "y": 197.9550018310547 + "x": -68.98699951171875, + "y": 216.5500030517578 }, { - "x": -64.53600311279297, - "y": 196.77499389648438 + "x": -72.19000244140625, + "y": 215.2530059814453 }, { - "x": -67.42900085449219, - "y": 195.5500030517578 + "x": -75.37200164794922, + "y": 213.906005859375 }, { - "x": -70.302001953125, - "y": 194.27999877929688 + "x": -78.53299713134766, + "y": 212.50799560546875 }, { - "x": -73.15499877929688, - "y": 192.96499633789062 + "x": -81.6709976196289, + "y": 211.06100463867188 }, { - "x": -75.98699951171875, - "y": 191.60499572753906 + "x": -84.78600311279297, + "y": 209.5659942626953 }, { - "x": -78.7979965209961, - "y": 190.2010040283203 + "x": -87.87699890136719, + "y": 208.02099609375 }, { - "x": -81.58499908447266, - "y": 188.7530059814453 + "x": -90.94400024414062, + "y": 206.42799377441406 }, { - "x": -84.3499984741211, - "y": 187.26100158691406 + "x": -93.98500061035156, + "y": 204.78700256347656 }, { - "x": -87.09100341796875, - "y": 185.7259979248047 + "x": -97, + "y": 203.09800720214844 }, { - "x": -89.80799865722656, - "y": 184.1479949951172 + "x": -99.98899841308594, + "y": 201.36300659179688 }, { - "x": -92.4990005493164, - "y": 182.5279998779297 + "x": -102.9489974975586, + "y": 199.5800018310547 }, { - "x": -95.16500091552734, - "y": 180.86500549316406 + "x": -105.88099670410156, + "y": 197.7519989013672 }, { - "x": -97.80400085449219, - "y": 179.16099548339844 + "x": -108.78500366210938, + "y": 195.8769989013672 }, { - "x": -100.41600036621094, - "y": 177.41600036621094 + "x": -111.65799713134766, + "y": 193.95700073242188 }, { - "x": -103.0009994506836, - "y": 175.62899780273438 + "x": -114.5009994506836, + "y": 191.99200439453125 }, { - "x": -105.55699920654297, - "y": 173.80299377441406 + "x": -117.31199645996094, + "y": 189.98300170898438 }, { - "x": -108.08399963378906, - "y": 171.93600463867188 + "x": -120.09200286865234, + "y": 187.92999267578125 }, { - "x": -110.58100128173828, - "y": 170.031005859375 + "x": -122.83899688720703, + "y": 185.83399963378906 }, { - "x": -113.0479965209961, - "y": 168.08599853515625 + "x": -125.5530014038086, + "y": 183.69400024414062 }, { - "x": -115.48400115966797, - "y": 166.1020050048828 + "x": -128.23300170898438, + "y": 181.51199340820312 }, { - "x": -117.88899993896484, - "y": 164.08099365234375 + "x": -130.8780059814453, + "y": 179.28900146484375 }, { - "x": -120.26200103759766, - "y": 162.02200317382812 + "x": -133.48800659179688, + "y": 177.0240020751953 }, { - "x": -122.60199737548828, - "y": 159.92599487304688 + "x": -136.06199645996094, + "y": 174.71800231933594 }, { - "x": -124.90899658203125, - "y": 157.79299926757812 + "x": -138.60000610351562, + "y": 172.3730010986328 }, { - "x": -127.18199920654297, - "y": 155.625 + "x": -141.10000610351562, + "y": 169.98699951171875 }, { - "x": -129.42100524902344, - "y": 153.42100524902344 + "x": -143.56300354003906, + "y": 167.56300354003906 }, { - "x": -131.625, - "y": 151.1820068359375 + "x": -145.98699951171875, + "y": 165.10000610351562 }, { - "x": -133.79299926757812, - "y": 148.90899658203125 + "x": -148.3730010986328, + "y": 162.60000610351562 }, { - "x": -135.92599487304688, - "y": 146.6020050048828 + "x": -150.71800231933594, + "y": 160.06199645996094 }, { - "x": -138.02200317382812, - "y": 144.26199340820312 + "x": -153.0240020751953, + "y": 157.48800659179688 }, { - "x": -140.08099365234375, - "y": 141.88900756835938 + "x": -155.28900146484375, + "y": 154.8780059814453 }, { - "x": -142.1020050048828, - "y": 139.48399353027344 + "x": -157.51199340820312, + "y": 152.23300170898438 }, { - "x": -144.08599853515625, - "y": 137.04800415039062 + "x": -159.69400024414062, + "y": 149.55299377441406 }, { - "x": -146.031005859375, - "y": 134.58099365234375 + "x": -161.83399963378906, + "y": 146.83900451660156 }, { - "x": -147.93600463867188, - "y": 132.08399963378906 + "x": -163.92999267578125, + "y": 144.0919952392578 }, { - "x": -149.80299377441406, - "y": 129.5570068359375 + "x": -165.98300170898438, + "y": 141.31199645996094 }, { - "x": -151.62899780273438, - "y": 127.0009994506836 + "x": -167.99200439453125, + "y": 138.50100708007812 }, { - "x": -153.41600036621094, - "y": 124.41600036621094 + "x": -169.95700073242188, + "y": 135.6580047607422 }, { - "x": -155.16099548339844, - "y": 121.80400085449219 + "x": -171.8769989013672, + "y": 132.78500366210938 }, { - "x": -156.86500549316406, - "y": 119.16500091552734 + "x": -173.7519989013672, + "y": 129.88099670410156 }, { - "x": -158.5279998779297, - "y": 116.4990005493164 + "x": -175.5800018310547, + "y": 126.9489974975586 }, { - "x": -160.1479949951172, - "y": 113.80799865722656 + "x": -177.36300659179688, + "y": 123.98899841308594 }, { - "x": -161.7259979248047, - "y": 111.09100341796875 + "x": -179.09800720214844, + "y": 121 }, { - "x": -163.26100158691406, - "y": 108.3499984741211 + "x": -180.78700256347656, + "y": 117.98500061035156 }, { - "x": -164.7530059814453, - "y": 105.58499908447266 + "x": -182.42799377441406, + "y": 114.94400024414062 }, { - "x": -166.2010040283203, - "y": 102.7979965209961 + "x": -184.02099609375, + "y": 111.87699890136719 }, { - "x": -167.60499572753906, - "y": 99.98699951171875 + "x": -185.5659942626953, + "y": 108.78600311279297 }, { - "x": -168.96499633789062, - "y": 97.15499877929688 + "x": -187.06100463867188, + "y": 105.6709976196289 }, { - "x": -170.27999877929688, - "y": 94.302001953125 + "x": -188.50799560546875, + "y": 102.53299713134766 }, { - "x": -171.5500030517578, - "y": 91.42900085449219 + "x": -189.906005859375, + "y": 99.37200164794922 }, { - "x": -172.77499389648438, - "y": 88.53600311279297 + "x": -191.2530059814453, + "y": 96.19000244140625 }, { - "x": -173.9550018310547, - "y": 85.6240005493164 + "x": -192.5500030517578, + "y": 92.98699951171875 }, { - "x": -175.08799743652344, - "y": 82.69400024414062 + "x": -193.7969970703125, + "y": 89.76399993896484 }, { - "x": -176.17599487304688, - "y": 79.74700164794922 + "x": -194.9929962158203, + "y": 86.52200317382812 }, { - "x": -177.2169952392578, - "y": 76.78299713134766 + "x": -196.13800048828125, + "y": 83.26100158691406 }, { - "x": -178.21099853515625, - "y": 73.8030014038086 + "x": -197.23199462890625, + "y": 79.98300170898438 }, { - "x": -179.1580047607422, - "y": 70.80799865722656 + "x": -198.2740020751953, + "y": 76.68800354003906 }, { - "x": -180.05799865722656, - "y": 67.7979965209961 + "x": -199.26400756835938, + "y": 73.37799835205078 }, { - "x": -180.91099548339844, - "y": 64.77400207519531 + "x": -200.20199584960938, + "y": 70.052001953125 }, { - "x": -181.71600341796875, - "y": 61.73699951171875 + "x": -201.08799743652344, + "y": 66.71099853515625 }, { - "x": -182.47300720214844, - "y": 58.68899917602539 + "x": -201.92100524902344, + "y": 63.356998443603516 }, { - "x": -183.18299865722656, - "y": 55.62799835205078 + "x": -202.7010040283203, + "y": 59.99100112915039 }, { - "x": -183.843994140625, - "y": 52.55699920654297 + "x": -203.4290008544922, + "y": 56.612998962402344 }, { - "x": -184.45700073242188, - "y": 49.47600173950195 + "x": -204.10299682617188, + "y": 53.222999572753906 }, { - "x": -184.5659942626953, - "y": 49.10100173950195 + "x": -204.7239990234375, + "y": 49.82400131225586 }, { - "x": -185.2519989013672, + "x": -204.8800048828125, + "y": 49.111000061035156 + }, + { + "x": -205.50399780273438, "y": 45 } ], @@ -2176,352 +2200,360 @@ "link": "", "route": [ { - "x": 512, - "y": -136.2259979248047 + "x": 552, + "y": -151.38900756835938 + }, + { + "x": 553.072998046875, + "y": -151.26499938964844 + }, + { + "x": 557.6380004882812, + "y": -150.63900756835938 }, { - "x": 514.7160034179688, - "y": -135.85400390625 + "x": 562.1890258789062, + "y": -149.91900634765625 }, { - "x": 518.85302734375, - "y": -135.19900512695312 + "x": 566.7230224609375, + "y": -149.10299682617188 }, { - "x": 522.9760131835938, - "y": -134.45700073242188 + "x": 571.239990234375, + "y": -148.19200134277344 }, { - "x": 527.0819702148438, - "y": -133.62899780273438 + "x": 575.7369995117188, + "y": -147.18699645996094 }, { - "x": 531.1699829101562, - "y": -132.71499633789062 + "x": 580.2109985351562, + "y": -146.08799743652344 }, { - "x": 535.2369995117188, - "y": -131.71600341796875 + "x": 584.6619873046875, + "y": -144.89500427246094 }, { - "x": 539.2830200195312, - "y": -130.6320037841797 + "x": 589.0859985351562, + "y": -143.61000061035156 }, { - "x": 543.3060302734375, - "y": -129.46299743652344 + "x": 593.4829711914062, + "y": -142.23199462890625 }, { - "x": 547.302978515625, - "y": -128.21099853515625 + "x": 597.8499755859375, + "y": -140.76199340820312 }, { - "x": 551.2730102539062, - "y": -126.875 + "x": 602.1849975585938, + "y": -139.20199584960938 }, { - "x": 555.2139892578125, - "y": -125.45600128173828 + "x": 606.4869995117188, + "y": -137.5500030517578 }, { - "x": 559.1240234375, - "y": -123.95500183105469 + "x": 610.7529907226562, + "y": -135.8090057373047 }, { - "x": 563.0029907226562, - "y": -122.37200164794922 + "x": 614.9819946289062, + "y": -133.97999572753906 }, { - "x": 566.8469848632812, - "y": -120.70899963378906 + "x": 619.1710205078125, + "y": -132.06100463867188 }, { - "x": 570.655029296875, - "y": -118.96499633789062 + "x": 623.3189697265625, + "y": -130.05599975585938 }, { - "x": 574.427001953125, - "y": -117.14199829101562 + "x": 627.4249877929688, + "y": -127.96399688720703 }, { - "x": 578.1589965820312, - "y": -115.23999786376953 + "x": 631.4849853515625, + "y": -125.78700256347656 }, { - "x": 581.8499755859375, - "y": -113.26100158691406 + "x": 635.5, + "y": -123.5250015258789 }, { - "x": 585.5, - "y": -111.20500183105469 + "x": 639.4650268554688, + "y": -121.18000030517578 }, { - "x": 589.10498046875, - "y": -109.0719985961914 + "x": 643.3809814453125, + "y": -118.75199890136719 }, { - "x": 592.6649780273438, - "y": -106.86499786376953 + "x": 647.2459716796875, + "y": -116.24199676513672 }, { - "x": 596.177978515625, - "y": -104.58399963378906 + "x": 651.0560302734375, + "y": -113.6520004272461 }, { - "x": 599.6420288085938, - "y": -102.22899627685547 + "x": 654.81201171875, + "y": -110.98300170898438 }, { - "x": 603.0570068359375, - "y": -99.8030014038086 + "x": 658.510986328125, + "y": -108.23600006103516 }, { - "x": 606.4190063476562, - "y": -97.30500030517578 + "x": 662.1519775390625, + "y": -105.41200256347656 }, { - "x": 609.72900390625, - "y": -94.73799896240234 + "x": 665.7329711914062, + "y": -102.51200103759766 }, { - "x": 612.9840087890625, - "y": -92.10199737548828 + "x": 669.2520141601562, + "y": -99.53800201416016 }, { - "x": 616.1840209960938, - "y": -89.39900207519531 + "x": 672.7080078125, + "y": -96.49099731445312 }, { - "x": 619.3259887695312, - "y": -86.62799835205078 + "x": 676.0999755859375, + "y": -93.37300109863281 }, { - "x": 622.4089965820312, - "y": -83.79299926757812 + "x": 679.4249877929688, + "y": -90.18299865722656 }, { - "x": 625.4320068359375, - "y": -80.89399719238281 + "x": 682.6829833984375, + "y": -86.92500305175781 }, { - "x": 628.3939819335938, - "y": -77.93199920654297 + "x": 685.8729858398438, + "y": -83.5999984741211 }, { - "x": 631.2930297851562, - "y": -74.90899658203125 + "x": 688.9910278320312, + "y": -80.20800018310547 }, { - "x": 634.1279907226562, - "y": -71.82599639892578 + "x": 692.0380249023438, + "y": -76.75199890136719 }, { - "x": 636.8989868164062, - "y": -68.68399810791016 + "x": 695.0120239257812, + "y": -73.23300170898438 }, { - "x": 639.6019897460938, - "y": -65.48400115966797 + "x": 697.9119873046875, + "y": -69.6520004272461 }, { - "x": 642.2379760742188, - "y": -62.229000091552734 + "x": 700.7360229492188, + "y": -66.01100158691406 }, { - "x": 644.8049926757812, - "y": -58.91899871826172 + "x": 703.4829711914062, + "y": -62.3120002746582 }, { - "x": 647.302978515625, - "y": -55.55699920654297 + "x": 706.1519775390625, + "y": -58.555999755859375 }, { - "x": 649.72900390625, - "y": -52.141998291015625 + "x": 708.7420043945312, + "y": -54.74599838256836 }, { - "x": 652.083984375, - "y": -48.678001403808594 + "x": 711.2520141601562, + "y": -50.88100051879883 }, { - "x": 654.364990234375, - "y": -45.165000915527344 + "x": 713.6799926757812, + "y": -46.96500015258789 }, { - "x": 656.572021484375, - "y": -41.60499954223633 + "x": 716.0250244140625, + "y": -43 }, { - "x": 658.7050170898438, - "y": -38 + "x": 718.2869873046875, + "y": -38.98500061035156 }, { - "x": 660.760986328125, - "y": -34.349998474121094 + "x": 720.4639892578125, + "y": -34.92499923706055 }, { - "x": 662.739990234375, - "y": -30.659000396728516 + "x": 722.5560302734375, + "y": -30.819000244140625 }, { - "x": 664.6420288085938, - "y": -26.927000045776367 + "x": 724.5609741210938, + "y": -26.67099952697754 }, { - "x": 666.4650268554688, - "y": -23.155000686645508 + "x": 726.47998046875, + "y": -22.48200035095215 }, { - "x": 668.208984375, - "y": -19.347000122070312 + "x": 728.3090209960938, + "y": -18.253000259399414 }, { - "x": 669.8720092773438, - "y": -15.503000259399414 + "x": 730.0499877929688, + "y": -13.987000465393066 }, { - "x": 671.4550170898438, - "y": -11.62399959564209 + "x": 731.7020263671875, + "y": -9.6850004196167 }, { - "x": 672.9559936523438, - "y": -7.714000225067139 + "x": 733.2620239257812, + "y": -5.349999904632568 }, { - "x": 674.375, - "y": -3.7730000019073486 + "x": 734.7319946289062, + "y": -0.9829999804496765 }, { - "x": 675.7109985351562, - "y": 0.19599999487400055 + "x": 736.1099853515625, + "y": 3.4130001068115234 }, { - "x": 676.9630126953125, - "y": 4.192999839782715 + "x": 737.39501953125, + "y": 7.836999893188477 }, { - "x": 678.1320190429688, - "y": 8.215999603271484 + "x": 738.5880126953125, + "y": 12.288000106811523 }, { - "x": 679.2160034179688, - "y": 12.26200008392334 + "x": 739.68701171875, + "y": 16.761999130249023 }, { - "x": 680.2150268554688, - "y": 16.32900047302246 + "x": 740.6920166015625, + "y": 21.259000778198242 }, { - "x": 681.1290283203125, - "y": 20.41699981689453 + "x": 741.60302734375, + "y": 25.775999069213867 }, { - "x": 681.9569702148438, - "y": 24.523000717163086 + "x": 742.4190063476562, + "y": 30.309999465942383 }, { - "x": 682.698974609375, - "y": 28.645999908447266 + "x": 743.1389770507812, + "y": 34.861000061035156 }, { - "x": 683.35400390625, - "y": 32.78300094604492 + "x": 743.7650146484375, + "y": 39.42599868774414 }, { - "x": 683.9219970703125, - "y": 36.93299865722656 + "x": 744.2940063476562, + "y": 44.00299835205078 }, { - "x": 684.4039916992188, - "y": 41.09400177001953 + "x": 744.72802734375, + "y": 48.59000015258789 }, { - "x": 684.7979736328125, - "y": 45.263999938964844 + "x": 745.0650024414062, + "y": 53.18600082397461 }, { - "x": 685.10498046875, - "y": 49.441001892089844 + "x": 745.3070068359375, + "y": 57.7869987487793 }, { - "x": 685.323974609375, - "y": 53.624000549316406 + "x": 745.4509887695312, + "y": 62.391998291015625 }, { - "x": 685.4559936523438, - "y": 57.81100082397461 + "x": 745.5, + "y": 66.9990005493164 }, { - "x": 685.5, - "y": 61.999000549316406 + "x": 745.4509887695312, + "y": 71.60700225830078 }, { - "x": 685.4559936523438, - "y": 66.18800354003906 + "x": 745.3070068359375, + "y": 76.21199798583984 }, { - "x": 685.323974609375, - "y": 70.375 + "x": 745.0650024414062, + "y": 80.81300354003906 }, { - "x": 685.10498046875, - "y": 74.55799865722656 + "x": 744.72802734375, + "y": 85.40899658203125 }, { - "x": 684.7979736328125, - "y": 78.73500061035156 + "x": 744.2940063476562, + "y": 89.99600219726562 }, { - "x": 684.4039916992188, - "y": 82.90499877929688 + "x": 743.7650146484375, + "y": 94.572998046875 }, { - "x": 683.9219970703125, - "y": 87.06600189208984 + "x": 743.1389770507812, + "y": 99.13800048828125 }, { - "x": 683.35400390625, - "y": 91.21600341796875 + "x": 742.4190063476562, + "y": 103.68900299072266 }, { - "x": 682.698974609375, - "y": 95.35299682617188 + "x": 741.60302734375, + "y": 108.2229995727539 }, { - "x": 681.9569702148438, - "y": 99.47599792480469 + "x": 740.6920166015625, + "y": 112.73999786376953 }, { - "x": 681.1290283203125, - "y": 103.58200073242188 + "x": 739.68701171875, + "y": 117.23699951171875 }, { - "x": 680.2150268554688, - "y": 107.66999816894531 + "x": 738.5880126953125, + "y": 121.71099853515625 }, { - "x": 679.2160034179688, - "y": 111.73699951171875 + "x": 737.39501953125, + "y": 126.16200256347656 }, { - "x": 678.1320190429688, - "y": 115.78299713134766 + "x": 736.1099853515625, + "y": 130.58599853515625 }, { - "x": 676.9630126953125, - "y": 119.80599975585938 + "x": 734.7319946289062, + "y": 134.98300170898438 }, { - "x": 675.7109985351562, - "y": 123.8030014038086 + "x": 733.2620239257812, + "y": 139.35000610351562 }, { - "x": 675.3259887695312, - "y": 125.08100128173828 + "x": 733.0369873046875, + "y": 140.10400390625 }, { - "x": 673.9329833984375, - "y": 128.99899291992188 + "x": 731.5809936523438, + "y": 143.99899291992188 } ], "isCurve": true, @@ -2556,336 +2588,344 @@ "link": "", "route": [ { - "x": 634.8569946289062, - "y": 194.99899291992188 + "x": 692.6740112304688, + "y": 209.99899291992188 + }, + { + "x": 692.0380249023438, + "y": 210.7519989013672 + }, + { + "x": 688.9910278320312, + "y": 214.20799255371094 }, { - "x": 634.1279907226562, - "y": 195.8260040283203 + "x": 685.8729858398438, + "y": 217.60000610351562 }, { - "x": 631.2930297851562, - "y": 198.90899658203125 + "x": 682.6829833984375, + "y": 220.9250030517578 }, { - "x": 628.3939819335938, - "y": 201.9320068359375 + "x": 679.4249877929688, + "y": 224.18299865722656 }, { - "x": 625.4320068359375, - "y": 204.8939971923828 + "x": 676.0999755859375, + "y": 227.3730010986328 }, { - "x": 622.4089965820312, - "y": 207.79299926757812 + "x": 672.7080078125, + "y": 230.49099731445312 }, { - "x": 619.3259887695312, - "y": 210.6280059814453 + "x": 669.2520141601562, + "y": 233.53799438476562 }, { - "x": 616.1840209960938, - "y": 213.3990020751953 + "x": 665.7329711914062, + "y": 236.51199340820312 }, { - "x": 612.9840087890625, - "y": 216.1020050048828 + "x": 662.1519775390625, + "y": 239.41200256347656 }, { - "x": 609.72900390625, - "y": 218.73800659179688 + "x": 658.510986328125, + "y": 242.23599243164062 }, { - "x": 606.4190063476562, - "y": 221.30499267578125 + "x": 654.81201171875, + "y": 244.98300170898438 }, { - "x": 603.0570068359375, - "y": 223.80299377441406 + "x": 651.0560302734375, + "y": 247.65199279785156 }, { - "x": 599.6420288085938, - "y": 226.22900390625 + "x": 647.2459716796875, + "y": 250.24200439453125 }, { - "x": 596.177978515625, - "y": 228.58399963378906 + "x": 643.3809814453125, + "y": 252.7519989013672 }, { - "x": 592.6649780273438, - "y": 230.86500549316406 + "x": 639.4650268554688, + "y": 255.17999267578125 }, { - "x": 589.10498046875, - "y": 233.07200622558594 + "x": 635.5, + "y": 257.5249938964844 }, { - "x": 585.5, - "y": 235.2050018310547 + "x": 631.4849853515625, + "y": 259.7869873046875 }, { - "x": 581.8499755859375, - "y": 237.26100158691406 + "x": 627.4249877929688, + "y": 261.9639892578125 }, { - "x": 578.1589965820312, - "y": 239.24000549316406 + "x": 623.3189697265625, + "y": 264.0559997558594 }, { - "x": 574.427001953125, - "y": 241.14199829101562 + "x": 619.1710205078125, + "y": 266.0610046386719 }, { - "x": 570.655029296875, - "y": 242.96499633789062 + "x": 614.9819946289062, + "y": 267.9800109863281 }, { - "x": 566.8469848632812, - "y": 244.70899963378906 + "x": 610.7529907226562, + "y": 269.8089904785156 }, { - "x": 563.0029907226562, - "y": 246.3719940185547 + "x": 606.4869995117188, + "y": 271.54998779296875 }, { - "x": 559.1240234375, - "y": 247.9550018310547 + "x": 602.1849975585938, + "y": 273.2019958496094 }, { - "x": 555.2139892578125, - "y": 249.45599365234375 + "x": 597.8499755859375, + "y": 274.7619934082031 }, { - "x": 551.2730102539062, - "y": 250.875 + "x": 593.4829711914062, + "y": 276.23199462890625 }, { - "x": 547.302978515625, - "y": 252.21099853515625 + "x": 589.0859985351562, + "y": 277.6099853515625 }, { - "x": 543.3060302734375, - "y": 253.46299743652344 + "x": 584.6619873046875, + "y": 278.8949890136719 }, { - "x": 539.2830200195312, - "y": 254.6320037841797 + "x": 580.2109985351562, + "y": 280.0880126953125 }, { - "x": 535.2369995117188, - "y": 255.71600341796875 + "x": 575.7369995117188, + "y": 281.18701171875 }, { - "x": 531.1699829101562, - "y": 256.7149963378906 + "x": 571.239990234375, + "y": 282.1919860839844 }, { - "x": 527.0819702148438, - "y": 257.6289978027344 + "x": 566.7230224609375, + "y": 283.1029968261719 }, { - "x": 522.9760131835938, - "y": 258.4570007324219 + "x": 562.1890258789062, + "y": 283.91900634765625 }, { - "x": 518.85302734375, - "y": 259.1990051269531 + "x": 557.6380004882812, + "y": 284.6390075683594 }, { - "x": 514.7160034179688, - "y": 259.85400390625 + "x": 553.072998046875, + "y": 285.2650146484375 }, { - "x": 510.5660095214844, - "y": 260.4219970703125 + "x": 548.4959716796875, + "y": 285.79400634765625 }, { - "x": 506.4049987792969, - "y": 260.90399169921875 + "x": 543.9089965820312, + "y": 286.2279968261719 }, { - "x": 502.2349853515625, - "y": 261.2980041503906 + "x": 539.31298828125, + "y": 286.56500244140625 }, { - "x": 498.0580139160156, - "y": 261.6050109863281 + "x": 534.7119750976562, + "y": 286.8070068359375 }, { - "x": 493.875, - "y": 261.8240051269531 + "x": 530.1069946289062, + "y": 286.95098876953125 }, { - "x": 489.68798828125, - "y": 261.95599365234375 + "x": 525.5, + "y": 287 }, { - "x": 485.5, - "y": 262 + "x": 520.8920288085938, + "y": 286.95098876953125 }, { - "x": 481.3110046386719, - "y": 261.95599365234375 + "x": 516.2869873046875, + "y": 286.8070068359375 }, { - "x": 477.1239929199219, - "y": 261.8240051269531 + "x": 511.6860046386719, + "y": 286.56500244140625 }, { - "x": 472.9410095214844, - "y": 261.6050109863281 + "x": 507.0899963378906, + "y": 286.2279968261719 }, { - "x": 468.7640075683594, - "y": 261.2980041503906 + "x": 502.50299072265625, + "y": 285.79400634765625 }, { - "x": 464.593994140625, - "y": 260.90399169921875 + "x": 497.9259948730469, + "y": 285.2650146484375 }, { - "x": 460.4330139160156, - "y": 260.4219970703125 + "x": 493.3609924316406, + "y": 284.6390075683594 }, { - "x": 456.2829895019531, - "y": 259.85400390625 + "x": 488.80999755859375, + "y": 283.91900634765625 }, { - "x": 452.14599609375, - "y": 259.1990051269531 + "x": 484.2760009765625, + "y": 283.1029968261719 }, { - "x": 448.02301025390625, - "y": 258.4570007324219 + "x": 479.7590026855469, + "y": 282.1919860839844 }, { - "x": 443.9169921875, - "y": 257.6289978027344 + "x": 475.2619934082031, + "y": 281.18701171875 }, { - "x": 439.8290100097656, - "y": 256.7149963378906 + "x": 470.7879943847656, + "y": 280.0880126953125 }, { - "x": 435.7619934082031, - "y": 255.71600341796875 + "x": 466.3370056152344, + "y": 278.8949890136719 }, { - "x": 431.71600341796875, - "y": 254.6320037841797 + "x": 461.9129943847656, + "y": 277.6099853515625 }, { - "x": 427.6929931640625, - "y": 253.46299743652344 + "x": 457.5159912109375, + "y": 276.23199462890625 }, { - "x": 423.6960144042969, - "y": 252.21099853515625 + "x": 453.14898681640625, + "y": 274.7619934082031 }, { - "x": 419.72601318359375, - "y": 250.875 + "x": 448.8139953613281, + "y": 273.2019958496094 }, { - "x": 415.7850036621094, - "y": 249.45599365234375 + "x": 444.5119934082031, + "y": 271.54998779296875 }, { - "x": 411.875, - "y": 247.9550018310547 + "x": 440.2460021972656, + "y": 269.8089904785156 }, { - "x": 407.9960021972656, - "y": 246.3719940185547 + "x": 436.0169982910156, + "y": 267.9800109863281 }, { - "x": 404.1520080566406, - "y": 244.70899963378906 + "x": 431.8280029296875, + "y": 266.0610046386719 }, { - "x": 400.343994140625, - "y": 242.96499633789062 + "x": 427.67999267578125, + "y": 264.0559997558594 }, { - "x": 396.5719909667969, - "y": 241.14199829101562 + "x": 423.5740051269531, + "y": 261.9639892578125 }, { - "x": 392.8399963378906, - "y": 239.24000549316406 + "x": 419.5140075683594, + "y": 259.7869873046875 }, { - "x": 389.14898681640625, - "y": 237.26100158691406 + "x": 415.5, + "y": 257.5249938964844 }, { - "x": 385.5, - "y": 235.2050018310547 + "x": 411.53399658203125, + "y": 255.17999267578125 }, { - "x": 381.8940124511719, - "y": 233.07200622558594 + "x": 407.6180114746094, + "y": 252.7519989013672 }, { - "x": 378.3340148925781, - "y": 230.86500549316406 + "x": 403.75299072265625, + "y": 250.24200439453125 }, { - "x": 374.8210144042969, - "y": 228.58399963378906 + "x": 399.9429931640625, + "y": 247.65199279785156 }, { - "x": 371.35699462890625, - "y": 226.22900390625 + "x": 396.18701171875, + "y": 244.98300170898438 }, { - "x": 367.9419860839844, - "y": 223.80299377441406 + "x": 392.4880065917969, + "y": 242.23599243164062 }, { - "x": 364.5799865722656, - "y": 221.30499267578125 + "x": 388.84698486328125, + "y": 239.41200256347656 }, { - "x": 361.2699890136719, - "y": 218.73800659179688 + "x": 385.2659912109375, + "y": 236.51199340820312 }, { - "x": 358.0150146484375, - "y": 216.1020050048828 + "x": 381.74700927734375, + "y": 233.53799438476562 }, { - "x": 354.81500244140625, - "y": 213.3990020751953 + "x": 378.2909851074219, + "y": 230.49099731445312 }, { - "x": 351.6730041503906, - "y": 210.6280059814453 + "x": 374.89898681640625, + "y": 227.3730010986328 }, { - "x": 348.5899963378906, - "y": 207.79299926757812 + "x": 371.5740051269531, + "y": 224.18299865722656 }, { - "x": 345.5669860839844, - "y": 204.8939971923828 + "x": 368.3160095214844, + "y": 220.9250030517578 }, { - "x": 342.6050109863281, - "y": 201.9320068359375 + "x": 365.1260070800781, + "y": 217.60000610351562 }, { - "x": 339.70599365234375, - "y": 198.90899658203125 + "x": 362.00799560546875, + "y": 214.20799255371094 }, { - "x": 338.9079895019531, - "y": 198.1060028076172 + "x": 361.02801513671875, + "y": 213.16000366210938 }, { - "x": 336.1419982910156, - "y": 195 + "x": 358.32501220703125, + "y": 210 } ], "isCurve": true, @@ -2920,376 +2960,384 @@ "link": "", "route": [ { - "x": 931.4099731445312, - "y": -186.21800231933594 + "x": 1006.051025390625, + "y": -206.38299560546875 }, { - "x": 936.197021484375, - "y": -185.53700256347656 + "x": 1007.1240234375, + "y": -206.26499938964844 }, { - "x": 942.385986328125, - "y": -184.45700073242188 + "x": 1013.9660034179688, + "y": -205.29100036621094 }, { - "x": 948.5380249023438, - "y": -183.18299865722656 + "x": 1020.7750244140625, + "y": -204.10299682617188 }, { - "x": 954.6480102539062, - "y": -181.71600341796875 + "x": 1027.5419921875, + "y": -202.7010040283203 }, { - "x": 960.7080078125, - "y": -180.05799865722656 + "x": 1034.261962890625, + "y": -201.08799743652344 }, { - "x": 966.7130126953125, - "y": -178.21099853515625 + "x": 1040.928955078125, + "y": -199.26400756835938 }, { - "x": 972.656982421875, - "y": -176.17599487304688 + "x": 1047.5340576171875, + "y": -197.23199462890625 }, { - "x": 978.5349731445312, - "y": -173.9550018310547 + "x": 1054.072998046875, + "y": -194.9929962158203 }, { - "x": 984.3389892578125, - "y": -171.5500030517578 + "x": 1060.5379638671875, + "y": -192.5500030517578 }, { - "x": 990.0659790039062, - "y": -168.96499633789062 + "x": 1066.9229736328125, + "y": -189.906005859375 }, { - "x": 995.7080078125, - "y": -166.2010040283203 + "x": 1073.2220458984375, + "y": -187.06100463867188 }, { - "x": 1001.260009765625, - "y": -163.26100158691406 + "x": 1079.428955078125, + "y": -184.02099609375 }, { - "x": 1006.718017578125, - "y": -160.1479949951172 + "x": 1085.5360107421875, + "y": -180.78700256347656 }, { - "x": 1012.0750122070312, - "y": -156.86500549316406 + "x": 1091.5400390625, + "y": -177.36300659179688 }, { - "x": 1017.3259887695312, - "y": -153.41600036621094 + "x": 1097.4329833984375, + "y": -173.7519989013672 }, { - "x": 1022.4669799804688, - "y": -149.80299377441406 + "x": 1103.208984375, + "y": -169.95700073242188 }, { - "x": 1027.490966796875, - "y": -146.031005859375 + "x": 1108.863037109375, + "y": -165.98300170898438 }, { - "x": 1032.39404296875, - "y": -142.1020050048828 + "x": 1114.3900146484375, + "y": -161.83399963378906 }, { - "x": 1037.1719970703125, - "y": -138.02200317382812 + "x": 1119.7840576171875, + "y": -157.51199340820312 }, { - "x": 1041.8189697265625, - "y": -133.79299926757812 + "x": 1125.0389404296875, + "y": -153.0240020751953 }, { - "x": 1046.3310546875, - "y": -129.42100524902344 + "x": 1130.1510009765625, + "y": -148.3730010986328 }, { - "x": 1050.7030029296875, - "y": -124.90899658203125 + "x": 1135.114013671875, + "y": -143.56300354003906 }, { - "x": 1054.9320068359375, - "y": -120.26200103759766 + "x": 1139.9239501953125, + "y": -138.60000610351562 }, { - "x": 1059.011962890625, - "y": -115.48400115966797 + "x": 1144.574951171875, + "y": -133.48800659179688 }, { - "x": 1062.9410400390625, - "y": -110.58100128173828 + "x": 1149.06396484375, + "y": -128.23300170898438 }, { - "x": 1066.7130126953125, - "y": -105.55699920654297 + "x": 1153.385009765625, + "y": -122.83899688720703 }, { - "x": 1070.3260498046875, - "y": -100.41600036621094 + "x": 1157.5340576171875, + "y": -117.31199645996094 }, { - "x": 1073.7750244140625, - "y": -95.16500091552734 + "x": 1161.508056640625, + "y": -111.65799713134766 }, { - "x": 1077.0579833984375, - "y": -89.80799865722656 + "x": 1165.302978515625, + "y": -105.88099670410156 }, { - "x": 1080.1710205078125, - "y": -84.3499984741211 + "x": 1168.9139404296875, + "y": -99.98899841308594 }, { - "x": 1083.1109619140625, - "y": -78.7979965209961 + "x": 1172.3380126953125, + "y": -93.98500061035156 }, { - "x": 1085.875, - "y": -73.15499877929688 + "x": 1175.572021484375, + "y": -87.87699890136719 }, { - "x": 1088.4610595703125, - "y": -67.42900085449219 + "x": 1178.613037109375, + "y": -81.6709976196289 }, { - "x": 1090.864990234375, - "y": -61.624000549316406 + "x": 1181.45703125, + "y": -75.37200164794922 }, { - "x": 1093.0860595703125, - "y": -55.74700164794922 + "x": 1184.10205078125, + "y": -68.98699951171875 }, { - "x": 1095.1209716796875, - "y": -49.803001403808594 + "x": 1186.5439453125, + "y": -62.52199935913086 }, { - "x": 1096.968017578125, - "y": -43.79800033569336 + "x": 1188.782958984375, + "y": -55.983001708984375 }, { - "x": 1098.6259765625, - "y": -37.73699951171875 + "x": 1190.81494140625, + "y": -49.37799835205078 }, { - "x": 1100.093017578125, - "y": -31.628000259399414 + "x": 1192.6390380859375, + "y": -42.71099853515625 }, { - "x": 1101.366943359375, - "y": -25.47599983215332 + "x": 1194.251953125, + "y": -35.99100112915039 }, { - "x": 1102.447021484375, - "y": -19.285999298095703 + "x": 1195.654052734375, + "y": -29.222999572753906 }, { - "x": 1103.3330078125, - "y": -13.065999984741211 + "x": 1196.842041015625, + "y": -22.415000915527344 }, { - "x": 1104.02197265625, - "y": -6.821000099182129 + "x": 1197.8160400390625, + "y": -15.572999954223633 }, { - "x": 1104.5150146484375, - "y": -0.5580000281333923 + "x": 1198.573974609375, + "y": -8.70300006866455 }, { - "x": 1104.81103515625, - "y": 5.7170000076293945 + "x": 1199.116943359375, + "y": -1.812999963760376 }, { - "x": 1104.9100341796875, + "x": 1199.4420166015625, + "y": 5.089000225067139 + }, + { + "x": 1199.551025390625, "y": 12 }, { - "x": 1104.81103515625, - "y": 18.281999588012695 + "x": 1199.4420166015625, + "y": 18.90999984741211 }, { - "x": 1104.5150146484375, - "y": 24.558000564575195 + "x": 1199.116943359375, + "y": 25.812999725341797 }, { - "x": 1104.02197265625, - "y": 30.820999145507812 + "x": 1198.573974609375, + "y": 32.702999114990234 }, { - "x": 1103.3330078125, - "y": 37.066001892089844 + "x": 1197.8160400390625, + "y": 39.573001861572266 }, { - "x": 1102.447021484375, - "y": 43.2859992980957 + "x": 1196.842041015625, + "y": 46.415000915527344 }, { - "x": 1101.366943359375, - "y": 49.47600173950195 + "x": 1195.654052734375, + "y": 53.222999572753906 }, { - "x": 1100.093017578125, - "y": 55.62799835205078 + "x": 1194.251953125, + "y": 59.99100112915039 }, { - "x": 1098.6259765625, - "y": 61.73699951171875 + "x": 1192.6390380859375, + "y": 66.71099853515625 }, { - "x": 1096.968017578125, - "y": 67.7979965209961 + "x": 1190.81494140625, + "y": 73.37799835205078 }, { - "x": 1095.1209716796875, - "y": 73.8030014038086 + "x": 1188.782958984375, + "y": 79.98300170898438 }, { - "x": 1093.0860595703125, - "y": 79.74700164794922 + "x": 1186.5439453125, + "y": 86.52200317382812 }, { - "x": 1090.864990234375, - "y": 85.6240005493164 + "x": 1184.10205078125, + "y": 92.98699951171875 }, { - "x": 1088.4610595703125, - "y": 91.42900085449219 + "x": 1181.45703125, + "y": 99.37200164794922 }, { - "x": 1085.875, - "y": 97.15499877929688 + "x": 1178.613037109375, + "y": 105.6709976196289 }, { - "x": 1083.1109619140625, - "y": 102.7979965209961 + "x": 1175.572021484375, + "y": 111.87699890136719 }, { - "x": 1080.1710205078125, - "y": 108.3499984741211 + "x": 1172.3380126953125, + "y": 117.98500061035156 }, { - "x": 1077.0579833984375, - "y": 113.80799865722656 + "x": 1168.9139404296875, + "y": 123.98899841308594 }, { - "x": 1073.7750244140625, - "y": 119.16500091552734 + "x": 1165.302978515625, + "y": 129.88099670410156 }, { - "x": 1070.3260498046875, - "y": 124.41600036621094 + "x": 1161.508056640625, + "y": 135.6580047607422 }, { - "x": 1066.7130126953125, - "y": 129.5570068359375 + "x": 1157.5340576171875, + "y": 141.31199645996094 }, { - "x": 1062.9410400390625, - "y": 134.58099365234375 + "x": 1153.385009765625, + "y": 146.83900451660156 }, { - "x": 1059.011962890625, - "y": 139.48399353027344 + "x": 1149.06396484375, + "y": 152.23300170898438 }, { - "x": 1054.9320068359375, - "y": 144.26199340820312 + "x": 1144.574951171875, + "y": 157.48800659179688 }, { - "x": 1050.7030029296875, - "y": 148.90899658203125 + "x": 1139.9239501953125, + "y": 162.60000610351562 }, { - "x": 1046.3310546875, - "y": 153.42100524902344 + "x": 1135.114013671875, + "y": 167.56300354003906 }, { - "x": 1041.8189697265625, - "y": 157.79299926757812 + "x": 1130.1510009765625, + "y": 172.3730010986328 }, { - "x": 1037.1719970703125, - "y": 162.02200317382812 + "x": 1125.0389404296875, + "y": 177.0240020751953 }, { - "x": 1032.39404296875, - "y": 166.1020050048828 + "x": 1119.7840576171875, + "y": 181.51199340820312 }, { - "x": 1027.490966796875, - "y": 170.031005859375 + "x": 1114.3900146484375, + "y": 185.83399963378906 }, { - "x": 1022.4669799804688, - "y": 173.80299377441406 + "x": 1108.863037109375, + "y": 189.98300170898438 }, { - "x": 1017.3259887695312, - "y": 177.41600036621094 + "x": 1103.208984375, + "y": 193.95700073242188 }, { - "x": 1012.0750122070312, - "y": 180.86500549316406 + "x": 1097.4329833984375, + "y": 197.7519989013672 }, { - "x": 1006.718017578125, - "y": 184.1479949951172 + "x": 1091.5400390625, + "y": 201.36300659179688 }, { - "x": 1001.260009765625, - "y": 187.26100158691406 + "x": 1085.5360107421875, + "y": 204.78700256347656 }, { - "x": 995.7080078125, - "y": 190.2010040283203 + "x": 1079.428955078125, + "y": 208.02099609375 }, { - "x": 990.0659790039062, - "y": 192.96499633789062 + "x": 1073.2220458984375, + "y": 211.06100463867188 }, { - "x": 984.3389892578125, - "y": 195.5500030517578 + "x": 1066.9229736328125, + "y": 213.906005859375 }, { - "x": 978.5349731445312, - "y": 197.9550018310547 + "x": 1060.5379638671875, + "y": 216.5500030517578 }, { - "x": 972.656982421875, - "y": 200.17599487304688 + "x": 1054.072998046875, + "y": 218.9929962158203 }, { - "x": 966.7130126953125, - "y": 202.21099853515625 + "x": 1047.5340576171875, + "y": 221.23199462890625 }, { - "x": 960.7080078125, - "y": 204.05799865722656 + "x": 1040.928955078125, + "y": 223.26400756835938 }, { - "x": 954.6480102539062, - "y": 205.71600341796875 + "x": 1034.261962890625, + "y": 225.08799743652344 }, { - "x": 948.5380249023438, - "y": 207.18299865722656 + "x": 1027.5419921875, + "y": 226.7010040283203 }, { - "x": 942.385986328125, - "y": 208.45700073242188 + "x": 1020.7750244140625, + "y": 228.10299682617188 }, { - "x": 936.197021484375, - "y": 209.53700256347656 + "x": 1013.9660034179688, + "y": 229.29100036621094 }, { - "x": 931.4099731445312, - "y": 210.21800231933594 + "x": 1010.1790161132812, + "y": 229.8820037841797 + }, + { + "x": 1006.051025390625, + "y": 230.38299560546875 } ], "isCurve": true, @@ -3324,284 +3372,296 @@ "link": "", "route": [ { - "x": 1004.4099731445312, - "y": -186.23399353027344 + "x": 1079.051025390625, + "y": -206.39500427246094 + }, + { + "x": 1080.1240234375, + "y": -206.26499938964844 + }, + { + "x": 1082.407958984375, + "y": -205.96400451660156 + }, + { + "x": 1084.68896484375, + "y": -205.63900756835938 }, { - "x": 1005.052978515625, - "y": -186.1490020751953 + "x": 1086.9659423828125, + "y": -205.29100036621094 }, { - "x": 1007.1259765625, - "y": -185.85400390625 + "x": 1089.239990234375, + "y": -204.91900634765625 }, { - "x": 1009.197021484375, - "y": -185.53700256347656 + "x": 1091.509033203125, + "y": -204.5229949951172 }, { - "x": 1011.2630004882812, - "y": -185.19900512695312 + "x": 1093.7750244140625, + "y": -204.10299682617188 }, { - "x": 1013.3270263671875, - "y": -184.83900451660156 + "x": 1096.0350341796875, + "y": -203.65899658203125 }, { - "x": 1015.385986328125, - "y": -184.45700073242188 + "x": 1098.291015625, + "y": -203.19200134277344 }, { - "x": 1017.4409790039062, - "y": -184.0540008544922 + "x": 1100.5419921875, + "y": -202.7010040283203 }, { - "x": 1019.4920043945312, - "y": -183.62899780273438 + "x": 1102.7879638671875, + "y": -202.18699645996094 }, { - "x": 1021.5380249023438, - "y": -183.18299865722656 + "x": 1105.0279541015625, + "y": -201.6490020751953 }, { - "x": 1023.5800170898438, - "y": -182.71499633789062 + "x": 1107.261962890625, + "y": -201.08799743652344 }, { - "x": 1025.615966796875, - "y": -182.2259979248047 + "x": 1109.490966796875, + "y": -200.5030059814453 }, { - "x": 1027.64794921875, - "y": -181.71600341796875 + "x": 1111.7130126953125, + "y": -199.89500427246094 }, { - "x": 1029.6729736328125, - "y": -181.18499755859375 + "x": 1113.928955078125, + "y": -199.26400756835938 }, { - "x": 1031.6939697265625, - "y": -180.6320037841797 + "x": 1116.137939453125, + "y": -198.61000061035156 }, { - "x": 1033.7080078125, - "y": -180.05799865722656 + "x": 1118.3399658203125, + "y": -197.9320068359375 }, { - "x": 1035.7159423828125, - "y": -179.46299743652344 + "x": 1120.5340576171875, + "y": -197.23199462890625 }, { - "x": 1037.718017578125, - "y": -178.84800720214844 + "x": 1122.7220458984375, + "y": -196.50900268554688 }, { - "x": 1039.7130126953125, - "y": -178.21099853515625 + "x": 1124.9010009765625, + "y": -195.76199340820312 }, { - "x": 1041.7020263671875, - "y": -177.55299377441406 + "x": 1127.072998046875, + "y": -194.9929962158203 }, { - "x": 1043.6829833984375, - "y": -176.875 + "x": 1129.237060546875, + "y": -194.20199584960938 }, { - "x": 1045.656982421875, - "y": -176.17599487304688 + "x": 1131.3919677734375, + "y": -193.38699340820312 }, { - "x": 1047.6240234375, - "y": -175.45599365234375 + "x": 1133.5379638671875, + "y": -192.5500030517578 }, { - "x": 1049.5830078125, - "y": -174.71600341796875 + "x": 1135.676025390625, + "y": -191.6909942626953 }, { - "x": 1051.5350341796875, - "y": -173.9550018310547 + "x": 1137.803955078125, + "y": -190.8090057373047 }, { - "x": 1053.47802734375, - "y": -173.1739959716797 + "x": 1139.9229736328125, + "y": -189.906005859375 }, { - "x": 1055.4129638671875, - "y": -172.3719940185547 + "x": 1142.032958984375, + "y": -188.97999572753906 }, { - "x": 1057.3389892578125, - "y": -171.5500030517578 + "x": 1144.1319580078125, + "y": -188.031005859375 }, { - "x": 1059.2569580078125, - "y": -170.70899963378906 + "x": 1146.2220458984375, + "y": -187.06100463867188 }, { - "x": 1061.166015625, - "y": -169.8470001220703 + "x": 1148.302001953125, + "y": -186.07000732421875 }, { - "x": 1063.0660400390625, - "y": -168.96499633789062 + "x": 1150.3699951171875, + "y": -185.05599975585938 }, { - "x": 1064.9560546875, - "y": -168.06300354003906 + "x": 1152.428955078125, + "y": -184.02099609375 }, { - "x": 1066.8370361328125, - "y": -167.14199829101562 + "x": 1154.4759521484375, + "y": -182.96400451660156 }, { - "x": 1068.7080078125, - "y": -166.2010040283203 + "x": 1156.511962890625, + "y": -181.88600158691406 }, { - "x": 1070.5689697265625, - "y": -165.24000549316406 + "x": 1158.5360107421875, + "y": -180.78700256347656 }, { - "x": 1072.4200439453125, - "y": -164.25999450683594 + "x": 1160.550048828125, + "y": -179.66700744628906 }, { - "x": 1074.260009765625, - "y": -163.26100158691406 + "x": 1162.551025390625, + "y": -178.52499389648438 }, { - "x": 1076.0899658203125, - "y": -162.24200439453125 + "x": 1164.5400390625, + "y": -177.36300659179688 }, { - "x": 1077.9100341796875, - "y": -161.2050018310547 + "x": 1166.5169677734375, + "y": -176.17999267578125 }, { - "x": 1079.718017578125, - "y": -160.1479949951172 + "x": 1168.48095703125, + "y": -174.9759979248047 }, { - "x": 1081.5150146484375, - "y": -159.07200622558594 + "x": 1170.4329833984375, + "y": -173.7519989013672 }, { - "x": 1083.301025390625, - "y": -157.97799682617188 + "x": 1172.3709716796875, + "y": -172.5070037841797 }, { - "x": 1085.074951171875, - "y": -156.86500549316406 + "x": 1174.2969970703125, + "y": -171.24200439453125 }, { - "x": 1086.8370361328125, - "y": -155.73399353027344 + "x": 1176.208984375, + "y": -169.95700073242188 }, { - "x": 1088.5880126953125, - "y": -154.58399963378906 + "x": 1178.1080322265625, + "y": -168.65199279785156 }, { - "x": 1090.3260498046875, - "y": -153.41600036621094 + "x": 1179.9930419921875, + "y": -167.3280029296875 }, { - "x": 1092.052001953125, - "y": -152.22900390625 + "x": 1181.863037109375, + "y": -165.98300170898438 }, { - "x": 1093.7659912109375, - "y": -151.02499389648438 + "x": 1183.719970703125, + "y": -164.61900329589844 }, { - "x": 1095.467041015625, - "y": -149.80299377441406 + "x": 1185.56201171875, + "y": -163.23599243164062 }, { - "x": 1097.155029296875, - "y": -148.56300354003906 + "x": 1187.3900146484375, + "y": -161.83399963378906 }, { - "x": 1098.8289794921875, - "y": -147.30499267578125 + "x": 1189.2030029296875, + "y": -160.41200256347656 }, { - "x": 1100.490966796875, - "y": -146.031005859375 + "x": 1191.0009765625, + "y": -158.9720001220703 }, { - "x": 1102.1390380859375, - "y": -144.73800659179688 + "x": 1192.7840576171875, + "y": -157.51199340820312 }, { - "x": 1103.7740478515625, - "y": -143.4290008544922 + "x": 1194.551025390625, + "y": -156.03500366210938 }, { - "x": 1105.39404296875, - "y": -142.1020050048828 + "x": 1196.302978515625, + "y": -154.53799438476562 }, { - "x": 1107.0009765625, - "y": -140.75900268554688 + "x": 1198.0389404296875, + "y": -153.0240020751953 }, { - "x": 1108.593994140625, - "y": -139.3990020751953 + "x": 1199.759033203125, + "y": -151.49099731445312 }, { - "x": 1110.1719970703125, - "y": -138.02200317382812 + "x": 1201.4630126953125, + "y": -149.9409942626953 }, { - "x": 1111.7359619140625, - "y": -136.6280059814453 + "x": 1203.1510009765625, + "y": -148.3730010986328 }, { - "x": 1113.2850341796875, - "y": -135.218994140625 + "x": 1204.822021484375, + "y": -146.78700256347656 }, { - "x": 1114.8189697265625, - "y": -133.79299926757812 + "x": 1206.47705078125, + "y": -145.18299865722656 }, { - "x": 1116.3380126953125, - "y": -132.3520050048828 + "x": 1208.114013671875, + "y": -143.56300354003906 }, { - "x": 1117.842041015625, - "y": -130.8939971923828 + "x": 1209.7349853515625, + "y": -141.9250030517578 }, { - "x": 1119.3310546875, - "y": -129.42100524902344 + "x": 1211.3380126953125, + "y": -140.27099609375 }, { - "x": 1120.803955078125, - "y": -127.93199920654297 + "x": 1212.9239501953125, + "y": -138.60000610351562 }, { - "x": 1122.261962890625, - "y": -126.4280014038086 + "x": 1214.491943359375, + "y": -136.91200256347656 }, { - "x": 1123.7030029296875, - "y": -124.90899658203125 + "x": 1216.04296875, + "y": -135.20799255371094 }, { - "x": 1125.1290283203125, - "y": -123.375 + "x": 1217.574951171875, + "y": -133.48800659179688 }, { - "x": 1124.509033203125, - "y": -124.10600280761719 + "x": 1217.029052734375, + "y": -134.16000366210938 }, { - "x": 1127.2750244140625, - "y": -121 + "x": 1219.7320556640625, + "y": -131 } ], "isCurve": true, @@ -3636,272 +3696,288 @@ "link": "", "route": [ { - "x": 1166.3509521484375, - "y": -55 + "x": 1258.634033203125, + "y": -65 }, { - "x": 1166.7850341796875, - "y": -53.77299880981445 + "x": 1258.7530517578125, + "y": -64.68499755859375 }, { - "x": 1167.4630126953125, - "y": -51.79100036621094 + "x": 1259.5439453125, + "y": -62.52199935913086 }, { - "x": 1168.1209716796875, - "y": -49.803001403808594 + "x": 1260.31298828125, + "y": -60.349998474121094 }, { - "x": 1168.758056640625, - "y": -47.80799865722656 + "x": 1261.06005859375, + "y": -58.17100143432617 }, { - "x": 1169.3740234375, - "y": -45.805999755859375 + "x": 1261.782958984375, + "y": -55.983001708984375 }, { - "x": 1169.968017578125, - "y": -43.79800033569336 + "x": 1262.4840087890625, + "y": -53.78799819946289 }, { - "x": 1170.5419921875, - "y": -41.78300094604492 + "x": 1263.1610107421875, + "y": -51.58599853515625 }, { - "x": 1171.094970703125, - "y": -39.76300048828125 + "x": 1263.81494140625, + "y": -49.37799835205078 }, { - "x": 1171.6259765625, - "y": -37.73699951171875 + "x": 1264.446044921875, + "y": -47.1619987487793 }, { - "x": 1172.136962890625, - "y": -35.70600128173828 + "x": 1265.053955078125, + "y": -44.939998626708984 }, { - "x": 1172.625, - "y": -33.66999816894531 + "x": 1265.6390380859375, + "y": -42.71099853515625 }, { - "x": 1173.093017578125, - "y": -31.628000259399414 + "x": 1266.199951171875, + "y": -40.47700119018555 }, { - "x": 1173.5389404296875, - "y": -29.582000732421875 + "x": 1266.738037109375, + "y": -38.23699951171875 }, { - "x": 1173.9639892578125, - "y": -27.5310001373291 + "x": 1267.251953125, + "y": -35.99100112915039 }, { - "x": 1174.366943359375, - "y": -25.47599983215332 + "x": 1267.7430419921875, + "y": -33.7400016784668 }, { - "x": 1174.7490234375, - "y": -23.416000366210938 + "x": 1268.2099609375, + "y": -31.483999252319336 }, { - "x": 1175.1090087890625, - "y": -21.35300064086914 + "x": 1268.654052734375, + "y": -29.222999572753906 }, { - "x": 1175.447021484375, - "y": -19.285999298095703 + "x": 1269.073974609375, + "y": -26.95800018310547 }, { - "x": 1175.7640380859375, - "y": -17.215999603271484 + "x": 1269.469970703125, + "y": -24.68899917602539 }, { - "x": 1176.0589599609375, - "y": -15.142999649047852 + "x": 1269.842041015625, + "y": -22.415000915527344 }, { - "x": 1176.3330078125, - "y": -13.065999984741211 + "x": 1270.1910400390625, + "y": -20.13800048828125 }, { - "x": 1176.583984375, - "y": -10.987000465393066 + "x": 1270.5150146484375, + "y": -17.85700035095215 }, { - "x": 1176.81396484375, - "y": -8.904999732971191 + "x": 1270.8160400390625, + "y": -15.572999954223633 }, { - "x": 1177.02197265625, - "y": -6.821000099182129 + "x": 1271.093017578125, + "y": -13.28600025177002 }, { - "x": 1177.2080078125, - "y": -4.735000133514404 + "x": 1271.344970703125, + "y": -10.996000289916992 }, { - "x": 1177.373046875, - "y": -2.6470000743865967 + "x": 1271.573974609375, + "y": -8.70300006866455 }, { - "x": 1177.5150146484375, - "y": -0.5580000281333923 + "x": 1271.779052734375, + "y": -6.408999919891357 }, { - "x": 1177.635986328125, - "y": 1.531999945640564 + "x": 1271.9599609375, + "y": -4.111999988555908 }, { - "x": 1177.7340087890625, - "y": 3.624000072479248 + "x": 1272.116943359375, + "y": -1.812999963760376 }, { - "x": 1177.81103515625, - "y": 5.7170000076293945 + "x": 1272.2490234375, + "y": 0.4860000014305115 }, { - "x": 1177.865966796875, - "y": 7.810999870300293 + "x": 1272.3580322265625, + "y": 2.7869999408721924 }, { - "x": 1177.8990478515625, - "y": 9.904999732971191 + "x": 1272.4420166015625, + "y": 5.089000225067139 }, { - "x": 1177.9100341796875, + "x": 1272.501953125, + "y": 7.392000198364258 + }, + { + "x": 1272.5389404296875, + "y": 9.696000099182129 + }, + { + "x": 1272.551025390625, "y": 11.99899959564209 }, { - "x": 1177.8990478515625, - "y": 14.093999862670898 + "x": 1272.5389404296875, + "y": 14.303000450134277 }, { - "x": 1177.865966796875, - "y": 16.187999725341797 + "x": 1272.501953125, + "y": 16.60700035095215 }, { - "x": 1177.81103515625, - "y": 18.281999588012695 + "x": 1272.4420166015625, + "y": 18.90999984741211 }, { - "x": 1177.7340087890625, - "y": 20.375 + "x": 1272.3580322265625, + "y": 21.211999893188477 }, { - "x": 1177.635986328125, - "y": 22.466999053955078 + "x": 1272.2490234375, + "y": 23.51300048828125 }, { - "x": 1177.5150146484375, - "y": 24.558000564575195 + "x": 1272.116943359375, + "y": 25.812999725341797 }, { - "x": 1177.373046875, - "y": 26.64699935913086 + "x": 1271.9599609375, + "y": 28.11199951171875 }, { - "x": 1177.2080078125, - "y": 28.735000610351562 + "x": 1271.779052734375, + "y": 30.409000396728516 }, { - "x": 1177.02197265625, - "y": 30.820999145507812 + "x": 1271.573974609375, + "y": 32.702999114990234 }, { - "x": 1176.81396484375, - "y": 32.904998779296875 + "x": 1271.344970703125, + "y": 34.99599838256836 }, { - "x": 1176.583984375, - "y": 34.98699951171875 + "x": 1271.093017578125, + "y": 37.2859992980957 }, { - "x": 1176.3330078125, - "y": 37.066001892089844 + "x": 1270.8160400390625, + "y": 39.573001861572266 }, { - "x": 1176.0589599609375, - "y": 39.143001556396484 + "x": 1270.5150146484375, + "y": 41.856998443603516 }, { - "x": 1175.7640380859375, - "y": 41.215999603271484 + "x": 1270.1910400390625, + "y": 44.13800048828125 }, { - "x": 1175.447021484375, - "y": 43.2859992980957 + "x": 1269.842041015625, + "y": 46.415000915527344 }, { - "x": 1175.1090087890625, - "y": 45.35300064086914 + "x": 1269.469970703125, + "y": 48.68899917602539 }, { - "x": 1174.7490234375, - "y": 47.41600036621094 + "x": 1269.073974609375, + "y": 50.95800018310547 }, { - "x": 1174.366943359375, - "y": 49.47600173950195 + "x": 1268.654052734375, + "y": 53.222999572753906 }, { - "x": 1173.9639892578125, - "y": 51.53099822998047 + "x": 1268.2099609375, + "y": 55.48400115966797 }, { - "x": 1173.5389404296875, - "y": 53.582000732421875 + "x": 1267.7430419921875, + "y": 57.7400016784668 }, { - "x": 1173.093017578125, - "y": 55.62799835205078 + "x": 1267.251953125, + "y": 59.99100112915039 }, { - "x": 1172.625, - "y": 57.66999816894531 + "x": 1266.738037109375, + "y": 62.23699951171875 }, { - "x": 1172.136962890625, - "y": 59.70600128173828 + "x": 1266.199951171875, + "y": 64.47699737548828 }, { - "x": 1171.6259765625, - "y": 61.73699951171875 + "x": 1265.6390380859375, + "y": 66.71099853515625 }, { - "x": 1171.094970703125, - "y": 63.76300048828125 + "x": 1265.053955078125, + "y": 68.94000244140625 }, { - "x": 1170.5419921875, - "y": 65.78299713134766 + "x": 1264.446044921875, + "y": 71.16200256347656 }, { - "x": 1169.968017578125, - "y": 67.7979965209961 + "x": 1263.81494140625, + "y": 73.37799835205078 }, { - "x": 1169.3740234375, - "y": 69.80599975585938 + "x": 1263.1610107421875, + "y": 75.58599853515625 }, { - "x": 1168.758056640625, - "y": 71.80799865722656 + "x": 1262.4840087890625, + "y": 77.78800201416016 }, { - "x": 1168.1209716796875, - "y": 73.8030014038086 + "x": 1261.782958984375, + "y": 79.98300170898438 }, { - "x": 1167.4630126953125, - "y": 75.79100036621094 + "x": 1261.06005859375, + "y": 82.1709976196289 }, { - "x": 1167.7440185546875, - "y": 75.08100128173828 + "x": 1260.31298828125, + "y": 84.3499984741211 }, { - "x": 1166.3509521484375, - "y": 78.9990005493164 + "x": 1259.5439453125, + "y": 86.52200317382812 + }, + { + "x": 1260.0899658203125, + "y": 85.10399627685547 + }, + { + "x": 1258.634033203125, + "y": 88.9990005493164 } ], "isCurve": true, @@ -3936,284 +4012,296 @@ "link": "", "route": [ { - "x": 1127.2750244140625, - "y": 144.99899291992188 + "x": 1219.7320556640625, + "y": 154.99899291992188 + }, + { + "x": 1219.0899658203125, + "y": 155.7519989013672 + }, + { + "x": 1217.574951171875, + "y": 157.48800659179688 + }, + { + "x": 1216.04296875, + "y": 159.20799255371094 }, { - "x": 1126.5389404296875, - "y": 145.8260040283203 + "x": 1214.491943359375, + "y": 160.91200256347656 }, { - "x": 1125.1290283203125, - "y": 147.375 + "x": 1212.9239501953125, + "y": 162.60000610351562 }, { - "x": 1123.7030029296875, - "y": 148.90899658203125 + "x": 1211.3380126953125, + "y": 164.27099609375 }, { - "x": 1122.261962890625, - "y": 150.42799377441406 + "x": 1209.7349853515625, + "y": 165.9250030517578 }, { - "x": 1120.803955078125, - "y": 151.9320068359375 + "x": 1208.114013671875, + "y": 167.56300354003906 }, { - "x": 1119.3310546875, - "y": 153.42100524902344 + "x": 1206.47705078125, + "y": 169.18299865722656 }, { - "x": 1117.842041015625, - "y": 154.8939971923828 + "x": 1204.822021484375, + "y": 170.78700256347656 }, { - "x": 1116.3380126953125, - "y": 156.3520050048828 + "x": 1203.1510009765625, + "y": 172.3730010986328 }, { - "x": 1114.8189697265625, - "y": 157.79299926757812 + "x": 1201.4630126953125, + "y": 173.9409942626953 }, { - "x": 1113.2850341796875, - "y": 159.218994140625 + "x": 1199.759033203125, + "y": 175.49099731445312 }, { - "x": 1111.7359619140625, - "y": 160.6280059814453 + "x": 1198.0389404296875, + "y": 177.0240020751953 }, { - "x": 1110.1719970703125, - "y": 162.02200317382812 + "x": 1196.302978515625, + "y": 178.53799438476562 }, { - "x": 1108.593994140625, - "y": 163.3990020751953 + "x": 1194.551025390625, + "y": 180.03500366210938 }, { - "x": 1107.0009765625, - "y": 164.75900268554688 + "x": 1192.7840576171875, + "y": 181.51199340820312 }, { - "x": 1105.39404296875, - "y": 166.1020050048828 + "x": 1191.0009765625, + "y": 182.9720001220703 }, { - "x": 1103.7740478515625, - "y": 167.4290008544922 + "x": 1189.2030029296875, + "y": 184.41200256347656 }, { - "x": 1102.1390380859375, - "y": 168.73800659179688 + "x": 1187.3900146484375, + "y": 185.83399963378906 }, { - "x": 1100.490966796875, - "y": 170.031005859375 + "x": 1185.56201171875, + "y": 187.23599243164062 }, { - "x": 1098.8289794921875, - "y": 171.30499267578125 + "x": 1183.719970703125, + "y": 188.61900329589844 }, { - "x": 1097.155029296875, - "y": 172.56300354003906 + "x": 1181.863037109375, + "y": 189.98300170898438 }, { - "x": 1095.467041015625, - "y": 173.80299377441406 + "x": 1179.9930419921875, + "y": 191.3280029296875 }, { - "x": 1093.7659912109375, - "y": 175.02499389648438 + "x": 1178.1080322265625, + "y": 192.65199279785156 }, { - "x": 1092.052001953125, - "y": 176.22900390625 + "x": 1176.208984375, + "y": 193.95700073242188 }, { - "x": 1090.3260498046875, - "y": 177.41600036621094 + "x": 1174.2969970703125, + "y": 195.24200439453125 }, { - "x": 1088.5880126953125, - "y": 178.58399963378906 + "x": 1172.3709716796875, + "y": 196.5070037841797 }, { - "x": 1086.8370361328125, - "y": 179.73399353027344 + "x": 1170.4329833984375, + "y": 197.7519989013672 }, { - "x": 1085.074951171875, - "y": 180.86500549316406 + "x": 1168.48095703125, + "y": 198.9759979248047 }, { - "x": 1083.301025390625, - "y": 181.97799682617188 + "x": 1166.5169677734375, + "y": 200.17999267578125 }, { - "x": 1081.5150146484375, - "y": 183.07200622558594 + "x": 1164.5400390625, + "y": 201.36300659179688 }, { - "x": 1079.718017578125, - "y": 184.1479949951172 + "x": 1162.551025390625, + "y": 202.52499389648438 }, { - "x": 1077.9100341796875, - "y": 185.2050018310547 + "x": 1160.550048828125, + "y": 203.66700744628906 }, { - "x": 1076.0899658203125, - "y": 186.24200439453125 + "x": 1158.5360107421875, + "y": 204.78700256347656 }, { - "x": 1074.260009765625, - "y": 187.26100158691406 + "x": 1156.511962890625, + "y": 205.88600158691406 }, { - "x": 1072.4200439453125, - "y": 188.25999450683594 + "x": 1154.4759521484375, + "y": 206.96400451660156 }, { - "x": 1070.5689697265625, - "y": 189.24000549316406 + "x": 1152.428955078125, + "y": 208.02099609375 }, { - "x": 1068.7080078125, - "y": 190.2010040283203 + "x": 1150.3699951171875, + "y": 209.05599975585938 }, { - "x": 1066.8370361328125, - "y": 191.14199829101562 + "x": 1148.302001953125, + "y": 210.07000732421875 }, { - "x": 1064.9560546875, - "y": 192.06300354003906 + "x": 1146.2220458984375, + "y": 211.06100463867188 }, { - "x": 1063.0660400390625, - "y": 192.96499633789062 + "x": 1144.1319580078125, + "y": 212.031005859375 }, { - "x": 1061.166015625, - "y": 193.8470001220703 + "x": 1142.032958984375, + "y": 212.97999572753906 }, { - "x": 1059.2569580078125, - "y": 194.70899963378906 + "x": 1139.9229736328125, + "y": 213.906005859375 }, { - "x": 1057.3389892578125, - "y": 195.5500030517578 + "x": 1137.803955078125, + "y": 214.8090057373047 }, { - "x": 1055.4129638671875, - "y": 196.3719940185547 + "x": 1135.676025390625, + "y": 215.6909942626953 }, { - "x": 1053.47802734375, - "y": 197.1739959716797 + "x": 1133.5379638671875, + "y": 216.5500030517578 }, { - "x": 1051.5350341796875, - "y": 197.9550018310547 + "x": 1131.3919677734375, + "y": 217.38699340820312 }, { - "x": 1049.5830078125, - "y": 198.71600341796875 + "x": 1129.237060546875, + "y": 218.20199584960938 }, { - "x": 1047.6240234375, - "y": 199.45599365234375 + "x": 1127.072998046875, + "y": 218.9929962158203 }, { - "x": 1045.656982421875, - "y": 200.17599487304688 + "x": 1124.9010009765625, + "y": 219.76199340820312 }, { - "x": 1043.6829833984375, - "y": 200.875 + "x": 1122.7220458984375, + "y": 220.50900268554688 }, { - "x": 1041.7020263671875, - "y": 201.55299377441406 + "x": 1120.5340576171875, + "y": 221.23199462890625 }, { - "x": 1039.7130126953125, - "y": 202.21099853515625 + "x": 1118.3399658203125, + "y": 221.9320068359375 }, { - "x": 1037.718017578125, - "y": 202.84800720214844 + "x": 1116.137939453125, + "y": 222.61000061035156 }, { - "x": 1035.7159423828125, - "y": 203.46299743652344 + "x": 1113.928955078125, + "y": 223.26400756835938 }, { - "x": 1033.7080078125, - "y": 204.05799865722656 + "x": 1111.7130126953125, + "y": 223.89500427246094 }, { - "x": 1031.6939697265625, - "y": 204.6320037841797 + "x": 1109.490966796875, + "y": 224.5030059814453 }, { - "x": 1029.6729736328125, - "y": 205.18499755859375 + "x": 1107.261962890625, + "y": 225.08799743652344 }, { - "x": 1027.64794921875, - "y": 205.71600341796875 + "x": 1105.0279541015625, + "y": 225.6490020751953 }, { - "x": 1025.615966796875, - "y": 206.2259979248047 + "x": 1102.7879638671875, + "y": 226.18699645996094 }, { - "x": 1023.5800170898438, - "y": 206.71499633789062 + "x": 1100.5419921875, + "y": 226.7010040283203 }, { - "x": 1021.5380249023438, - "y": 207.18299865722656 + "x": 1098.291015625, + "y": 227.19200134277344 }, { - "x": 1019.4920043945312, - "y": 207.62899780273438 + "x": 1096.0350341796875, + "y": 227.65899658203125 }, { - "x": 1017.4409790039062, - "y": 208.0540008544922 + "x": 1093.7750244140625, + "y": 228.10299682617188 }, { - "x": 1015.385986328125, - "y": 208.45700073242188 + "x": 1091.509033203125, + "y": 228.5229949951172 }, { - "x": 1013.3270263671875, - "y": 208.83900451660156 + "x": 1089.239990234375, + "y": 228.91900634765625 }, { - "x": 1011.2630004882812, - "y": 209.19900512695312 + "x": 1086.9659423828125, + "y": 229.29100036621094 }, { - "x": 1009.197021484375, - "y": 209.53700256347656 + "x": 1084.68896484375, + "y": 229.63900756835938 }, { - "x": 1007.1259765625, - "y": 209.85400390625 + "x": 1082.407958984375, + "y": 229.96400451660156 }, { - "x": 1009.031005859375, - "y": 209.6060028076172 + "x": 1083.677978515625, + "y": 229.82400512695312 }, { - "x": 1004.9099731445312, - "y": 210.16799926757812 + "x": 1079.551025390625, + "y": 230.33399963378906 } ], "isCurve": true, @@ -4248,284 +4336,296 @@ "link": "", "route": [ { - "x": 950.9099731445312, - "y": 210.16799926757812 + "x": 1025.551025390625, + "y": 230.33399963378906 + }, + { + "x": 1024.97705078125, + "y": 230.26499938964844 + }, + { + "x": 1022.6929931640625, + "y": 229.96400451660156 + }, + { + "x": 1020.4119873046875, + "y": 229.63900756835938 }, { - "x": 950.7670288085938, - "y": 210.1490020751953 + "x": 1018.135009765625, + "y": 229.29100036621094 }, { - "x": 948.6929931640625, - "y": 209.85400390625 + "x": 1015.8619995117188, + "y": 228.91900634765625 }, { - "x": 946.6229858398438, - "y": 209.53700256347656 + "x": 1013.5919799804688, + "y": 228.5229949951172 }, { - "x": 944.5560302734375, - "y": 209.19900512695312 + "x": 1011.3270263671875, + "y": 228.10299682617188 }, { - "x": 942.4929809570312, - "y": 208.83900451660156 + "x": 1009.0659790039062, + "y": 227.65899658203125 }, { - "x": 940.4329833984375, - "y": 208.45700073242188 + "x": 1006.8099975585938, + "y": 227.19200134277344 }, { - "x": 938.3779907226562, - "y": 208.0540008544922 + "x": 1004.5590209960938, + "y": 226.7010040283203 }, { - "x": 936.3270263671875, - "y": 207.62899780273438 + "x": 1002.31298828125, + "y": 226.18699645996094 }, { - "x": 934.281005859375, - "y": 207.18299865722656 + "x": 1000.072998046875, + "y": 225.6490020751953 }, { - "x": 932.239013671875, - "y": 206.71499633789062 + "x": 997.8389892578125, + "y": 225.08799743652344 }, { - "x": 930.2030029296875, - "y": 206.2259979248047 + "x": 995.6099853515625, + "y": 224.5030059814453 }, { - "x": 928.1719970703125, - "y": 205.71600341796875 + "x": 993.3880004882812, + "y": 223.89500427246094 }, { - "x": 926.14599609375, - "y": 205.18499755859375 + "x": 991.1729736328125, + "y": 223.26400756835938 }, { - "x": 924.1259765625, - "y": 204.6320037841797 + "x": 988.9639892578125, + "y": 222.61000061035156 }, { - "x": 922.1110229492188, - "y": 204.05799865722656 + "x": 986.7620239257812, + "y": 221.9320068359375 }, { - "x": 920.10302734375, - "y": 203.46299743652344 + "x": 984.5670166015625, + "y": 221.23199462890625 }, { - "x": 918.1019897460938, - "y": 202.84800720214844 + "x": 982.3800048828125, + "y": 220.50900268554688 }, { - "x": 916.1060180664062, - "y": 202.21099853515625 + "x": 980.2000122070312, + "y": 219.76199340820312 }, { - "x": 914.1179809570312, - "y": 201.55299377441406 + "x": 978.0280151367188, + "y": 218.9929962158203 }, { - "x": 912.135986328125, - "y": 200.875 + "x": 975.864990234375, + "y": 218.20199584960938 }, { - "x": 910.1619873046875, - "y": 200.17599487304688 + "x": 973.7100219726562, + "y": 217.38699340820312 }, { - "x": 908.1950073242188, - "y": 199.45599365234375 + "x": 971.56298828125, + "y": 216.5500030517578 }, { - "x": 906.2360229492188, - "y": 198.71600341796875 + "x": 969.426025390625, + "y": 215.6909942626953 }, { - "x": 904.2849731445312, - "y": 197.9550018310547 + "x": 967.2969970703125, + "y": 214.8090057373047 }, { - "x": 902.3419799804688, - "y": 197.1739959716797 + "x": 965.177978515625, + "y": 213.906005859375 }, { - "x": 900.406982421875, - "y": 196.3719940185547 + "x": 963.0689697265625, + "y": 212.97999572753906 }, { - "x": 898.47998046875, - "y": 195.5500030517578 + "x": 960.968994140625, + "y": 212.031005859375 }, { - "x": 896.56201171875, - "y": 194.70899963378906 + "x": 958.8790283203125, + "y": 211.06100463867188 }, { - "x": 894.6539916992188, - "y": 193.8470001220703 + "x": 956.7999877929688, + "y": 210.07000732421875 }, { - "x": 892.7540283203125, - "y": 192.96499633789062 + "x": 954.7310180664062, + "y": 209.05599975585938 }, { - "x": 890.8629760742188, - "y": 192.06300354003906 + "x": 952.6729736328125, + "y": 208.02099609375 }, { - "x": 888.9829711914062, - "y": 191.14199829101562 + "x": 950.6259765625, + "y": 206.96400451660156 }, { - "x": 887.1119995117188, - "y": 190.2010040283203 + "x": 948.5900268554688, + "y": 205.88600158691406 }, { - "x": 885.25, - "y": 189.24000549316406 + "x": 946.5650024414062, + "y": 204.78700256347656 }, { - "x": 883.4000244140625, - "y": 188.25999450683594 + "x": 944.552001953125, + "y": 203.66700744628906 }, { - "x": 881.5590209960938, - "y": 187.26100158691406 + "x": 942.551025390625, + "y": 202.52499389648438 }, { - "x": 879.72900390625, - "y": 186.24200439453125 + "x": 940.56201171875, + "y": 201.36300659179688 }, { - "x": 877.9099731445312, - "y": 185.2050018310547 + "x": 938.5850219726562, + "y": 200.17999267578125 }, { - "x": 876.1010131835938, - "y": 184.1479949951172 + "x": 936.6199951171875, + "y": 198.9759979248047 }, { - "x": 874.3040161132812, - "y": 183.07200622558594 + "x": 934.6690063476562, + "y": 197.7519989013672 }, { - "x": 872.5189819335938, - "y": 181.97799682617188 + "x": 932.72998046875, + "y": 196.5070037841797 }, { - "x": 870.7440185546875, - "y": 180.86500549316406 + "x": 930.8049926757812, + "y": 195.24200439453125 }, { - "x": 868.9819946289062, - "y": 179.73399353027344 + "x": 928.8920288085938, + "y": 193.95700073242188 }, { - "x": 867.2310180664062, - "y": 178.58399963378906 + "x": 926.9940185546875, + "y": 192.65199279785156 }, { - "x": 865.4929809570312, - "y": 177.41600036621094 + "x": 925.1090087890625, + "y": 191.3280029296875 }, { - "x": 863.7670288085938, - "y": 176.22900390625 + "x": 923.2379760742188, + "y": 189.98300170898438 }, { - "x": 862.052978515625, - "y": 175.02499389648438 + "x": 921.3809814453125, + "y": 188.61900329589844 }, { - "x": 860.35302734375, - "y": 173.80299377441406 + "x": 919.5390014648438, + "y": 187.23599243164062 }, { - "x": 858.6649780273438, - "y": 172.56300354003906 + "x": 917.7109985351562, + "y": 185.83399963378906 }, { - "x": 856.989990234375, - "y": 171.30499267578125 + "x": 915.8980102539062, + "y": 184.41200256347656 }, { - "x": 855.3280029296875, - "y": 170.031005859375 + "x": 914.0999755859375, + "y": 182.9720001220703 }, { - "x": 853.6799926757812, - "y": 168.73800659179688 + "x": 912.3170166015625, + "y": 181.51199340820312 }, { - "x": 852.0460205078125, - "y": 167.4290008544922 + "x": 910.5499877929688, + "y": 180.03500366210938 }, { - "x": 850.4249877929688, - "y": 166.1020050048828 + "x": 908.7979736328125, + "y": 178.53799438476562 }, { - "x": 848.8179931640625, - "y": 164.75900268554688 + "x": 907.06201171875, + "y": 177.0240020751953 }, { - "x": 847.2260131835938, - "y": 163.3990020751953 + "x": 905.3419799804688, + "y": 175.49099731445312 }, { - "x": 845.64697265625, - "y": 162.02200317382812 + "x": 903.6380004882812, + "y": 173.9409942626953 }, { - "x": 844.083984375, - "y": 160.6280059814453 + "x": 901.9500122070312, + "y": 172.3730010986328 }, { - "x": 842.5339965820312, - "y": 159.218994140625 + "x": 900.2789916992188, + "y": 170.78700256347656 }, { - "x": 841, - "y": 157.79299926757812 + "x": 898.625, + "y": 169.18299865722656 }, { - "x": 839.4810180664062, - "y": 156.3520050048828 + "x": 896.9869995117188, + "y": 167.56300354003906 }, { - "x": 837.9769897460938, - "y": 154.8939971923828 + "x": 895.3670043945312, + "y": 165.9250030517578 }, { - "x": 836.4879760742188, - "y": 153.42100524902344 + "x": 893.7630004882812, + "y": 164.27099609375 }, { - "x": 835.0150146484375, - "y": 151.9320068359375 + "x": 892.177978515625, + "y": 162.60000610351562 }, { - "x": 833.5579833984375, - "y": 150.42799377441406 + "x": 890.6090087890625, + "y": 160.91200256347656 }, { - "x": 832.1160278320312, - "y": 148.90899658203125 + "x": 889.0590209960938, + "y": 159.20799255371094 }, { - "x": 830.6900024414062, - "y": 147.375 + "x": 887.5260009765625, + "y": 157.48800659179688 }, { - "x": 831.3099975585938, - "y": 148.1060028076172 + "x": 888.072021484375, + "y": 158.16000366210938 }, { - "x": 828.5449829101562, - "y": 145 + "x": 885.3690185546875, + "y": 155 } ], "isCurve": true, @@ -4560,272 +4660,288 @@ "link": "", "route": [ { - "x": 789.468994140625, - "y": 79 + "x": 846.4669799804688, + "y": 89 + }, + { + "x": 846.3489990234375, + "y": 88.68499755859375 + }, + { + "x": 845.5570068359375, + "y": 86.52200317382812 }, { - "x": 789.0339965820312, - "y": 77.77300262451172 + "x": 844.7880249023438, + "y": 84.3499984741211 }, { - "x": 788.3560180664062, - "y": 75.79100036621094 + "x": 844.0419921875, + "y": 82.1709976196289 }, { - "x": 787.697998046875, - "y": 73.8030014038086 + "x": 843.3179931640625, + "y": 79.98300170898438 }, { - "x": 787.06201171875, - "y": 71.80799865722656 + "x": 842.6179809570312, + "y": 77.78800201416016 }, { - "x": 786.4459838867188, - "y": 69.80599975585938 + "x": 841.9400024414062, + "y": 75.58599853515625 }, { - "x": 785.8510131835938, - "y": 67.7979965209961 + "x": 841.2860107421875, + "y": 73.37799835205078 }, { - "x": 785.2769775390625, - "y": 65.78299713134766 + "x": 840.655029296875, + "y": 71.16200256347656 }, { - "x": 784.7239990234375, - "y": 63.76300048828125 + "x": 840.0469970703125, + "y": 68.94000244140625 }, { - "x": 784.1929931640625, - "y": 61.73699951171875 + "x": 839.4619750976562, + "y": 66.71099853515625 }, { - "x": 783.6829833984375, - "y": 59.70600128173828 + "x": 838.9010009765625, + "y": 64.47699737548828 }, { - "x": 783.1939697265625, - "y": 57.66999816894531 + "x": 838.3629760742188, + "y": 62.23699951171875 }, { - "x": 782.7260131835938, - "y": 55.62799835205078 + "x": 837.8489990234375, + "y": 59.99100112915039 }, { - "x": 782.280029296875, - "y": 53.582000732421875 + "x": 837.3579711914062, + "y": 57.7400016784668 }, { - "x": 781.85498046875, - "y": 51.53099822998047 + "x": 836.8909912109375, + "y": 55.48400115966797 }, { - "x": 781.4520263671875, - "y": 49.47600173950195 + "x": 836.447021484375, + "y": 53.222999572753906 }, { - "x": 781.0709838867188, - "y": 47.41600036621094 + "x": 836.0280151367188, + "y": 50.95800018310547 }, { - "x": 780.7100219726562, - "y": 45.35300064086914 + "x": 835.6320190429688, + "y": 48.68899917602539 }, { - "x": 780.3720092773438, - "y": 43.2859992980957 + "x": 835.2589721679688, + "y": 46.415000915527344 }, { - "x": 780.0549926757812, - "y": 41.215999603271484 + "x": 834.9110107421875, + "y": 44.13800048828125 }, { - "x": 779.760009765625, - "y": 39.143001556396484 + "x": 834.5859985351562, + "y": 41.856998443603516 }, { - "x": 779.4869995117188, - "y": 37.066001892089844 + "x": 834.2849731445312, + "y": 39.573001861572266 }, { - "x": 779.2349853515625, - "y": 34.98699951171875 + "x": 834.0089721679688, + "y": 37.2859992980957 }, { - "x": 779.0050048828125, - "y": 32.904998779296875 + "x": 833.7559814453125, + "y": 34.99599838256836 }, { - "x": 778.7969970703125, - "y": 30.820999145507812 + "x": 833.5269775390625, + "y": 32.702999114990234 }, { - "x": 778.6110229492188, - "y": 28.735000610351562 + "x": 833.322021484375, + "y": 30.409000396728516 }, { - "x": 778.447021484375, - "y": 26.64699935913086 + "x": 833.1409912109375, + "y": 28.11199951171875 }, { - "x": 778.3040161132812, - "y": 24.558000564575195 + "x": 832.9849853515625, + "y": 25.812999725341797 }, { - "x": 778.1840209960938, - "y": 22.466999053955078 + "x": 832.8519897460938, + "y": 23.51300048828125 }, { - "x": 778.0850219726562, - "y": 20.375 + "x": 832.7440185546875, + "y": 21.211999893188477 }, { - "x": 778.0079956054688, - "y": 18.281999588012695 + "x": 832.6589965820312, + "y": 18.90999984741211 }, { - "x": 777.9539794921875, - "y": 16.187999725341797 + "x": 832.5989990234375, + "y": 16.60700035095215 }, { - "x": 777.9210205078125, - "y": 14.093999862670898 + "x": 832.56298828125, + "y": 14.303000450134277 }, { - "x": 777.9099731445312, + "x": 832.551025390625, "y": 12 }, { - "x": 777.9210205078125, - "y": 9.904999732971191 + "x": 832.56298828125, + "y": 9.696000099182129 }, { - "x": 777.9539794921875, - "y": 7.810999870300293 + "x": 832.5989990234375, + "y": 7.392000198364258 }, { - "x": 778.0079956054688, - "y": 5.7170000076293945 + "x": 832.6589965820312, + "y": 5.089000225067139 }, { - "x": 778.0850219726562, - "y": 3.624000072479248 + "x": 832.7440185546875, + "y": 2.7869999408721924 }, { - "x": 778.1840209960938, - "y": 1.531999945640564 + "x": 832.8519897460938, + "y": 0.4860000014305115 }, { - "x": 778.3040161132812, - "y": -0.5580000281333923 + "x": 832.9849853515625, + "y": -1.812999963760376 }, { - "x": 778.447021484375, - "y": -2.6470000743865967 + "x": 833.1409912109375, + "y": -4.111999988555908 }, { - "x": 778.6110229492188, - "y": -4.735000133514404 + "x": 833.322021484375, + "y": -6.408999919891357 }, { - "x": 778.7969970703125, - "y": -6.821000099182129 + "x": 833.5269775390625, + "y": -8.70300006866455 }, { - "x": 779.0050048828125, - "y": -8.904999732971191 + "x": 833.7559814453125, + "y": -10.996000289916992 }, { - "x": 779.2349853515625, - "y": -10.987000465393066 + "x": 834.0089721679688, + "y": -13.28600025177002 }, { - "x": 779.4869995117188, - "y": -13.065999984741211 + "x": 834.2849731445312, + "y": -15.572999954223633 }, { - "x": 779.760009765625, - "y": -15.142999649047852 + "x": 834.5859985351562, + "y": -17.85700035095215 }, { - "x": 780.0549926757812, - "y": -17.215999603271484 + "x": 834.9110107421875, + "y": -20.13800048828125 }, { - "x": 780.3720092773438, - "y": -19.285999298095703 + "x": 835.2589721679688, + "y": -22.415000915527344 }, { - "x": 780.7100219726562, - "y": -21.35300064086914 + "x": 835.6320190429688, + "y": -24.68899917602539 }, { - "x": 781.0709838867188, - "y": -23.416000366210938 + "x": 836.0280151367188, + "y": -26.95800018310547 }, { - "x": 781.4520263671875, - "y": -25.47599983215332 + "x": 836.447021484375, + "y": -29.222999572753906 }, { - "x": 781.85498046875, - "y": -27.5310001373291 + "x": 836.8909912109375, + "y": -31.483999252319336 }, { - "x": 782.280029296875, - "y": -29.582000732421875 + "x": 837.3579711914062, + "y": -33.7400016784668 }, { - "x": 782.7260131835938, - "y": -31.628000259399414 + "x": 837.8489990234375, + "y": -35.99100112915039 }, { - "x": 783.1939697265625, - "y": -33.66999816894531 + "x": 838.3629760742188, + "y": -38.23699951171875 }, { - "x": 783.6829833984375, - "y": -35.70600128173828 + "x": 838.9010009765625, + "y": -40.47700119018555 }, { - "x": 784.1929931640625, - "y": -37.73699951171875 + "x": 839.4619750976562, + "y": -42.71099853515625 }, { - "x": 784.7239990234375, - "y": -39.76300048828125 + "x": 840.0469970703125, + "y": -44.939998626708984 }, { - "x": 785.2769775390625, - "y": -41.78300094604492 + "x": 840.655029296875, + "y": -47.1619987487793 }, { - "x": 785.8510131835938, - "y": -43.79800033569336 + "x": 841.2860107421875, + "y": -49.37799835205078 }, { - "x": 786.4459838867188, - "y": -45.805999755859375 + "x": 841.9400024414062, + "y": -51.58599853515625 }, { - "x": 787.06201171875, - "y": -47.80799865722656 + "x": 842.6179809570312, + "y": -53.78799819946289 }, { - "x": 787.697998046875, - "y": -49.803001403808594 + "x": 843.3179931640625, + "y": -55.983001708984375 }, { - "x": 788.3560180664062, - "y": -51.79100036621094 + "x": 844.0419921875, + "y": -58.17100143432617 }, { - "x": 788.0750122070312, - "y": -51.08100128173828 + "x": 844.7880249023438, + "y": -60.349998474121094 }, { - "x": 789.468994140625, - "y": -55 + "x": 845.5570068359375, + "y": -62.52199935913086 + }, + { + "x": 845.0120239257812, + "y": -61.104000091552734 + }, + { + "x": 846.4669799804688, + "y": -65 } ], "isCurve": true, @@ -4860,312 +4976,324 @@ "link": "", "route": [ { - "x": 1423.8199462890625, - "y": -167.13400268554688 + "x": 1533.10205078125, + "y": -185.38499450683594 }, { - "x": 1424.8780517578125, - "y": -166.9929962158203 + "x": 1534.175048828125, + "y": -185.2570037841797 }, { - "x": 1427.364990234375, - "y": -166.6320037841797 + "x": 1536.916015625, + "y": -184.89300537109375 }, { - "x": 1429.8470458984375, - "y": -166.23800659179688 + "x": 1539.6510009765625, + "y": -184.4949951171875 }, { - "x": 1432.323974609375, - "y": -165.81399536132812 + "x": 1542.3819580078125, + "y": -184.06199645996094 }, { - "x": 1434.7960205078125, - "y": -165.35899353027344 + "x": 1545.1070556640625, + "y": -183.5959930419922 }, { - "x": 1437.261962890625, - "y": -164.8719940185547 + "x": 1547.8260498046875, + "y": -183.09500122070312 }, { - "x": 1439.720947265625, - "y": -164.35499572753906 + "x": 1550.5379638671875, + "y": -182.5590057373047 }, { - "x": 1442.1739501953125, - "y": -163.8070068359375 + "x": 1553.2430419921875, + "y": -181.99000549316406 }, { - "x": 1444.6199951171875, - "y": -163.22799682617188 + "x": 1555.9410400390625, + "y": -181.38699340820312 }, { - "x": 1447.0579833984375, - "y": -162.6179962158203 + "x": 1558.6319580078125, + "y": -180.75 }, { - "x": 1449.488037109375, - "y": -161.97799682617188 + "x": 1561.31396484375, + "y": -180.0800018310547 }, { - "x": 1451.9100341796875, - "y": -161.3070068359375 + "x": 1563.987060546875, + "y": -179.375 }, { - "x": 1454.323974609375, - "y": -160.6060028076172 + "x": 1566.6510009765625, + "y": -178.63699340820312 }, { - "x": 1456.72802734375, - "y": -159.87399291992188 + "x": 1569.3060302734375, + "y": -177.86599731445312 }, { - "x": 1459.123046875, - "y": -159.11300659179688 + "x": 1571.9510498046875, + "y": -177.06199645996094 }, { - "x": 1461.509033203125, - "y": -158.3209991455078 + "x": 1574.5860595703125, + "y": -176.2239990234375 }, { - "x": 1463.884033203125, - "y": -157.49899291992188 + "x": 1577.208984375, + "y": -175.35299682617188 }, { - "x": 1466.248046875, - "y": -156.6479949951172 + "x": 1579.822021484375, + "y": -174.44900512695312 }, { - "x": 1468.60205078125, - "y": -155.76699829101562 + "x": 1582.4229736328125, + "y": -173.51300048828125 }, { - "x": 1470.9449462890625, - "y": -154.8560028076172 + "x": 1585.011962890625, + "y": -172.54400634765625 }, { - "x": 1473.2760009765625, - "y": -153.91700744628906 + "x": 1587.5889892578125, + "y": -171.54200744628906 }, { - "x": 1475.594970703125, - "y": -152.947998046875 + "x": 1590.1529541015625, + "y": -170.50799560546875 }, { - "x": 1477.9010009765625, - "y": -151.94900512695312 + "x": 1592.7039794921875, + "y": -169.44200134277344 }, { - "x": 1480.1949462890625, - "y": -150.9219970703125 + "x": 1595.240966796875, + "y": -168.343994140625 }, { - "x": 1482.4759521484375, - "y": -149.86700439453125 + "x": 1597.7640380859375, + "y": -167.21499633789062 }, { - "x": 1484.7430419921875, - "y": -148.78199768066406 + "x": 1600.27294921875, + "y": -166.05299377441406 }, { - "x": 1486.9959716796875, - "y": -147.66900634765625 + "x": 1602.7669677734375, + "y": -164.86099243164062 }, { - "x": 1489.2359619140625, - "y": -146.5279998779297 + "x": 1605.2459716796875, + "y": -163.63600158691406 }, { - "x": 1491.4610595703125, - "y": -145.35899353027344 + "x": 1607.708984375, + "y": -162.38099670410156 }, { - "x": 1493.6710205078125, - "y": -144.16299438476562 + "x": 1610.156982421875, + "y": -161.09500122070312 }, { - "x": 1495.864990234375, - "y": -142.93800354003906 + "x": 1612.5880126953125, + "y": -159.7790069580078 }, { - "x": 1498.0439453125, - "y": -141.68600463867188 + "x": 1615.001953125, + "y": -158.4320068359375 }, { - "x": 1500.2080078125, - "y": -140.40699768066406 + "x": 1617.3990478515625, + "y": -157.05499267578125 }, { - "x": 1502.35498046875, - "y": -139.10000610351562 + "x": 1619.779052734375, + "y": -155.64700317382812 }, { - "x": 1504.4849853515625, - "y": -137.76699829101562 + "x": 1622.1400146484375, + "y": -154.2100067138672 }, { - "x": 1506.5989990234375, - "y": -136.40699768066406 + "x": 1624.4840087890625, + "y": -152.74400329589844 }, { - "x": 1508.6949462890625, - "y": -135.02000427246094 + "x": 1626.8089599609375, + "y": -151.2480010986328 }, { - "x": 1510.7740478515625, - "y": -133.60800170898438 + "x": 1629.114013671875, + "y": -149.7220001220703 }, { - "x": 1512.833984375, - "y": -132.16900634765625 + "x": 1631.4010009765625, + "y": -148.16900634765625 }, { - "x": 1514.876953125, - "y": -130.7050018310547 + "x": 1633.66796875, + "y": -146.58599853515625 }, { - "x": 1516.9010009765625, - "y": -129.21499633789062 + "x": 1635.9150390625, + "y": -144.97500610351562 }, { - "x": 1518.906005859375, - "y": -127.6989974975586 + "x": 1638.1409912109375, + "y": -143.33599853515625 }, { - "x": 1520.8919677734375, - "y": -126.15899658203125 + "x": 1640.3470458984375, + "y": -141.66900634765625 }, { - "x": 1522.8580322265625, - "y": -124.59400177001953 + "x": 1642.531005859375, + "y": -139.97500610351562 }, { - "x": 1524.8050537109375, - "y": -123.00399780273438 + "x": 1644.6939697265625, + "y": -138.2530059814453 }, { - "x": 1526.73095703125, - "y": -121.38999938964844 + "x": 1646.8349609375, + "y": -136.50399780273438 }, { - "x": 1528.636962890625, - "y": -119.7509994506836 + "x": 1648.9539794921875, + "y": -134.72900390625 }, { - "x": 1530.52197265625, - "y": -118.08899688720703 + "x": 1651.051025390625, + "y": -132.927001953125 }, { - "x": 1532.385986328125, - "y": -116.40399932861328 + "x": 1653.1240234375, + "y": -131.09800720214844 }, { - "x": 1534.22900390625, - "y": -114.69499969482422 + "x": 1655.175048828125, + "y": -129.24400329589844 }, { - "x": 1536.050048828125, - "y": -112.96299743652344 + "x": 1657.2020263671875, + "y": -127.36399841308594 }, { - "x": 1537.8499755859375, - "y": -111.20800018310547 + "x": 1659.2060546875, + "y": -125.45899963378906 }, { - "x": 1539.626953125, - "y": -109.43099975585938 + "x": 1661.18505859375, + "y": -123.52899932861328 }, { - "x": 1541.3819580078125, - "y": -107.63200378417969 + "x": 1663.1400146484375, + "y": -121.5739974975586 }, { - "x": 1543.114013671875, - "y": -105.81099700927734 + "x": 1665.0699462890625, + "y": -119.59500122070312 }, { - "x": 1544.822021484375, - "y": -103.96800231933594 + "x": 1666.9749755859375, + "y": -117.59200286865234 }, { - "x": 1546.508056640625, - "y": -102.10399627685547 + "x": 1668.85498046875, + "y": -115.56500244140625 }, { - "x": 1548.1700439453125, - "y": -100.21800231933594 + "x": 1670.708984375, + "y": -113.51399993896484 }, { - "x": 1549.8079833984375, - "y": -98.31199645996094 + "x": 1672.5369873046875, + "y": -111.44000244140625 }, { - "x": 1551.4219970703125, - "y": -96.38600158691406 + "x": 1674.3389892578125, + "y": -109.34400177001953 }, { - "x": 1553.011962890625, - "y": -94.43900299072266 + "x": 1676.114990234375, + "y": -107.2249984741211 }, { - "x": 1554.5780029296875, - "y": -92.4729995727539 + "x": 1677.864013671875, + "y": -105.08300018310547 }, { - "x": 1556.1180419921875, - "y": -90.48699951171875 + "x": 1679.5849609375, + "y": -102.91999816894531 }, { - "x": 1557.633056640625, - "y": -88.48200225830078 + "x": 1681.280029296875, + "y": -100.73600006103516 }, { - "x": 1559.123046875, - "y": -86.45800018310547 + "x": 1682.947021484375, + "y": -98.52999877929688 }, { - "x": 1560.5880126953125, - "y": -84.41600036621094 + "x": 1684.5860595703125, + "y": -96.30400085449219 }, { - "x": 1562.0260009765625, - "y": -82.3550033569336 + "x": 1686.196044921875, + "y": -94.05699920654297 }, { - "x": 1563.43896484375, - "y": -80.2760009765625 + "x": 1687.779052734375, + "y": -91.79100036621094 }, { - "x": 1564.824951171875, - "y": -78.18000030517578 + "x": 1689.3330078125, + "y": -89.50399780273438 }, { - "x": 1566.18505859375, - "y": -76.06700134277344 + "x": 1690.8580322265625, + "y": -87.197998046875 }, { - "x": 1567.51904296875, - "y": -73.93599700927734 + "x": 1692.35400390625, + "y": -84.87300109863281 }, { - "x": 1568.824951171875, - "y": -71.78900146484375 + "x": 1693.821044921875, + "y": -82.52999877929688 }, { - "x": 1570.10498046875, - "y": -69.6259994506836 + "x": 1695.258056640625, + "y": -80.16799926757812 }, { - "x": 1571.3570556640625, - "y": -67.4469985961914 + "x": 1696.6650390625, + "y": -77.78800201416016 }, { - "x": 1571.447998046875, - "y": -67.36699676513672 + "x": 1698.0419921875, + "y": -75.39099884033203 }, { - "x": 1573.4189453125, - "y": -63.70500183105469 + "x": 1699.3890380859375, + "y": -72.97699737548828 + }, + { + "x": 1700.7060546875, + "y": -70.5459976196289 + }, + { + "x": 1700.14599609375, + "y": -71.66999816894531 + }, + { + "x": 1702.0550537109375, + "y": -67.9749984741211 } ], "isCurve": true, @@ -5200,304 +5328,312 @@ "link": "", "route": [ { - "x": 1595.23095703125, - "y": 2.2939999103546143 + "x": 1723.7989501953125, + "y": -1.975000023841858 }, { - "x": 1595.4119873046875, - "y": 3.5399999618530273 + "x": 1724.10498046875, + "y": -0.04100000113248825 }, { - "x": 1595.7430419921875, - "y": 6.031000137329102 + "x": 1724.5030517578125, + "y": 2.694000005722046 }, { - "x": 1596.0419921875, - "y": 8.527000427246094 + "x": 1724.866943359375, + "y": 5.434000015258789 }, { - "x": 1596.31005859375, - "y": 11.024999618530273 + "x": 1725.196044921875, + "y": 8.178999900817871 }, { - "x": 1596.5469970703125, - "y": 13.527999877929688 + "x": 1725.490966796875, + "y": 10.928000450134277 }, { - "x": 1596.751953125, - "y": 16.031999588012695 + "x": 1725.7509765625, + "y": 13.680000305175781 }, { - "x": 1596.925048828125, - "y": 18.540000915527344 + "x": 1725.97705078125, + "y": 16.43600082397461 }, { - "x": 1597.0670166015625, - "y": 21.048999786376953 + "x": 1726.16796875, + "y": 19.194000244140625 }, { - "x": 1597.177978515625, - "y": 23.559999465942383 + "x": 1726.323974609375, + "y": 21.95400047302246 }, { - "x": 1597.2569580078125, - "y": 26.07200050354004 + "x": 1726.446044921875, + "y": 24.715999603271484 }, { - "x": 1597.303955078125, - "y": 28.584999084472656 + "x": 1726.531982421875, + "y": 27.479000091552734 }, { - "x": 1597.3199462890625, - "y": 31.097999572753906 + "x": 1726.583984375, + "y": 30.243000030517578 }, { - "x": 1597.303955078125, - "y": 33.611000061035156 + "x": 1726.60205078125, + "y": 33.007999420166016 }, { - "x": 1597.2569580078125, - "y": 36.124000549316406 + "x": 1726.583984375, + "y": 35.77199935913086 }, { - "x": 1597.177978515625, - "y": 38.63600158691406 + "x": 1726.531982421875, + "y": 38.5359992980957 }, { - "x": 1597.0670166015625, - "y": 41.14699935913086 + "x": 1726.446044921875, + "y": 41.29899978637695 }, { - "x": 1596.925048828125, - "y": 43.65599822998047 + "x": 1726.323974609375, + "y": 44.06100082397461 }, { - "x": 1596.751953125, - "y": 46.16299819946289 + "x": 1726.16796875, + "y": 46.821998596191406 }, { - "x": 1596.5469970703125, - "y": 48.667999267578125 + "x": 1725.97705078125, + "y": 49.58000183105469 }, { - "x": 1596.31005859375, - "y": 51.16999816894531 + "x": 1725.7509765625, + "y": 52.334999084472656 }, { - "x": 1596.0419921875, - "y": 53.66899871826172 + "x": 1725.490966796875, + "y": 55.08700180053711 }, { - "x": 1595.7430419921875, - "y": 56.16400146484375 + "x": 1725.196044921875, + "y": 57.83599853515625 }, { - "x": 1595.4119873046875, - "y": 58.65599822998047 + "x": 1724.866943359375, + "y": 60.58100128173828 }, { - "x": 1595.050048828125, - "y": 61.143001556396484 + "x": 1724.5030517578125, + "y": 63.32099914550781 }, { - "x": 1594.656982421875, - "y": 63.625 + "x": 1724.10498046875, + "y": 66.05699920654297 }, { - "x": 1594.2330322265625, - "y": 66.10199737548828 + "x": 1723.6729736328125, + "y": 68.78800201416016 }, { - "x": 1593.7769775390625, - "y": 68.5739974975586 + "x": 1723.2060546875, + "y": 71.51300048828125 }, { - "x": 1593.291015625, - "y": 71.04000091552734 + "x": 1722.7049560546875, + "y": 74.23200225830078 }, { - "x": 1592.77294921875, - "y": 73.4990005493164 + "x": 1722.1700439453125, + "y": 76.94400024414062 }, { - "x": 1592.2249755859375, - "y": 75.9520034790039 + "x": 1721.6009521484375, + "y": 79.64900207519531 }, { - "x": 1591.64599609375, - "y": 78.39800262451172 + "x": 1720.998046875, + "y": 82.34700012207031 }, { - "x": 1591.0360107421875, - "y": 80.83599853515625 + "x": 1720.3609619140625, + "y": 85.03700256347656 }, { - "x": 1590.39599609375, - "y": 83.26599884033203 + "x": 1719.68994140625, + "y": 87.71900177001953 }, { - "x": 1589.7249755859375, - "y": 85.68800354003906 + "x": 1718.9859619140625, + "y": 90.39299774169922 }, { - "x": 1589.0240478515625, - "y": 88.10199737548828 + "x": 1718.248046875, + "y": 93.05699920654297 }, { - "x": 1588.29296875, - "y": 90.50599670410156 + "x": 1717.47705078125, + "y": 95.71199798583984 }, { - "x": 1587.531005859375, - "y": 92.9010009765625 + "x": 1716.6719970703125, + "y": 98.35700225830078 }, { - "x": 1586.739013671875, - "y": 95.28700256347656 + "x": 1715.833984375, + "y": 100.99099731445312 }, { - "x": 1585.91796875, - "y": 97.66200256347656 + "x": 1714.9630126953125, + "y": 103.61499786376953 }, { - "x": 1585.0670166015625, - "y": 100.0260009765625 + "x": 1714.06005859375, + "y": 106.22799682617188 }, { - "x": 1584.18603515625, - "y": 102.37999725341797 + "x": 1713.123046875, + "y": 108.8290023803711 }, { - "x": 1583.2750244140625, - "y": 104.7229995727539 + "x": 1712.154052734375, + "y": 111.41799926757812 }, { - "x": 1582.3349609375, - "y": 107.05400085449219 + "x": 1711.1529541015625, + "y": 113.99500274658203 }, { - "x": 1581.365966796875, - "y": 109.37300109863281 + "x": 1710.1190185546875, + "y": 116.55899810791016 }, { - "x": 1580.3680419921875, - "y": 111.67900085449219 + "x": 1709.052978515625, + "y": 119.11000061035156 }, { - "x": 1579.3409423828125, - "y": 113.9729995727539 + "x": 1707.9549560546875, + "y": 121.64700317382812 }, { - "x": 1578.2850341796875, - "y": 116.25399780273438 + "x": 1706.824951171875, + "y": 124.16999816894531 }, { - "x": 1577.2010498046875, - "y": 118.52100372314453 + "x": 1705.6639404296875, + "y": 126.67900085449219 }, { - "x": 1576.0880126953125, - "y": 120.77400207519531 + "x": 1704.470947265625, + "y": 129.17300415039062 }, { - "x": 1574.947021484375, - "y": 123.01399993896484 + "x": 1703.2469482421875, + "y": 131.65199279785156 }, { - "x": 1573.7779541015625, - "y": 125.23899841308594 + "x": 1701.991943359375, + "y": 134.11500549316406 }, { - "x": 1572.5810546875, - "y": 127.4489974975586 + "x": 1700.7060546875, + "y": 136.56199645996094 }, { - "x": 1571.3570556640625, - "y": 129.64300537109375 + "x": 1699.3890380859375, + "y": 138.9929962158203 }, { - "x": 1570.10498046875, - "y": 131.82200622558594 + "x": 1698.0419921875, + "y": 141.4080047607422 }, { - "x": 1568.824951171875, - "y": 133.98599243164062 + "x": 1696.6650390625, + "y": 143.80499267578125 }, { - "x": 1567.51904296875, - "y": 136.13299560546875 + "x": 1695.258056640625, + "y": 146.1840057373047 }, { - "x": 1566.18505859375, - "y": 138.26300048828125 + "x": 1693.821044921875, + "y": 148.54600524902344 }, { - "x": 1564.824951171875, - "y": 140.3769989013672 + "x": 1692.35400390625, + "y": 150.88999938964844 }, { - "x": 1563.43896484375, - "y": 142.47300720214844 + "x": 1690.8580322265625, + "y": 153.21400451660156 }, { - "x": 1562.0260009765625, - "y": 144.552001953125 + "x": 1689.3330078125, + "y": 155.52000427246094 }, { - "x": 1560.5880126953125, - "y": 146.61199951171875 + "x": 1687.779052734375, + "y": 157.8070068359375 }, { - "x": 1559.123046875, - "y": 148.65499877929688 + "x": 1686.196044921875, + "y": 160.07400512695312 }, { - "x": 1557.633056640625, - "y": 150.6790008544922 + "x": 1684.5860595703125, + "y": 162.32000732421875 }, { - "x": 1556.1180419921875, - "y": 152.6840057373047 + "x": 1682.947021484375, + "y": 164.5469970703125 }, { - "x": 1554.5780029296875, - "y": 154.6699981689453 + "x": 1681.280029296875, + "y": 166.7519989013672 }, { - "x": 1553.011962890625, - "y": 156.63600158691406 + "x": 1679.5849609375, + "y": 168.93699645996094 }, { - "x": 1551.4219970703125, - "y": 158.58299255371094 + "x": 1677.864013671875, + "y": 171.10000610351562 }, { - "x": 1549.8079833984375, - "y": 160.50900268554688 + "x": 1676.114990234375, + "y": 173.24099731445312 }, { - "x": 1548.1700439453125, - "y": 162.4149932861328 + "x": 1674.3389892578125, + "y": 175.36000061035156 }, { - "x": 1546.508056640625, - "y": 164.3000030517578 + "x": 1672.5369873046875, + "y": 177.45599365234375 }, { - "x": 1544.822021484375, - "y": 166.16400146484375 + "x": 1670.708984375, + "y": 179.52999877929688 }, { - "x": 1543.114013671875, - "y": 168.0070037841797 + "x": 1668.85498046875, + "y": 181.58099365234375 }, { - "x": 1544.261962890625, - "y": 166.83799743652344 + "x": 1666.9749755859375, + "y": 183.60800170898438 }, { - "x": 1541.376953125, - "y": 169.83299255371094 + "x": 1665.0699462890625, + "y": 185.61099243164062 + }, + { + "x": 1665.3509521484375, + "y": 185.3699951171875 + }, + { + "x": 1662.4150390625, + "y": 188.3159942626953 } ], "isCurve": true, @@ -5532,312 +5668,320 @@ "link": "", "route": [ { - "x": 1488.376953125, - "y": 209.16299438476562 + "x": 1609.4150390625, + "y": 227.5019989013672 }, { - "x": 1486.9959716796875, - "y": 209.86599731445312 + "x": 1607.708984375, + "y": 228.3979949951172 }, { - "x": 1484.7430419921875, - "y": 210.97900390625 + "x": 1605.2459716796875, + "y": 229.6529998779297 }, { - "x": 1482.4759521484375, - "y": 212.06300354003906 + "x": 1602.7669677734375, + "y": 230.8769989013672 }, { - "x": 1480.1949462890625, - "y": 213.11900329589844 + "x": 1600.27294921875, + "y": 232.07000732421875 }, { - "x": 1477.9010009765625, - "y": 214.14599609375 + "x": 1597.7640380859375, + "y": 233.2310028076172 }, { - "x": 1475.594970703125, - "y": 215.1439971923828 + "x": 1595.240966796875, + "y": 234.36099243164062 }, { - "x": 1473.2760009765625, - "y": 216.11300659179688 + "x": 1592.7039794921875, + "y": 235.45899963378906 }, { - "x": 1470.9449462890625, - "y": 217.05299377441406 + "x": 1590.1529541015625, + "y": 236.52499389648438 }, { - "x": 1468.60205078125, - "y": 217.96400451660156 + "x": 1587.5889892578125, + "y": 237.55799865722656 }, { - "x": 1466.248046875, - "y": 218.84500122070312 + "x": 1585.011962890625, + "y": 238.55999755859375 }, { - "x": 1463.884033203125, - "y": 219.6959991455078 + "x": 1582.4229736328125, + "y": 239.5290069580078 }, { - "x": 1461.509033203125, - "y": 220.51699829101562 + "x": 1579.822021484375, + "y": 240.46600341796875 }, { - "x": 1459.123046875, - "y": 221.3090057373047 + "x": 1577.208984375, + "y": 241.36900329589844 }, { - "x": 1456.72802734375, - "y": 222.0709991455078 + "x": 1574.5860595703125, + "y": 242.24000549316406 }, { - "x": 1454.323974609375, - "y": 222.802001953125 + "x": 1571.9510498046875, + "y": 243.0780029296875 }, { - "x": 1451.9100341796875, - "y": 223.5030059814453 + "x": 1569.3060302734375, + "y": 243.8820037841797 }, { - "x": 1449.488037109375, - "y": 224.1739959716797 + "x": 1566.6510009765625, + "y": 244.6540069580078 }, { - "x": 1447.0579833984375, - "y": 224.81399536132812 + "x": 1563.987060546875, + "y": 245.39199829101562 }, { - "x": 1444.6199951171875, - "y": 225.4239959716797 + "x": 1561.31396484375, + "y": 246.0959930419922 }, { - "x": 1442.1739501953125, - "y": 226.0030059814453 + "x": 1558.6319580078125, + "y": 246.76699829101562 }, { - "x": 1439.720947265625, - "y": 226.55099487304688 + "x": 1555.9410400390625, + "y": 247.4040069580078 }, { - "x": 1437.261962890625, - "y": 227.06900024414062 + "x": 1553.2430419921875, + "y": 248.0070037841797 }, { - "x": 1434.7960205078125, - "y": 227.55499267578125 + "x": 1550.5379638671875, + "y": 248.5760040283203 }, { - "x": 1432.323974609375, - "y": 228.01100158691406 + "x": 1547.8260498046875, + "y": 249.11099243164062 }, { - "x": 1429.8470458984375, - "y": 228.43499755859375 + "x": 1545.1070556640625, + "y": 249.61199951171875 }, { - "x": 1427.364990234375, - "y": 228.8280029296875 + "x": 1542.3819580078125, + "y": 250.07899475097656 }, { - "x": 1424.8780517578125, - "y": 229.19000244140625 + "x": 1539.6510009765625, + "y": 250.51100158691406 }, { - "x": 1422.385986328125, - "y": 229.52099609375 + "x": 1536.916015625, + "y": 250.90899658203125 }, { - "x": 1419.8909912109375, - "y": 229.82000732421875 + "x": 1534.175048828125, + "y": 251.2729949951172 }, { - "x": 1417.3919677734375, - "y": 230.08799743652344 + "x": 1531.4300537109375, + "y": 251.6020050048828 }, { - "x": 1414.8900146484375, - "y": 230.3249969482422 + "x": 1528.6810302734375, + "y": 251.89700317382812 }, { - "x": 1412.385009765625, - "y": 230.52999877929688 + "x": 1525.928955078125, + "y": 252.15699768066406 }, { - "x": 1409.8780517578125, - "y": 230.7030029296875 + "x": 1523.1739501953125, + "y": 252.38299560546875 }, { - "x": 1407.3690185546875, - "y": 230.84500122070312 + "x": 1520.416015625, + "y": 252.57400512695312 }, { - "x": 1404.8580322265625, - "y": 230.95599365234375 + "x": 1517.656005859375, + "y": 252.72999572753906 }, { - "x": 1402.345947265625, - "y": 231.03500366210938 + "x": 1514.89404296875, + "y": 252.8509979248047 }, { - "x": 1399.8330078125, - "y": 231.08200073242188 + "x": 1512.1300048828125, + "y": 252.93800354003906 }, { - "x": 1397.3199462890625, - "y": 231.09800720214844 + "x": 1509.365966796875, + "y": 252.99000549316406 }, { - "x": 1394.8070068359375, - "y": 231.08200073242188 + "x": 1506.60205078125, + "y": 253.00799560546875 }, { - "x": 1392.2939453125, - "y": 231.03500366210938 + "x": 1503.8370361328125, + "y": 252.99000549316406 }, { - "x": 1389.781982421875, - "y": 230.95599365234375 + "x": 1501.072998046875, + "y": 252.93800354003906 }, { - "x": 1387.27099609375, - "y": 230.84500122070312 + "x": 1498.31005859375, + "y": 252.8509979248047 }, { - "x": 1384.761962890625, - "y": 230.7030029296875 + "x": 1495.5479736328125, + "y": 252.72999572753906 }, { - "x": 1382.2540283203125, - "y": 230.52999877929688 + "x": 1492.7879638671875, + "y": 252.57400512695312 }, { - "x": 1379.75, - "y": 230.3249969482422 + "x": 1490.030029296875, + "y": 252.38299560546875 }, { - "x": 1377.2469482421875, - "y": 230.08799743652344 + "x": 1487.2750244140625, + "y": 252.15699768066406 }, { - "x": 1374.7490234375, - "y": 229.82000732421875 + "x": 1484.52197265625, + "y": 251.89700317382812 }, { - "x": 1372.2530517578125, - "y": 229.52099609375 + "x": 1481.77294921875, + "y": 251.6020050048828 }, { - "x": 1369.761962890625, - "y": 229.19000244140625 + "x": 1479.029052734375, + "y": 251.2729949951172 }, { - "x": 1367.2750244140625, - "y": 228.8280029296875 + "x": 1476.2879638671875, + "y": 250.90899658203125 }, { - "x": 1364.7919921875, - "y": 228.43499755859375 + "x": 1473.552001953125, + "y": 250.51100158691406 }, { - "x": 1362.31494140625, - "y": 228.01100158691406 + "x": 1470.822021484375, + "y": 250.07899475097656 }, { - "x": 1359.843994140625, - "y": 227.55499267578125 + "x": 1468.0970458984375, + "y": 249.61199951171875 }, { - "x": 1357.3780517578125, - "y": 227.06900024414062 + "x": 1465.3780517578125, + "y": 249.11099243164062 }, { - "x": 1354.91796875, - "y": 226.55099487304688 + "x": 1462.666015625, + "y": 248.5760040283203 }, { - "x": 1352.4659423828125, - "y": 226.0030059814453 + "x": 1459.9599609375, + "y": 248.0070037841797 }, { - "x": 1350.02001953125, - "y": 225.4239959716797 + "x": 1457.261962890625, + "y": 247.4040069580078 }, { - "x": 1347.58203125, - "y": 224.81399536132812 + "x": 1454.572021484375, + "y": 246.76699829101562 }, { - "x": 1345.1519775390625, - "y": 224.1739959716797 + "x": 1451.8900146484375, + "y": 246.0959930419922 }, { - "x": 1342.72900390625, - "y": 223.5030059814453 + "x": 1449.217041015625, + "y": 245.39199829101562 }, { - "x": 1340.3160400390625, - "y": 222.802001953125 + "x": 1446.552001953125, + "y": 244.6540069580078 }, { - "x": 1337.9119873046875, - "y": 222.0709991455078 + "x": 1443.89794921875, + "y": 243.8820037841797 }, { - "x": 1335.5159912109375, - "y": 221.3090057373047 + "x": 1441.2530517578125, + "y": 243.0780029296875 }, { - "x": 1333.1309814453125, - "y": 220.51699829101562 + "x": 1438.6180419921875, + "y": 242.24000549316406 }, { - "x": 1330.7559814453125, - "y": 219.6959991455078 + "x": 1435.9940185546875, + "y": 241.36900329589844 }, { - "x": 1328.3909912109375, - "y": 218.84500122070312 + "x": 1433.3819580078125, + "y": 240.46600341796875 }, { - "x": 1326.0369873046875, - "y": 217.96400451660156 + "x": 1430.780029296875, + "y": 239.5290069580078 }, { - "x": 1323.6949462890625, - "y": 217.05299377441406 + "x": 1428.1910400390625, + "y": 238.55999755859375 }, { - "x": 1321.364013671875, - "y": 216.11300659179688 + "x": 1425.614013671875, + "y": 237.55799865722656 }, { - "x": 1319.0450439453125, - "y": 215.1439971923828 + "x": 1423.050048828125, + "y": 236.52499389648438 }, { - "x": 1316.739013671875, - "y": 214.14599609375 + "x": 1420.5, + "y": 235.45899963378906 }, { - "x": 1314.4449462890625, - "y": 213.11900329589844 + "x": 1417.9620361328125, + "y": 234.36099243164062 }, { - "x": 1312.1639404296875, - "y": 212.06300354003906 + "x": 1415.43896484375, + "y": 233.2310028076172 }, { - "x": 1309.89697265625, - "y": 210.97900390625 + "x": 1412.9300537109375, + "y": 232.07000732421875 }, { - "x": 1310.470947265625, - "y": 211.30099487304688 + "x": 1410.43603515625, + "y": 230.8769989013672 }, { - "x": 1306.762939453125, - "y": 209.41700744628906 + "x": 1407.9580078125, + "y": 229.6529998779297 + }, + { + "x": 1407.970947265625, + "y": 229.69900512695312 + }, + { + "x": 1404.2889404296875, + "y": 227.76400756835938 } ], "isCurve": true, @@ -5872,300 +6016,312 @@ "link": "", "route": [ { - "x": 1252.762939453125, - "y": 169.30799865722656 + "x": 1350.2889404296875, + "y": 187.8159942626953 + }, + { + "x": 1350.06396484375, + "y": 187.59100341796875 + }, + { + "x": 1348.134033203125, + "y": 185.61099243164062 + }, + { + "x": 1346.22900390625, + "y": 183.60800170898438 }, { - "x": 1251.5260009765625, - "y": 168.0070037841797 + "x": 1344.3489990234375, + "y": 181.58099365234375 }, { - "x": 1249.8170166015625, - "y": 166.16400146484375 + "x": 1342.4949951171875, + "y": 179.52999877929688 }, { - "x": 1248.1319580078125, - "y": 164.3000030517578 + "x": 1340.6669921875, + "y": 177.45599365234375 }, { - "x": 1246.469970703125, - "y": 162.4149932861328 + "x": 1338.864990234375, + "y": 175.36000061035156 }, { - "x": 1244.8310546875, - "y": 160.50900268554688 + "x": 1337.0889892578125, + "y": 173.24099731445312 }, { - "x": 1243.217041015625, - "y": 158.58299255371094 + "x": 1335.3399658203125, + "y": 171.10000610351562 }, { - "x": 1241.626953125, - "y": 156.63600158691406 + "x": 1333.6180419921875, + "y": 168.93699645996094 }, { - "x": 1240.06201171875, - "y": 154.6699981689453 + "x": 1331.9239501953125, + "y": 166.7519989013672 }, { - "x": 1238.52197265625, - "y": 152.6840057373047 + "x": 1330.2569580078125, + "y": 164.5469970703125 }, { - "x": 1237.0059814453125, - "y": 150.6790008544922 + "x": 1328.6180419921875, + "y": 162.32000732421875 }, { - "x": 1235.5159912109375, - "y": 148.65499877929688 + "x": 1327.0069580078125, + "y": 160.07400512695312 }, { - "x": 1234.052001953125, - "y": 146.61199951171875 + "x": 1325.425048828125, + "y": 157.8070068359375 }, { - "x": 1232.613037109375, - "y": 144.552001953125 + "x": 1323.8709716796875, + "y": 155.52000427246094 }, { - "x": 1231.2010498046875, - "y": 142.47300720214844 + "x": 1322.345947265625, + "y": 153.21400451660156 }, { - "x": 1229.81396484375, - "y": 140.3769989013672 + "x": 1320.8499755859375, + "y": 150.88999938964844 }, { - "x": 1228.4539794921875, - "y": 138.26300048828125 + "x": 1319.383056640625, + "y": 148.54600524902344 }, { - "x": 1227.1209716796875, - "y": 136.13299560546875 + "x": 1317.946044921875, + "y": 146.1840057373047 }, { - "x": 1225.81396484375, - "y": 133.98599243164062 + "x": 1316.5389404296875, + "y": 143.80499267578125 }, { - "x": 1224.5350341796875, - "y": 131.82200622558594 + "x": 1315.1610107421875, + "y": 141.4080047607422 }, { - "x": 1223.282958984375, - "y": 129.64300537109375 + "x": 1313.81396484375, + "y": 138.9929962158203 }, { - "x": 1222.0579833984375, - "y": 127.4489974975586 + "x": 1312.498046875, + "y": 136.56199645996094 }, { - "x": 1220.862060546875, - "y": 125.23899841308594 + "x": 1311.2120361328125, + "y": 134.11500549316406 }, { - "x": 1219.6929931640625, - "y": 123.01399993896484 + "x": 1309.95703125, + "y": 131.65199279785156 }, { - "x": 1218.552001953125, - "y": 120.77400207519531 + "x": 1308.7330322265625, + "y": 129.17300415039062 }, { - "x": 1217.43896484375, - "y": 118.52100372314453 + "x": 1307.5400390625, + "y": 126.67900085449219 }, { - "x": 1216.35400390625, - "y": 116.25399780273438 + "x": 1306.3790283203125, + "y": 124.16999816894531 }, { - "x": 1215.2989501953125, - "y": 113.9729995727539 + "x": 1305.2490234375, + "y": 121.64700317382812 }, { - "x": 1214.27197265625, - "y": 111.67900085449219 + "x": 1304.1510009765625, + "y": 119.11000061035156 }, { - "x": 1213.27294921875, - "y": 109.37300109863281 + "x": 1303.0849609375, + "y": 116.55899810791016 }, { - "x": 1212.303955078125, - "y": 107.05400085449219 + "x": 1302.051025390625, + "y": 113.99500274658203 }, { - "x": 1211.364990234375, - "y": 104.7229995727539 + "x": 1301.0489501953125, + "y": 111.41799926757812 }, { - "x": 1210.4539794921875, - "y": 102.37999725341797 + "x": 1300.0799560546875, + "y": 108.8290023803711 }, { - "x": 1209.572998046875, - "y": 100.0260009765625 + "x": 1299.14404296875, + "y": 106.22799682617188 }, { - "x": 1208.7220458984375, - "y": 97.66200256347656 + "x": 1298.239990234375, + "y": 103.61499786376953 }, { - "x": 1207.9000244140625, - "y": 95.28700256347656 + "x": 1297.3690185546875, + "y": 100.99099731445312 }, { - "x": 1207.1090087890625, - "y": 92.9010009765625 + "x": 1296.531982421875, + "y": 98.35700225830078 }, { - "x": 1206.3470458984375, - "y": 90.50599670410156 + "x": 1295.72705078125, + "y": 95.71199798583984 }, { - "x": 1205.614990234375, - "y": 88.10199737548828 + "x": 1294.9560546875, + "y": 93.05699920654297 }, { - "x": 1204.9139404296875, - "y": 85.68800354003906 + "x": 1294.218017578125, + "y": 90.39299774169922 }, { - "x": 1204.2430419921875, - "y": 83.26599884033203 + "x": 1293.5140380859375, + "y": 87.71900177001953 }, { - "x": 1203.60302734375, - "y": 80.83599853515625 + "x": 1292.843017578125, + "y": 85.03700256347656 }, { - "x": 1202.9930419921875, - "y": 78.39800262451172 + "x": 1292.2060546875, + "y": 82.34700012207031 }, { - "x": 1202.4139404296875, - "y": 75.9520034790039 + "x": 1291.60302734375, + "y": 79.64900207519531 }, { - "x": 1201.865966796875, - "y": 73.4990005493164 + "x": 1291.0340576171875, + "y": 76.94400024414062 }, { - "x": 1201.3489990234375, - "y": 71.04000091552734 + "x": 1290.4990234375, + "y": 74.23200225830078 }, { - "x": 1200.862060546875, - "y": 68.5739974975586 + "x": 1289.998046875, + "y": 71.51300048828125 }, { - "x": 1200.406982421875, - "y": 66.10199737548828 + "x": 1289.531005859375, + "y": 68.78800201416016 }, { - "x": 1199.9830322265625, - "y": 63.625 + "x": 1289.0980224609375, + "y": 66.05699920654297 }, { - "x": 1199.5889892578125, - "y": 61.143001556396484 + "x": 1288.699951171875, + "y": 63.32099914550781 }, { - "x": 1199.22802734375, - "y": 58.65599822998047 + "x": 1288.3370361328125, + "y": 60.58100128173828 }, { - "x": 1198.89697265625, - "y": 56.16400146484375 + "x": 1288.0069580078125, + "y": 57.83599853515625 }, { - "x": 1198.5980224609375, - "y": 53.66899871826172 + "x": 1287.7130126953125, + "y": 55.08700180053711 }, { - "x": 1198.3299560546875, - "y": 51.16999816894531 + "x": 1287.4520263671875, + "y": 52.334999084472656 }, { - "x": 1198.093017578125, - "y": 48.667999267578125 + "x": 1287.22705078125, + "y": 49.58000183105469 }, { - "x": 1197.887939453125, - "y": 46.16299819946289 + "x": 1287.0360107421875, + "y": 46.821998596191406 }, { - "x": 1197.7139892578125, - "y": 43.65599822998047 + "x": 1286.8800048828125, + "y": 44.06100082397461 }, { - "x": 1197.572021484375, - "y": 41.14699935913086 + "x": 1286.758056640625, + "y": 41.29899978637695 }, { - "x": 1197.4620361328125, - "y": 38.63600158691406 + "x": 1286.6710205078125, + "y": 38.5359992980957 }, { - "x": 1197.383056640625, - "y": 36.124000549316406 + "x": 1286.6190185546875, + "y": 35.77199935913086 }, { - "x": 1197.3360595703125, - "y": 33.611000061035156 + "x": 1286.60205078125, + "y": 33.007999420166016 }, { - "x": 1197.3199462890625, - "y": 31.097999572753906 + "x": 1286.6190185546875, + "y": 30.243000030517578 }, { - "x": 1197.3360595703125, - "y": 28.584999084472656 + "x": 1286.6710205078125, + "y": 27.479000091552734 }, { - "x": 1197.383056640625, - "y": 26.07200050354004 + "x": 1286.758056640625, + "y": 24.715999603271484 }, { - "x": 1197.4620361328125, - "y": 23.559999465942383 + "x": 1286.8800048828125, + "y": 21.95400047302246 }, { - "x": 1197.572021484375, - "y": 21.048999786376953 + "x": 1287.0360107421875, + "y": 19.194000244140625 }, { - "x": 1197.7139892578125, - "y": 18.540000915527344 + "x": 1287.22705078125, + "y": 16.43600082397461 }, { - "x": 1197.887939453125, - "y": 16.031999588012695 + "x": 1287.4520263671875, + "y": 13.680000305175781 }, { - "x": 1198.093017578125, - "y": 13.527999877929688 + "x": 1287.7130126953125, + "y": 10.928000450134277 }, { - "x": 1198.3299560546875, - "y": 11.024999618530273 + "x": 1288.0069580078125, + "y": 8.178999900817871 }, { - "x": 1198.5980224609375, - "y": 8.527000427246094 + "x": 1288.3370361328125, + "y": 5.434000015258789 }, { - "x": 1198.89697265625, - "y": 6.031000137329102 + "x": 1288.699951171875, + "y": 2.694000005722046 }, { - "x": 1198.81005859375, - "y": 6.409999847412109 + "x": 1288.7430419921875, + "y": 2.130000114440918 }, { - "x": 1199.4090576171875, - "y": 2.2939999103546143 + "x": 1289.405029296875, + "y": -1.975000023841858 } ], "isCurve": true, diff --git a/e2etests/testdata/txtar/cycle-diagram/elk/sketch.exp.svg b/e2etests/testdata/txtar/cycle-diagram/elk/sketch.exp.svg index 35f09dec2b..6cab848fcf 100644 --- a/e2etests/testdata/txtar/cycle-diagram/elk/sketch.exp.svg +++ b/e2etests/testdata/txtar/cycle-diagram/elk/sketch.exp.svg @@ -1,9 +1,9 @@ -abcdabcababcdefabcde - - - - - - - - - - - - - - - - - - - - - + .d2-713325804 .fill-N1{fill:#0A0F25;} + .d2-713325804 .fill-N2{fill:#676C7E;} + .d2-713325804 .fill-N3{fill:#9499AB;} + .d2-713325804 .fill-N4{fill:#CFD2DD;} + .d2-713325804 .fill-N5{fill:#DEE1EB;} + .d2-713325804 .fill-N6{fill:#EEF1F8;} + .d2-713325804 .fill-N7{fill:#FFFFFF;} + .d2-713325804 .fill-B1{fill:#0D32B2;} + .d2-713325804 .fill-B2{fill:#0D32B2;} + .d2-713325804 .fill-B3{fill:#E3E9FD;} + .d2-713325804 .fill-B4{fill:#E3E9FD;} + .d2-713325804 .fill-B5{fill:#EDF0FD;} + .d2-713325804 .fill-B6{fill:#F7F8FE;} + .d2-713325804 .fill-AA2{fill:#4A6FF3;} + .d2-713325804 .fill-AA4{fill:#EDF0FD;} + .d2-713325804 .fill-AA5{fill:#F7F8FE;} + .d2-713325804 .fill-AB4{fill:#EDF0FD;} + .d2-713325804 .fill-AB5{fill:#F7F8FE;} + .d2-713325804 .stroke-N1{stroke:#0A0F25;} + .d2-713325804 .stroke-N2{stroke:#676C7E;} + .d2-713325804 .stroke-N3{stroke:#9499AB;} + .d2-713325804 .stroke-N4{stroke:#CFD2DD;} + .d2-713325804 .stroke-N5{stroke:#DEE1EB;} + .d2-713325804 .stroke-N6{stroke:#EEF1F8;} + .d2-713325804 .stroke-N7{stroke:#FFFFFF;} + .d2-713325804 .stroke-B1{stroke:#0D32B2;} + .d2-713325804 .stroke-B2{stroke:#0D32B2;} + .d2-713325804 .stroke-B3{stroke:#E3E9FD;} + .d2-713325804 .stroke-B4{stroke:#E3E9FD;} + .d2-713325804 .stroke-B5{stroke:#EDF0FD;} + .d2-713325804 .stroke-B6{stroke:#F7F8FE;} + .d2-713325804 .stroke-AA2{stroke:#4A6FF3;} + .d2-713325804 .stroke-AA4{stroke:#EDF0FD;} + .d2-713325804 .stroke-AA5{stroke:#F7F8FE;} + .d2-713325804 .stroke-AB4{stroke:#EDF0FD;} + .d2-713325804 .stroke-AB5{stroke:#F7F8FE;} + .d2-713325804 .background-color-N1{background-color:#0A0F25;} + .d2-713325804 .background-color-N2{background-color:#676C7E;} + .d2-713325804 .background-color-N3{background-color:#9499AB;} + .d2-713325804 .background-color-N4{background-color:#CFD2DD;} + .d2-713325804 .background-color-N5{background-color:#DEE1EB;} + .d2-713325804 .background-color-N6{background-color:#EEF1F8;} + .d2-713325804 .background-color-N7{background-color:#FFFFFF;} + .d2-713325804 .background-color-B1{background-color:#0D32B2;} + .d2-713325804 .background-color-B2{background-color:#0D32B2;} + .d2-713325804 .background-color-B3{background-color:#E3E9FD;} + .d2-713325804 .background-color-B4{background-color:#E3E9FD;} + .d2-713325804 .background-color-B5{background-color:#EDF0FD;} + .d2-713325804 .background-color-B6{background-color:#F7F8FE;} + .d2-713325804 .background-color-AA2{background-color:#4A6FF3;} + .d2-713325804 .background-color-AA4{background-color:#EDF0FD;} + .d2-713325804 .background-color-AA5{background-color:#F7F8FE;} + .d2-713325804 .background-color-AB4{background-color:#EDF0FD;} + .d2-713325804 .background-color-AB5{background-color:#F7F8FE;} + .d2-713325804 .color-N1{color:#0A0F25;} + .d2-713325804 .color-N2{color:#676C7E;} + .d2-713325804 .color-N3{color:#9499AB;} + .d2-713325804 .color-N4{color:#CFD2DD;} + .d2-713325804 .color-N5{color:#DEE1EB;} + .d2-713325804 .color-N6{color:#EEF1F8;} + .d2-713325804 .color-N7{color:#FFFFFF;} + .d2-713325804 .color-B1{color:#0D32B2;} + .d2-713325804 .color-B2{color:#0D32B2;} + .d2-713325804 .color-B3{color:#E3E9FD;} + .d2-713325804 .color-B4{color:#E3E9FD;} + .d2-713325804 .color-B5{color:#EDF0FD;} + .d2-713325804 .color-B6{color:#F7F8FE;} + .d2-713325804 .color-AA2{color:#4A6FF3;} + .d2-713325804 .color-AA4{color:#EDF0FD;} + .d2-713325804 .color-AA5{color:#F7F8FE;} + .d2-713325804 .color-AB4{color:#EDF0FD;} + .d2-713325804 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker-d2-713325804);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker-d2-713325804);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright-d2-713325804);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright-d2-713325804);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright-d2-713325804);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright-d2-713325804);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark-d2-713325804);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright-d2-713325804);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright-d2-713325804);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright-d2-713325804);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright-d2-713325804);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker-d2-713325804);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark-d2-713325804);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal-d2-713325804);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal-d2-713325804);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright-d2-713325804);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright-d2-713325804);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright-d2-713325804);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>abcdabcababcdefabcde + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file From fd8d01dfe6c366872a7607498118b5484245bd2c Mon Sep 17 00:00:00 2001 From: Mayank Mohapatra <125661248+Mayank77maruti@users.noreply.github.com> Date: Sat, 8 Mar 2025 11:08:45 +0000 Subject: [PATCH 72/73] try --- d2layouts/d2cycle/layout.go | 40 +- .../txtar/cycle-diagram/dagre/board.exp.json | 4876 ++++++++--------- .../txtar/cycle-diagram/dagre/sketch.exp.svg | 194 +- .../txtar/cycle-diagram/elk/board.exp.json | 4876 ++++++++--------- .../txtar/cycle-diagram/elk/sketch.exp.svg | 194 +- 5 files changed, 4933 insertions(+), 5247 deletions(-) diff --git a/d2layouts/d2cycle/layout.go b/d2layouts/d2cycle/layout.go index b1943b9eb9..eea19a68e4 100644 --- a/d2layouts/d2cycle/layout.go +++ b/d2layouts/d2cycle/layout.go @@ -18,7 +18,7 @@ const ( ARC_STEPS = 100 ) -// Layout lays out the graph and computes curved edge routes +// Layout lays out the graph and computes curved edge routes. func Layout(ctx context.Context, g *d2graph.Graph, layout d2graph.LayoutGraph) error { objects := g.Root.ChildrenArray if len(objects) == 0 { @@ -39,26 +39,29 @@ func Layout(ctx context.Context, g *d2graph.Graph, layout d2graph.LayoutGraph) e return nil } -// calculateRadius computes the required radius such that the chord between -// adjacent objects is at least (maxSize + 2*PADDING). We multiply the resulting -// radius by 1.1 (10% extra) to provide additional separation and avoid overlapping. +// calculateRadius computes a radius ensuring that the circular layout does not overlap. +// For each object we compute the half-diagonal (i.e. the radius of the minimal enclosing circle), +// then ensure the chord between two adjacent centers (2*radius*sin(π/n)) is at least +// 2*(maxHalfDiagonal + PADDING). We also add a safety factor (1.2) to avoid floating-point issues. func calculateRadius(objects []*d2graph.Object) float64 { if len(objects) < 2 { return MIN_RADIUS } numObjects := float64(len(objects)) - maxSize := 0.0 + maxHalfDiag := 0.0 for _, obj := range objects { - size := math.Max(obj.Box.Width, obj.Box.Height) - maxSize = math.Max(maxSize, size) + halfDiag := math.Hypot(obj.Box.Width/2, obj.Box.Height/2) + if halfDiag > maxHalfDiag { + maxHalfDiag = halfDiag + } } - // The chord between adjacent centers is 2*radius*sin(π/n). To ensure that - // chord >= maxSize + 2*PADDING, we require: - // radius >= (maxSize/2 + PADDING) / sin(π/n) - minRadius := (maxSize/2.0 + PADDING) / math.Sin(math.Pi/numObjects) - // Use MIN_RADIUS as a lower bound and then add a 10% extra margin. - radius := math.Max(minRadius, MIN_RADIUS) - return radius * 1.1 + // We need the chord (distance between adjacent centers) to be at least: + // 2*(maxHalfDiag + PADDING) + // and since chord = 2*radius*sin(π/n), we require: + // radius >= (maxHalfDiag + PADDING) / sin(π/n) + minRadius := (maxHalfDiag + PADDING) / math.Sin(math.Pi/numObjects) + // Apply a safety factor of 1.2 and ensure it doesn't fall below MIN_RADIUS. + return math.Max(minRadius*1.2, MIN_RADIUS) } func positionObjects(objects []*d2graph.Object, radius float64) { @@ -139,10 +142,9 @@ func createCircularArc(edge *d2graph.Edge) { // 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 + adjustLength := MIN_SEGMENT_LEN if segLength >= MIN_SEGMENT_LEN { - adjustLength = segLength // Both are float64 now + adjustLength = segLength } newSecondLastX := lastPoint.X - tangentX*adjustLength newSecondLastY := lastPoint.Y - tangentY*adjustLength @@ -217,7 +219,6 @@ func findPreciseIntersection(box *geo.Box, seg geo.Segment) *geo.Point { // Check vertical boundaries. if dx != 0 { - // Left boundary. t := (left - seg.Start.X) / dx if t >= 0 && t <= 1 { y := seg.Start.Y + t*dy @@ -228,7 +229,6 @@ func findPreciseIntersection(box *geo.Box, seg geo.Segment) *geo.Point { }{geo.NewPoint(left, y), t}) } } - // Right boundary. t = (right - seg.Start.X) / dx if t >= 0 && t <= 1 { y := seg.Start.Y + t*dy @@ -243,7 +243,6 @@ func findPreciseIntersection(box *geo.Box, seg geo.Segment) *geo.Point { // Check horizontal boundaries. if dy != 0 { - // Top boundary. t := (top - seg.Start.Y) / dy if t >= 0 && t <= 1 { x := seg.Start.X + t*dx @@ -254,7 +253,6 @@ func findPreciseIntersection(box *geo.Box, seg geo.Segment) *geo.Point { }{geo.NewPoint(x, top), t}) } } - // Bottom boundary. t = (bottom - seg.Start.Y) / dy if t >= 0 && t <= 1 { x := seg.Start.X + t*dx diff --git a/e2etests/testdata/txtar/cycle-diagram/dagre/board.exp.json b/e2etests/testdata/txtar/cycle-diagram/dagre/board.exp.json index d35a95a783..a44184a6d5 100644 --- a/e2etests/testdata/txtar/cycle-diagram/dagre/board.exp.json +++ b/e2etests/testdata/txtar/cycle-diagram/dagre/board.exp.json @@ -18,8 +18,8 @@ "x": 0, "y": 0 }, - "width": 493, - "height": 506, + "width": 453, + "height": 466, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -57,7 +57,7 @@ "type": "rectangle", "pos": { "x": -26, - "y": -253 + "y": -233 }, "width": 53, "height": 66, @@ -98,7 +98,7 @@ "id": "1.b", "type": "rectangle", "pos": { - "x": 193, + "x": 173, "y": -33 }, "width": 53, @@ -141,7 +141,7 @@ "type": "rectangle", "pos": { "x": -26, - "y": 187 + "y": 167 }, "width": 53, "height": 66, @@ -182,7 +182,7 @@ "id": "1.d", "type": "rectangle", "pos": { - "x": -247, + "x": -227, "y": -32 }, "width": 54, @@ -224,11 +224,11 @@ "id": "2", "type": "cycle", "pos": { - "x": 553, - "y": 55 + "x": 513, + "y": 50 }, - "width": 434, - "height": 396, + "width": 399, + "height": 366, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -265,8 +265,8 @@ "id": "2.a", "type": "rectangle", "pos": { - "x": 526, - "y": -198 + "x": 486, + "y": -183 }, "width": 53, "height": 66, @@ -307,8 +307,8 @@ "id": "2.b", "type": "rectangle", "pos": { - "x": 717, - "y": 131 + "x": 659, + "y": 116 }, "width": 53, "height": 66, @@ -349,8 +349,8 @@ "id": "2.c", "type": "rectangle", "pos": { - "x": 335, - "y": 132 + "x": 313, + "y": 117 }, "width": 53, "height": 66, @@ -391,11 +391,11 @@ "id": "3", "type": "cycle", "pos": { - "x": 1047, + "x": 972, "y": 0 }, "width": 53, - "height": 506, + "height": 466, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -432,8 +432,8 @@ "id": "3.a", "type": "rectangle", "pos": { - "x": 1020, - "y": -253 + "x": 945, + "y": -233 }, "width": 53, "height": 66, @@ -474,8 +474,8 @@ "id": "3.b", "type": "rectangle", "pos": { - "x": 1020, - "y": 187 + "x": 945, + "y": 167 }, "width": 53, "height": 66, @@ -516,11 +516,11 @@ "id": "4", "type": "cycle", "pos": { - "x": 1160, + "x": 1085, "y": 0 }, - "width": 434, - "height": 506, + "width": 399, + "height": 466, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -557,8 +557,8 @@ "id": "4.a", "type": "rectangle", "pos": { - "x": 1133, - "y": -253 + "x": 1058, + "y": -233 }, "width": 53, "height": 66, @@ -599,8 +599,8 @@ "id": "4.b", "type": "rectangle", "pos": { - "x": 1324, - "y": -143 + "x": 1231, + "y": -133 }, "width": 53, "height": 66, @@ -641,8 +641,8 @@ "id": "4.c", "type": "rectangle", "pos": { - "x": 1324, - "y": 76 + "x": 1231, + "y": 66 }, "width": 53, "height": 66, @@ -683,8 +683,8 @@ "id": "4.d", "type": "rectangle", "pos": { - "x": 1133, - "y": 187 + "x": 1058, + "y": 167 }, "width": 54, "height": 66, @@ -725,8 +725,8 @@ "id": "4.e", "type": "rectangle", "pos": { - "x": 942, - "y": 77 + "x": 885, + "y": 67 }, "width": 53, "height": 66, @@ -767,8 +767,8 @@ "id": "4.f", "type": "rectangle", "pos": { - "x": 943, - "y": -143 + "x": 886, + "y": -133 }, "width": 51, "height": 66, @@ -809,11 +809,11 @@ "id": "5", "type": "cycle", "pos": { - "x": 1654, - "y": 22 + "x": 1544, + "y": 20 }, - "width": 471, - "height": 463, + "width": 433, + "height": 427, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -850,8 +850,8 @@ "id": "5.a", "type": "rectangle", "pos": { - "x": 1627, - "y": -231 + "x": 1517, + "y": -213 }, "width": 53, "height": 66, @@ -892,8 +892,8 @@ "id": "5.b", "type": "rectangle", "pos": { - "x": 1836, - "y": -78 + "x": 1707, + "y": -74 }, "width": 53, "height": 66, @@ -934,8 +934,8 @@ "id": "5.c", "type": "rectangle", "pos": { - "x": 1756, - "y": 166 + "x": 1635, + "y": 148 }, "width": 53, "height": 66, @@ -976,8 +976,8 @@ "id": "5.d", "type": "rectangle", "pos": { - "x": 1497, - "y": 166 + "x": 1399, + "y": 148 }, "width": 54, "height": 66, @@ -1018,8 +1018,8 @@ "id": "5.e", "type": "rectangle", "pos": { - "x": 1418, - "y": -78 + "x": 1327, + "y": -74 }, "width": 53, "height": 66, @@ -1085,342 +1085,334 @@ "route": [ { "x": 26.5, - "y": -218.39199829101562 + "y": -198.22999572753906 }, { - "x": 27.572999954223633, - "y": -218.26499938964844 + "x": 28.18000030517578, + "y": -198.00399780273438 }, { - "x": 30.99799919128418, - "y": -217.80499267578125 + "x": 31.285999298095703, + "y": -197.53700256347656 }, { - "x": 34.415000915527344, - "y": -217.29100036621094 + "x": 34.3849983215332, + "y": -197.02099609375 }, { - "x": 37.82400131225586, - "y": -216.7239990234375 + "x": 37.47600173950195, + "y": -196.45700073242188 }, { - "x": 41.222999572753906, - "y": -216.10299682617188 + "x": 40.55699920654297, + "y": -195.843994140625 }, { - "x": 44.612998962402344, - "y": -215.4290008544922 + "x": 43.62799835205078, + "y": -195.18299865722656 }, { - "x": 47.99100112915039, - "y": -214.7010040283203 + "x": 46.68899917602539, + "y": -194.47300720214844 }, { - "x": 51.356998443603516, - "y": -213.92100524902344 + "x": 49.73699951171875, + "y": -193.71600341796875 }, { - "x": 54.71099853515625, - "y": -213.08799743652344 + "x": 52.77399826049805, + "y": -192.91099548339844 }, { - "x": 58.051998138427734, - "y": -212.20199584960938 + "x": 55.79800033569336, + "y": -192.05799865722656 }, { - "x": 61.37799835205078, - "y": -211.26400756835938 + "x": 58.80799865722656, + "y": -191.1580047607422 }, { - "x": 64.68800354003906, - "y": -210.2740020751953 + "x": 61.803001403808594, + "y": -190.21099853515625 }, { - "x": 67.98300170898438, - "y": -209.23199462890625 + "x": 64.78299713134766, + "y": -189.2169952392578 }, { - "x": 71.26100158691406, - "y": -208.13800048828125 + "x": 67.74700164794922, + "y": -188.17599487304688 }, { - "x": 74.52200317382812, - "y": -206.9929962158203 + "x": 70.69400024414062, + "y": -187.08799743652344 }, { - "x": 77.76399993896484, - "y": -205.7969970703125 + "x": 73.6240005493164, + "y": -185.9550018310547 }, { - "x": 80.98699951171875, - "y": -204.5500030517578 + "x": 76.53600311279297, + "y": -184.77499389648438 }, { - "x": 84.19000244140625, - "y": -203.2530059814453 + "x": 79.42900085449219, + "y": -183.5500030517578 }, { - "x": 87.37200164794922, - "y": -201.906005859375 + "x": 82.302001953125, + "y": -182.27999877929688 }, { - "x": 90.53299713134766, - "y": -200.50799560546875 + "x": 85.15499877929688, + "y": -180.96499633789062 }, { - "x": 93.6709976196289, - "y": -199.06100463867188 + "x": 87.98699951171875, + "y": -179.60499572753906 }, { - "x": 96.78600311279297, - "y": -197.5659942626953 + "x": 90.7979965209961, + "y": -178.2010040283203 }, { - "x": 99.87699890136719, - "y": -196.02099609375 + "x": 93.58499908447266, + "y": -176.7530059814453 }, { - "x": 102.94400024414062, - "y": -194.42799377441406 + "x": 96.3499984741211, + "y": -175.26100158691406 }, { - "x": 105.98500061035156, - "y": -192.78700256347656 + "x": 99.09100341796875, + "y": -173.7259979248047 }, { - "x": 109, - "y": -191.09800720214844 + "x": 101.80799865722656, + "y": -172.1479949951172 }, { - "x": 111.98899841308594, - "y": -189.36300659179688 + "x": 104.4990005493164, + "y": -170.5279998779297 }, { - "x": 114.9489974975586, - "y": -187.5800018310547 + "x": 107.16500091552734, + "y": -168.86500549316406 }, { - "x": 117.88099670410156, - "y": -185.7519989013672 + "x": 109.80400085449219, + "y": -167.16099548339844 }, { - "x": 120.78500366210938, - "y": -183.8769989013672 + "x": 112.41600036621094, + "y": -165.41600036621094 }, { - "x": 123.65799713134766, - "y": -181.95700073242188 + "x": 115.0009994506836, + "y": -163.62899780273438 }, { - "x": 126.5009994506836, - "y": -179.99200439453125 + "x": 117.55699920654297, + "y": -161.80299377441406 }, { - "x": 129.31199645996094, - "y": -177.98300170898438 + "x": 120.08399963378906, + "y": -159.93600463867188 }, { - "x": 132.0919952392578, - "y": -175.92999267578125 + "x": 122.58100128173828, + "y": -158.031005859375 }, { - "x": 134.83900451660156, - "y": -173.83399963378906 + "x": 125.0479965209961, + "y": -156.08599853515625 }, { - "x": 137.55299377441406, - "y": -171.69400024414062 + "x": 127.48400115966797, + "y": -154.1020050048828 }, { - "x": 140.23300170898438, - "y": -169.51199340820312 + "x": 129.88900756835938, + "y": -152.08099365234375 }, { - "x": 142.8780059814453, - "y": -167.28900146484375 + "x": 132.26199340820312, + "y": -150.02200317382812 }, { - "x": 145.48800659179688, - "y": -165.0240020751953 + "x": 134.6020050048828, + "y": -147.92599487304688 }, { - "x": 148.06199645996094, - "y": -162.71800231933594 + "x": 136.90899658203125, + "y": -145.79299926757812 }, { - "x": 150.60000610351562, - "y": -160.3730010986328 + "x": 139.1820068359375, + "y": -143.625 }, { - "x": 153.10000610351562, - "y": -157.98699951171875 + "x": 141.42100524902344, + "y": -141.42100524902344 }, { - "x": 155.56300354003906, - "y": -155.56300354003906 + "x": 143.625, + "y": -139.1820068359375 }, { - "x": 157.98699951171875, - "y": -153.10000610351562 + "x": 145.79299926757812, + "y": -136.90899658203125 }, { - "x": 160.3730010986328, - "y": -150.60000610351562 + "x": 147.92599487304688, + "y": -134.6020050048828 }, { - "x": 162.71800231933594, - "y": -148.06199645996094 + "x": 150.02200317382812, + "y": -132.26199340820312 }, { - "x": 165.0240020751953, - "y": -145.48800659179688 + "x": 152.08099365234375, + "y": -129.88900756835938 }, { - "x": 167.28900146484375, - "y": -142.8780059814453 + "x": 154.1020050048828, + "y": -127.48400115966797 }, { - "x": 169.51199340820312, - "y": -140.23300170898438 + "x": 156.08599853515625, + "y": -125.0479965209961 }, { - "x": 171.69400024414062, - "y": -137.55299377441406 + "x": 158.031005859375, + "y": -122.58100128173828 }, { - "x": 173.83399963378906, - "y": -134.83900451660156 + "x": 159.93600463867188, + "y": -120.08399963378906 }, { - "x": 175.92999267578125, - "y": -132.0919952392578 + "x": 161.80299377441406, + "y": -117.55699920654297 }, { - "x": 177.98300170898438, - "y": -129.31199645996094 + "x": 163.62899780273438, + "y": -115.0009994506836 }, { - "x": 179.99200439453125, - "y": -126.5009994506836 + "x": 165.41600036621094, + "y": -112.41600036621094 }, { - "x": 181.95700073242188, - "y": -123.65799713134766 + "x": 167.16099548339844, + "y": -109.80400085449219 }, { - "x": 183.8769989013672, - "y": -120.78500366210938 + "x": 168.86500549316406, + "y": -107.16500091552734 }, { - "x": 185.7519989013672, - "y": -117.88099670410156 + "x": 170.5279998779297, + "y": -104.4990005493164 }, { - "x": 187.5800018310547, - "y": -114.9489974975586 + "x": 172.1479949951172, + "y": -101.80799865722656 }, { - "x": 189.36300659179688, - "y": -111.98899841308594 + "x": 173.7259979248047, + "y": -99.09100341796875 }, { - "x": 191.09800720214844, - "y": -109 + "x": 175.26100158691406, + "y": -96.3499984741211 }, { - "x": 192.78700256347656, - "y": -105.98500061035156 + "x": 176.7530059814453, + "y": -93.58499908447266 }, { - "x": 194.42799377441406, - "y": -102.94400024414062 + "x": 178.2010040283203, + "y": -90.7979965209961 }, { - "x": 196.02099609375, - "y": -99.87699890136719 + "x": 179.60499572753906, + "y": -87.98699951171875 }, { - "x": 197.5659942626953, - "y": -96.78600311279297 + "x": 180.96499633789062, + "y": -85.15499877929688 }, { - "x": 199.06100463867188, - "y": -93.6709976196289 + "x": 182.27999877929688, + "y": -82.302001953125 }, { - "x": 200.50799560546875, - "y": -90.53299713134766 + "x": 183.5500030517578, + "y": -79.42900085449219 }, { - "x": 201.906005859375, - "y": -87.37200164794922 + "x": 184.77499389648438, + "y": -76.53600311279297 }, { - "x": 203.2530059814453, - "y": -84.19000244140625 + "x": 185.9550018310547, + "y": -73.6240005493164 }, { - "x": 204.5500030517578, - "y": -80.98699951171875 + "x": 187.08799743652344, + "y": -70.69400024414062 }, { - "x": 205.7969970703125, - "y": -77.76399993896484 + "x": 188.17599487304688, + "y": -67.74700164794922 }, { - "x": 206.9929962158203, - "y": -74.52200317382812 + "x": 189.2169952392578, + "y": -64.78299713134766 }, { - "x": 208.13800048828125, - "y": -71.26100158691406 + "x": 190.21099853515625, + "y": -61.803001403808594 }, { - "x": 209.23199462890625, - "y": -67.98300170898438 + "x": 191.1580047607422, + "y": -58.80799865722656 }, { - "x": 210.2740020751953, - "y": -64.68800354003906 + "x": 192.05799865722656, + "y": -55.79800033569336 }, { - "x": 211.26400756835938, - "y": -61.37799835205078 + "x": 192.91099548339844, + "y": -52.77399826049805 }, { - "x": 212.20199584960938, - "y": -58.051998138427734 + "x": 193.71600341796875, + "y": -49.73699951171875 }, { - "x": 213.08799743652344, - "y": -54.71099853515625 + "x": 194.47300720214844, + "y": -46.68899917602539 }, { - "x": 213.92100524902344, - "y": -51.356998443603516 + "x": 195.18299865722656, + "y": -43.62799835205078 }, { - "x": 214.7010040283203, - "y": -47.99100112915039 + "x": 195.843994140625, + "y": -40.55699920654297 }, { - "x": 215.4290008544922, - "y": -44.612998962402344 + "x": 196.45700073242188, + "y": -37.47600173950195 }, { - "x": 216.10299682617188, - "y": -41.222999572753906 + "x": 196.5659942626953, + "y": -37.10100173950195 }, { - "x": 216.7239990234375, - "y": -37.82400131225586 - }, - { - "x": 216.8800048828125, - "y": -37.111000061035156 - }, - { - "x": 217.50399780273438, + "x": 197.2519989013672, "y": -33 } ], @@ -1456,344 +1448,336 @@ "link": "", "route": [ { - "x": 217.50399780273438, + "x": 197.2519989013672, "y": 33 }, { - "x": 217.29100036621094, - "y": 34.415000915527344 - }, - { - "x": 216.7239990234375, - "y": 37.82400131225586 - }, - { - "x": 216.10299682617188, - "y": 41.222999572753906 + "x": 197.02099609375, + "y": 34.3849983215332 }, { - "x": 215.4290008544922, - "y": 44.612998962402344 + "x": 196.45700073242188, + "y": 37.47600173950195 }, { - "x": 214.7010040283203, - "y": 47.99100112915039 + "x": 195.843994140625, + "y": 40.55699920654297 }, { - "x": 213.92100524902344, - "y": 51.356998443603516 + "x": 195.18299865722656, + "y": 43.62799835205078 }, { - "x": 213.08799743652344, - "y": 54.71099853515625 + "x": 194.47300720214844, + "y": 46.68899917602539 }, { - "x": 212.20199584960938, - "y": 58.051998138427734 + "x": 193.71600341796875, + "y": 49.73699951171875 }, { - "x": 211.26400756835938, - "y": 61.37799835205078 + "x": 192.91099548339844, + "y": 52.77399826049805 }, { - "x": 210.2740020751953, - "y": 64.68800354003906 + "x": 192.05799865722656, + "y": 55.79800033569336 }, { - "x": 209.23199462890625, - "y": 67.98300170898438 + "x": 191.1580047607422, + "y": 58.80799865722656 }, { - "x": 208.13800048828125, - "y": 71.26100158691406 + "x": 190.21099853515625, + "y": 61.803001403808594 }, { - "x": 206.9929962158203, - "y": 74.52200317382812 + "x": 189.2169952392578, + "y": 64.78299713134766 }, { - "x": 205.7969970703125, - "y": 77.76399993896484 + "x": 188.17599487304688, + "y": 67.74700164794922 }, { - "x": 204.5500030517578, - "y": 80.98699951171875 + "x": 187.08799743652344, + "y": 70.69400024414062 }, { - "x": 203.2530059814453, - "y": 84.19000244140625 + "x": 185.9550018310547, + "y": 73.6240005493164 }, { - "x": 201.906005859375, - "y": 87.37200164794922 + "x": 184.77499389648438, + "y": 76.53600311279297 }, { - "x": 200.50799560546875, - "y": 90.53299713134766 + "x": 183.5500030517578, + "y": 79.42900085449219 }, { - "x": 199.06100463867188, - "y": 93.6709976196289 + "x": 182.27999877929688, + "y": 82.302001953125 }, { - "x": 197.5659942626953, - "y": 96.78600311279297 + "x": 180.96499633789062, + "y": 85.15499877929688 }, { - "x": 196.02099609375, - "y": 99.87699890136719 + "x": 179.60499572753906, + "y": 87.98699951171875 }, { - "x": 194.42799377441406, - "y": 102.94400024414062 + "x": 178.2010040283203, + "y": 90.7979965209961 }, { - "x": 192.78700256347656, - "y": 105.98500061035156 + "x": 176.7530059814453, + "y": 93.58499908447266 }, { - "x": 191.09800720214844, - "y": 109 + "x": 175.26100158691406, + "y": 96.3499984741211 }, { - "x": 189.36300659179688, - "y": 111.98899841308594 + "x": 173.7259979248047, + "y": 99.09100341796875 }, { - "x": 187.5800018310547, - "y": 114.9489974975586 + "x": 172.1479949951172, + "y": 101.80799865722656 }, { - "x": 185.7519989013672, - "y": 117.88099670410156 + "x": 170.5279998779297, + "y": 104.4990005493164 }, { - "x": 183.8769989013672, - "y": 120.78500366210938 + "x": 168.86500549316406, + "y": 107.16500091552734 }, { - "x": 181.95700073242188, - "y": 123.65799713134766 + "x": 167.16099548339844, + "y": 109.80400085449219 }, { - "x": 179.99200439453125, - "y": 126.5009994506836 + "x": 165.41600036621094, + "y": 112.41600036621094 }, { - "x": 177.98300170898438, - "y": 129.31199645996094 + "x": 163.62899780273438, + "y": 115.0009994506836 }, { - "x": 175.92999267578125, - "y": 132.0919952392578 + "x": 161.80299377441406, + "y": 117.55699920654297 }, { - "x": 173.83399963378906, - "y": 134.83900451660156 + "x": 159.93600463867188, + "y": 120.08399963378906 }, { - "x": 171.69400024414062, - "y": 137.55299377441406 + "x": 158.031005859375, + "y": 122.58100128173828 }, { - "x": 169.51199340820312, - "y": 140.23300170898438 + "x": 156.08599853515625, + "y": 125.0479965209961 }, { - "x": 167.28900146484375, - "y": 142.8780059814453 + "x": 154.1020050048828, + "y": 127.48400115966797 }, { - "x": 165.0240020751953, - "y": 145.48800659179688 + "x": 152.08099365234375, + "y": 129.88900756835938 }, { - "x": 162.71800231933594, - "y": 148.06199645996094 + "x": 150.02200317382812, + "y": 132.26199340820312 }, { - "x": 160.3730010986328, - "y": 150.60000610351562 + "x": 147.92599487304688, + "y": 134.6020050048828 }, { - "x": 157.98699951171875, - "y": 153.10000610351562 + "x": 145.79299926757812, + "y": 136.90899658203125 }, { - "x": 155.56300354003906, - "y": 155.56300354003906 + "x": 143.625, + "y": 139.1820068359375 }, { - "x": 153.10000610351562, - "y": 157.98699951171875 + "x": 141.42100524902344, + "y": 141.42100524902344 }, { - "x": 150.60000610351562, - "y": 160.3730010986328 + "x": 139.1820068359375, + "y": 143.625 }, { - "x": 148.06199645996094, - "y": 162.71800231933594 + "x": 136.90899658203125, + "y": 145.79299926757812 }, { - "x": 145.48800659179688, - "y": 165.0240020751953 + "x": 134.6020050048828, + "y": 147.92599487304688 }, { - "x": 142.8780059814453, - "y": 167.28900146484375 + "x": 132.26199340820312, + "y": 150.02200317382812 }, { - "x": 140.23300170898438, - "y": 169.51199340820312 + "x": 129.88900756835938, + "y": 152.08099365234375 }, { - "x": 137.55299377441406, - "y": 171.69400024414062 + "x": 127.48400115966797, + "y": 154.1020050048828 }, { - "x": 134.83900451660156, - "y": 173.83399963378906 + "x": 125.0479965209961, + "y": 156.08599853515625 }, { - "x": 132.0919952392578, - "y": 175.92999267578125 + "x": 122.58100128173828, + "y": 158.031005859375 }, { - "x": 129.31199645996094, - "y": 177.98300170898438 + "x": 120.08399963378906, + "y": 159.93600463867188 }, { - "x": 126.5009994506836, - "y": 179.99200439453125 + "x": 117.55699920654297, + "y": 161.80299377441406 }, { - "x": 123.65799713134766, - "y": 181.95700073242188 + "x": 115.0009994506836, + "y": 163.62899780273438 }, { - "x": 120.78500366210938, - "y": 183.8769989013672 + "x": 112.41600036621094, + "y": 165.41600036621094 }, { - "x": 117.88099670410156, - "y": 185.7519989013672 + "x": 109.80400085449219, + "y": 167.16099548339844 }, { - "x": 114.9489974975586, - "y": 187.5800018310547 + "x": 107.16500091552734, + "y": 168.86500549316406 }, { - "x": 111.98899841308594, - "y": 189.36300659179688 + "x": 104.4990005493164, + "y": 170.5279998779297 }, { - "x": 109, - "y": 191.09800720214844 + "x": 101.80799865722656, + "y": 172.1479949951172 }, { - "x": 105.98500061035156, - "y": 192.78700256347656 + "x": 99.09100341796875, + "y": 173.7259979248047 }, { - "x": 102.94400024414062, - "y": 194.42799377441406 + "x": 96.3499984741211, + "y": 175.26100158691406 }, { - "x": 99.87699890136719, - "y": 196.02099609375 + "x": 93.58499908447266, + "y": 176.7530059814453 }, { - "x": 96.78600311279297, - "y": 197.5659942626953 + "x": 90.7979965209961, + "y": 178.2010040283203 }, { - "x": 93.6709976196289, - "y": 199.06100463867188 + "x": 87.98699951171875, + "y": 179.60499572753906 }, { - "x": 90.53299713134766, - "y": 200.50799560546875 + "x": 85.15499877929688, + "y": 180.96499633789062 }, { - "x": 87.37200164794922, - "y": 201.906005859375 + "x": 82.302001953125, + "y": 182.27999877929688 }, { - "x": 84.19000244140625, - "y": 203.2530059814453 + "x": 79.42900085449219, + "y": 183.5500030517578 }, { - "x": 80.98699951171875, - "y": 204.5500030517578 + "x": 76.53600311279297, + "y": 184.77499389648438 }, { - "x": 77.76399993896484, - "y": 205.7969970703125 + "x": 73.6240005493164, + "y": 185.9550018310547 }, { - "x": 74.52200317382812, - "y": 206.9929962158203 + "x": 70.69400024414062, + "y": 187.08799743652344 }, { - "x": 71.26100158691406, - "y": 208.13800048828125 + "x": 67.74700164794922, + "y": 188.17599487304688 }, { - "x": 67.98300170898438, - "y": 209.23199462890625 + "x": 64.78299713134766, + "y": 189.2169952392578 }, { - "x": 64.68800354003906, - "y": 210.2740020751953 + "x": 61.803001403808594, + "y": 190.21099853515625 }, { - "x": 61.37799835205078, - "y": 211.26400756835938 + "x": 58.80799865722656, + "y": 191.1580047607422 }, { - "x": 58.051998138427734, - "y": 212.20199584960938 + "x": 55.79800033569336, + "y": 192.05799865722656 }, { - "x": 54.71099853515625, - "y": 213.08799743652344 + "x": 52.77399826049805, + "y": 192.91099548339844 }, { - "x": 51.356998443603516, - "y": 213.92100524902344 + "x": 49.73699951171875, + "y": 193.71600341796875 }, { - "x": 47.99100112915039, - "y": 214.7010040283203 + "x": 46.68899917602539, + "y": 194.47300720214844 }, { - "x": 44.612998962402344, - "y": 215.4290008544922 + "x": 43.62799835205078, + "y": 195.18299865722656 }, { - "x": 41.222999572753906, - "y": 216.10299682617188 + "x": 40.55699920654297, + "y": 195.843994140625 }, { - "x": 37.82400131225586, - "y": 216.7239990234375 + "x": 37.47600173950195, + "y": 196.45700073242188 }, { - "x": 34.415000915527344, - "y": 217.29100036621094 + "x": 34.3849983215332, + "y": 197.02099609375 }, { - "x": 30.99799919128418, - "y": 217.80499267578125 + "x": 31.285999298095703, + "y": 197.53700256347656 }, { - "x": 30.628000259399414, - "y": 217.89100646972656 + "x": 30.621999740600586, + "y": 197.6790008544922 }, { "x": 26.5, - "y": 218.39199829101562 + "y": 198.22999572753906 } ], "isCurve": true, @@ -1829,342 +1813,334 @@ "route": [ { "x": -26.499000549316406, - "y": 218.39199829101562 - }, - { - "x": -27.572999954223633, - "y": 218.26499938964844 + "y": 198.22999572753906 }, { - "x": -30.99799919128418, - "y": 217.80499267578125 + "x": -28.18000030517578, + "y": 198.00399780273438 }, { - "x": -34.415000915527344, - "y": 217.29100036621094 + "x": -31.285999298095703, + "y": 197.53700256347656 }, { - "x": -37.82400131225586, - "y": 216.7239990234375 + "x": -34.3849983215332, + "y": 197.02099609375 }, { - "x": -41.222999572753906, - "y": 216.10299682617188 + "x": -37.47600173950195, + "y": 196.45700073242188 }, { - "x": -44.612998962402344, - "y": 215.4290008544922 + "x": -40.55699920654297, + "y": 195.843994140625 }, { - "x": -47.99100112915039, - "y": 214.7010040283203 + "x": -43.62799835205078, + "y": 195.18299865722656 }, { - "x": -51.356998443603516, - "y": 213.92100524902344 + "x": -46.68899917602539, + "y": 194.47300720214844 }, { - "x": -54.71099853515625, - "y": 213.08799743652344 + "x": -49.73699951171875, + "y": 193.71600341796875 }, { - "x": -58.051998138427734, - "y": 212.20199584960938 + "x": -52.77399826049805, + "y": 192.91099548339844 }, { - "x": -61.37799835205078, - "y": 211.26400756835938 + "x": -55.79800033569336, + "y": 192.05799865722656 }, { - "x": -64.68800354003906, - "y": 210.2740020751953 + "x": -58.80799865722656, + "y": 191.1580047607422 }, { - "x": -67.98300170898438, - "y": 209.23199462890625 + "x": -61.803001403808594, + "y": 190.21099853515625 }, { - "x": -71.26100158691406, - "y": 208.13800048828125 + "x": -64.78299713134766, + "y": 189.2169952392578 }, { - "x": -74.52200317382812, - "y": 206.9929962158203 + "x": -67.74700164794922, + "y": 188.17599487304688 }, { - "x": -77.76399993896484, - "y": 205.7969970703125 + "x": -70.69400024414062, + "y": 187.08799743652344 }, { - "x": -80.98699951171875, - "y": 204.5500030517578 + "x": -73.6240005493164, + "y": 185.9550018310547 }, { - "x": -84.19000244140625, - "y": 203.2530059814453 + "x": -76.53600311279297, + "y": 184.77499389648438 }, { - "x": -87.37200164794922, - "y": 201.906005859375 + "x": -79.42900085449219, + "y": 183.5500030517578 }, { - "x": -90.53299713134766, - "y": 200.50799560546875 + "x": -82.302001953125, + "y": 182.27999877929688 }, { - "x": -93.6709976196289, - "y": 199.06100463867188 + "x": -85.15499877929688, + "y": 180.96499633789062 }, { - "x": -96.78600311279297, - "y": 197.5659942626953 + "x": -87.98699951171875, + "y": 179.60499572753906 }, { - "x": -99.87699890136719, - "y": 196.02099609375 + "x": -90.7979965209961, + "y": 178.2010040283203 }, { - "x": -102.94400024414062, - "y": 194.42799377441406 + "x": -93.58499908447266, + "y": 176.7530059814453 }, { - "x": -105.98500061035156, - "y": 192.78700256347656 + "x": -96.3499984741211, + "y": 175.26100158691406 }, { - "x": -109, - "y": 191.09800720214844 + "x": -99.09100341796875, + "y": 173.7259979248047 }, { - "x": -111.98899841308594, - "y": 189.36300659179688 + "x": -101.80799865722656, + "y": 172.1479949951172 }, { - "x": -114.9489974975586, - "y": 187.5800018310547 + "x": -104.4990005493164, + "y": 170.5279998779297 }, { - "x": -117.88099670410156, - "y": 185.7519989013672 + "x": -107.16500091552734, + "y": 168.86500549316406 }, { - "x": -120.78500366210938, - "y": 183.8769989013672 + "x": -109.80400085449219, + "y": 167.16099548339844 }, { - "x": -123.65799713134766, - "y": 181.95700073242188 + "x": -112.41600036621094, + "y": 165.41600036621094 }, { - "x": -126.5009994506836, - "y": 179.99200439453125 + "x": -115.0009994506836, + "y": 163.62899780273438 }, { - "x": -129.31199645996094, - "y": 177.98300170898438 + "x": -117.55699920654297, + "y": 161.80299377441406 }, { - "x": -132.0919952392578, - "y": 175.92999267578125 + "x": -120.08399963378906, + "y": 159.93600463867188 }, { - "x": -134.83900451660156, - "y": 173.83399963378906 + "x": -122.58100128173828, + "y": 158.031005859375 }, { - "x": -137.55299377441406, - "y": 171.69400024414062 + "x": -125.0479965209961, + "y": 156.08599853515625 }, { - "x": -140.23300170898438, - "y": 169.51199340820312 + "x": -127.48400115966797, + "y": 154.1020050048828 }, { - "x": -142.8780059814453, - "y": 167.28900146484375 + "x": -129.88900756835938, + "y": 152.08099365234375 }, { - "x": -145.48800659179688, - "y": 165.0240020751953 + "x": -132.26199340820312, + "y": 150.02200317382812 }, { - "x": -148.06199645996094, - "y": 162.71800231933594 + "x": -134.6020050048828, + "y": 147.92599487304688 }, { - "x": -150.60000610351562, - "y": 160.3730010986328 + "x": -136.90899658203125, + "y": 145.79299926757812 }, { - "x": -153.10000610351562, - "y": 157.98699951171875 + "x": -139.1820068359375, + "y": 143.625 }, { - "x": -155.56300354003906, - "y": 155.56300354003906 + "x": -141.42100524902344, + "y": 141.42100524902344 }, { - "x": -157.98699951171875, - "y": 153.10000610351562 + "x": -143.625, + "y": 139.1820068359375 }, { - "x": -160.3730010986328, - "y": 150.60000610351562 + "x": -145.79299926757812, + "y": 136.90899658203125 }, { - "x": -162.71800231933594, - "y": 148.06199645996094 + "x": -147.92599487304688, + "y": 134.6020050048828 }, { - "x": -165.0240020751953, - "y": 145.48800659179688 + "x": -150.02200317382812, + "y": 132.26199340820312 }, { - "x": -167.28900146484375, - "y": 142.8780059814453 + "x": -152.08099365234375, + "y": 129.88900756835938 }, { - "x": -169.51199340820312, - "y": 140.23300170898438 + "x": -154.1020050048828, + "y": 127.48400115966797 }, { - "x": -171.69400024414062, - "y": 137.55299377441406 + "x": -156.08599853515625, + "y": 125.0479965209961 }, { - "x": -173.83399963378906, - "y": 134.83900451660156 + "x": -158.031005859375, + "y": 122.58100128173828 }, { - "x": -175.92999267578125, - "y": 132.0919952392578 + "x": -159.93600463867188, + "y": 120.08399963378906 }, { - "x": -177.98300170898438, - "y": 129.31199645996094 + "x": -161.80299377441406, + "y": 117.55699920654297 }, { - "x": -179.99200439453125, - "y": 126.5009994506836 + "x": -163.62899780273438, + "y": 115.0009994506836 }, { - "x": -181.95700073242188, - "y": 123.65799713134766 + "x": -165.41600036621094, + "y": 112.41600036621094 }, { - "x": -183.8769989013672, - "y": 120.78500366210938 + "x": -167.16099548339844, + "y": 109.80400085449219 }, { - "x": -185.7519989013672, - "y": 117.88099670410156 + "x": -168.86500549316406, + "y": 107.16500091552734 }, { - "x": -187.5800018310547, - "y": 114.9489974975586 + "x": -170.5279998779297, + "y": 104.4990005493164 }, { - "x": -189.36300659179688, - "y": 111.98899841308594 + "x": -172.1479949951172, + "y": 101.80799865722656 }, { - "x": -191.09800720214844, - "y": 109 + "x": -173.7259979248047, + "y": 99.09100341796875 }, { - "x": -192.78700256347656, - "y": 105.98500061035156 + "x": -175.26100158691406, + "y": 96.3499984741211 }, { - "x": -194.42799377441406, - "y": 102.94400024414062 + "x": -176.7530059814453, + "y": 93.58499908447266 }, { - "x": -196.02099609375, - "y": 99.87699890136719 + "x": -178.2010040283203, + "y": 90.7979965209961 }, { - "x": -197.5659942626953, - "y": 96.78600311279297 + "x": -179.60499572753906, + "y": 87.98699951171875 }, { - "x": -199.06100463867188, - "y": 93.6709976196289 + "x": -180.96499633789062, + "y": 85.15499877929688 }, { - "x": -200.50799560546875, - "y": 90.53299713134766 + "x": -182.27999877929688, + "y": 82.302001953125 }, { - "x": -201.906005859375, - "y": 87.37200164794922 + "x": -183.5500030517578, + "y": 79.42900085449219 }, { - "x": -203.2530059814453, - "y": 84.19000244140625 + "x": -184.77499389648438, + "y": 76.53600311279297 }, { - "x": -204.5500030517578, - "y": 80.98699951171875 + "x": -185.9550018310547, + "y": 73.6240005493164 }, { - "x": -205.7969970703125, - "y": 77.76399993896484 + "x": -187.08799743652344, + "y": 70.69400024414062 }, { - "x": -206.9929962158203, - "y": 74.52200317382812 + "x": -188.17599487304688, + "y": 67.74700164794922 }, { - "x": -208.13800048828125, - "y": 71.26100158691406 + "x": -189.2169952392578, + "y": 64.78299713134766 }, { - "x": -209.23199462890625, - "y": 67.98300170898438 + "x": -190.21099853515625, + "y": 61.803001403808594 }, { - "x": -210.2740020751953, - "y": 64.68800354003906 + "x": -191.1580047607422, + "y": 58.80799865722656 }, { - "x": -211.26400756835938, - "y": 61.37799835205078 + "x": -192.05799865722656, + "y": 55.79800033569336 }, { - "x": -212.20199584960938, - "y": 58.051998138427734 + "x": -192.91099548339844, + "y": 52.77399826049805 }, { - "x": -213.08799743652344, - "y": 54.71099853515625 + "x": -193.71600341796875, + "y": 49.73699951171875 }, { - "x": -213.92100524902344, - "y": 51.356998443603516 + "x": -194.47300720214844, + "y": 46.68899917602539 }, { - "x": -214.7010040283203, - "y": 47.99100112915039 + "x": -195.18299865722656, + "y": 43.62799835205078 }, { - "x": -215.4290008544922, - "y": 44.612998962402344 + "x": -195.843994140625, + "y": 40.55699920654297 }, { - "x": -216.10299682617188, - "y": 41.222999572753906 + "x": -196.45700073242188, + "y": 37.47600173950195 }, { - "x": -216.7239990234375, - "y": 37.82400131225586 + "x": -196.5659942626953, + "y": 37.10100173950195 }, { - "x": -216.8800048828125, - "y": 37.111000061035156 - }, - { - "x": -217.50399780273438, + "x": -197.2519989013672, "y": 33 } ], @@ -2200,360 +2176,352 @@ "link": "", "route": [ { - "x": 579.5, - "y": -163.38900756835938 - }, - { - "x": 580.572998046875, - "y": -163.26499938964844 - }, - { - "x": 585.1380004882812, - "y": -162.63900756835938 + "x": 539.5, + "y": -148.2259979248047 }, { - "x": 589.6890258789062, - "y": -161.91900634765625 + "x": 542.2160034179688, + "y": -147.85400390625 }, { - "x": 594.2230224609375, - "y": -161.10299682617188 + "x": 546.35302734375, + "y": -147.19900512695312 }, { - "x": 598.739990234375, - "y": -160.19200134277344 + "x": 550.4760131835938, + "y": -146.45700073242188 }, { - "x": 603.2369995117188, - "y": -159.18699645996094 + "x": 554.5819702148438, + "y": -145.62899780273438 }, { - "x": 607.7109985351562, - "y": -158.08799743652344 + "x": 558.6699829101562, + "y": -144.71499633789062 }, { - "x": 612.1619873046875, - "y": -156.89500427246094 + "x": 562.7369995117188, + "y": -143.71600341796875 }, { - "x": 616.5859985351562, - "y": -155.61000061035156 + "x": 566.7830200195312, + "y": -142.6320037841797 }, { - "x": 620.9829711914062, - "y": -154.23199462890625 + "x": 570.8060302734375, + "y": -141.46299743652344 }, { - "x": 625.3499755859375, - "y": -152.76199340820312 + "x": 574.802978515625, + "y": -140.21099853515625 }, { - "x": 629.6849975585938, - "y": -151.20199584960938 + "x": 578.7730102539062, + "y": -138.875 }, { - "x": 633.9869995117188, - "y": -149.5500030517578 + "x": 582.7139892578125, + "y": -137.45599365234375 }, { - "x": 638.2529907226562, - "y": -147.8090057373047 + "x": 586.6240234375, + "y": -135.9550018310547 }, { - "x": 642.4819946289062, - "y": -145.97999572753906 + "x": 590.5029907226562, + "y": -134.3719940185547 }, { - "x": 646.6710205078125, - "y": -144.06100463867188 + "x": 594.3469848632812, + "y": -132.70899963378906 }, { - "x": 650.8189697265625, - "y": -142.05599975585938 + "x": 598.155029296875, + "y": -130.96499633789062 }, { - "x": 654.9249877929688, - "y": -139.96400451660156 + "x": 601.927001953125, + "y": -129.14199829101562 }, { - "x": 658.9849853515625, - "y": -137.78700256347656 + "x": 605.6589965820312, + "y": -127.23999786376953 }, { - "x": 663, - "y": -135.52499389648438 + "x": 609.3499755859375, + "y": -125.26100158691406 }, { - "x": 666.9650268554688, - "y": -133.17999267578125 + "x": 613, + "y": -123.20500183105469 }, { - "x": 670.8809814453125, - "y": -130.7519989013672 + "x": 616.60498046875, + "y": -121.0719985961914 }, { - "x": 674.7459716796875, - "y": -128.24200439453125 + "x": 620.1649780273438, + "y": -118.86499786376953 }, { - "x": 678.5560302734375, - "y": -125.6520004272461 + "x": 623.677978515625, + "y": -116.58399963378906 }, { - "x": 682.31201171875, - "y": -122.98300170898438 + "x": 627.1420288085938, + "y": -114.22899627685547 }, { - "x": 686.010986328125, - "y": -120.23600006103516 + "x": 630.5570068359375, + "y": -111.8030014038086 }, { - "x": 689.6519775390625, - "y": -117.41200256347656 + "x": 633.9190063476562, + "y": -109.30500030517578 }, { - "x": 693.2329711914062, - "y": -114.51200103759766 + "x": 637.22900390625, + "y": -106.73799896240234 }, { - "x": 696.7520141601562, - "y": -111.53800201416016 + "x": 640.4840087890625, + "y": -104.10199737548828 }, { - "x": 700.2080078125, - "y": -108.49099731445312 + "x": 643.6840209960938, + "y": -101.39900207519531 }, { - "x": 703.5999755859375, - "y": -105.37300109863281 + "x": 646.8259887695312, + "y": -98.62799835205078 }, { - "x": 706.9249877929688, - "y": -102.18299865722656 + "x": 649.9089965820312, + "y": -95.79299926757812 }, { - "x": 710.1829833984375, - "y": -98.92500305175781 + "x": 652.9320068359375, + "y": -92.89399719238281 }, { - "x": 713.3729858398438, - "y": -95.5999984741211 + "x": 655.8939819335938, + "y": -89.93199920654297 }, { - "x": 716.4910278320312, - "y": -92.20800018310547 + "x": 658.7930297851562, + "y": -86.90899658203125 }, { - "x": 719.5380249023438, - "y": -88.75199890136719 + "x": 661.6279907226562, + "y": -83.82599639892578 }, { - "x": 722.5120239257812, - "y": -85.23300170898438 + "x": 664.3989868164062, + "y": -80.68399810791016 }, { - "x": 725.4119873046875, - "y": -81.6520004272461 + "x": 667.1019897460938, + "y": -77.48400115966797 }, { - "x": 728.2360229492188, - "y": -78.01100158691406 + "x": 669.7379760742188, + "y": -74.22899627685547 }, { - "x": 730.9829711914062, - "y": -74.31199645996094 + "x": 672.3049926757812, + "y": -70.91899871826172 }, { - "x": 733.6519775390625, - "y": -70.55599975585938 + "x": 674.802978515625, + "y": -67.55699920654297 }, { - "x": 736.2420043945312, - "y": -66.74600219726562 + "x": 677.22900390625, + "y": -64.14199829101562 }, { - "x": 738.7520141601562, - "y": -62.88100051879883 + "x": 679.583984375, + "y": -60.678001403808594 }, { - "x": 741.1799926757812, - "y": -58.96500015258789 + "x": 681.864990234375, + "y": -57.165000915527344 }, { - "x": 743.5250244140625, - "y": -55 + "x": 684.072021484375, + "y": -53.60499954223633 }, { - "x": 745.7869873046875, - "y": -50.98500061035156 + "x": 686.2050170898438, + "y": -50 }, { - "x": 747.9639892578125, - "y": -46.92499923706055 + "x": 688.260986328125, + "y": -46.349998474121094 }, { - "x": 750.0560302734375, - "y": -42.819000244140625 + "x": 690.239990234375, + "y": -42.659000396728516 }, { - "x": 752.0609741210938, - "y": -38.67100143432617 + "x": 692.1420288085938, + "y": -38.926998138427734 }, { - "x": 753.97998046875, - "y": -34.481998443603516 + "x": 693.9650268554688, + "y": -35.154998779296875 }, { - "x": 755.8090209960938, - "y": -30.253000259399414 + "x": 695.708984375, + "y": -31.347000122070312 }, { - "x": 757.5499877929688, - "y": -25.98699951171875 + "x": 697.3720092773438, + "y": -27.503000259399414 }, { - "x": 759.2020263671875, - "y": -21.684999465942383 + "x": 698.9550170898438, + "y": -23.624000549316406 }, { - "x": 760.7620239257812, - "y": -17.350000381469727 + "x": 700.4559936523438, + "y": -19.714000701904297 }, { - "x": 762.2319946289062, - "y": -12.982999801635742 + "x": 701.875, + "y": -15.77299976348877 }, { - "x": 763.6099853515625, - "y": -8.586000442504883 + "x": 703.2109985351562, + "y": -11.803000450134277 }, { - "x": 764.89501953125, - "y": -4.1620001792907715 + "x": 704.4630126953125, + "y": -7.806000232696533 }, { - "x": 766.0880126953125, - "y": 0.2879999876022339 + "x": 705.6320190429688, + "y": -3.7829999923706055 }, { - "x": 767.18701171875, - "y": 4.76200008392334 + "x": 706.7160034179688, + "y": 0.2619999945163727 }, { - "x": 768.1920166015625, - "y": 9.258999824523926 + "x": 707.7150268554688, + "y": 4.328999996185303 }, { - "x": 769.10302734375, - "y": 13.776000022888184 + "x": 708.6290283203125, + "y": 8.416999816894531 }, { - "x": 769.9190063476562, - "y": 18.309999465942383 + "x": 709.4569702148438, + "y": 12.52299976348877 }, { - "x": 770.6389770507812, - "y": 22.861000061035156 + "x": 710.198974609375, + "y": 16.645999908447266 }, { - "x": 771.2650146484375, - "y": 27.426000595092773 + "x": 710.85400390625, + "y": 20.783000946044922 }, { - "x": 771.7940063476562, - "y": 32.00299835205078 + "x": 711.4219970703125, + "y": 24.933000564575195 }, { - "x": 772.22802734375, - "y": 36.59000015258789 + "x": 711.9039916992188, + "y": 29.0939998626709 }, { - "x": 772.5650024414062, - "y": 41.18600082397461 + "x": 712.2979736328125, + "y": 33.263999938964844 }, { - "x": 772.8070068359375, - "y": 45.7869987487793 + "x": 712.60498046875, + "y": 37.441001892089844 }, { - "x": 772.9509887695312, - "y": 50.391998291015625 + "x": 712.823974609375, + "y": 41.624000549316406 }, { - "x": 773, - "y": 55 + "x": 712.9559936523438, + "y": 45.81100082397461 }, { - "x": 772.9509887695312, - "y": 59.606998443603516 + "x": 713, + "y": 50 }, { - "x": 772.8070068359375, - "y": 64.21199798583984 + "x": 712.9559936523438, + "y": 54.1879997253418 }, { - "x": 772.5650024414062, - "y": 68.81300354003906 + "x": 712.823974609375, + "y": 58.375 }, { - "x": 772.22802734375, - "y": 73.40899658203125 + "x": 712.60498046875, + "y": 62.55799865722656 }, { - "x": 771.7940063476562, - "y": 77.99600219726562 + "x": 712.2979736328125, + "y": 66.73500061035156 }, { - "x": 771.2650146484375, - "y": 82.572998046875 + "x": 711.9039916992188, + "y": 70.90499877929688 }, { - "x": 770.6389770507812, - "y": 87.13800048828125 + "x": 711.4219970703125, + "y": 75.06600189208984 }, { - "x": 769.9190063476562, - "y": 91.68900299072266 + "x": 710.85400390625, + "y": 79.21600341796875 }, { - "x": 769.10302734375, - "y": 96.2229995727539 + "x": 710.198974609375, + "y": 83.35299682617188 }, { - "x": 768.1920166015625, - "y": 100.73999786376953 + "x": 709.4569702148438, + "y": 87.47599792480469 }, { - "x": 767.18701171875, - "y": 105.23699951171875 + "x": 708.6290283203125, + "y": 91.58200073242188 }, { - "x": 766.0880126953125, - "y": 109.71099853515625 + "x": 707.7150268554688, + "y": 95.66999816894531 }, { - "x": 764.89501953125, - "y": 114.16200256347656 + "x": 706.7160034179688, + "y": 99.73699951171875 }, { - "x": 763.6099853515625, - "y": 118.58599853515625 + "x": 705.6320190429688, + "y": 103.78299713134766 }, { - "x": 762.2319946289062, - "y": 122.98300170898438 + "x": 704.4630126953125, + "y": 107.80599975585938 }, { - "x": 760.7620239257812, - "y": 127.3499984741211 + "x": 703.2109985351562, + "y": 111.8030014038086 }, { - "x": 760.5369873046875, - "y": 128.10400390625 + "x": 702.8259887695312, + "y": 113.08100128173828 }, { - "x": 759.0809936523438, - "y": 131.99899291992188 + "x": 701.4329833984375, + "y": 116.9990005493164 } ], "isCurve": true, @@ -2588,344 +2556,336 @@ "link": "", "route": [ { - "x": 720.1740112304688, - "y": 197.99899291992188 - }, - { - "x": 719.5380249023438, - "y": 198.7519989013672 - }, - { - "x": 716.4910278320312, - "y": 202.20799255371094 + "x": 662.3569946289062, + "y": 182.99899291992188 }, { - "x": 713.3729858398438, - "y": 205.60000610351562 + "x": 661.6279907226562, + "y": 183.8260040283203 }, { - "x": 710.1829833984375, - "y": 208.9250030517578 + "x": 658.7930297851562, + "y": 186.90899658203125 }, { - "x": 706.9249877929688, - "y": 212.18299865722656 + "x": 655.8939819335938, + "y": 189.9320068359375 }, { - "x": 703.5999755859375, - "y": 215.3730010986328 + "x": 652.9320068359375, + "y": 192.8939971923828 }, { - "x": 700.2080078125, - "y": 218.49099731445312 + "x": 649.9089965820312, + "y": 195.79299926757812 }, { - "x": 696.7520141601562, - "y": 221.53799438476562 + "x": 646.8259887695312, + "y": 198.6280059814453 }, { - "x": 693.2329711914062, - "y": 224.51199340820312 + "x": 643.6840209960938, + "y": 201.3990020751953 }, { - "x": 689.6519775390625, - "y": 227.41200256347656 + "x": 640.4840087890625, + "y": 204.1020050048828 }, { - "x": 686.010986328125, - "y": 230.23599243164062 + "x": 637.22900390625, + "y": 206.73800659179688 }, { - "x": 682.31201171875, - "y": 232.98300170898438 + "x": 633.9190063476562, + "y": 209.30499267578125 }, { - "x": 678.5560302734375, - "y": 235.65199279785156 + "x": 630.5570068359375, + "y": 211.80299377441406 }, { - "x": 674.7459716796875, - "y": 238.24200439453125 + "x": 627.1420288085938, + "y": 214.22900390625 }, { - "x": 670.8809814453125, - "y": 240.7519989013672 + "x": 623.677978515625, + "y": 216.58399963378906 }, { - "x": 666.9650268554688, - "y": 243.17999267578125 + "x": 620.1649780273438, + "y": 218.86500549316406 }, { - "x": 663, - "y": 245.52499389648438 + "x": 616.60498046875, + "y": 221.07200622558594 }, { - "x": 658.9849853515625, - "y": 247.78700256347656 + "x": 613, + "y": 223.2050018310547 }, { - "x": 654.9249877929688, - "y": 249.96400451660156 + "x": 609.3499755859375, + "y": 225.26100158691406 }, { - "x": 650.8189697265625, - "y": 252.05599975585938 + "x": 605.6589965820312, + "y": 227.24000549316406 }, { - "x": 646.6710205078125, - "y": 254.06100463867188 + "x": 601.927001953125, + "y": 229.14199829101562 }, { - "x": 642.4819946289062, - "y": 255.97999572753906 + "x": 598.155029296875, + "y": 230.96499633789062 }, { - "x": 638.2529907226562, - "y": 257.8089904785156 + "x": 594.3469848632812, + "y": 232.70899963378906 }, { - "x": 633.9869995117188, - "y": 259.54998779296875 + "x": 590.5029907226562, + "y": 234.3719940185547 }, { - "x": 629.6849975585938, - "y": 261.2019958496094 + "x": 586.6240234375, + "y": 235.9550018310547 }, { - "x": 625.3499755859375, - "y": 262.7619934082031 + "x": 582.7139892578125, + "y": 237.45599365234375 }, { - "x": 620.9829711914062, - "y": 264.23199462890625 + "x": 578.7730102539062, + "y": 238.875 }, { - "x": 616.5859985351562, - "y": 265.6099853515625 + "x": 574.802978515625, + "y": 240.21099853515625 }, { - "x": 612.1619873046875, - "y": 266.8949890136719 + "x": 570.8060302734375, + "y": 241.46299743652344 }, { - "x": 607.7109985351562, - "y": 268.0880126953125 + "x": 566.7830200195312, + "y": 242.6320037841797 }, { - "x": 603.2369995117188, - "y": 269.18701171875 + "x": 562.7369995117188, + "y": 243.71600341796875 }, { - "x": 598.739990234375, - "y": 270.1919860839844 + "x": 558.6699829101562, + "y": 244.71499633789062 }, { - "x": 594.2230224609375, - "y": 271.1029968261719 + "x": 554.5819702148438, + "y": 245.62899780273438 }, { - "x": 589.6890258789062, - "y": 271.91900634765625 + "x": 550.4760131835938, + "y": 246.45700073242188 }, { - "x": 585.1380004882812, - "y": 272.6390075683594 + "x": 546.35302734375, + "y": 247.19900512695312 }, { - "x": 580.572998046875, - "y": 273.2650146484375 + "x": 542.2160034179688, + "y": 247.85400390625 }, { - "x": 575.9959716796875, - "y": 273.79400634765625 + "x": 538.0659790039062, + "y": 248.4219970703125 }, { - "x": 571.4089965820312, - "y": 274.2279968261719 + "x": 533.905029296875, + "y": 248.9040069580078 }, { - "x": 566.81298828125, - "y": 274.56500244140625 + "x": 529.7349853515625, + "y": 249.29800415039062 }, { - "x": 562.2119750976562, - "y": 274.8070068359375 + "x": 525.5579833984375, + "y": 249.60499572753906 }, { - "x": 557.6069946289062, - "y": 274.95098876953125 + "x": 521.375, + "y": 249.82400512695312 }, { - "x": 553, - "y": 275 + "x": 517.18798828125, + "y": 249.95599365234375 }, { - "x": 548.3920288085938, - "y": 274.95098876953125 + "x": 513, + "y": 250 }, { - "x": 543.7869873046875, - "y": 274.8070068359375 + "x": 508.8110046386719, + "y": 249.95599365234375 }, { - "x": 539.1859741210938, - "y": 274.56500244140625 + "x": 504.6239929199219, + "y": 249.82400512695312 }, { - "x": 534.5900268554688, - "y": 274.2279968261719 + "x": 500.4410095214844, + "y": 249.60499572753906 }, { - "x": 530.0029907226562, - "y": 273.79400634765625 + "x": 496.2640075683594, + "y": 249.29800415039062 }, { - "x": 525.426025390625, - "y": 273.2650146484375 + "x": 492.093994140625, + "y": 248.9040069580078 }, { - "x": 520.8610229492188, - "y": 272.6390075683594 + "x": 487.9330139160156, + "y": 248.4219970703125 }, { - "x": 516.3099975585938, - "y": 271.91900634765625 + "x": 483.7829895019531, + "y": 247.85400390625 }, { - "x": 511.7760009765625, - "y": 271.1029968261719 + "x": 479.64599609375, + "y": 247.19900512695312 }, { - "x": 507.2590026855469, - "y": 270.1919860839844 + "x": 475.52301025390625, + "y": 246.45700073242188 }, { - "x": 502.7619934082031, - "y": 269.18701171875 + "x": 471.4169921875, + "y": 245.62899780273438 }, { - "x": 498.2879943847656, - "y": 268.0880126953125 + "x": 467.3290100097656, + "y": 244.71499633789062 }, { - "x": 493.8370056152344, - "y": 266.8949890136719 + "x": 463.2619934082031, + "y": 243.71600341796875 }, { - "x": 489.4129943847656, - "y": 265.6099853515625 + "x": 459.21600341796875, + "y": 242.6320037841797 }, { - "x": 485.0159912109375, - "y": 264.23199462890625 + "x": 455.1929931640625, + "y": 241.46299743652344 }, { - "x": 480.64898681640625, - "y": 262.7619934082031 + "x": 451.1960144042969, + "y": 240.21099853515625 }, { - "x": 476.3139953613281, - "y": 261.2019958496094 + "x": 447.22601318359375, + "y": 238.875 }, { - "x": 472.0119934082031, - "y": 259.54998779296875 + "x": 443.2850036621094, + "y": 237.45599365234375 }, { - "x": 467.7460021972656, - "y": 257.8089904785156 + "x": 439.375, + "y": 235.9550018310547 }, { - "x": 463.5169982910156, - "y": 255.97999572753906 + "x": 435.4960021972656, + "y": 234.3719940185547 }, { - "x": 459.3280029296875, - "y": 254.06100463867188 + "x": 431.6520080566406, + "y": 232.70899963378906 }, { - "x": 455.17999267578125, - "y": 252.05599975585938 + "x": 427.843994140625, + "y": 230.96499633789062 }, { - "x": 451.0740051269531, - "y": 249.96400451660156 + "x": 424.0719909667969, + "y": 229.14199829101562 }, { - "x": 447.0140075683594, - "y": 247.78700256347656 + "x": 420.3399963378906, + "y": 227.24000549316406 }, { - "x": 443, - "y": 245.52499389648438 + "x": 416.64898681640625, + "y": 225.26100158691406 }, { - "x": 439.03399658203125, - "y": 243.17999267578125 + "x": 413, + "y": 223.2050018310547 }, { - "x": 435.1180114746094, - "y": 240.7519989013672 + "x": 409.3940124511719, + "y": 221.07200622558594 }, { - "x": 431.25299072265625, - "y": 238.24200439453125 + "x": 405.8340148925781, + "y": 218.86500549316406 }, { - "x": 427.4429931640625, - "y": 235.65199279785156 + "x": 402.3210144042969, + "y": 216.58399963378906 }, { - "x": 423.68701171875, - "y": 232.98300170898438 + "x": 398.85699462890625, + "y": 214.22900390625 }, { - "x": 419.9880065917969, - "y": 230.23599243164062 + "x": 395.4419860839844, + "y": 211.80299377441406 }, { - "x": 416.34698486328125, - "y": 227.41200256347656 + "x": 392.0799865722656, + "y": 209.30499267578125 }, { - "x": 412.7659912109375, - "y": 224.51199340820312 + "x": 388.7699890136719, + "y": 206.73800659179688 }, { - "x": 409.24700927734375, - "y": 221.53799438476562 + "x": 385.5150146484375, + "y": 204.1020050048828 }, { - "x": 405.7909851074219, - "y": 218.49099731445312 + "x": 382.31500244140625, + "y": 201.3990020751953 }, { - "x": 402.39898681640625, - "y": 215.3730010986328 + "x": 379.1730041503906, + "y": 198.6280059814453 }, { - "x": 399.0740051269531, - "y": 212.18299865722656 + "x": 376.0899963378906, + "y": 195.79299926757812 }, { - "x": 395.8160095214844, - "y": 208.9250030517578 + "x": 373.0669860839844, + "y": 192.8939971923828 }, { - "x": 392.6260070800781, - "y": 205.60000610351562 + "x": 370.1050109863281, + "y": 189.9320068359375 }, { - "x": 389.50799560546875, - "y": 202.20799255371094 + "x": 367.20599365234375, + "y": 186.90899658203125 }, { - "x": 388.52801513671875, - "y": 201.16000366210938 + "x": 366.4079895019531, + "y": 186.1060028076172 }, { - "x": 385.82501220703125, - "y": 198 + "x": 363.6419982910156, + "y": 183 } ], "isCurve": true, @@ -2960,384 +2920,376 @@ "link": "", "route": [ { - "x": 1073.5, - "y": -218.38299560546875 + "x": 998.5, + "y": -198.21800231933594 }, { - "x": 1074.572998046875, - "y": -218.26499938964844 + "x": 1003.2860107421875, + "y": -197.53700256347656 }, { - "x": 1081.4150390625, - "y": -217.29100036621094 + "x": 1009.4760131835938, + "y": -196.45700073242188 }, { - "x": 1088.2230224609375, - "y": -216.10299682617188 + "x": 1015.6279907226562, + "y": -195.18299865722656 }, { - "x": 1094.990966796875, - "y": -214.7010040283203 + "x": 1021.7369995117188, + "y": -193.71600341796875 }, { - "x": 1101.7110595703125, - "y": -213.08799743652344 + "x": 1027.7979736328125, + "y": -192.05799865722656 }, { - "x": 1108.3780517578125, - "y": -211.26400756835938 + "x": 1033.802978515625, + "y": -190.21099853515625 }, { - "x": 1114.9830322265625, - "y": -209.23199462890625 + "x": 1039.7469482421875, + "y": -188.17599487304688 }, { - "x": 1121.52197265625, - "y": -206.9929962158203 + "x": 1045.6240234375, + "y": -185.9550018310547 }, { - "x": 1127.987060546875, - "y": -204.5500030517578 + "x": 1051.428955078125, + "y": -183.5500030517578 }, { - "x": 1134.3719482421875, - "y": -201.906005859375 + "x": 1057.155029296875, + "y": -180.96499633789062 }, { - "x": 1140.6710205078125, - "y": -199.06100463867188 + "x": 1062.7979736328125, + "y": -178.2010040283203 }, { - "x": 1146.876953125, - "y": -196.02099609375 + "x": 1068.3499755859375, + "y": -175.26100158691406 }, { - "x": 1152.9849853515625, - "y": -192.78700256347656 + "x": 1073.8079833984375, + "y": -172.1479949951172 }, { - "x": 1158.989013671875, - "y": -189.36300659179688 + "x": 1079.1650390625, + "y": -168.86500549316406 }, { - "x": 1164.8809814453125, - "y": -185.7519989013672 + "x": 1084.416015625, + "y": -165.41600036621094 }, { - "x": 1170.657958984375, - "y": -181.95700073242188 + "x": 1089.5570068359375, + "y": -161.80299377441406 }, { - "x": 1176.31201171875, - "y": -177.98300170898438 + "x": 1094.5810546875, + "y": -158.031005859375 }, { - "x": 1181.8389892578125, - "y": -173.83399963378906 + "x": 1099.4840087890625, + "y": -154.1020050048828 }, { - "x": 1187.2330322265625, - "y": -169.51199340820312 + "x": 1104.261962890625, + "y": -150.02200317382812 }, { - "x": 1192.488037109375, - "y": -165.0240020751953 + "x": 1108.9090576171875, + "y": -145.79299926757812 }, { - "x": 1197.5999755859375, - "y": -160.3730010986328 + "x": 1113.4210205078125, + "y": -141.42100524902344 }, { - "x": 1202.56298828125, - "y": -155.56300354003906 + "x": 1117.79296875, + "y": -136.90899658203125 }, { - "x": 1207.373046875, - "y": -150.60000610351562 + "x": 1122.02197265625, + "y": -132.26199340820312 }, { - "x": 1212.0240478515625, - "y": -145.48800659179688 + "x": 1126.10205078125, + "y": -127.48400115966797 }, { - "x": 1216.511962890625, - "y": -140.23300170898438 + "x": 1130.031005859375, + "y": -122.58100128173828 }, { - "x": 1220.833984375, - "y": -134.83900451660156 + "x": 1133.802978515625, + "y": -117.55699920654297 }, { - "x": 1224.9830322265625, - "y": -129.31199645996094 + "x": 1137.416015625, + "y": -112.41600036621094 }, { - "x": 1228.95703125, - "y": -123.65799713134766 + "x": 1140.864990234375, + "y": -107.16500091552734 }, { - "x": 1232.751953125, - "y": -117.88099670410156 + "x": 1144.14794921875, + "y": -101.80799865722656 }, { - "x": 1236.363037109375, - "y": -111.98899841308594 + "x": 1147.260986328125, + "y": -96.3499984741211 }, { - "x": 1239.7869873046875, - "y": -105.98500061035156 + "x": 1150.2010498046875, + "y": -90.7979965209961 }, { - "x": 1243.02099609375, - "y": -99.87699890136719 + "x": 1152.9649658203125, + "y": -85.15499877929688 }, { - "x": 1246.06103515625, - "y": -93.6709976196289 + "x": 1155.550048828125, + "y": -79.42900085449219 }, { - "x": 1248.906005859375, - "y": -87.37200164794922 + "x": 1157.9549560546875, + "y": -73.6240005493164 }, { - "x": 1251.550048828125, - "y": -80.98699951171875 + "x": 1160.176025390625, + "y": -67.74700164794922 }, { - "x": 1253.9930419921875, - "y": -74.52200317382812 + "x": 1162.2110595703125, + "y": -61.803001403808594 }, { - "x": 1256.2320556640625, - "y": -67.98300170898438 + "x": 1164.0579833984375, + "y": -55.79800033569336 }, { - "x": 1258.2640380859375, - "y": -61.37799835205078 + "x": 1165.7159423828125, + "y": -49.73699951171875 }, { - "x": 1260.0880126953125, - "y": -54.71099853515625 + "x": 1167.1829833984375, + "y": -43.62799835205078 }, { - "x": 1261.7010498046875, - "y": -47.99100112915039 + "x": 1168.45703125, + "y": -37.47600173950195 }, { - "x": 1263.10302734375, - "y": -41.222999572753906 + "x": 1169.5369873046875, + "y": -31.285999298095703 }, { - "x": 1264.291015625, - "y": -34.415000915527344 + "x": 1170.4219970703125, + "y": -25.06599998474121 }, { - "x": 1265.2650146484375, - "y": -27.572999954223633 + "x": 1171.112060546875, + "y": -18.820999145507812 }, { - "x": 1266.02294921875, - "y": -20.702999114990234 + "x": 1171.60498046875, + "y": -12.557999610900879 }, { - "x": 1266.56494140625, - "y": -13.812999725341797 + "x": 1171.9010009765625, + "y": -6.2820000648498535 }, { - "x": 1266.8909912109375, - "y": -6.909999847412109 - }, - { - "x": 1267, + "x": 1172, "y": 0 }, { - "x": 1266.8909912109375, - "y": 6.909999847412109 + "x": 1171.9010009765625, + "y": 6.2820000648498535 }, { - "x": 1266.56494140625, - "y": 13.812999725341797 + "x": 1171.60498046875, + "y": 12.557999610900879 }, { - "x": 1266.02294921875, - "y": 20.702999114990234 + "x": 1171.112060546875, + "y": 18.820999145507812 }, { - "x": 1265.2650146484375, - "y": 27.572999954223633 + "x": 1170.4219970703125, + "y": 25.06599998474121 }, { - "x": 1264.291015625, - "y": 34.415000915527344 + "x": 1169.5369873046875, + "y": 31.285999298095703 }, { - "x": 1263.10302734375, - "y": 41.222999572753906 + "x": 1168.45703125, + "y": 37.47600173950195 }, { - "x": 1261.7010498046875, - "y": 47.99100112915039 + "x": 1167.1829833984375, + "y": 43.62799835205078 }, { - "x": 1260.0880126953125, - "y": 54.71099853515625 + "x": 1165.7159423828125, + "y": 49.73699951171875 }, { - "x": 1258.2640380859375, - "y": 61.37799835205078 + "x": 1164.0579833984375, + "y": 55.79800033569336 }, { - "x": 1256.2320556640625, - "y": 67.98300170898438 + "x": 1162.2110595703125, + "y": 61.803001403808594 }, { - "x": 1253.9930419921875, - "y": 74.52200317382812 + "x": 1160.176025390625, + "y": 67.74700164794922 }, { - "x": 1251.550048828125, - "y": 80.98699951171875 + "x": 1157.9549560546875, + "y": 73.6240005493164 }, { - "x": 1248.906005859375, - "y": 87.37200164794922 + "x": 1155.550048828125, + "y": 79.42900085449219 }, { - "x": 1246.06103515625, - "y": 93.6709976196289 + "x": 1152.9649658203125, + "y": 85.15499877929688 }, { - "x": 1243.02099609375, - "y": 99.87699890136719 + "x": 1150.2010498046875, + "y": 90.7979965209961 }, { - "x": 1239.7869873046875, - "y": 105.98500061035156 + "x": 1147.260986328125, + "y": 96.3499984741211 }, { - "x": 1236.363037109375, - "y": 111.98899841308594 + "x": 1144.14794921875, + "y": 101.80799865722656 }, { - "x": 1232.751953125, - "y": 117.88099670410156 + "x": 1140.864990234375, + "y": 107.16500091552734 }, { - "x": 1228.95703125, - "y": 123.65799713134766 + "x": 1137.416015625, + "y": 112.41600036621094 }, { - "x": 1224.9830322265625, - "y": 129.31199645996094 + "x": 1133.802978515625, + "y": 117.55699920654297 }, { - "x": 1220.833984375, - "y": 134.83900451660156 + "x": 1130.031005859375, + "y": 122.58100128173828 }, { - "x": 1216.511962890625, - "y": 140.23300170898438 + "x": 1126.10205078125, + "y": 127.48400115966797 }, { - "x": 1212.0240478515625, - "y": 145.48800659179688 + "x": 1122.02197265625, + "y": 132.26199340820312 }, { - "x": 1207.373046875, - "y": 150.60000610351562 + "x": 1117.79296875, + "y": 136.90899658203125 }, { - "x": 1202.56298828125, - "y": 155.56300354003906 + "x": 1113.4210205078125, + "y": 141.42100524902344 }, { - "x": 1197.5999755859375, - "y": 160.3730010986328 + "x": 1108.9090576171875, + "y": 145.79299926757812 }, { - "x": 1192.488037109375, - "y": 165.0240020751953 + "x": 1104.261962890625, + "y": 150.02200317382812 }, { - "x": 1187.2330322265625, - "y": 169.51199340820312 + "x": 1099.4840087890625, + "y": 154.1020050048828 }, { - "x": 1181.8389892578125, - "y": 173.83399963378906 + "x": 1094.5810546875, + "y": 158.031005859375 }, { - "x": 1176.31201171875, - "y": 177.98300170898438 + "x": 1089.5570068359375, + "y": 161.80299377441406 }, { - "x": 1170.657958984375, - "y": 181.95700073242188 + "x": 1084.416015625, + "y": 165.41600036621094 }, { - "x": 1164.8809814453125, - "y": 185.7519989013672 + "x": 1079.1650390625, + "y": 168.86500549316406 }, { - "x": 1158.989013671875, - "y": 189.36300659179688 + "x": 1073.8079833984375, + "y": 172.1479949951172 }, { - "x": 1152.9849853515625, - "y": 192.78700256347656 + "x": 1068.3499755859375, + "y": 175.26100158691406 }, { - "x": 1146.876953125, - "y": 196.02099609375 + "x": 1062.7979736328125, + "y": 178.2010040283203 }, { - "x": 1140.6710205078125, - "y": 199.06100463867188 + "x": 1057.155029296875, + "y": 180.96499633789062 }, { - "x": 1134.3719482421875, - "y": 201.906005859375 + "x": 1051.428955078125, + "y": 183.5500030517578 }, { - "x": 1127.987060546875, - "y": 204.5500030517578 + "x": 1045.6240234375, + "y": 185.9550018310547 }, { - "x": 1121.52197265625, - "y": 206.9929962158203 + "x": 1039.7469482421875, + "y": 188.17599487304688 }, { - "x": 1114.9830322265625, - "y": 209.23199462890625 + "x": 1033.802978515625, + "y": 190.21099853515625 }, { - "x": 1108.3780517578125, - "y": 211.26400756835938 + "x": 1027.7979736328125, + "y": 192.05799865722656 }, { - "x": 1101.7110595703125, - "y": 213.08799743652344 + "x": 1021.7369995117188, + "y": 193.71600341796875 }, { - "x": 1094.990966796875, - "y": 214.7010040283203 + "x": 1015.6279907226562, + "y": 195.18299865722656 }, { - "x": 1088.2230224609375, - "y": 216.10299682617188 + "x": 1009.4760131835938, + "y": 196.45700073242188 }, { - "x": 1081.4150390625, - "y": 217.29100036621094 + "x": 1003.2860107421875, + "y": 197.53700256347656 }, { - "x": 1077.6280517578125, - "y": 217.8820037841797 - }, - { - "x": 1073.5, - "y": 218.38299560546875 + "x": 998.5, + "y": 198.21800231933594 } ], "isCurve": true, @@ -3372,296 +3324,284 @@ "link": "", "route": [ { - "x": 1186.5, - "y": -218.39500427246094 - }, - { - "x": 1187.572998046875, - "y": -218.26499938964844 - }, - { - "x": 1189.8570556640625, - "y": -217.96400451660156 - }, - { - "x": 1192.137939453125, - "y": -217.63900756835938 + "x": 1111.5, + "y": -198.23399353027344 }, { - "x": 1194.4150390625, - "y": -217.29100036621094 + "x": 1112.1429443359375, + "y": -198.1490020751953 }, { - "x": 1196.68896484375, - "y": -216.91900634765625 + "x": 1114.2159423828125, + "y": -197.85400390625 }, { - "x": 1198.9580078125, - "y": -216.5229949951172 + "x": 1116.2860107421875, + "y": -197.53700256347656 }, { - "x": 1201.2230224609375, - "y": -216.10299682617188 + "x": 1118.35302734375, + "y": -197.19900512695312 }, { - "x": 1203.4840087890625, - "y": -215.65899658203125 + "x": 1120.416015625, + "y": -196.83900451660156 }, { - "x": 1205.739990234375, - "y": -215.19200134277344 + "x": 1122.4759521484375, + "y": -196.45700073242188 }, { - "x": 1207.990966796875, - "y": -214.7010040283203 + "x": 1124.531005859375, + "y": -196.0540008544922 }, { - "x": 1210.237060546875, - "y": -214.18699645996094 + "x": 1126.58203125, + "y": -195.62899780273438 }, { - "x": 1212.47705078125, - "y": -213.6490020751953 + "x": 1128.6280517578125, + "y": -195.18299865722656 }, { - "x": 1214.7110595703125, - "y": -213.08799743652344 + "x": 1130.6700439453125, + "y": -194.71499633789062 }, { - "x": 1216.93994140625, - "y": -212.5030059814453 + "x": 1132.7060546875, + "y": -194.2259979248047 }, { - "x": 1219.1619873046875, - "y": -211.89500427246094 + "x": 1134.737060546875, + "y": -193.71600341796875 }, { - "x": 1221.3780517578125, - "y": -211.26400756835938 + "x": 1136.762939453125, + "y": -193.18499755859375 }, { - "x": 1223.5860595703125, - "y": -210.61000061035156 + "x": 1138.782958984375, + "y": -192.6320037841797 }, { - "x": 1225.7879638671875, - "y": -209.9320068359375 + "x": 1140.7979736328125, + "y": -192.05799865722656 }, { - "x": 1227.9830322265625, - "y": -209.23199462890625 + "x": 1142.8060302734375, + "y": -191.46299743652344 }, { - "x": 1230.1710205078125, - "y": -208.50900268554688 + "x": 1144.8079833984375, + "y": -190.84800720214844 }, { - "x": 1232.3499755859375, - "y": -207.76199340820312 + "x": 1146.802978515625, + "y": -190.21099853515625 }, { - "x": 1234.52197265625, - "y": -206.9929962158203 + "x": 1148.791015625, + "y": -189.55299377441406 }, { - "x": 1236.68505859375, - "y": -206.20199584960938 + "x": 1150.77294921875, + "y": -188.875 }, { - "x": 1238.8399658203125, - "y": -205.38699340820312 + "x": 1152.7469482421875, + "y": -188.17599487304688 }, { - "x": 1240.987060546875, - "y": -204.5500030517578 + "x": 1154.7139892578125, + "y": -187.45599365234375 }, { - "x": 1243.1240234375, - "y": -203.6909942626953 + "x": 1156.6729736328125, + "y": -186.71600341796875 }, { - "x": 1245.2530517578125, - "y": -202.8090057373047 + "x": 1158.6240234375, + "y": -185.9550018310547 }, { - "x": 1247.3719482421875, - "y": -201.906005859375 + "x": 1160.5679931640625, + "y": -185.1739959716797 }, { - "x": 1249.4820556640625, - "y": -200.97999572753906 + "x": 1162.5030517578125, + "y": -184.3719940185547 }, { - "x": 1251.5810546875, - "y": -200.031005859375 + "x": 1164.428955078125, + "y": -183.5500030517578 }, { - "x": 1253.6710205078125, - "y": -199.06100463867188 + "x": 1166.3470458984375, + "y": -182.70899963378906 }, { - "x": 1255.75, - "y": -198.07000732421875 + "x": 1168.2559814453125, + "y": -181.8470001220703 }, { - "x": 1257.8189697265625, - "y": -197.05599975585938 + "x": 1170.155029296875, + "y": -180.96499633789062 }, { - "x": 1259.876953125, - "y": -196.02099609375 + "x": 1172.0460205078125, + "y": -180.06300354003906 }, { - "x": 1261.925048828125, - "y": -194.96400451660156 + "x": 1173.927001953125, + "y": -179.14199829101562 }, { - "x": 1263.9610595703125, - "y": -193.88600158691406 + "x": 1175.7979736328125, + "y": -178.2010040283203 }, { - "x": 1265.9849853515625, - "y": -192.78700256347656 + "x": 1177.6590576171875, + "y": -177.24000549316406 }, { - "x": 1267.998046875, - "y": -191.66700744628906 + "x": 1179.510009765625, + "y": -176.25999450683594 }, { - "x": 1270, - "y": -190.52499389648438 + "x": 1181.3499755859375, + "y": -175.26100158691406 }, { - "x": 1271.989013671875, - "y": -189.36300659179688 + "x": 1183.1800537109375, + "y": -174.24200439453125 }, { - "x": 1273.9649658203125, - "y": -188.17999267578125 + "x": 1185, + "y": -173.2050018310547 }, { - "x": 1275.9300537109375, - "y": -186.9759979248047 + "x": 1186.8079833984375, + "y": -172.1479949951172 }, { - "x": 1277.8809814453125, - "y": -185.7519989013672 + "x": 1188.60498046875, + "y": -171.07200622558594 }, { - "x": 1279.8199462890625, - "y": -184.5070037841797 + "x": 1190.3909912109375, + "y": -169.97799682617188 }, { - "x": 1281.7459716796875, - "y": -183.24200439453125 + "x": 1192.1650390625, + "y": -168.86500549316406 }, { - "x": 1283.657958984375, - "y": -181.95700073242188 + "x": 1193.927001953125, + "y": -167.73399353027344 }, { - "x": 1285.5560302734375, - "y": -180.65199279785156 + "x": 1195.677978515625, + "y": -166.58399963378906 }, { - "x": 1287.4410400390625, - "y": -179.3280029296875 + "x": 1197.416015625, + "y": -165.41600036621094 }, { - "x": 1289.31201171875, - "y": -177.98300170898438 + "x": 1199.1419677734375, + "y": -164.22900390625 }, { - "x": 1291.1689453125, - "y": -176.61900329589844 + "x": 1200.85595703125, + "y": -163.02499389648438 }, { - "x": 1293.010986328125, - "y": -175.23599243164062 + "x": 1202.5570068359375, + "y": -161.80299377441406 }, { - "x": 1294.8389892578125, - "y": -173.83399963378906 + "x": 1204.2440185546875, + "y": -160.56300354003906 }, { - "x": 1296.6519775390625, - "y": -172.41200256347656 + "x": 1205.9189453125, + "y": -159.30499267578125 }, { - "x": 1298.449951171875, - "y": -170.9720001220703 + "x": 1207.5810546875, + "y": -158.031005859375 }, { - "x": 1300.2330322265625, - "y": -169.51199340820312 + "x": 1209.22900390625, + "y": -156.73800659179688 }, { - "x": 1302, - "y": -168.03500366210938 + "x": 1210.864013671875, + "y": -155.4290008544922 }, { - "x": 1303.751953125, - "y": -166.53799438476562 + "x": 1212.4840087890625, + "y": -154.1020050048828 }, { - "x": 1305.488037109375, - "y": -165.0240020751953 + "x": 1214.0909423828125, + "y": -152.75900268554688 }, { - "x": 1307.2080078125, - "y": -163.49099731445312 + "x": 1215.6839599609375, + "y": -151.3990020751953 }, { - "x": 1308.9119873046875, - "y": -161.9409942626953 + "x": 1217.261962890625, + "y": -150.02200317382812 }, { - "x": 1310.5999755859375, - "y": -160.3730010986328 + "x": 1218.8260498046875, + "y": -148.6280059814453 }, { - "x": 1312.27099609375, - "y": -158.78700256347656 + "x": 1220.375, + "y": -147.218994140625 }, { - "x": 1313.925048828125, - "y": -157.18299865722656 + "x": 1221.9090576171875, + "y": -145.79299926757812 }, { - "x": 1315.56298828125, - "y": -155.56300354003906 + "x": 1223.427978515625, + "y": -144.3520050048828 }, { - "x": 1317.1829833984375, - "y": -153.9250030517578 + "x": 1224.9320068359375, + "y": -142.8939971923828 }, { - "x": 1318.7869873046875, - "y": -152.27099609375 + "x": 1226.4210205078125, + "y": -141.42100524902344 }, { - "x": 1320.373046875, - "y": -150.60000610351562 + "x": 1227.89404296875, + "y": -139.9320068359375 }, { - "x": 1321.9410400390625, - "y": -148.91200256347656 + "x": 1229.35205078125, + "y": -138.42799377441406 }, { - "x": 1323.490966796875, - "y": -147.20799255371094 + "x": 1230.79296875, + "y": -136.90899658203125 }, { - "x": 1325.0240478515625, - "y": -145.48800659179688 + "x": 1232.218994140625, + "y": -135.375 }, { - "x": 1324.47802734375, - "y": -146.16000366210938 + "x": 1231.5989990234375, + "y": -136.1060028076172 }, { - "x": 1327.1810302734375, - "y": -143 + "x": 1234.364990234375, + "y": -133 } ], "isCurve": true, @@ -3696,288 +3636,272 @@ "link": "", "route": [ { - "x": 1366.0830078125, - "y": -77 - }, - { - "x": 1366.2020263671875, - "y": -76.68499755859375 - }, - { - "x": 1366.9930419921875, - "y": -74.52200317382812 + "x": 1273.43994140625, + "y": -67 }, { - "x": 1367.761962890625, - "y": -72.3499984741211 + "x": 1273.875, + "y": -65.77300262451172 }, { - "x": 1368.509033203125, - "y": -70.1709976196289 + "x": 1274.552978515625, + "y": -63.79100036621094 }, { - "x": 1369.2320556640625, - "y": -67.98300170898438 + "x": 1275.2110595703125, + "y": -61.803001403808594 }, { - "x": 1369.9320068359375, - "y": -65.78800201416016 + "x": 1275.8480224609375, + "y": -59.80799865722656 }, { - "x": 1370.6099853515625, - "y": -63.58599853515625 + "x": 1276.4630126953125, + "y": -57.805999755859375 }, { - "x": 1371.2640380859375, - "y": -61.37799835205078 + "x": 1277.0579833984375, + "y": -55.79800033569336 }, { - "x": 1371.89501953125, - "y": -59.1619987487793 + "x": 1277.6319580078125, + "y": -53.78300094604492 }, { - "x": 1372.5030517578125, - "y": -56.939998626708984 + "x": 1278.18505859375, + "y": -51.76300048828125 }, { - "x": 1373.0880126953125, - "y": -54.71099853515625 + "x": 1278.7159423828125, + "y": -49.73699951171875 }, { - "x": 1373.6490478515625, - "y": -52.47700119018555 + "x": 1279.2259521484375, + "y": -47.70600128173828 }, { - "x": 1374.18701171875, - "y": -50.23699951171875 + "x": 1279.7149658203125, + "y": -45.66999816894531 }, { - "x": 1374.7010498046875, - "y": -47.99100112915039 + "x": 1280.1829833984375, + "y": -43.62799835205078 }, { - "x": 1375.1920166015625, - "y": -45.7400016784668 + "x": 1280.6290283203125, + "y": -41.582000732421875 }, { - "x": 1375.6590576171875, - "y": -43.48400115966797 + "x": 1281.053955078125, + "y": -39.53099822998047 }, { - "x": 1376.10302734375, - "y": -41.222999572753906 + "x": 1281.45703125, + "y": -37.47600173950195 }, { - "x": 1376.52294921875, - "y": -38.95800018310547 + "x": 1281.8389892578125, + "y": -35.41600036621094 }, { - "x": 1376.9189453125, - "y": -36.68899917602539 + "x": 1282.198974609375, + "y": -33.35300064086914 }, { - "x": 1377.291015625, - "y": -34.415000915527344 + "x": 1282.5369873046875, + "y": -31.285999298095703 }, { - "x": 1377.6390380859375, - "y": -32.13800048828125 + "x": 1282.85400390625, + "y": -29.215999603271484 }, { - "x": 1377.9639892578125, - "y": -29.85700035095215 + "x": 1283.1490478515625, + "y": -27.14299964904785 }, { - "x": 1378.2650146484375, - "y": -27.572999954223633 + "x": 1283.4219970703125, + "y": -25.06599998474121 }, { - "x": 1378.5419921875, - "y": -25.285999298095703 + "x": 1283.6739501953125, + "y": -22.98699951171875 }, { - "x": 1378.7939453125, - "y": -22.996000289916992 + "x": 1283.904052734375, + "y": -20.905000686645508 }, { - "x": 1379.02294921875, - "y": -20.702999114990234 + "x": 1284.112060546875, + "y": -18.820999145507812 }, { - "x": 1379.22802734375, - "y": -18.409000396728516 + "x": 1284.2979736328125, + "y": -16.735000610351562 }, { - "x": 1379.4090576171875, - "y": -16.11199951171875 + "x": 1284.4620361328125, + "y": -14.647000312805176 }, { - "x": 1379.56494140625, - "y": -13.812999725341797 + "x": 1284.60498046875, + "y": -12.557999610900879 }, { - "x": 1379.697998046875, - "y": -11.512999534606934 + "x": 1284.7249755859375, + "y": -10.467000007629395 }, { - "x": 1379.8070068359375, - "y": -9.211999893188477 + "x": 1284.823974609375, + "y": -8.375 }, { - "x": 1379.8909912109375, - "y": -6.909999847412109 + "x": 1284.9010009765625, + "y": -6.2820000648498535 }, { - "x": 1379.9510498046875, - "y": -4.60699987411499 + "x": 1284.9560546875, + "y": -4.188000202178955 }, { - "x": 1379.987060546875, - "y": -2.302999973297119 + "x": 1284.989013671875, + "y": -2.0940001010894775 }, { - "x": 1380, + "x": 1285, "y": 0 }, { - "x": 1379.987060546875, - "y": 2.302999973297119 + "x": 1284.989013671875, + "y": 2.0940001010894775 }, { - "x": 1379.9510498046875, - "y": 4.60699987411499 + "x": 1284.9560546875, + "y": 4.188000202178955 }, { - "x": 1379.8909912109375, - "y": 6.909999847412109 + "x": 1284.9010009765625, + "y": 6.2820000648498535 }, { - "x": 1379.8070068359375, - "y": 9.211999893188477 + "x": 1284.823974609375, + "y": 8.375 }, { - "x": 1379.697998046875, - "y": 11.512999534606934 + "x": 1284.7249755859375, + "y": 10.467000007629395 }, { - "x": 1379.56494140625, - "y": 13.812999725341797 + "x": 1284.60498046875, + "y": 12.557999610900879 }, { - "x": 1379.4090576171875, - "y": 16.11199951171875 + "x": 1284.4620361328125, + "y": 14.647000312805176 }, { - "x": 1379.22802734375, - "y": 18.409000396728516 + "x": 1284.2979736328125, + "y": 16.735000610351562 }, { - "x": 1379.02294921875, - "y": 20.702999114990234 + "x": 1284.112060546875, + "y": 18.820999145507812 }, { - "x": 1378.7939453125, - "y": 22.996000289916992 + "x": 1283.904052734375, + "y": 20.905000686645508 }, { - "x": 1378.5419921875, - "y": 25.285999298095703 + "x": 1283.6739501953125, + "y": 22.98699951171875 }, { - "x": 1378.2650146484375, - "y": 27.572999954223633 + "x": 1283.4219970703125, + "y": 25.06599998474121 }, { - "x": 1377.9639892578125, - "y": 29.85700035095215 + "x": 1283.1490478515625, + "y": 27.14299964904785 }, { - "x": 1377.6390380859375, - "y": 32.13800048828125 + "x": 1282.85400390625, + "y": 29.215999603271484 }, { - "x": 1377.291015625, - "y": 34.415000915527344 + "x": 1282.5369873046875, + "y": 31.285999298095703 }, { - "x": 1376.9189453125, - "y": 36.68899917602539 + "x": 1282.198974609375, + "y": 33.35300064086914 }, { - "x": 1376.52294921875, - "y": 38.95800018310547 + "x": 1281.8389892578125, + "y": 35.41600036621094 }, { - "x": 1376.10302734375, - "y": 41.222999572753906 + "x": 1281.45703125, + "y": 37.47600173950195 }, { - "x": 1375.6590576171875, - "y": 43.48400115966797 + "x": 1281.053955078125, + "y": 39.53099822998047 }, { - "x": 1375.1920166015625, - "y": 45.7400016784668 + "x": 1280.6290283203125, + "y": 41.582000732421875 }, { - "x": 1374.7010498046875, - "y": 47.99100112915039 + "x": 1280.1829833984375, + "y": 43.62799835205078 }, { - "x": 1374.18701171875, - "y": 50.23699951171875 + "x": 1279.7149658203125, + "y": 45.66999816894531 }, { - "x": 1373.6490478515625, - "y": 52.47700119018555 + "x": 1279.2259521484375, + "y": 47.70600128173828 }, { - "x": 1373.0880126953125, - "y": 54.71099853515625 + "x": 1278.7159423828125, + "y": 49.73699951171875 }, { - "x": 1372.5030517578125, - "y": 56.939998626708984 + "x": 1278.18505859375, + "y": 51.76300048828125 }, { - "x": 1371.89501953125, - "y": 59.1619987487793 + "x": 1277.6319580078125, + "y": 53.78300094604492 }, { - "x": 1371.2640380859375, - "y": 61.37799835205078 + "x": 1277.0579833984375, + "y": 55.79800033569336 }, { - "x": 1370.6099853515625, - "y": 63.58599853515625 + "x": 1276.4630126953125, + "y": 57.805999755859375 }, { - "x": 1369.9320068359375, - "y": 65.78800201416016 + "x": 1275.8480224609375, + "y": 59.80799865722656 }, { - "x": 1369.2320556640625, - "y": 67.98300170898438 + "x": 1275.2110595703125, + "y": 61.803001403808594 }, { - "x": 1368.509033203125, - "y": 70.1709976196289 + "x": 1274.552978515625, + "y": 63.79100036621094 }, { - "x": 1367.761962890625, - "y": 72.3499984741211 + "x": 1274.833984375, + "y": 63.08100128173828 }, { - "x": 1366.9930419921875, - "y": 74.52200317382812 - }, - { - "x": 1367.5379638671875, - "y": 73.10399627685547 - }, - { - "x": 1366.0830078125, - "y": 76.9990005493164 + "x": 1273.43994140625, + "y": 66.9990005493164 } ], "isCurve": true, @@ -4012,296 +3936,284 @@ "link": "", "route": [ { - "x": 1327.1810302734375, - "y": 142.99899291992188 - }, - { - "x": 1326.5379638671875, - "y": 143.7519989013672 - }, - { - "x": 1325.0240478515625, - "y": 145.48800659179688 - }, - { - "x": 1323.490966796875, - "y": 147.20799255371094 + "x": 1234.364990234375, + "y": 132.99899291992188 }, { - "x": 1321.9410400390625, - "y": 148.91200256347656 + "x": 1233.6280517578125, + "y": 133.8260040283203 }, { - "x": 1320.373046875, - "y": 150.60000610351562 + "x": 1232.218994140625, + "y": 135.375 }, { - "x": 1318.7869873046875, - "y": 152.27099609375 + "x": 1230.79296875, + "y": 136.90899658203125 }, { - "x": 1317.1829833984375, - "y": 153.9250030517578 + "x": 1229.35205078125, + "y": 138.42799377441406 }, { - "x": 1315.56298828125, - "y": 155.56300354003906 + "x": 1227.89404296875, + "y": 139.9320068359375 }, { - "x": 1313.925048828125, - "y": 157.18299865722656 + "x": 1226.4210205078125, + "y": 141.42100524902344 }, { - "x": 1312.27099609375, - "y": 158.78700256347656 + "x": 1224.9320068359375, + "y": 142.8939971923828 }, { - "x": 1310.5999755859375, - "y": 160.3730010986328 + "x": 1223.427978515625, + "y": 144.3520050048828 }, { - "x": 1308.9119873046875, - "y": 161.9409942626953 + "x": 1221.9090576171875, + "y": 145.79299926757812 }, { - "x": 1307.2080078125, - "y": 163.49099731445312 + "x": 1220.375, + "y": 147.218994140625 }, { - "x": 1305.488037109375, - "y": 165.0240020751953 + "x": 1218.8260498046875, + "y": 148.6280059814453 }, { - "x": 1303.751953125, - "y": 166.53799438476562 + "x": 1217.261962890625, + "y": 150.02200317382812 }, { - "x": 1302, - "y": 168.03500366210938 + "x": 1215.6839599609375, + "y": 151.3990020751953 }, { - "x": 1300.2330322265625, - "y": 169.51199340820312 + "x": 1214.0909423828125, + "y": 152.75900268554688 }, { - "x": 1298.449951171875, - "y": 170.9720001220703 + "x": 1212.4840087890625, + "y": 154.1020050048828 }, { - "x": 1296.6519775390625, - "y": 172.41200256347656 + "x": 1210.864013671875, + "y": 155.4290008544922 }, { - "x": 1294.8389892578125, - "y": 173.83399963378906 + "x": 1209.22900390625, + "y": 156.73800659179688 }, { - "x": 1293.010986328125, - "y": 175.23599243164062 + "x": 1207.5810546875, + "y": 158.031005859375 }, { - "x": 1291.1689453125, - "y": 176.61900329589844 + "x": 1205.9189453125, + "y": 159.30499267578125 }, { - "x": 1289.31201171875, - "y": 177.98300170898438 + "x": 1204.2440185546875, + "y": 160.56300354003906 }, { - "x": 1287.4410400390625, - "y": 179.3280029296875 + "x": 1202.5570068359375, + "y": 161.80299377441406 }, { - "x": 1285.5560302734375, - "y": 180.65199279785156 + "x": 1200.85595703125, + "y": 163.02499389648438 }, { - "x": 1283.657958984375, - "y": 181.95700073242188 + "x": 1199.1419677734375, + "y": 164.22900390625 }, { - "x": 1281.7459716796875, - "y": 183.24200439453125 + "x": 1197.416015625, + "y": 165.41600036621094 }, { - "x": 1279.8199462890625, - "y": 184.5070037841797 + "x": 1195.677978515625, + "y": 166.58399963378906 }, { - "x": 1277.8809814453125, - "y": 185.7519989013672 + "x": 1193.927001953125, + "y": 167.73399353027344 }, { - "x": 1275.9300537109375, - "y": 186.9759979248047 + "x": 1192.1650390625, + "y": 168.86500549316406 }, { - "x": 1273.9649658203125, - "y": 188.17999267578125 + "x": 1190.3909912109375, + "y": 169.97799682617188 }, { - "x": 1271.989013671875, - "y": 189.36300659179688 + "x": 1188.60498046875, + "y": 171.07200622558594 }, { - "x": 1270, - "y": 190.52499389648438 + "x": 1186.8079833984375, + "y": 172.1479949951172 }, { - "x": 1267.998046875, - "y": 191.66700744628906 + "x": 1185, + "y": 173.2050018310547 }, { - "x": 1265.9849853515625, - "y": 192.78700256347656 + "x": 1183.1800537109375, + "y": 174.24200439453125 }, { - "x": 1263.9610595703125, - "y": 193.88600158691406 + "x": 1181.3499755859375, + "y": 175.26100158691406 }, { - "x": 1261.925048828125, - "y": 194.96400451660156 + "x": 1179.510009765625, + "y": 176.25999450683594 }, { - "x": 1259.876953125, - "y": 196.02099609375 + "x": 1177.6590576171875, + "y": 177.24000549316406 }, { - "x": 1257.8189697265625, - "y": 197.05599975585938 + "x": 1175.7979736328125, + "y": 178.2010040283203 }, { - "x": 1255.75, - "y": 198.07000732421875 + "x": 1173.927001953125, + "y": 179.14199829101562 }, { - "x": 1253.6710205078125, - "y": 199.06100463867188 + "x": 1172.0460205078125, + "y": 180.06300354003906 }, { - "x": 1251.5810546875, - "y": 200.031005859375 + "x": 1170.155029296875, + "y": 180.96499633789062 }, { - "x": 1249.4820556640625, - "y": 200.97999572753906 + "x": 1168.2559814453125, + "y": 181.8470001220703 }, { - "x": 1247.3719482421875, - "y": 201.906005859375 + "x": 1166.3470458984375, + "y": 182.70899963378906 }, { - "x": 1245.2530517578125, - "y": 202.8090057373047 + "x": 1164.428955078125, + "y": 183.5500030517578 }, { - "x": 1243.1240234375, - "y": 203.6909942626953 + "x": 1162.5030517578125, + "y": 184.3719940185547 }, { - "x": 1240.987060546875, - "y": 204.5500030517578 + "x": 1160.5679931640625, + "y": 185.1739959716797 }, { - "x": 1238.8399658203125, - "y": 205.38699340820312 + "x": 1158.6240234375, + "y": 185.9550018310547 }, { - "x": 1236.68505859375, - "y": 206.20199584960938 + "x": 1156.6729736328125, + "y": 186.71600341796875 }, { - "x": 1234.52197265625, - "y": 206.9929962158203 + "x": 1154.7139892578125, + "y": 187.45599365234375 }, { - "x": 1232.3499755859375, - "y": 207.76199340820312 + "x": 1152.7469482421875, + "y": 188.17599487304688 }, { - "x": 1230.1710205078125, - "y": 208.50900268554688 + "x": 1150.77294921875, + "y": 188.875 }, { - "x": 1227.9830322265625, - "y": 209.23199462890625 + "x": 1148.791015625, + "y": 189.55299377441406 }, { - "x": 1225.7879638671875, - "y": 209.9320068359375 + "x": 1146.802978515625, + "y": 190.21099853515625 }, { - "x": 1223.5860595703125, - "y": 210.61000061035156 + "x": 1144.8079833984375, + "y": 190.84800720214844 }, { - "x": 1221.3780517578125, - "y": 211.26400756835938 + "x": 1142.8060302734375, + "y": 191.46299743652344 }, { - "x": 1219.1619873046875, - "y": 211.89500427246094 + "x": 1140.7979736328125, + "y": 192.05799865722656 }, { - "x": 1216.93994140625, - "y": 212.5030059814453 + "x": 1138.782958984375, + "y": 192.6320037841797 }, { - "x": 1214.7110595703125, - "y": 213.08799743652344 + "x": 1136.762939453125, + "y": 193.18499755859375 }, { - "x": 1212.47705078125, - "y": 213.6490020751953 + "x": 1134.737060546875, + "y": 193.71600341796875 }, { - "x": 1210.237060546875, - "y": 214.18699645996094 + "x": 1132.7060546875, + "y": 194.2259979248047 }, { - "x": 1207.990966796875, - "y": 214.7010040283203 + "x": 1130.6700439453125, + "y": 194.71499633789062 }, { - "x": 1205.739990234375, - "y": 215.19200134277344 + "x": 1128.6280517578125, + "y": 195.18299865722656 }, { - "x": 1203.4840087890625, - "y": 215.65899658203125 + "x": 1126.58203125, + "y": 195.62899780273438 }, { - "x": 1201.2230224609375, - "y": 216.10299682617188 + "x": 1124.531005859375, + "y": 196.0540008544922 }, { - "x": 1198.9580078125, - "y": 216.5229949951172 + "x": 1122.4759521484375, + "y": 196.45700073242188 }, { - "x": 1196.68896484375, - "y": 216.91900634765625 + "x": 1120.416015625, + "y": 196.83900451660156 }, { - "x": 1194.4150390625, - "y": 217.29100036621094 + "x": 1118.35302734375, + "y": 197.19900512695312 }, { - "x": 1192.137939453125, - "y": 217.63900756835938 + "x": 1116.2860107421875, + "y": 197.53700256347656 }, { - "x": 1189.8570556640625, - "y": 217.96400451660156 + "x": 1114.2159423828125, + "y": 197.85400390625 }, { - "x": 1191.126953125, - "y": 217.82400512695312 + "x": 1116.1199951171875, + "y": 197.6060028076172 }, { - "x": 1187, - "y": 218.33399963378906 + "x": 1112, + "y": 198.16799926757812 } ], "isCurve": true, @@ -4336,296 +4248,284 @@ "link": "", "route": [ { - "x": 1133, - "y": 218.33399963378906 - }, - { - "x": 1132.426025390625, - "y": 218.26499938964844 - }, - { - "x": 1130.1419677734375, - "y": 217.96400451660156 - }, - { - "x": 1127.8609619140625, - "y": 217.63900756835938 + "x": 1058, + "y": 198.16799926757812 }, { - "x": 1125.583984375, - "y": 217.29100036621094 + "x": 1057.85595703125, + "y": 198.1490020751953 }, { - "x": 1123.31005859375, - "y": 216.91900634765625 + "x": 1055.782958984375, + "y": 197.85400390625 }, { - "x": 1121.041015625, - "y": 216.5229949951172 + "x": 1053.7130126953125, + "y": 197.53700256347656 }, { - "x": 1118.7760009765625, - "y": 216.10299682617188 + "x": 1051.64599609375, + "y": 197.19900512695312 }, { - "x": 1116.5150146484375, - "y": 215.65899658203125 + "x": 1049.5830078125, + "y": 196.83900451660156 }, { - "x": 1114.259033203125, - "y": 215.19200134277344 + "x": 1047.52294921875, + "y": 196.45700073242188 }, { - "x": 1112.008056640625, - "y": 214.7010040283203 + "x": 1045.468017578125, + "y": 196.0540008544922 }, { - "x": 1109.761962890625, - "y": 214.18699645996094 + "x": 1043.4169921875, + "y": 195.62899780273438 }, { - "x": 1107.52197265625, - "y": 213.6490020751953 + "x": 1041.3709716796875, + "y": 195.18299865722656 }, { - "x": 1105.2879638671875, - "y": 213.08799743652344 + "x": 1039.3289794921875, + "y": 194.71499633789062 }, { - "x": 1103.0589599609375, - "y": 212.5030059814453 + "x": 1037.29296875, + "y": 194.2259979248047 }, { - "x": 1100.8370361328125, - "y": 211.89500427246094 + "x": 1035.261962890625, + "y": 193.71600341796875 }, { - "x": 1098.6209716796875, - "y": 211.26400756835938 + "x": 1033.2359619140625, + "y": 193.18499755859375 }, { - "x": 1096.4129638671875, - "y": 210.61000061035156 + "x": 1031.2159423828125, + "y": 192.6320037841797 }, { - "x": 1094.2110595703125, - "y": 209.9320068359375 + "x": 1029.2010498046875, + "y": 192.05799865722656 }, { - "x": 1092.0159912109375, - "y": 209.23199462890625 + "x": 1027.1929931640625, + "y": 191.46299743652344 }, { - "x": 1089.8280029296875, - "y": 208.50900268554688 + "x": 1025.1910400390625, + "y": 190.84800720214844 }, { - "x": 1087.6490478515625, - "y": 207.76199340820312 + "x": 1023.1959838867188, + "y": 190.21099853515625 }, { - "x": 1085.47705078125, - "y": 206.9929962158203 + "x": 1021.2080078125, + "y": 189.55299377441406 }, { - "x": 1083.31396484375, - "y": 206.20199584960938 + "x": 1019.2260131835938, + "y": 188.875 }, { - "x": 1081.1590576171875, - "y": 205.38699340820312 + "x": 1017.2520141601562, + "y": 188.17599487304688 }, { - "x": 1079.011962890625, - "y": 204.5500030517578 + "x": 1015.2849731445312, + "y": 187.45599365234375 }, { - "x": 1076.875, - "y": 203.6909942626953 + "x": 1013.3259887695312, + "y": 186.71600341796875 }, { - "x": 1074.7459716796875, - "y": 202.8090057373047 + "x": 1011.375, + "y": 185.9550018310547 }, { - "x": 1072.626953125, - "y": 201.906005859375 + "x": 1009.4310302734375, + "y": 185.1739959716797 }, { - "x": 1070.5169677734375, - "y": 200.97999572753906 + "x": 1007.4959716796875, + "y": 184.3719940185547 }, { - "x": 1068.41796875, - "y": 200.031005859375 + "x": 1005.5700073242188, + "y": 183.5500030517578 }, { - "x": 1066.3280029296875, - "y": 199.06100463867188 + "x": 1003.6519775390625, + "y": 182.70899963378906 }, { - "x": 1064.2490234375, - "y": 198.07000732421875 + "x": 1001.7429809570312, + "y": 181.8470001220703 }, { - "x": 1062.1800537109375, - "y": 197.05599975585938 + "x": 999.843994140625, + "y": 180.96499633789062 }, { - "x": 1060.1219482421875, - "y": 196.02099609375 + "x": 997.9530029296875, + "y": 180.06300354003906 }, { - "x": 1058.073974609375, - "y": 194.96400451660156 + "x": 996.072021484375, + "y": 179.14199829101562 }, { - "x": 1056.0379638671875, - "y": 193.88600158691406 + "x": 994.2009887695312, + "y": 178.2010040283203 }, { - "x": 1054.0140380859375, - "y": 192.78700256347656 + "x": 992.3400268554688, + "y": 177.24000549316406 }, { - "x": 1052.0009765625, - "y": 191.66700744628906 + "x": 990.489013671875, + "y": 176.25999450683594 }, { - "x": 1050, - "y": 190.52499389648438 + "x": 988.6489868164062, + "y": 175.26100158691406 }, { - "x": 1048.010009765625, - "y": 189.36300659179688 + "x": 986.8189697265625, + "y": 174.24200439453125 }, { - "x": 1046.0340576171875, - "y": 188.17999267578125 + "x": 985, + "y": 173.2050018310547 }, { - "x": 1044.0689697265625, - "y": 186.9759979248047 + "x": 983.1909790039062, + "y": 172.1479949951172 }, { - "x": 1042.1180419921875, - "y": 185.7519989013672 + "x": 981.3939819335938, + "y": 171.07200622558594 }, { - "x": 1040.178955078125, - "y": 184.5070037841797 + "x": 979.6079711914062, + "y": 169.97799682617188 }, { - "x": 1038.2530517578125, - "y": 183.24200439453125 + "x": 977.833984375, + "y": 168.86500549316406 }, { - "x": 1036.3409423828125, - "y": 181.95700073242188 + "x": 976.072021484375, + "y": 167.73399353027344 }, { - "x": 1034.4429931640625, - "y": 180.65199279785156 + "x": 974.3209838867188, + "y": 166.58399963378906 }, { - "x": 1032.5579833984375, - "y": 179.3280029296875 + "x": 972.5830078125, + "y": 165.41600036621094 }, { - "x": 1030.68701171875, - "y": 177.98300170898438 + "x": 970.8569946289062, + "y": 164.22900390625 }, { - "x": 1028.8299560546875, - "y": 176.61900329589844 + "x": 969.1430053710938, + "y": 163.02499389648438 }, { - "x": 1026.988037109375, - "y": 175.23599243164062 + "x": 967.4420166015625, + "y": 161.80299377441406 }, { - "x": 1025.1600341796875, - "y": 173.83399963378906 + "x": 965.7550048828125, + "y": 160.56300354003906 }, { - "x": 1023.3469848632812, - "y": 172.41200256347656 + "x": 964.0800170898438, + "y": 159.30499267578125 }, { - "x": 1021.5490112304688, - "y": 170.9720001220703 + "x": 962.4180297851562, + "y": 158.031005859375 }, { - "x": 1019.7659912109375, - "y": 169.51199340820312 + "x": 960.77001953125, + "y": 156.73800659179688 }, { - "x": 1017.9990234375, - "y": 168.03500366210938 + "x": 959.135009765625, + "y": 155.4290008544922 }, { - "x": 1016.2470092773438, - "y": 166.53799438476562 + "x": 957.5150146484375, + "y": 154.1020050048828 }, { - "x": 1014.510986328125, - "y": 165.0240020751953 + "x": 955.9080200195312, + "y": 152.75900268554688 }, { - "x": 1012.791015625, - "y": 163.49099731445312 + "x": 954.3150024414062, + "y": 151.3990020751953 }, { - "x": 1011.0869750976562, - "y": 161.9409942626953 + "x": 952.7369995117188, + "y": 150.02200317382812 }, { - "x": 1009.3989868164062, - "y": 160.3730010986328 + "x": 951.1729736328125, + "y": 148.6280059814453 }, { - "x": 1007.72802734375, - "y": 158.78700256347656 + "x": 949.6240234375, + "y": 147.218994140625 }, { - "x": 1006.073974609375, - "y": 157.18299865722656 + "x": 948.0900268554688, + "y": 145.79299926757812 }, { - "x": 1004.4359741210938, - "y": 155.56300354003906 + "x": 946.5709838867188, + "y": 144.3520050048828 }, { - "x": 1002.8159790039062, - "y": 153.9250030517578 + "x": 945.0670166015625, + "y": 142.8939971923828 }, { - "x": 1001.2119750976562, - "y": 152.27099609375 + "x": 943.5780029296875, + "y": 141.42100524902344 }, { - "x": 999.6259765625, - "y": 150.60000610351562 + "x": 942.10498046875, + "y": 139.9320068359375 }, { - "x": 998.0579833984375, - "y": 148.91200256347656 + "x": 940.64697265625, + "y": 138.42799377441406 }, { - "x": 996.5079956054688, - "y": 147.20799255371094 + "x": 939.2059936523438, + "y": 136.90899658203125 }, { - "x": 994.9749755859375, - "y": 145.48800659179688 + "x": 937.780029296875, + "y": 135.375 }, { - "x": 995.52099609375, - "y": 146.16000366210938 + "x": 938.4000244140625, + "y": 136.1060028076172 }, { - "x": 992.8179931640625, - "y": 143 + "x": 935.6339721679688, + "y": 133 } ], "isCurve": true, @@ -4660,288 +4560,272 @@ "link": "", "route": [ { - "x": 953.916015625, - "y": 77 - }, - { - "x": 953.7969970703125, - "y": 76.68499755859375 - }, - { - "x": 953.0059814453125, - "y": 74.52200317382812 + "x": 896.5590209960938, + "y": 67 }, { - "x": 952.2369995117188, - "y": 72.3499984741211 + "x": 896.1240234375, + "y": 65.77300262451172 }, { - "x": 951.489990234375, - "y": 70.1709976196289 + "x": 895.4459838867188, + "y": 63.79100036621094 }, { - "x": 950.7670288085938, - "y": 67.98300170898438 + "x": 894.7880249023438, + "y": 61.803001403808594 }, { - "x": 950.0670166015625, - "y": 65.78800201416016 + "x": 894.1510009765625, + "y": 59.80799865722656 }, { - "x": 949.3889770507812, - "y": 63.58599853515625 + "x": 893.5360107421875, + "y": 57.805999755859375 }, { - "x": 948.7349853515625, - "y": 61.37799835205078 + "x": 892.9409790039062, + "y": 55.79800033569336 }, { - "x": 948.10400390625, - "y": 59.1619987487793 + "x": 892.3670043945312, + "y": 53.78300094604492 }, { - "x": 947.4959716796875, - "y": 56.939998626708984 + "x": 891.8140258789062, + "y": 51.76300048828125 }, { - "x": 946.9110107421875, - "y": 54.71099853515625 + "x": 891.2830200195312, + "y": 49.73699951171875 }, { - "x": 946.3499755859375, - "y": 52.47700119018555 + "x": 890.7730102539062, + "y": 47.70600128173828 }, { - "x": 945.81201171875, - "y": 50.23699951171875 + "x": 890.2839965820312, + "y": 45.66999816894531 }, { - "x": 945.2979736328125, - "y": 47.99100112915039 + "x": 889.8159790039062, + "y": 43.62799835205078 }, { - "x": 944.8070068359375, - "y": 45.7400016784668 + "x": 889.3699951171875, + "y": 41.582000732421875 }, { - "x": 944.3400268554688, - "y": 43.48400115966797 + "x": 888.9450073242188, + "y": 39.53099822998047 }, { - "x": 943.89599609375, - "y": 41.222999572753906 + "x": 888.5419921875, + "y": 37.47600173950195 }, { - "x": 943.4760131835938, - "y": 38.95800018310547 + "x": 888.1599731445312, + "y": 35.41600036621094 }, { - "x": 943.0800170898438, - "y": 36.68899917602539 + "x": 887.7999877929688, + "y": 33.35300064086914 }, { - "x": 942.7080078125, - "y": 34.415000915527344 + "x": 887.4619750976562, + "y": 31.285999298095703 }, { - "x": 942.3599853515625, - "y": 32.13800048828125 + "x": 887.14501953125, + "y": 29.215999603271484 }, { - "x": 942.0349731445312, - "y": 29.85700035095215 + "x": 886.8499755859375, + "y": 27.14299964904785 }, { - "x": 941.7340087890625, - "y": 27.572999954223633 + "x": 886.5770263671875, + "y": 25.06599998474121 }, { - "x": 941.4569702148438, - "y": 25.285999298095703 + "x": 886.3250122070312, + "y": 22.98699951171875 }, { - "x": 941.2050170898438, - "y": 22.996000289916992 + "x": 886.094970703125, + "y": 20.905000686645508 }, { - "x": 940.9760131835938, - "y": 20.702999114990234 + "x": 885.8870239257812, + "y": 18.820999145507812 }, { - "x": 940.77099609375, - "y": 18.409000396728516 + "x": 885.7009887695312, + "y": 16.735000610351562 }, { - "x": 940.5900268554688, - "y": 16.11199951171875 + "x": 885.5369873046875, + "y": 14.647000312805176 }, { - "x": 940.4340209960938, - "y": 13.812999725341797 + "x": 885.3939819335938, + "y": 12.557999610900879 }, { - "x": 940.301025390625, - "y": 11.512999534606934 + "x": 885.2739868164062, + "y": 10.467000007629395 }, { - "x": 940.1920166015625, - "y": 9.211999893188477 + "x": 885.1749877929688, + "y": 8.375 }, { - "x": 940.1079711914062, - "y": 6.909999847412109 + "x": 885.0980224609375, + "y": 6.2820000648498535 }, { - "x": 940.0479736328125, - "y": 4.60699987411499 + "x": 885.0430297851562, + "y": 4.188000202178955 }, { - "x": 940.0120239257812, - "y": 2.302999973297119 + "x": 885.010009765625, + "y": 2.0940001010894775 }, { - "x": 940, + "x": 885, "y": 0 }, { - "x": 940.0120239257812, - "y": -2.302999973297119 + "x": 885.010009765625, + "y": -2.0940001010894775 }, { - "x": 940.0479736328125, - "y": -4.60699987411499 + "x": 885.0430297851562, + "y": -4.188000202178955 }, { - "x": 940.1079711914062, - "y": -6.909999847412109 + "x": 885.0980224609375, + "y": -6.2820000648498535 }, { - "x": 940.1920166015625, - "y": -9.211999893188477 + "x": 885.1749877929688, + "y": -8.375 }, { - "x": 940.301025390625, - "y": -11.512999534606934 + "x": 885.2739868164062, + "y": -10.467000007629395 }, { - "x": 940.4340209960938, - "y": -13.812999725341797 + "x": 885.3939819335938, + "y": -12.557999610900879 }, { - "x": 940.5900268554688, - "y": -16.11199951171875 + "x": 885.5369873046875, + "y": -14.647000312805176 }, { - "x": 940.77099609375, - "y": -18.409000396728516 + "x": 885.7009887695312, + "y": -16.735000610351562 }, { - "x": 940.9760131835938, - "y": -20.702999114990234 + "x": 885.8870239257812, + "y": -18.820999145507812 }, { - "x": 941.2050170898438, - "y": -22.996000289916992 + "x": 886.094970703125, + "y": -20.905000686645508 }, { - "x": 941.4569702148438, - "y": -25.285999298095703 + "x": 886.3250122070312, + "y": -22.98699951171875 }, { - "x": 941.7340087890625, - "y": -27.572999954223633 + "x": 886.5770263671875, + "y": -25.06599998474121 }, { - "x": 942.0349731445312, - "y": -29.85700035095215 + "x": 886.8499755859375, + "y": -27.14299964904785 }, { - "x": 942.3599853515625, - "y": -32.13800048828125 + "x": 887.14501953125, + "y": -29.215999603271484 }, { - "x": 942.7080078125, - "y": -34.415000915527344 + "x": 887.4619750976562, + "y": -31.285999298095703 }, { - "x": 943.0800170898438, - "y": -36.68899917602539 + "x": 887.7999877929688, + "y": -33.35300064086914 }, { - "x": 943.4760131835938, - "y": -38.95800018310547 + "x": 888.1599731445312, + "y": -35.41600036621094 }, { - "x": 943.89599609375, - "y": -41.222999572753906 + "x": 888.5419921875, + "y": -37.47600173950195 }, { - "x": 944.3400268554688, - "y": -43.48400115966797 + "x": 888.9450073242188, + "y": -39.53099822998047 }, { - "x": 944.8070068359375, - "y": -45.7400016784668 + "x": 889.3699951171875, + "y": -41.582000732421875 }, { - "x": 945.2979736328125, - "y": -47.99100112915039 + "x": 889.8159790039062, + "y": -43.62799835205078 }, { - "x": 945.81201171875, - "y": -50.23699951171875 + "x": 890.2839965820312, + "y": -45.66999816894531 }, { - "x": 946.3499755859375, - "y": -52.47700119018555 + "x": 890.7730102539062, + "y": -47.70600128173828 }, { - "x": 946.9110107421875, - "y": -54.71099853515625 + "x": 891.2830200195312, + "y": -49.73699951171875 }, { - "x": 947.4959716796875, - "y": -56.939998626708984 + "x": 891.8140258789062, + "y": -51.76300048828125 }, { - "x": 948.10400390625, - "y": -59.1619987487793 + "x": 892.3670043945312, + "y": -53.78300094604492 }, { - "x": 948.7349853515625, - "y": -61.37799835205078 + "x": 892.9409790039062, + "y": -55.79800033569336 }, { - "x": 949.3889770507812, - "y": -63.58599853515625 + "x": 893.5360107421875, + "y": -57.805999755859375 }, { - "x": 950.0670166015625, - "y": -65.78800201416016 + "x": 894.1510009765625, + "y": -59.80799865722656 }, { - "x": 950.7670288085938, - "y": -67.98300170898438 + "x": 894.7880249023438, + "y": -61.803001403808594 }, { - "x": 951.489990234375, - "y": -70.1709976196289 + "x": 895.4459838867188, + "y": -63.79100036621094 }, { - "x": 952.2369995117188, - "y": -72.3499984741211 + "x": 895.1649780273438, + "y": -63.08100128173828 }, { - "x": 953.0059814453125, - "y": -74.52200317382812 - }, - { - "x": 952.4609985351562, - "y": -73.10399627685547 - }, - { - "x": 953.916015625, - "y": -77 + "x": 896.5590209960938, + "y": -67 } ], "isCurve": true, @@ -4976,324 +4860,312 @@ "link": "", "route": [ { - "x": 1680.5, - "y": -196.39300537109375 - }, - { - "x": 1681.572998046875, - "y": -196.26499938964844 - }, - { - "x": 1684.31298828125, - "y": -195.9010009765625 - }, - { - "x": 1687.0489501953125, - "y": -195.5030059814453 + "x": 1570.5, + "y": -178.23199462890625 }, { - "x": 1689.780029296875, - "y": -195.07000732421875 + "x": 1571.5579833984375, + "y": -178.0919952392578 }, { - "x": 1692.5050048828125, - "y": -194.60400390625 + "x": 1574.0450439453125, + "y": -177.72999572753906 }, { - "x": 1695.2230224609375, - "y": -194.10299682617188 + "x": 1576.5269775390625, + "y": -177.33700561523438 }, { - "x": 1697.93603515625, - "y": -193.5679931640625 + "x": 1579.0040283203125, + "y": -176.91200256347656 }, { - "x": 1700.6409912109375, - "y": -192.9980010986328 + "x": 1581.4759521484375, + "y": -176.45700073242188 }, { - "x": 1703.3389892578125, - "y": -192.39500427246094 + "x": 1583.9410400390625, + "y": -175.9709930419922 }, { - "x": 1706.029052734375, - "y": -191.75799560546875 + "x": 1586.4010009765625, + "y": -175.4530029296875 }, { - "x": 1708.7110595703125, - "y": -191.08799743652344 + "x": 1588.85400390625, + "y": -174.90499877929688 }, { - "x": 1711.385009765625, - "y": -190.38299560546875 + "x": 1591.2989501953125, + "y": -174.3260040283203 }, { - "x": 1714.0489501953125, - "y": -189.64599609375 + "x": 1593.737060546875, + "y": -173.71600341796875 }, { - "x": 1716.7039794921875, - "y": -188.87399291992188 + "x": 1596.16796875, + "y": -173.0760040283203 }, { - "x": 1719.3489990234375, - "y": -188.07000732421875 + "x": 1598.5899658203125, + "y": -172.40499877929688 }, { - "x": 1721.9830322265625, - "y": -187.23199462890625 + "x": 1601.0030517578125, + "y": -171.70399475097656 }, { - "x": 1724.6070556640625, - "y": -186.36099243164062 + "x": 1603.407958984375, + "y": -170.9720001220703 }, { - "x": 1727.219970703125, - "y": -185.45700073242188 + "x": 1605.802978515625, + "y": -170.21099853515625 }, { - "x": 1729.821044921875, - "y": -184.52099609375 + "x": 1608.18798828125, + "y": -169.41900634765625 }, { - "x": 1732.4100341796875, - "y": -183.552001953125 + "x": 1610.56298828125, + "y": -168.59800720214844 }, { - "x": 1734.987060546875, - "y": -182.5500030517578 + "x": 1612.927978515625, + "y": -167.74600219726562 }, { - "x": 1737.551025390625, - "y": -181.51600646972656 + "x": 1615.281982421875, + "y": -166.86500549316406 }, { - "x": 1740.10205078125, - "y": -180.4510040283203 + "x": 1617.6240234375, + "y": -165.9550018310547 }, { - "x": 1742.6390380859375, - "y": -179.35299682617188 + "x": 1619.9549560546875, + "y": -165.01499938964844 }, { - "x": 1745.1619873046875, - "y": -178.22300720214844 + "x": 1622.2740478515625, + "y": -164.04600524902344 }, { - "x": 1747.6710205078125, - "y": -177.06100463867188 + "x": 1624.5810546875, + "y": -163.04800415039062 }, { - "x": 1750.1650390625, - "y": -175.86900329589844 + "x": 1626.875, + "y": -162.02099609375 }, { - "x": 1752.64404296875, - "y": -174.64500427246094 + "x": 1629.155029296875, + "y": -160.96499633789062 }, { - "x": 1755.1070556640625, - "y": -173.38999938964844 + "x": 1631.4229736328125, + "y": -159.88099670410156 }, { - "x": 1757.553955078125, - "y": -172.10400390625 + "x": 1633.676025390625, + "y": -158.76800537109375 }, { - "x": 1759.9849853515625, - "y": -170.78700256347656 + "x": 1635.9150390625, + "y": -157.6269989013672 }, { - "x": 1762.4000244140625, - "y": -169.44000244140625 + "x": 1638.1400146484375, + "y": -156.45799255371094 }, { - "x": 1764.7969970703125, - "y": -168.06300354003906 + "x": 1640.3499755859375, + "y": -155.26100158691406 }, { - "x": 1767.176025390625, - "y": -166.65499877929688 + "x": 1642.5450439453125, + "y": -154.03599548339844 }, { - "x": 1769.5379638671875, - "y": -165.21800231933594 + "x": 1644.7239990234375, + "y": -152.78399658203125 }, { - "x": 1771.8809814453125, - "y": -163.7519989013672 + "x": 1646.886962890625, + "y": -151.5050048828125 }, { - "x": 1774.2060546875, - "y": -162.25599670410156 + "x": 1649.0340576171875, + "y": -150.197998046875 }, { - "x": 1776.511962890625, - "y": -160.7310028076172 + "x": 1651.1650390625, + "y": -148.86500549316406 }, { - "x": 1778.7989501953125, - "y": -159.177001953125 + "x": 1653.2779541015625, + "y": -147.5050048828125 }, { - "x": 1781.06494140625, - "y": -157.593994140625 + "x": 1655.375, + "y": -146.11900329589844 }, { - "x": 1783.31201171875, - "y": -155.98300170898438 + "x": 1657.4530029296875, + "y": -144.70599365234375 }, { - "x": 1785.5389404296875, - "y": -154.343994140625 + "x": 1659.5140380859375, + "y": -143.26699829101562 }, { - "x": 1787.7440185546875, - "y": -152.677001953125 + "x": 1661.5570068359375, + "y": -141.80299377441406 }, { - "x": 1789.928955078125, - "y": -150.98300170898438 + "x": 1663.5799560546875, + "y": -140.31300354003906 }, { - "x": 1792.092041015625, - "y": -149.26100158691406 + "x": 1665.5860595703125, + "y": -138.79800415039062 }, { - "x": 1794.2330322265625, - "y": -147.51199340820312 + "x": 1667.571044921875, + "y": -137.2570037841797 }, { - "x": 1796.35205078125, - "y": -145.73699951171875 + "x": 1669.5379638671875, + "y": -135.69200134277344 }, { - "x": 1798.447998046875, - "y": -143.93499755859375 + "x": 1671.4840087890625, + "y": -134.1020050048828 }, { - "x": 1800.52197265625, - "y": -142.10699462890625 + "x": 1673.4110107421875, + "y": -132.48800659179688 }, { - "x": 1802.572998046875, - "y": -140.2519989013672 + "x": 1675.3170166015625, + "y": -130.85000610351562 }, { - "x": 1804.5999755859375, - "y": -138.3730010986328 + "x": 1677.2020263671875, + "y": -129.18800354003906 }, { - "x": 1806.60302734375, - "y": -136.4669952392578 + "x": 1679.0660400390625, + "y": -127.50199890136719 }, { - "x": 1808.58203125, - "y": -134.53700256347656 + "x": 1680.9090576171875, + "y": -125.79299926757812 }, { - "x": 1810.5369873046875, - "y": -132.58200073242188 + "x": 1682.72998046875, + "y": -124.06099700927734 }, { - "x": 1812.467041015625, - "y": -130.60299682617188 + "x": 1684.529052734375, + "y": -122.30699920654297 }, { - "x": 1814.373046875, - "y": -128.60000610351562 + "x": 1686.3070068359375, + "y": -120.52899932861328 }, { - "x": 1816.251953125, - "y": -126.572998046875 + "x": 1688.06103515625, + "y": -118.7300033569336 }, { - "x": 1818.1070556640625, - "y": -124.52200317382812 + "x": 1689.79296875, + "y": -116.90899658203125 }, { - "x": 1819.93505859375, - "y": -122.447998046875 + "x": 1691.501953125, + "y": -115.06600189208984 }, { - "x": 1821.737060546875, - "y": -120.35199737548828 + "x": 1693.18798828125, + "y": -113.2020034790039 }, { - "x": 1823.511962890625, - "y": -118.23300170898438 + "x": 1694.8499755859375, + "y": -111.31700134277344 }, { - "x": 1825.260986328125, - "y": -116.09200286865234 + "x": 1696.488037109375, + "y": -109.41100311279297 }, { - "x": 1826.9830322265625, - "y": -113.92900085449219 + "x": 1698.10205078125, + "y": -107.48400115966797 }, { - "x": 1828.677001953125, - "y": -111.74400329589844 + "x": 1699.6920166015625, + "y": -105.53800201416016 }, { - "x": 1830.343994140625, - "y": -109.53900146484375 + "x": 1701.2569580078125, + "y": -103.57099914550781 }, { - "x": 1831.9830322265625, - "y": -107.31199645996094 + "x": 1702.7979736328125, + "y": -101.58599853515625 }, { - "x": 1833.593994140625, - "y": -105.06500244140625 + "x": 1704.31298828125, + "y": -99.58000183105469 }, { - "x": 1835.177001953125, - "y": -102.79900360107422 + "x": 1705.802978515625, + "y": -97.55699920654297 }, { - "x": 1836.73095703125, - "y": -100.51200103759766 + "x": 1707.2669677734375, + "y": -95.51399993896484 }, { - "x": 1838.2559814453125, - "y": -98.20600128173828 + "x": 1708.7060546875, + "y": -93.4530029296875 }, { - "x": 1839.751953125, - "y": -95.88099670410156 + "x": 1710.1190185546875, + "y": -91.375 }, { - "x": 1841.218017578125, - "y": -93.53800201416016 + "x": 1711.5050048828125, + "y": -89.27799987792969 }, { - "x": 1842.655029296875, - "y": -91.1760025024414 + "x": 1712.864990234375, + "y": -87.16500091552734 }, { - "x": 1844.06298828125, - "y": -88.7969970703125 + "x": 1714.197998046875, + "y": -85.03399658203125 }, { - "x": 1845.43994140625, - "y": -86.4000015258789 + "x": 1715.5050048828125, + "y": -82.88700103759766 }, { - "x": 1846.7869873046875, - "y": -83.98500061035156 + "x": 1716.7840576171875, + "y": -80.7239990234375 }, { - "x": 1848.10400390625, - "y": -81.55400085449219 + "x": 1718.0360107421875, + "y": -78.54499816894531 }, { - "x": 1847.5439453125, - "y": -82.6780014038086 + "x": 1718.126953125, + "y": -78.46499633789062 }, { - "x": 1849.4530029296875, - "y": -78.98300170898438 + "x": 1720.0989990234375, + "y": -74.8030014038086 } ], "isCurve": true, @@ -5328,312 +5200,304 @@ "link": "", "route": [ { - "x": 1871.197021484375, - "y": -12.982999801635742 - }, - { - "x": 1871.5030517578125, - "y": -11.048999786376953 - }, - { - "x": 1871.9010009765625, - "y": -8.312999725341797 + "x": 1741.9110107421875, + "y": -8.803000450134277 }, { - "x": 1872.2650146484375, - "y": -5.572999954223633 + "x": 1742.092041015625, + "y": -7.558000087738037 }, { - "x": 1872.593994140625, - "y": -2.828000068664551 + "x": 1742.4219970703125, + "y": -5.065999984741211 }, { - "x": 1872.8890380859375, - "y": -0.07900000363588333 + "x": 1742.7220458984375, + "y": -2.571000099182129 }, { - "x": 1873.1490478515625, - "y": 2.671999931335449 + "x": 1742.989990234375, + "y": -0.07199999690055847 }, { - "x": 1873.3740234375, - "y": 5.427999973297119 + "x": 1743.2259521484375, + "y": 2.428999900817871 }, { - "x": 1873.56494140625, - "y": 8.185999870300293 + "x": 1743.4310302734375, + "y": 4.934000015258789 }, { - "x": 1873.7220458984375, - "y": 10.946000099182129 + "x": 1743.60498046875, + "y": 7.440999984741211 }, { - "x": 1873.843017578125, - "y": 13.708000183105469 + "x": 1743.7469482421875, + "y": 9.951000213623047 }, { - "x": 1873.9300537109375, - "y": 16.47100067138672 + "x": 1743.8570556640625, + "y": 12.461000442504883 }, { - "x": 1873.9820556640625, - "y": 19.235000610351562 + "x": 1743.93603515625, + "y": 14.972999572753906 }, { - "x": 1874, - "y": 22 + "x": 1743.9840087890625, + "y": 17.486000061035156 }, { - "x": 1873.9820556640625, - "y": 24.763999938964844 + "x": 1744, + "y": 20 }, { - "x": 1873.9300537109375, - "y": 27.527999877929688 + "x": 1743.9840087890625, + "y": 22.51300048828125 }, { - "x": 1873.843017578125, - "y": 30.291000366210938 + "x": 1743.93603515625, + "y": 25.025999069213867 }, { - "x": 1873.7220458984375, - "y": 33.053001403808594 + "x": 1743.8570556640625, + "y": 27.538000106811523 }, { - "x": 1873.56494140625, - "y": 35.8129997253418 + "x": 1743.7469482421875, + "y": 30.04800033569336 }, { - "x": 1873.3740234375, - "y": 38.57099914550781 + "x": 1743.60498046875, + "y": 32.55799865722656 }, { - "x": 1873.1490478515625, - "y": 41.32699966430664 + "x": 1743.4310302734375, + "y": 35.064998626708984 }, { - "x": 1872.8890380859375, - "y": 44.07899856567383 + "x": 1743.2259521484375, + "y": 37.56999969482422 }, { - "x": 1872.593994140625, - "y": 46.827999114990234 + "x": 1742.989990234375, + "y": 40.071998596191406 }, { - "x": 1872.2650146484375, - "y": 49.573001861572266 + "x": 1742.7220458984375, + "y": 42.57099914550781 }, { - "x": 1871.9010009765625, - "y": 52.3129997253418 + "x": 1742.4219970703125, + "y": 45.066001892089844 }, { - "x": 1871.5030517578125, - "y": 55.04899978637695 + "x": 1742.092041015625, + "y": 47.55799865722656 }, { - "x": 1871.0699462890625, - "y": 57.779998779296875 + "x": 1741.72998046875, + "y": 50.04499816894531 }, { - "x": 1870.60400390625, - "y": 60.505001068115234 + "x": 1741.3370361328125, + "y": 52.527000427246094 }, { - "x": 1870.10302734375, - "y": 63.222999572753906 + "x": 1740.9119873046875, + "y": 55.00400161743164 }, { - "x": 1869.5679931640625, - "y": 65.93599700927734 + "x": 1740.45703125, + "y": 57.47600173950195 }, { - "x": 1868.998046875, - "y": 68.64099884033203 + "x": 1739.970947265625, + "y": 59.941001892089844 }, { - "x": 1868.39501953125, - "y": 71.33899688720703 + "x": 1739.4530029296875, + "y": 62.4010009765625 }, { - "x": 1867.758056640625, - "y": 74.02899932861328 + "x": 1738.905029296875, + "y": 64.85399627685547 }, { - "x": 1867.0880126953125, - "y": 76.71099853515625 + "x": 1738.3260498046875, + "y": 67.29900360107422 }, { - "x": 1866.383056640625, - "y": 79.38500213623047 + "x": 1737.7159423828125, + "y": 69.73699951171875 }, { - "x": 1865.64599609375, - "y": 82.04900360107422 + "x": 1737.0760498046875, + "y": 72.16799926757812 }, { - "x": 1864.8740234375, - "y": 84.7040023803711 + "x": 1736.405029296875, + "y": 74.58999633789062 }, { - "x": 1864.0699462890625, - "y": 87.3489990234375 + "x": 1735.7039794921875, + "y": 77.00299835205078 }, { - "x": 1863.2320556640625, - "y": 89.98300170898438 + "x": 1734.9720458984375, + "y": 79.40799713134766 }, { - "x": 1862.3609619140625, - "y": 92.60700225830078 + "x": 1734.2110595703125, + "y": 81.8030014038086 }, { - "x": 1861.45703125, - "y": 95.22000122070312 + "x": 1733.4189453125, + "y": 84.18800354003906 }, { - "x": 1860.52099609375, - "y": 97.82099914550781 + "x": 1732.5980224609375, + "y": 86.56300354003906 }, { - "x": 1859.552001953125, - "y": 100.41000366210938 + "x": 1731.7459716796875, + "y": 88.9280014038086 }, { - "x": 1858.550048828125, - "y": 102.98699951171875 + "x": 1730.864990234375, + "y": 91.28199768066406 }, { - "x": 1857.5159912109375, - "y": 105.5510025024414 + "x": 1729.9549560546875, + "y": 93.6240005493164 }, { - "x": 1856.4510498046875, - "y": 108.10199737548828 + "x": 1729.0150146484375, + "y": 95.95500183105469 }, { - "x": 1855.35302734375, - "y": 110.63899993896484 + "x": 1728.0460205078125, + "y": 98.27400207519531 }, { - "x": 1854.2230224609375, - "y": 113.16200256347656 + "x": 1727.0479736328125, + "y": 100.58100128173828 }, { - "x": 1853.06103515625, - "y": 115.6709976196289 + "x": 1726.02099609375, + "y": 102.875 }, { - "x": 1851.8690185546875, - "y": 118.16500091552734 + "x": 1724.9649658203125, + "y": 105.15499877929688 }, { - "x": 1850.64501953125, - "y": 120.64399719238281 + "x": 1723.8809814453125, + "y": 107.4229965209961 }, { - "x": 1849.3900146484375, - "y": 123.10700225830078 + "x": 1722.7679443359375, + "y": 109.6760025024414 }, { - "x": 1848.10400390625, - "y": 125.55400085449219 + "x": 1721.626953125, + "y": 111.91500091552734 }, { - "x": 1846.7869873046875, - "y": 127.98500061035156 + "x": 1720.4580078125, + "y": 114.13999938964844 }, { - "x": 1845.43994140625, - "y": 130.39999389648438 + "x": 1719.260986328125, + "y": 116.3499984741211 }, { - "x": 1844.06298828125, - "y": 132.7969970703125 + "x": 1718.0360107421875, + "y": 118.54499816894531 }, { - "x": 1842.655029296875, - "y": 135.17599487304688 + "x": 1716.7840576171875, + "y": 120.7239990234375 }, { - "x": 1841.218017578125, - "y": 137.53799438476562 + "x": 1715.5050048828125, + "y": 122.88700103759766 }, { - "x": 1839.751953125, - "y": 139.88099670410156 + "x": 1714.197998046875, + "y": 125.03399658203125 }, { - "x": 1838.2559814453125, - "y": 142.20599365234375 + "x": 1712.864990234375, + "y": 127.16500091552734 }, { - "x": 1836.73095703125, - "y": 144.51199340820312 + "x": 1711.5050048828125, + "y": 129.2779998779297 }, { - "x": 1835.177001953125, - "y": 146.7989959716797 + "x": 1710.1190185546875, + "y": 131.375 }, { - "x": 1833.593994140625, - "y": 149.06500244140625 + "x": 1708.7060546875, + "y": 133.4530029296875 }, { - "x": 1831.9830322265625, - "y": 151.31199645996094 + "x": 1707.2669677734375, + "y": 135.51400756835938 }, { - "x": 1830.343994140625, - "y": 153.53900146484375 + "x": 1705.802978515625, + "y": 137.5570068359375 }, { - "x": 1828.677001953125, - "y": 155.74400329589844 + "x": 1704.31298828125, + "y": 139.5800018310547 }, { - "x": 1826.9830322265625, - "y": 157.9290008544922 + "x": 1702.7979736328125, + "y": 141.58599853515625 }, { - "x": 1825.260986328125, - "y": 160.0919952392578 + "x": 1701.2569580078125, + "y": 143.5709991455078 }, { - "x": 1823.511962890625, - "y": 162.23300170898438 + "x": 1699.6920166015625, + "y": 145.53799438476562 }, { - "x": 1821.737060546875, - "y": 164.3520050048828 + "x": 1698.10205078125, + "y": 147.48399353027344 }, { - "x": 1819.93505859375, - "y": 166.447998046875 + "x": 1696.488037109375, + "y": 149.41099548339844 }, { - "x": 1818.1070556640625, - "y": 168.52200317382812 + "x": 1694.8499755859375, + "y": 151.31700134277344 }, { - "x": 1816.251953125, - "y": 170.572998046875 + "x": 1693.18798828125, + "y": 153.20199584960938 }, { - "x": 1814.373046875, - "y": 172.60000610351562 + "x": 1691.501953125, + "y": 155.0659942626953 }, { - "x": 1812.467041015625, - "y": 174.60299682617188 + "x": 1689.79296875, + "y": 156.90899658203125 }, { - "x": 1812.748046875, - "y": 174.36199951171875 + "x": 1690.9420166015625, + "y": 155.73899841308594 }, { - "x": 1809.81201171875, - "y": 177.30799865722656 + "x": 1688.0570068359375, + "y": 158.73500061035156 } ], "isCurve": true, @@ -5668,320 +5532,312 @@ "link": "", "route": [ { - "x": 1756.81201171875, - "y": 216.49400329589844 + "x": 1635.0570068359375, + "y": 198.06399536132812 }, { - "x": 1755.1070556640625, - "y": 217.38999938964844 + "x": 1633.676025390625, + "y": 198.76800537109375 }, { - "x": 1752.64404296875, - "y": 218.64500427246094 + "x": 1631.4229736328125, + "y": 199.88099670410156 }, { - "x": 1750.1650390625, - "y": 219.86900329589844 + "x": 1629.155029296875, + "y": 200.96499633789062 }, { - "x": 1747.6710205078125, - "y": 221.06100463867188 + "x": 1626.875, + "y": 202.02099609375 }, { - "x": 1745.1619873046875, - "y": 222.22300720214844 + "x": 1624.5810546875, + "y": 203.04800415039062 }, { - "x": 1742.6390380859375, - "y": 223.35299682617188 + "x": 1622.2740478515625, + "y": 204.04600524902344 }, { - "x": 1740.10205078125, - "y": 224.4510040283203 + "x": 1619.9549560546875, + "y": 205.01499938964844 }, { - "x": 1737.551025390625, - "y": 225.51600646972656 + "x": 1617.6240234375, + "y": 205.9550018310547 }, { - "x": 1734.987060546875, - "y": 226.5500030517578 + "x": 1615.281982421875, + "y": 206.86500549316406 }, { - "x": 1732.4100341796875, - "y": 227.552001953125 + "x": 1612.927978515625, + "y": 207.74600219726562 }, { - "x": 1729.821044921875, - "y": 228.52099609375 + "x": 1610.56298828125, + "y": 208.59800720214844 }, { - "x": 1727.219970703125, - "y": 229.45700073242188 + "x": 1608.18798828125, + "y": 209.41900634765625 }, { - "x": 1724.6070556640625, - "y": 230.36099243164062 + "x": 1605.802978515625, + "y": 210.21099853515625 }, { - "x": 1721.9830322265625, - "y": 231.23199462890625 + "x": 1603.407958984375, + "y": 210.9720001220703 }, { - "x": 1719.3489990234375, - "y": 232.07000732421875 + "x": 1601.0030517578125, + "y": 211.70399475097656 }, { - "x": 1716.7039794921875, - "y": 232.87399291992188 + "x": 1598.5899658203125, + "y": 212.40499877929688 }, { - "x": 1714.0489501953125, - "y": 233.64599609375 + "x": 1596.16796875, + "y": 213.0760040283203 }, { - "x": 1711.385009765625, - "y": 234.38299560546875 + "x": 1593.737060546875, + "y": 213.71600341796875 }, { - "x": 1708.7110595703125, - "y": 235.08799743652344 + "x": 1591.2989501953125, + "y": 214.3260040283203 }, { - "x": 1706.029052734375, - "y": 235.75799560546875 + "x": 1588.85400390625, + "y": 214.90499877929688 }, { - "x": 1703.3389892578125, - "y": 236.39500427246094 + "x": 1586.4010009765625, + "y": 215.4530029296875 }, { - "x": 1700.6409912109375, - "y": 236.9980010986328 + "x": 1583.9410400390625, + "y": 215.9709930419922 }, { - "x": 1697.93603515625, - "y": 237.5679931640625 + "x": 1581.4759521484375, + "y": 216.45700073242188 }, { - "x": 1695.2230224609375, - "y": 238.10299682617188 + "x": 1579.0040283203125, + "y": 216.91200256347656 }, { - "x": 1692.5050048828125, - "y": 238.60400390625 + "x": 1576.5269775390625, + "y": 217.33700561523438 }, { - "x": 1689.780029296875, - "y": 239.07000732421875 + "x": 1574.0450439453125, + "y": 217.72999572753906 }, { - "x": 1687.0489501953125, - "y": 239.5030059814453 + "x": 1571.5579833984375, + "y": 218.0919952392578 }, { - "x": 1684.31298828125, - "y": 239.9010009765625 + "x": 1569.0660400390625, + "y": 218.4219970703125 }, { - "x": 1681.572998046875, - "y": 240.26499938964844 + "x": 1566.571044921875, + "y": 218.7220001220703 }, { - "x": 1678.8280029296875, - "y": 240.593994140625 + "x": 1564.072021484375, + "y": 218.99000549316406 }, { - "x": 1676.0789794921875, - "y": 240.88900756835938 + "x": 1561.5699462890625, + "y": 219.2259979248047 }, { - "x": 1673.3270263671875, - "y": 241.1490020751953 + "x": 1559.06494140625, + "y": 219.43099975585938 }, { - "x": 1670.571044921875, - "y": 241.37399291992188 + "x": 1556.5579833984375, + "y": 219.60499572753906 }, { - "x": 1667.81298828125, - "y": 241.56500244140625 + "x": 1554.0479736328125, + "y": 219.7469940185547 }, { - "x": 1665.052978515625, - "y": 241.7220001220703 + "x": 1551.5379638671875, + "y": 219.85699462890625 }, { - "x": 1662.291015625, - "y": 241.84300231933594 + "x": 1549.0260009765625, + "y": 219.93600463867188 }, { - "x": 1659.5279541015625, - "y": 241.92999267578125 + "x": 1546.512939453125, + "y": 219.98399353027344 }, { - "x": 1656.7640380859375, - "y": 241.98199462890625 + "x": 1544, + "y": 220 }, { - "x": 1654, - "y": 242 + "x": 1541.4859619140625, + "y": 219.98399353027344 }, { - "x": 1651.2349853515625, - "y": 241.98199462890625 + "x": 1538.9730224609375, + "y": 219.93600463867188 }, { - "x": 1648.470947265625, - "y": 241.92999267578125 + "x": 1536.4610595703125, + "y": 219.85699462890625 }, { - "x": 1645.7080078125, - "y": 241.84300231933594 + "x": 1533.9510498046875, + "y": 219.7469940185547 }, { - "x": 1642.946044921875, - "y": 241.7220001220703 + "x": 1531.4410400390625, + "y": 219.60499572753906 }, { - "x": 1640.18603515625, - "y": 241.56500244140625 + "x": 1528.9339599609375, + "y": 219.43099975585938 }, { - "x": 1637.427978515625, - "y": 241.37399291992188 + "x": 1526.428955078125, + "y": 219.2259979248047 }, { - "x": 1634.6719970703125, - "y": 241.1490020751953 + "x": 1523.927001953125, + "y": 218.99000549316406 }, { - "x": 1631.9200439453125, - "y": 240.88900756835938 + "x": 1521.427978515625, + "y": 218.7220001220703 }, { - "x": 1629.1710205078125, - "y": 240.593994140625 + "x": 1518.9329833984375, + "y": 218.4219970703125 }, { - "x": 1626.426025390625, - "y": 240.26499938964844 + "x": 1516.4410400390625, + "y": 218.0919952392578 }, { - "x": 1623.68603515625, - "y": 239.9010009765625 + "x": 1513.9539794921875, + "y": 217.72999572753906 }, { - "x": 1620.949951171875, - "y": 239.5030059814453 + "x": 1511.4720458984375, + "y": 217.33700561523438 }, { - "x": 1618.218994140625, - "y": 239.07000732421875 + "x": 1508.9949951171875, + "y": 216.91200256347656 }, { - "x": 1615.4940185546875, - "y": 238.60400390625 + "x": 1506.52294921875, + "y": 216.45700073242188 }, { - "x": 1612.7760009765625, - "y": 238.10299682617188 + "x": 1504.0579833984375, + "y": 215.9709930419922 }, { - "x": 1610.06298828125, - "y": 237.5679931640625 + "x": 1501.5980224609375, + "y": 215.4530029296875 }, { - "x": 1607.3580322265625, - "y": 236.9980010986328 + "x": 1499.14501953125, + "y": 214.90499877929688 }, { - "x": 1604.6600341796875, - "y": 236.39500427246094 + "x": 1496.699951171875, + "y": 214.3260040283203 }, { - "x": 1601.969970703125, - "y": 235.75799560546875 + "x": 1494.261962890625, + "y": 213.71600341796875 }, { - "x": 1599.2879638671875, - "y": 235.08799743652344 + "x": 1491.8310546875, + "y": 213.0760040283203 }, { - "x": 1596.614013671875, - "y": 234.38299560546875 + "x": 1489.4090576171875, + "y": 212.40499877929688 }, { - "x": 1593.949951171875, - "y": 233.64599609375 + "x": 1486.9959716796875, + "y": 211.70399475097656 }, { - "x": 1591.2950439453125, - "y": 232.87399291992188 + "x": 1484.5909423828125, + "y": 210.9720001220703 }, { - "x": 1588.6500244140625, - "y": 232.07000732421875 + "x": 1482.196044921875, + "y": 210.21099853515625 }, { - "x": 1586.0159912109375, - "y": 231.23199462890625 + "x": 1479.81103515625, + "y": 209.41900634765625 }, { - "x": 1583.3919677734375, - "y": 230.36099243164062 + "x": 1477.43603515625, + "y": 208.59800720214844 }, { - "x": 1580.779052734375, - "y": 229.45700073242188 + "x": 1475.071044921875, + "y": 207.74600219726562 }, { - "x": 1578.177978515625, - "y": 228.52099609375 + "x": 1472.717041015625, + "y": 206.86500549316406 }, { - "x": 1575.5889892578125, - "y": 227.552001953125 + "x": 1470.375, + "y": 205.9550018310547 }, { - "x": 1573.011962890625, - "y": 226.5500030517578 + "x": 1468.0439453125, + "y": 205.01499938964844 }, { - "x": 1570.447998046875, - "y": 225.51600646972656 + "x": 1465.7249755859375, + "y": 204.04600524902344 }, { - "x": 1567.89697265625, - "y": 224.4510040283203 + "x": 1463.41796875, + "y": 203.04800415039062 }, { - "x": 1565.3599853515625, - "y": 223.35299682617188 + "x": 1461.1240234375, + "y": 202.02099609375 }, { - "x": 1562.8370361328125, - "y": 222.22300720214844 + "x": 1458.843994140625, + "y": 200.96499633789062 }, { - "x": 1560.3280029296875, - "y": 221.06100463867188 + "x": 1456.5760498046875, + "y": 199.88099670410156 }, { - "x": 1557.833984375, - "y": 219.86900329589844 + "x": 1457.1510009765625, + "y": 200.20199584960938 }, { - "x": 1555.35498046875, - "y": 218.64500427246094 - }, - { - "x": 1555.3690185546875, - "y": 218.69000244140625 - }, - { - "x": 1551.68701171875, - "y": 216.75599670410156 + "x": 1453.4420166015625, + "y": 198.31900024414062 } ], "isCurve": true, @@ -6016,312 +5872,300 @@ "link": "", "route": [ { - "x": 1497.68701171875, - "y": 176.80799865722656 - }, - { - "x": 1497.4620361328125, - "y": 176.58200073242188 - }, - { - "x": 1495.531982421875, - "y": 174.60299682617188 - }, - { - "x": 1493.6259765625, - "y": 172.60000610351562 + "x": 1399.4420166015625, + "y": 158.20899963378906 }, { - "x": 1491.7469482421875, - "y": 170.572998046875 + "x": 1398.2060546875, + "y": 156.90899658203125 }, { - "x": 1489.8919677734375, - "y": 168.52200317382812 + "x": 1396.4969482421875, + "y": 155.0659942626953 }, { - "x": 1488.06396484375, - "y": 166.447998046875 + "x": 1394.81103515625, + "y": 153.20199584960938 }, { - "x": 1486.261962890625, - "y": 164.3520050048828 + "x": 1393.1490478515625, + "y": 151.31700134277344 }, { - "x": 1484.487060546875, - "y": 162.23300170898438 + "x": 1391.510986328125, + "y": 149.41099548339844 }, { - "x": 1482.738037109375, - "y": 160.0919952392578 + "x": 1389.89697265625, + "y": 147.48399353027344 }, { - "x": 1481.0159912109375, - "y": 157.9290008544922 + "x": 1388.3070068359375, + "y": 145.53799438476562 }, { - "x": 1479.322021484375, - "y": 155.74400329589844 + "x": 1386.741943359375, + "y": 143.5709991455078 }, { - "x": 1477.655029296875, - "y": 153.53900146484375 + "x": 1385.2010498046875, + "y": 141.58599853515625 }, { - "x": 1476.0159912109375, - "y": 151.31199645996094 + "x": 1383.68603515625, + "y": 139.5800018310547 }, { - "x": 1474.405029296875, - "y": 149.06500244140625 + "x": 1382.196044921875, + "y": 137.5570068359375 }, { - "x": 1472.822021484375, - "y": 146.7989959716797 + "x": 1380.7320556640625, + "y": 135.51400756835938 }, { - "x": 1471.2679443359375, - "y": 144.51199340820312 + "x": 1379.29296875, + "y": 133.4530029296875 }, { - "x": 1469.7430419921875, - "y": 142.20599365234375 + "x": 1377.8800048828125, + "y": 131.375 }, { - "x": 1468.2469482421875, - "y": 139.88099670410156 + "x": 1376.4940185546875, + "y": 129.2779998779297 }, { - "x": 1466.781005859375, - "y": 137.53799438476562 + "x": 1375.134033203125, + "y": 127.16500091552734 }, { - "x": 1465.343994140625, - "y": 135.17599487304688 + "x": 1373.801025390625, + "y": 125.03399658203125 }, { - "x": 1463.93603515625, - "y": 132.7969970703125 + "x": 1372.4940185546875, + "y": 122.88700103759766 }, { - "x": 1462.5589599609375, - "y": 130.39999389648438 + "x": 1371.2149658203125, + "y": 120.7239990234375 }, { - "x": 1461.2120361328125, - "y": 127.98500061035156 + "x": 1369.9630126953125, + "y": 118.54499816894531 }, { - "x": 1459.89501953125, - "y": 125.55400085449219 + "x": 1368.738037109375, + "y": 116.3499984741211 }, { - "x": 1458.6090087890625, - "y": 123.10700225830078 + "x": 1367.541015625, + "y": 114.13999938964844 }, { - "x": 1457.35400390625, - "y": 120.64399719238281 + "x": 1366.3719482421875, + "y": 111.91500091552734 }, { - "x": 1456.1300048828125, - "y": 118.16500091552734 + "x": 1365.23095703125, + "y": 109.6760025024414 }, { - "x": 1454.93798828125, - "y": 115.6709976196289 + "x": 1364.1180419921875, + "y": 107.4229965209961 }, { - "x": 1453.7760009765625, - "y": 113.16200256347656 + "x": 1363.0340576171875, + "y": 105.15499877929688 }, { - "x": 1452.64599609375, - "y": 110.63899993896484 + "x": 1361.97802734375, + "y": 102.875 }, { - "x": 1451.5479736328125, - "y": 108.10199737548828 + "x": 1360.9510498046875, + "y": 100.58100128173828 }, { - "x": 1450.4830322265625, - "y": 105.5510025024414 + "x": 1359.9530029296875, + "y": 98.27400207519531 }, { - "x": 1449.448974609375, - "y": 102.98699951171875 + "x": 1358.9840087890625, + "y": 95.95500183105469 }, { - "x": 1448.447021484375, - "y": 100.41000366210938 + "x": 1358.0439453125, + "y": 93.6240005493164 }, { - "x": 1447.47802734375, - "y": 97.82099914550781 + "x": 1357.134033203125, + "y": 91.28199768066406 }, { - "x": 1446.5419921875, - "y": 95.22000122070312 + "x": 1356.2530517578125, + "y": 88.9280014038086 }, { - "x": 1445.637939453125, - "y": 92.60700225830078 + "x": 1355.4010009765625, + "y": 86.56300354003906 }, { - "x": 1444.7669677734375, - "y": 89.98300170898438 + "x": 1354.5799560546875, + "y": 84.18800354003906 }, { - "x": 1443.928955078125, - "y": 87.3489990234375 + "x": 1353.7879638671875, + "y": 81.8030014038086 }, { - "x": 1443.125, - "y": 84.7040023803711 + "x": 1353.0269775390625, + "y": 79.40799713134766 }, { - "x": 1442.35302734375, - "y": 82.04900360107422 + "x": 1352.2950439453125, + "y": 77.00299835205078 }, { - "x": 1441.615966796875, - "y": 79.38500213623047 + "x": 1351.593994140625, + "y": 74.58999633789062 }, { - "x": 1440.9110107421875, - "y": 76.71099853515625 + "x": 1350.9229736328125, + "y": 72.16799926757812 }, { - "x": 1440.240966796875, - "y": 74.02899932861328 + "x": 1350.282958984375, + "y": 69.73699951171875 }, { - "x": 1439.60400390625, - "y": 71.33899688720703 + "x": 1349.6729736328125, + "y": 67.29900360107422 }, { - "x": 1439.0009765625, - "y": 68.64099884033203 + "x": 1349.093994140625, + "y": 64.85399627685547 }, { - "x": 1438.4310302734375, - "y": 65.93599700927734 + "x": 1348.5460205078125, + "y": 62.4010009765625 }, { - "x": 1437.89599609375, - "y": 63.222999572753906 + "x": 1348.0279541015625, + "y": 59.941001892089844 }, { - "x": 1437.39501953125, - "y": 60.505001068115234 + "x": 1347.5419921875, + "y": 57.47600173950195 }, { - "x": 1436.928955078125, - "y": 57.779998779296875 + "x": 1347.0870361328125, + "y": 55.00400161743164 }, { - "x": 1436.4959716796875, - "y": 55.04899978637695 + "x": 1346.6619873046875, + "y": 52.527000427246094 }, { - "x": 1436.0980224609375, - "y": 52.3129997253418 + "x": 1346.26904296875, + "y": 50.04499816894531 }, { - "x": 1435.7340087890625, - "y": 49.573001861572266 + "x": 1345.906982421875, + "y": 47.55799865722656 }, { - "x": 1435.405029296875, - "y": 46.827999114990234 + "x": 1345.5770263671875, + "y": 45.066001892089844 }, { - "x": 1435.1099853515625, - "y": 44.07899856567383 + "x": 1345.2769775390625, + "y": 42.57099914550781 }, { - "x": 1434.8499755859375, - "y": 41.32699966430664 + "x": 1345.009033203125, + "y": 40.071998596191406 }, { - "x": 1434.625, - "y": 38.57099914550781 + "x": 1344.77294921875, + "y": 37.56999969482422 }, { - "x": 1434.4339599609375, - "y": 35.8129997253418 + "x": 1344.5679931640625, + "y": 35.064998626708984 }, { - "x": 1434.2769775390625, - "y": 33.053001403808594 + "x": 1344.39404296875, + "y": 32.55799865722656 }, { - "x": 1434.156005859375, - "y": 30.291000366210938 + "x": 1344.251953125, + "y": 30.04800033569336 }, { - "x": 1434.0689697265625, - "y": 27.527999877929688 + "x": 1344.1419677734375, + "y": 27.538000106811523 }, { - "x": 1434.0169677734375, - "y": 24.763999938964844 + "x": 1344.06298828125, + "y": 25.025999069213867 }, { - "x": 1434, - "y": 22 + "x": 1344.0150146484375, + "y": 22.51300048828125 }, { - "x": 1434.0169677734375, - "y": 19.235000610351562 + "x": 1344, + "y": 20 }, { - "x": 1434.0689697265625, - "y": 16.47100067138672 + "x": 1344.0150146484375, + "y": 17.486000061035156 }, { - "x": 1434.156005859375, - "y": 13.708000183105469 + "x": 1344.06298828125, + "y": 14.972999572753906 }, { - "x": 1434.2769775390625, - "y": 10.946000099182129 + "x": 1344.1419677734375, + "y": 12.461000442504883 }, { - "x": 1434.4339599609375, - "y": 8.185999870300293 + "x": 1344.251953125, + "y": 9.951000213623047 }, { - "x": 1434.625, - "y": 5.427999973297119 + "x": 1344.39404296875, + "y": 7.440999984741211 }, { - "x": 1434.8499755859375, - "y": 2.671999931335449 + "x": 1344.5679931640625, + "y": 4.934000015258789 }, { - "x": 1435.1099853515625, - "y": -0.07900000363588333 + "x": 1344.77294921875, + "y": 2.428999900817871 }, { - "x": 1435.405029296875, - "y": -2.828000068664551 + "x": 1345.009033203125, + "y": -0.07199999690055847 }, { - "x": 1435.7340087890625, - "y": -5.572999954223633 + "x": 1345.2769775390625, + "y": -2.571000099182129 }, { - "x": 1436.0980224609375, - "y": -8.312999725341797 + "x": 1345.5770263671875, + "y": -5.065999984741211 }, { - "x": 1436.1409912109375, - "y": -8.876999855041504 + "x": 1345.489013671875, + "y": -4.686999797821045 }, { - "x": 1436.802001953125, - "y": -12.982999801635742 + "x": 1346.0880126953125, + "y": -8.803000450134277 } ], "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 15bd39d32a..b1b31e77f0 100644 --- a/e2etests/testdata/txtar/cycle-diagram/dagre/sketch.exp.svg +++ b/e2etests/testdata/txtar/cycle-diagram/dagre/sketch.exp.svg @@ -1,9 +1,9 @@ -abcdabcababcdefabcde - - - - - - - - - - - - - - - - - - - - - + .d2-3510071088 .fill-N1{fill:#0A0F25;} + .d2-3510071088 .fill-N2{fill:#676C7E;} + .d2-3510071088 .fill-N3{fill:#9499AB;} + .d2-3510071088 .fill-N4{fill:#CFD2DD;} + .d2-3510071088 .fill-N5{fill:#DEE1EB;} + .d2-3510071088 .fill-N6{fill:#EEF1F8;} + .d2-3510071088 .fill-N7{fill:#FFFFFF;} + .d2-3510071088 .fill-B1{fill:#0D32B2;} + .d2-3510071088 .fill-B2{fill:#0D32B2;} + .d2-3510071088 .fill-B3{fill:#E3E9FD;} + .d2-3510071088 .fill-B4{fill:#E3E9FD;} + .d2-3510071088 .fill-B5{fill:#EDF0FD;} + .d2-3510071088 .fill-B6{fill:#F7F8FE;} + .d2-3510071088 .fill-AA2{fill:#4A6FF3;} + .d2-3510071088 .fill-AA4{fill:#EDF0FD;} + .d2-3510071088 .fill-AA5{fill:#F7F8FE;} + .d2-3510071088 .fill-AB4{fill:#EDF0FD;} + .d2-3510071088 .fill-AB5{fill:#F7F8FE;} + .d2-3510071088 .stroke-N1{stroke:#0A0F25;} + .d2-3510071088 .stroke-N2{stroke:#676C7E;} + .d2-3510071088 .stroke-N3{stroke:#9499AB;} + .d2-3510071088 .stroke-N4{stroke:#CFD2DD;} + .d2-3510071088 .stroke-N5{stroke:#DEE1EB;} + .d2-3510071088 .stroke-N6{stroke:#EEF1F8;} + .d2-3510071088 .stroke-N7{stroke:#FFFFFF;} + .d2-3510071088 .stroke-B1{stroke:#0D32B2;} + .d2-3510071088 .stroke-B2{stroke:#0D32B2;} + .d2-3510071088 .stroke-B3{stroke:#E3E9FD;} + .d2-3510071088 .stroke-B4{stroke:#E3E9FD;} + .d2-3510071088 .stroke-B5{stroke:#EDF0FD;} + .d2-3510071088 .stroke-B6{stroke:#F7F8FE;} + .d2-3510071088 .stroke-AA2{stroke:#4A6FF3;} + .d2-3510071088 .stroke-AA4{stroke:#EDF0FD;} + .d2-3510071088 .stroke-AA5{stroke:#F7F8FE;} + .d2-3510071088 .stroke-AB4{stroke:#EDF0FD;} + .d2-3510071088 .stroke-AB5{stroke:#F7F8FE;} + .d2-3510071088 .background-color-N1{background-color:#0A0F25;} + .d2-3510071088 .background-color-N2{background-color:#676C7E;} + .d2-3510071088 .background-color-N3{background-color:#9499AB;} + .d2-3510071088 .background-color-N4{background-color:#CFD2DD;} + .d2-3510071088 .background-color-N5{background-color:#DEE1EB;} + .d2-3510071088 .background-color-N6{background-color:#EEF1F8;} + .d2-3510071088 .background-color-N7{background-color:#FFFFFF;} + .d2-3510071088 .background-color-B1{background-color:#0D32B2;} + .d2-3510071088 .background-color-B2{background-color:#0D32B2;} + .d2-3510071088 .background-color-B3{background-color:#E3E9FD;} + .d2-3510071088 .background-color-B4{background-color:#E3E9FD;} + .d2-3510071088 .background-color-B5{background-color:#EDF0FD;} + .d2-3510071088 .background-color-B6{background-color:#F7F8FE;} + .d2-3510071088 .background-color-AA2{background-color:#4A6FF3;} + .d2-3510071088 .background-color-AA4{background-color:#EDF0FD;} + .d2-3510071088 .background-color-AA5{background-color:#F7F8FE;} + .d2-3510071088 .background-color-AB4{background-color:#EDF0FD;} + .d2-3510071088 .background-color-AB5{background-color:#F7F8FE;} + .d2-3510071088 .color-N1{color:#0A0F25;} + .d2-3510071088 .color-N2{color:#676C7E;} + .d2-3510071088 .color-N3{color:#9499AB;} + .d2-3510071088 .color-N4{color:#CFD2DD;} + .d2-3510071088 .color-N5{color:#DEE1EB;} + .d2-3510071088 .color-N6{color:#EEF1F8;} + .d2-3510071088 .color-N7{color:#FFFFFF;} + .d2-3510071088 .color-B1{color:#0D32B2;} + .d2-3510071088 .color-B2{color:#0D32B2;} + .d2-3510071088 .color-B3{color:#E3E9FD;} + .d2-3510071088 .color-B4{color:#E3E9FD;} + .d2-3510071088 .color-B5{color:#EDF0FD;} + .d2-3510071088 .color-B6{color:#F7F8FE;} + .d2-3510071088 .color-AA2{color:#4A6FF3;} + .d2-3510071088 .color-AA4{color:#EDF0FD;} + .d2-3510071088 .color-AA5{color:#F7F8FE;} + .d2-3510071088 .color-AB4{color:#EDF0FD;} + .d2-3510071088 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker-d2-3510071088);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker-d2-3510071088);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright-d2-3510071088);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright-d2-3510071088);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright-d2-3510071088);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright-d2-3510071088);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark-d2-3510071088);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright-d2-3510071088);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright-d2-3510071088);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright-d2-3510071088);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright-d2-3510071088);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker-d2-3510071088);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark-d2-3510071088);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal-d2-3510071088);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal-d2-3510071088);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright-d2-3510071088);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright-d2-3510071088);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright-d2-3510071088);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>abcdabcababcdefabcde + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/e2etests/testdata/txtar/cycle-diagram/elk/board.exp.json b/e2etests/testdata/txtar/cycle-diagram/elk/board.exp.json index e740172e7d..bc4abcf553 100644 --- a/e2etests/testdata/txtar/cycle-diagram/elk/board.exp.json +++ b/e2etests/testdata/txtar/cycle-diagram/elk/board.exp.json @@ -18,8 +18,8 @@ "x": 12, "y": 12 }, - "width": 494, - "height": 507, + "width": 454, + "height": 466, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -57,7 +57,7 @@ "type": "rectangle", "pos": { "x": -14, - "y": -241 + "y": -221 }, "width": 53, "height": 66, @@ -98,7 +98,7 @@ "id": "1.b", "type": "rectangle", "pos": { - "x": 205, + "x": 185, "y": -21 }, "width": 53, @@ -141,7 +141,7 @@ "type": "rectangle", "pos": { "x": -14, - "y": 199 + "y": 179 }, "width": 53, "height": 66, @@ -182,7 +182,7 @@ "id": "1.d", "type": "rectangle", "pos": { - "x": -235, + "x": -215, "y": -20 }, "width": 54, @@ -224,11 +224,11 @@ "id": "2", "type": "cycle", "pos": { - "x": 525, - "y": 66 + "x": 485, + "y": 61 }, - "width": 435, - "height": 397, + "width": 400, + "height": 367, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -265,8 +265,8 @@ "id": "2.a", "type": "rectangle", "pos": { - "x": 499, - "y": -186 + "x": 459, + "y": -171 }, "width": 53, "height": 66, @@ -307,8 +307,8 @@ "id": "2.b", "type": "rectangle", "pos": { - "x": 689, - "y": 143 + "x": 632, + "y": 128 }, "width": 53, "height": 66, @@ -349,8 +349,8 @@ "id": "2.c", "type": "rectangle", "pos": { - "x": 308, - "y": 144 + "x": 285, + "y": 129 }, "width": 53, "height": 66, @@ -391,11 +391,11 @@ "id": "3", "type": "cycle", "pos": { - "x": 979, + "x": 904, "y": 12 }, "width": 53, - "height": 507, + "height": 466, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -432,8 +432,8 @@ "id": "3.a", "type": "rectangle", "pos": { - "x": 953, - "y": -241 + "x": 878, + "y": -221 }, "width": 53, "height": 66, @@ -474,8 +474,8 @@ "id": "3.b", "type": "rectangle", "pos": { - "x": 953, - "y": 199 + "x": 878, + "y": 179 }, "width": 53, "height": 66, @@ -516,11 +516,11 @@ "id": "4", "type": "cycle", "pos": { - "x": 1052, + "x": 977, "y": 12 }, - "width": 435, - "height": 507, + "width": 400, + "height": 466, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -557,8 +557,8 @@ "id": "4.a", "type": "rectangle", "pos": { - "x": 1026, - "y": -241 + "x": 951, + "y": -221 }, "width": 53, "height": 66, @@ -599,8 +599,8 @@ "id": "4.b", "type": "rectangle", "pos": { - "x": 1216, - "y": -131 + "x": 1124, + "y": -121 }, "width": 53, "height": 66, @@ -641,8 +641,8 @@ "id": "4.c", "type": "rectangle", "pos": { - "x": 1216, - "y": 88 + "x": 1124, + "y": 78 }, "width": 53, "height": 66, @@ -683,8 +683,8 @@ "id": "4.d", "type": "rectangle", "pos": { - "x": 1025, - "y": 199 + "x": 950, + "y": 179 }, "width": 54, "height": 66, @@ -725,8 +725,8 @@ "id": "4.e", "type": "rectangle", "pos": { - "x": 835, - "y": 89 + "x": 778, + "y": 79 }, "width": 53, "height": 66, @@ -767,8 +767,8 @@ "id": "4.f", "type": "rectangle", "pos": { - "x": 836, - "y": -131 + "x": 779, + "y": -121 }, "width": 51, "height": 66, @@ -809,11 +809,11 @@ "id": "5", "type": "cycle", "pos": { - "x": 1506, - "y": 33 + "x": 1397, + "y": 31 }, - "width": 472, - "height": 464, + "width": 434, + "height": 428, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -850,8 +850,8 @@ "id": "5.a", "type": "rectangle", "pos": { - "x": 1480, - "y": -219 + "x": 1370, + "y": -201 }, "width": 53, "height": 66, @@ -892,8 +892,8 @@ "id": "5.b", "type": "rectangle", "pos": { - "x": 1689, - "y": -67 + "x": 1561, + "y": -63 }, "width": 53, "height": 66, @@ -934,8 +934,8 @@ "id": "5.c", "type": "rectangle", "pos": { - "x": 1609, - "y": 177 + "x": 1488, + "y": 159 }, "width": 53, "height": 66, @@ -976,8 +976,8 @@ "id": "5.d", "type": "rectangle", "pos": { - "x": 1350, - "y": 177 + "x": 1252, + "y": 159 }, "width": 54, "height": 66, @@ -1018,8 +1018,8 @@ "id": "5.e", "type": "rectangle", "pos": { - "x": 1270, - "y": -67 + "x": 1180, + "y": -63 }, "width": 53, "height": 66, @@ -1085,342 +1085,334 @@ "route": [ { "x": 38.5, - "y": -206.39199829101562 + "y": -186.22999572753906 }, { - "x": 39.573001861572266, - "y": -206.26499938964844 + "x": 40.18000030517578, + "y": -186.00399780273438 }, { - "x": 42.99800109863281, - "y": -205.80499267578125 + "x": 43.2859992980957, + "y": -185.53700256347656 }, { - "x": 46.415000915527344, - "y": -205.29100036621094 + "x": 46.3849983215332, + "y": -185.02099609375 }, { - "x": 49.82400131225586, - "y": -204.7239990234375 + "x": 49.47600173950195, + "y": -184.45700073242188 }, { - "x": 53.222999572753906, - "y": -204.10299682617188 + "x": 52.55699920654297, + "y": -183.843994140625 }, { - "x": 56.612998962402344, - "y": -203.4290008544922 + "x": 55.62799835205078, + "y": -183.18299865722656 }, { - "x": 59.99100112915039, - "y": -202.7010040283203 + "x": 58.68899917602539, + "y": -182.47300720214844 }, { - "x": 63.356998443603516, - "y": -201.92100524902344 + "x": 61.73699951171875, + "y": -181.71600341796875 }, { - "x": 66.71099853515625, - "y": -201.08799743652344 + "x": 64.77400207519531, + "y": -180.91099548339844 }, { - "x": 70.052001953125, - "y": -200.20199584960938 + "x": 67.7979965209961, + "y": -180.05799865722656 }, { - "x": 73.37799835205078, - "y": -199.26400756835938 + "x": 70.80799865722656, + "y": -179.1580047607422 }, { - "x": 76.68800354003906, - "y": -198.2740020751953 + "x": 73.8030014038086, + "y": -178.21099853515625 }, { - "x": 79.98300170898438, - "y": -197.23199462890625 + "x": 76.78299713134766, + "y": -177.2169952392578 }, { - "x": 83.26100158691406, - "y": -196.13800048828125 + "x": 79.74700164794922, + "y": -176.17599487304688 }, { - "x": 86.52200317382812, - "y": -194.9929962158203 + "x": 82.69400024414062, + "y": -175.08799743652344 }, { - "x": 89.76399993896484, - "y": -193.7969970703125 + "x": 85.6240005493164, + "y": -173.9550018310547 }, { - "x": 92.98699951171875, - "y": -192.5500030517578 + "x": 88.53600311279297, + "y": -172.77499389648438 }, { - "x": 96.19000244140625, - "y": -191.2530059814453 + "x": 91.42900085449219, + "y": -171.5500030517578 }, { - "x": 99.37200164794922, - "y": -189.906005859375 + "x": 94.302001953125, + "y": -170.27999877929688 }, { - "x": 102.53299713134766, - "y": -188.50799560546875 + "x": 97.15499877929688, + "y": -168.96499633789062 }, { - "x": 105.6709976196289, - "y": -187.06100463867188 + "x": 99.98699951171875, + "y": -167.60499572753906 }, { - "x": 108.78600311279297, - "y": -185.5659942626953 + "x": 102.7979965209961, + "y": -166.2010040283203 }, { - "x": 111.87699890136719, - "y": -184.02099609375 + "x": 105.58499908447266, + "y": -164.7530059814453 }, { - "x": 114.94400024414062, - "y": -182.42799377441406 + "x": 108.3499984741211, + "y": -163.26100158691406 }, { - "x": 117.98500061035156, - "y": -180.78700256347656 + "x": 111.09100341796875, + "y": -161.7259979248047 }, { - "x": 121, - "y": -179.09800720214844 + "x": 113.80799865722656, + "y": -160.1479949951172 }, { - "x": 123.98899841308594, - "y": -177.36300659179688 + "x": 116.4990005493164, + "y": -158.5279998779297 }, { - "x": 126.9489974975586, - "y": -175.5800018310547 + "x": 119.16500091552734, + "y": -156.86500549316406 }, { - "x": 129.88099670410156, - "y": -173.7519989013672 + "x": 121.80400085449219, + "y": -155.16099548339844 }, { - "x": 132.78500366210938, - "y": -171.8769989013672 + "x": 124.41600036621094, + "y": -153.41600036621094 }, { - "x": 135.6580047607422, - "y": -169.95700073242188 + "x": 127.0009994506836, + "y": -151.62899780273438 }, { - "x": 138.50100708007812, - "y": -167.99200439453125 + "x": 129.5570068359375, + "y": -149.80299377441406 }, { - "x": 141.31199645996094, - "y": -165.98300170898438 + "x": 132.08399963378906, + "y": -147.93600463867188 }, { - "x": 144.0919952392578, - "y": -163.92999267578125 + "x": 134.58099365234375, + "y": -146.031005859375 }, { - "x": 146.83900451660156, - "y": -161.83399963378906 + "x": 137.04800415039062, + "y": -144.08599853515625 }, { - "x": 149.55299377441406, - "y": -159.69400024414062 + "x": 139.48399353027344, + "y": -142.1020050048828 }, { - "x": 152.23300170898438, - "y": -157.51199340820312 + "x": 141.88900756835938, + "y": -140.08099365234375 }, { - "x": 154.8780059814453, - "y": -155.28900146484375 + "x": 144.26199340820312, + "y": -138.02200317382812 }, { - "x": 157.48800659179688, - "y": -153.0240020751953 + "x": 146.6020050048828, + "y": -135.92599487304688 }, { - "x": 160.06199645996094, - "y": -150.71800231933594 + "x": 148.90899658203125, + "y": -133.79299926757812 }, { - "x": 162.60000610351562, - "y": -148.3730010986328 + "x": 151.1820068359375, + "y": -131.625 }, { - "x": 165.10000610351562, - "y": -145.98699951171875 + "x": 153.42100524902344, + "y": -129.42100524902344 }, { - "x": 167.56300354003906, - "y": -143.56300354003906 + "x": 155.625, + "y": -127.18199920654297 }, { - "x": 169.98699951171875, - "y": -141.10000610351562 + "x": 157.79299926757812, + "y": -124.90899658203125 }, { - "x": 172.3730010986328, - "y": -138.60000610351562 + "x": 159.92599487304688, + "y": -122.60199737548828 }, { - "x": 174.71800231933594, - "y": -136.06199645996094 + "x": 162.02200317382812, + "y": -120.26200103759766 }, { - "x": 177.0240020751953, - "y": -133.48800659179688 + "x": 164.08099365234375, + "y": -117.88899993896484 }, { - "x": 179.28900146484375, - "y": -130.8780059814453 + "x": 166.1020050048828, + "y": -115.48400115966797 }, { - "x": 181.51199340820312, - "y": -128.23300170898438 + "x": 168.08599853515625, + "y": -113.0479965209961 }, { - "x": 183.69400024414062, - "y": -125.5530014038086 + "x": 170.031005859375, + "y": -110.58100128173828 }, { - "x": 185.83399963378906, - "y": -122.83899688720703 + "x": 171.93600463867188, + "y": -108.08399963378906 }, { - "x": 187.92999267578125, - "y": -120.09200286865234 + "x": 173.80299377441406, + "y": -105.55699920654297 }, { - "x": 189.98300170898438, - "y": -117.31199645996094 + "x": 175.62899780273438, + "y": -103.0009994506836 }, { - "x": 191.99200439453125, - "y": -114.5009994506836 + "x": 177.41600036621094, + "y": -100.41600036621094 }, { - "x": 193.95700073242188, - "y": -111.65799713134766 + "x": 179.16099548339844, + "y": -97.80400085449219 }, { - "x": 195.8769989013672, - "y": -108.78500366210938 + "x": 180.86500549316406, + "y": -95.16500091552734 }, { - "x": 197.7519989013672, - "y": -105.88099670410156 + "x": 182.5279998779297, + "y": -92.4990005493164 }, { - "x": 199.5800018310547, - "y": -102.9489974975586 + "x": 184.1479949951172, + "y": -89.80799865722656 }, { - "x": 201.36300659179688, - "y": -99.98899841308594 + "x": 185.7259979248047, + "y": -87.09100341796875 }, { - "x": 203.09800720214844, - "y": -97 + "x": 187.26100158691406, + "y": -84.3499984741211 }, { - "x": 204.78700256347656, - "y": -93.98500061035156 + "x": 188.7530059814453, + "y": -81.58499908447266 }, { - "x": 206.42799377441406, - "y": -90.94400024414062 + "x": 190.2010040283203, + "y": -78.7979965209961 }, { - "x": 208.02099609375, - "y": -87.87699890136719 + "x": 191.60499572753906, + "y": -75.98699951171875 }, { - "x": 209.5659942626953, - "y": -84.78600311279297 + "x": 192.96499633789062, + "y": -73.15499877929688 }, { - "x": 211.06100463867188, - "y": -81.6709976196289 + "x": 194.27999877929688, + "y": -70.302001953125 }, { - "x": 212.50799560546875, - "y": -78.53299713134766 + "x": 195.5500030517578, + "y": -67.42900085449219 }, { - "x": 213.906005859375, - "y": -75.37200164794922 + "x": 196.77499389648438, + "y": -64.53600311279297 }, { - "x": 215.2530059814453, - "y": -72.19000244140625 + "x": 197.9550018310547, + "y": -61.624000549316406 }, { - "x": 216.5500030517578, - "y": -68.98699951171875 + "x": 199.08799743652344, + "y": -58.694000244140625 }, { - "x": 217.7969970703125, - "y": -65.76399993896484 + "x": 200.17599487304688, + "y": -55.74700164794922 }, { - "x": 218.9929962158203, - "y": -62.52199935913086 + "x": 201.2169952392578, + "y": -52.78300094604492 }, { - "x": 220.13800048828125, - "y": -59.26100158691406 + "x": 202.21099853515625, + "y": -49.803001403808594 }, { - "x": 221.23199462890625, - "y": -55.983001708984375 + "x": 203.1580047607422, + "y": -46.80799865722656 }, { - "x": 222.2740020751953, - "y": -52.6879997253418 + "x": 204.05799865722656, + "y": -43.79800033569336 }, { - "x": 223.26400756835938, - "y": -49.37799835205078 + "x": 204.91099548339844, + "y": -40.77399826049805 }, { - "x": 224.20199584960938, - "y": -46.051998138427734 + "x": 205.71600341796875, + "y": -37.73699951171875 }, { - "x": 225.08799743652344, - "y": -42.71099853515625 + "x": 206.47300720214844, + "y": -34.68899917602539 }, { - "x": 225.92100524902344, - "y": -39.356998443603516 + "x": 207.18299865722656, + "y": -31.628000259399414 }, { - "x": 226.7010040283203, - "y": -35.99100112915039 + "x": 207.843994140625, + "y": -28.55699920654297 }, { - "x": 227.4290008544922, - "y": -32.612998962402344 + "x": 208.45700073242188, + "y": -25.47599983215332 }, { - "x": 228.10299682617188, - "y": -29.222999572753906 + "x": 208.5659942626953, + "y": -25.10099983215332 }, { - "x": 228.7239990234375, - "y": -25.823999404907227 - }, - { - "x": 228.8800048828125, - "y": -25.111000061035156 - }, - { - "x": 229.50399780273438, + "x": 209.2519989013672, "y": -21 } ], @@ -1456,344 +1448,336 @@ "link": "", "route": [ { - "x": 229.50399780273438, + "x": 209.2519989013672, "y": 45 }, { - "x": 229.29100036621094, - "y": 46.415000915527344 - }, - { - "x": 228.7239990234375, - "y": 49.82400131225586 - }, - { - "x": 228.10299682617188, - "y": 53.222999572753906 + "x": 209.02099609375, + "y": 46.3849983215332 }, { - "x": 227.4290008544922, - "y": 56.612998962402344 + "x": 208.45700073242188, + "y": 49.47600173950195 }, { - "x": 226.7010040283203, - "y": 59.99100112915039 + "x": 207.843994140625, + "y": 52.55699920654297 }, { - "x": 225.92100524902344, - "y": 63.356998443603516 + "x": 207.18299865722656, + "y": 55.62799835205078 }, { - "x": 225.08799743652344, - "y": 66.71099853515625 + "x": 206.47300720214844, + "y": 58.68899917602539 }, { - "x": 224.20199584960938, - "y": 70.052001953125 + "x": 205.71600341796875, + "y": 61.73699951171875 }, { - "x": 223.26400756835938, - "y": 73.37799835205078 + "x": 204.91099548339844, + "y": 64.77400207519531 }, { - "x": 222.2740020751953, - "y": 76.68800354003906 + "x": 204.05799865722656, + "y": 67.7979965209961 }, { - "x": 221.23199462890625, - "y": 79.98300170898438 + "x": 203.1580047607422, + "y": 70.80799865722656 }, { - "x": 220.13800048828125, - "y": 83.26100158691406 + "x": 202.21099853515625, + "y": 73.8030014038086 }, { - "x": 218.9929962158203, - "y": 86.52200317382812 + "x": 201.2169952392578, + "y": 76.78299713134766 }, { - "x": 217.7969970703125, - "y": 89.76399993896484 + "x": 200.17599487304688, + "y": 79.74700164794922 }, { - "x": 216.5500030517578, - "y": 92.98699951171875 + "x": 199.08799743652344, + "y": 82.69400024414062 }, { - "x": 215.2530059814453, - "y": 96.19000244140625 + "x": 197.9550018310547, + "y": 85.6240005493164 }, { - "x": 213.906005859375, - "y": 99.37200164794922 + "x": 196.77499389648438, + "y": 88.53600311279297 }, { - "x": 212.50799560546875, - "y": 102.53299713134766 + "x": 195.5500030517578, + "y": 91.42900085449219 }, { - "x": 211.06100463867188, - "y": 105.6709976196289 + "x": 194.27999877929688, + "y": 94.302001953125 }, { - "x": 209.5659942626953, - "y": 108.78600311279297 + "x": 192.96499633789062, + "y": 97.15499877929688 }, { - "x": 208.02099609375, - "y": 111.87699890136719 + "x": 191.60499572753906, + "y": 99.98699951171875 }, { - "x": 206.42799377441406, - "y": 114.94400024414062 + "x": 190.2010040283203, + "y": 102.7979965209961 }, { - "x": 204.78700256347656, - "y": 117.98500061035156 + "x": 188.7530059814453, + "y": 105.58499908447266 }, { - "x": 203.09800720214844, - "y": 121 + "x": 187.26100158691406, + "y": 108.3499984741211 }, { - "x": 201.36300659179688, - "y": 123.98899841308594 + "x": 185.7259979248047, + "y": 111.09100341796875 }, { - "x": 199.5800018310547, - "y": 126.9489974975586 + "x": 184.1479949951172, + "y": 113.80799865722656 }, { - "x": 197.7519989013672, - "y": 129.88099670410156 + "x": 182.5279998779297, + "y": 116.4990005493164 }, { - "x": 195.8769989013672, - "y": 132.78500366210938 + "x": 180.86500549316406, + "y": 119.16500091552734 }, { - "x": 193.95700073242188, - "y": 135.6580047607422 + "x": 179.16099548339844, + "y": 121.80400085449219 }, { - "x": 191.99200439453125, - "y": 138.50100708007812 + "x": 177.41600036621094, + "y": 124.41600036621094 }, { - "x": 189.98300170898438, - "y": 141.31199645996094 + "x": 175.62899780273438, + "y": 127.0009994506836 }, { - "x": 187.92999267578125, - "y": 144.0919952392578 + "x": 173.80299377441406, + "y": 129.5570068359375 }, { - "x": 185.83399963378906, - "y": 146.83900451660156 + "x": 171.93600463867188, + "y": 132.08399963378906 }, { - "x": 183.69400024414062, - "y": 149.55299377441406 + "x": 170.031005859375, + "y": 134.58099365234375 }, { - "x": 181.51199340820312, - "y": 152.23300170898438 + "x": 168.08599853515625, + "y": 137.04800415039062 }, { - "x": 179.28900146484375, - "y": 154.8780059814453 + "x": 166.1020050048828, + "y": 139.48399353027344 }, { - "x": 177.0240020751953, - "y": 157.48800659179688 + "x": 164.08099365234375, + "y": 141.88900756835938 }, { - "x": 174.71800231933594, - "y": 160.06199645996094 + "x": 162.02200317382812, + "y": 144.26199340820312 }, { - "x": 172.3730010986328, - "y": 162.60000610351562 + "x": 159.92599487304688, + "y": 146.6020050048828 }, { - "x": 169.98699951171875, - "y": 165.10000610351562 + "x": 157.79299926757812, + "y": 148.90899658203125 }, { - "x": 167.56300354003906, - "y": 167.56300354003906 + "x": 155.625, + "y": 151.1820068359375 }, { - "x": 165.10000610351562, - "y": 169.98699951171875 + "x": 153.42100524902344, + "y": 153.42100524902344 }, { - "x": 162.60000610351562, - "y": 172.3730010986328 + "x": 151.1820068359375, + "y": 155.625 }, { - "x": 160.06199645996094, - "y": 174.71800231933594 + "x": 148.90899658203125, + "y": 157.79299926757812 }, { - "x": 157.48800659179688, - "y": 177.0240020751953 + "x": 146.6020050048828, + "y": 159.92599487304688 }, { - "x": 154.8780059814453, - "y": 179.28900146484375 + "x": 144.26199340820312, + "y": 162.02200317382812 }, { - "x": 152.23300170898438, - "y": 181.51199340820312 + "x": 141.88900756835938, + "y": 164.08099365234375 }, { - "x": 149.55299377441406, - "y": 183.69400024414062 + "x": 139.48399353027344, + "y": 166.1020050048828 }, { - "x": 146.83900451660156, - "y": 185.83399963378906 + "x": 137.04800415039062, + "y": 168.08599853515625 }, { - "x": 144.0919952392578, - "y": 187.92999267578125 + "x": 134.58099365234375, + "y": 170.031005859375 }, { - "x": 141.31199645996094, - "y": 189.98300170898438 + "x": 132.08399963378906, + "y": 171.93600463867188 }, { - "x": 138.50100708007812, - "y": 191.99200439453125 + "x": 129.5570068359375, + "y": 173.80299377441406 }, { - "x": 135.6580047607422, - "y": 193.95700073242188 + "x": 127.0009994506836, + "y": 175.62899780273438 }, { - "x": 132.78500366210938, - "y": 195.8769989013672 + "x": 124.41600036621094, + "y": 177.41600036621094 }, { - "x": 129.88099670410156, - "y": 197.7519989013672 + "x": 121.80400085449219, + "y": 179.16099548339844 }, { - "x": 126.9489974975586, - "y": 199.5800018310547 + "x": 119.16500091552734, + "y": 180.86500549316406 }, { - "x": 123.98899841308594, - "y": 201.36300659179688 + "x": 116.4990005493164, + "y": 182.5279998779297 }, { - "x": 121, - "y": 203.09800720214844 + "x": 113.80799865722656, + "y": 184.1479949951172 }, { - "x": 117.98500061035156, - "y": 204.78700256347656 + "x": 111.09100341796875, + "y": 185.7259979248047 }, { - "x": 114.94400024414062, - "y": 206.42799377441406 + "x": 108.3499984741211, + "y": 187.26100158691406 }, { - "x": 111.87699890136719, - "y": 208.02099609375 + "x": 105.58499908447266, + "y": 188.7530059814453 }, { - "x": 108.78600311279297, - "y": 209.5659942626953 + "x": 102.7979965209961, + "y": 190.2010040283203 }, { - "x": 105.6709976196289, - "y": 211.06100463867188 + "x": 99.98699951171875, + "y": 191.60499572753906 }, { - "x": 102.53299713134766, - "y": 212.50799560546875 + "x": 97.15499877929688, + "y": 192.96499633789062 }, { - "x": 99.37200164794922, - "y": 213.906005859375 + "x": 94.302001953125, + "y": 194.27999877929688 }, { - "x": 96.19000244140625, - "y": 215.2530059814453 + "x": 91.42900085449219, + "y": 195.5500030517578 }, { - "x": 92.98699951171875, - "y": 216.5500030517578 + "x": 88.53600311279297, + "y": 196.77499389648438 }, { - "x": 89.76399993896484, - "y": 217.7969970703125 + "x": 85.6240005493164, + "y": 197.9550018310547 }, { - "x": 86.52200317382812, - "y": 218.9929962158203 + "x": 82.69400024414062, + "y": 199.08799743652344 }, { - "x": 83.26100158691406, - "y": 220.13800048828125 + "x": 79.74700164794922, + "y": 200.17599487304688 }, { - "x": 79.98300170898438, - "y": 221.23199462890625 + "x": 76.78299713134766, + "y": 201.2169952392578 }, { - "x": 76.68800354003906, - "y": 222.2740020751953 + "x": 73.8030014038086, + "y": 202.21099853515625 }, { - "x": 73.37799835205078, - "y": 223.26400756835938 + "x": 70.80799865722656, + "y": 203.1580047607422 }, { - "x": 70.052001953125, - "y": 224.20199584960938 + "x": 67.7979965209961, + "y": 204.05799865722656 }, { - "x": 66.71099853515625, - "y": 225.08799743652344 + "x": 64.77400207519531, + "y": 204.91099548339844 }, { - "x": 63.356998443603516, - "y": 225.92100524902344 + "x": 61.73699951171875, + "y": 205.71600341796875 }, { - "x": 59.99100112915039, - "y": 226.7010040283203 + "x": 58.68899917602539, + "y": 206.47300720214844 }, { - "x": 56.612998962402344, - "y": 227.4290008544922 + "x": 55.62799835205078, + "y": 207.18299865722656 }, { - "x": 53.222999572753906, - "y": 228.10299682617188 + "x": 52.55699920654297, + "y": 207.843994140625 }, { - "x": 49.82400131225586, - "y": 228.7239990234375 + "x": 49.47600173950195, + "y": 208.45700073242188 }, { - "x": 46.415000915527344, - "y": 229.29100036621094 + "x": 46.3849983215332, + "y": 209.02099609375 }, { - "x": 42.99800109863281, - "y": 229.80499267578125 + "x": 43.2859992980957, + "y": 209.53700256347656 }, { - "x": 42.62799835205078, - "y": 229.89100646972656 + "x": 42.62200164794922, + "y": 209.6790008544922 }, { "x": 38.5, - "y": 230.39199829101562 + "y": 210.22999572753906 } ], "isCurve": true, @@ -1829,342 +1813,334 @@ "route": [ { "x": -14.49899959564209, - "y": 230.39199829101562 - }, - { - "x": -15.572999954223633, - "y": 230.26499938964844 + "y": 210.22999572753906 }, { - "x": -18.99799919128418, - "y": 229.80499267578125 + "x": -16.18000030517578, + "y": 210.00399780273438 }, { - "x": -22.415000915527344, - "y": 229.29100036621094 + "x": -19.285999298095703, + "y": 209.53700256347656 }, { - "x": -25.823999404907227, - "y": 228.7239990234375 + "x": -22.385000228881836, + "y": 209.02099609375 }, { - "x": -29.222999572753906, - "y": 228.10299682617188 + "x": -25.47599983215332, + "y": 208.45700073242188 }, { - "x": -32.612998962402344, - "y": 227.4290008544922 + "x": -28.55699920654297, + "y": 207.843994140625 }, { - "x": -35.99100112915039, - "y": 226.7010040283203 + "x": -31.628000259399414, + "y": 207.18299865722656 }, { - "x": -39.356998443603516, - "y": 225.92100524902344 + "x": -34.68899917602539, + "y": 206.47300720214844 }, { - "x": -42.71099853515625, - "y": 225.08799743652344 + "x": -37.73699951171875, + "y": 205.71600341796875 }, { - "x": -46.051998138427734, - "y": 224.20199584960938 + "x": -40.77399826049805, + "y": 204.91099548339844 }, { - "x": -49.37799835205078, - "y": 223.26400756835938 + "x": -43.79800033569336, + "y": 204.05799865722656 }, { - "x": -52.6879997253418, - "y": 222.2740020751953 + "x": -46.80799865722656, + "y": 203.1580047607422 }, { - "x": -55.983001708984375, - "y": 221.23199462890625 + "x": -49.803001403808594, + "y": 202.21099853515625 }, { - "x": -59.26100158691406, - "y": 220.13800048828125 + "x": -52.78300094604492, + "y": 201.2169952392578 }, { - "x": -62.52199935913086, - "y": 218.9929962158203 + "x": -55.74700164794922, + "y": 200.17599487304688 }, { - "x": -65.76399993896484, - "y": 217.7969970703125 + "x": -58.694000244140625, + "y": 199.08799743652344 }, { - "x": -68.98699951171875, - "y": 216.5500030517578 + "x": -61.624000549316406, + "y": 197.9550018310547 }, { - "x": -72.19000244140625, - "y": 215.2530059814453 + "x": -64.53600311279297, + "y": 196.77499389648438 }, { - "x": -75.37200164794922, - "y": 213.906005859375 + "x": -67.42900085449219, + "y": 195.5500030517578 }, { - "x": -78.53299713134766, - "y": 212.50799560546875 + "x": -70.302001953125, + "y": 194.27999877929688 }, { - "x": -81.6709976196289, - "y": 211.06100463867188 + "x": -73.15499877929688, + "y": 192.96499633789062 }, { - "x": -84.78600311279297, - "y": 209.5659942626953 + "x": -75.98699951171875, + "y": 191.60499572753906 }, { - "x": -87.87699890136719, - "y": 208.02099609375 + "x": -78.7979965209961, + "y": 190.2010040283203 }, { - "x": -90.94400024414062, - "y": 206.42799377441406 + "x": -81.58499908447266, + "y": 188.7530059814453 }, { - "x": -93.98500061035156, - "y": 204.78700256347656 + "x": -84.3499984741211, + "y": 187.26100158691406 }, { - "x": -97, - "y": 203.09800720214844 + "x": -87.09100341796875, + "y": 185.7259979248047 }, { - "x": -99.98899841308594, - "y": 201.36300659179688 + "x": -89.80799865722656, + "y": 184.1479949951172 }, { - "x": -102.9489974975586, - "y": 199.5800018310547 + "x": -92.4990005493164, + "y": 182.5279998779297 }, { - "x": -105.88099670410156, - "y": 197.7519989013672 + "x": -95.16500091552734, + "y": 180.86500549316406 }, { - "x": -108.78500366210938, - "y": 195.8769989013672 + "x": -97.80400085449219, + "y": 179.16099548339844 }, { - "x": -111.65799713134766, - "y": 193.95700073242188 + "x": -100.41600036621094, + "y": 177.41600036621094 }, { - "x": -114.5009994506836, - "y": 191.99200439453125 + "x": -103.0009994506836, + "y": 175.62899780273438 }, { - "x": -117.31199645996094, - "y": 189.98300170898438 + "x": -105.55699920654297, + "y": 173.80299377441406 }, { - "x": -120.09200286865234, - "y": 187.92999267578125 + "x": -108.08399963378906, + "y": 171.93600463867188 }, { - "x": -122.83899688720703, - "y": 185.83399963378906 + "x": -110.58100128173828, + "y": 170.031005859375 }, { - "x": -125.5530014038086, - "y": 183.69400024414062 + "x": -113.0479965209961, + "y": 168.08599853515625 }, { - "x": -128.23300170898438, - "y": 181.51199340820312 + "x": -115.48400115966797, + "y": 166.1020050048828 }, { - "x": -130.8780059814453, - "y": 179.28900146484375 + "x": -117.88899993896484, + "y": 164.08099365234375 }, { - "x": -133.48800659179688, - "y": 177.0240020751953 + "x": -120.26200103759766, + "y": 162.02200317382812 }, { - "x": -136.06199645996094, - "y": 174.71800231933594 + "x": -122.60199737548828, + "y": 159.92599487304688 }, { - "x": -138.60000610351562, - "y": 172.3730010986328 + "x": -124.90899658203125, + "y": 157.79299926757812 }, { - "x": -141.10000610351562, - "y": 169.98699951171875 + "x": -127.18199920654297, + "y": 155.625 }, { - "x": -143.56300354003906, - "y": 167.56300354003906 + "x": -129.42100524902344, + "y": 153.42100524902344 }, { - "x": -145.98699951171875, - "y": 165.10000610351562 + "x": -131.625, + "y": 151.1820068359375 }, { - "x": -148.3730010986328, - "y": 162.60000610351562 + "x": -133.79299926757812, + "y": 148.90899658203125 }, { - "x": -150.71800231933594, - "y": 160.06199645996094 + "x": -135.92599487304688, + "y": 146.6020050048828 }, { - "x": -153.0240020751953, - "y": 157.48800659179688 + "x": -138.02200317382812, + "y": 144.26199340820312 }, { - "x": -155.28900146484375, - "y": 154.8780059814453 + "x": -140.08099365234375, + "y": 141.88900756835938 }, { - "x": -157.51199340820312, - "y": 152.23300170898438 + "x": -142.1020050048828, + "y": 139.48399353027344 }, { - "x": -159.69400024414062, - "y": 149.55299377441406 + "x": -144.08599853515625, + "y": 137.04800415039062 }, { - "x": -161.83399963378906, - "y": 146.83900451660156 + "x": -146.031005859375, + "y": 134.58099365234375 }, { - "x": -163.92999267578125, - "y": 144.0919952392578 + "x": -147.93600463867188, + "y": 132.08399963378906 }, { - "x": -165.98300170898438, - "y": 141.31199645996094 + "x": -149.80299377441406, + "y": 129.5570068359375 }, { - "x": -167.99200439453125, - "y": 138.50100708007812 + "x": -151.62899780273438, + "y": 127.0009994506836 }, { - "x": -169.95700073242188, - "y": 135.6580047607422 + "x": -153.41600036621094, + "y": 124.41600036621094 }, { - "x": -171.8769989013672, - "y": 132.78500366210938 + "x": -155.16099548339844, + "y": 121.80400085449219 }, { - "x": -173.7519989013672, - "y": 129.88099670410156 + "x": -156.86500549316406, + "y": 119.16500091552734 }, { - "x": -175.5800018310547, - "y": 126.9489974975586 + "x": -158.5279998779297, + "y": 116.4990005493164 }, { - "x": -177.36300659179688, - "y": 123.98899841308594 + "x": -160.1479949951172, + "y": 113.80799865722656 }, { - "x": -179.09800720214844, - "y": 121 + "x": -161.7259979248047, + "y": 111.09100341796875 }, { - "x": -180.78700256347656, - "y": 117.98500061035156 + "x": -163.26100158691406, + "y": 108.3499984741211 }, { - "x": -182.42799377441406, - "y": 114.94400024414062 + "x": -164.7530059814453, + "y": 105.58499908447266 }, { - "x": -184.02099609375, - "y": 111.87699890136719 + "x": -166.2010040283203, + "y": 102.7979965209961 }, { - "x": -185.5659942626953, - "y": 108.78600311279297 + "x": -167.60499572753906, + "y": 99.98699951171875 }, { - "x": -187.06100463867188, - "y": 105.6709976196289 + "x": -168.96499633789062, + "y": 97.15499877929688 }, { - "x": -188.50799560546875, - "y": 102.53299713134766 + "x": -170.27999877929688, + "y": 94.302001953125 }, { - "x": -189.906005859375, - "y": 99.37200164794922 + "x": -171.5500030517578, + "y": 91.42900085449219 }, { - "x": -191.2530059814453, - "y": 96.19000244140625 + "x": -172.77499389648438, + "y": 88.53600311279297 }, { - "x": -192.5500030517578, - "y": 92.98699951171875 + "x": -173.9550018310547, + "y": 85.6240005493164 }, { - "x": -193.7969970703125, - "y": 89.76399993896484 + "x": -175.08799743652344, + "y": 82.69400024414062 }, { - "x": -194.9929962158203, - "y": 86.52200317382812 + "x": -176.17599487304688, + "y": 79.74700164794922 }, { - "x": -196.13800048828125, - "y": 83.26100158691406 + "x": -177.2169952392578, + "y": 76.78299713134766 }, { - "x": -197.23199462890625, - "y": 79.98300170898438 + "x": -178.21099853515625, + "y": 73.8030014038086 }, { - "x": -198.2740020751953, - "y": 76.68800354003906 + "x": -179.1580047607422, + "y": 70.80799865722656 }, { - "x": -199.26400756835938, - "y": 73.37799835205078 + "x": -180.05799865722656, + "y": 67.7979965209961 }, { - "x": -200.20199584960938, - "y": 70.052001953125 + "x": -180.91099548339844, + "y": 64.77400207519531 }, { - "x": -201.08799743652344, - "y": 66.71099853515625 + "x": -181.71600341796875, + "y": 61.73699951171875 }, { - "x": -201.92100524902344, - "y": 63.356998443603516 + "x": -182.47300720214844, + "y": 58.68899917602539 }, { - "x": -202.7010040283203, - "y": 59.99100112915039 + "x": -183.18299865722656, + "y": 55.62799835205078 }, { - "x": -203.4290008544922, - "y": 56.612998962402344 + "x": -183.843994140625, + "y": 52.55699920654297 }, { - "x": -204.10299682617188, - "y": 53.222999572753906 + "x": -184.45700073242188, + "y": 49.47600173950195 }, { - "x": -204.7239990234375, - "y": 49.82400131225586 + "x": -184.5659942626953, + "y": 49.10100173950195 }, { - "x": -204.8800048828125, - "y": 49.111000061035156 - }, - { - "x": -205.50399780273438, + "x": -185.2519989013672, "y": 45 } ], @@ -2200,360 +2176,352 @@ "link": "", "route": [ { - "x": 552, - "y": -151.38900756835938 - }, - { - "x": 553.072998046875, - "y": -151.26499938964844 - }, - { - "x": 557.6380004882812, - "y": -150.63900756835938 + "x": 512, + "y": -136.2259979248047 }, { - "x": 562.1890258789062, - "y": -149.91900634765625 + "x": 514.7160034179688, + "y": -135.85400390625 }, { - "x": 566.7230224609375, - "y": -149.10299682617188 + "x": 518.85302734375, + "y": -135.19900512695312 }, { - "x": 571.239990234375, - "y": -148.19200134277344 + "x": 522.9760131835938, + "y": -134.45700073242188 }, { - "x": 575.7369995117188, - "y": -147.18699645996094 + "x": 527.0819702148438, + "y": -133.62899780273438 }, { - "x": 580.2109985351562, - "y": -146.08799743652344 + "x": 531.1699829101562, + "y": -132.71499633789062 }, { - "x": 584.6619873046875, - "y": -144.89500427246094 + "x": 535.2369995117188, + "y": -131.71600341796875 }, { - "x": 589.0859985351562, - "y": -143.61000061035156 + "x": 539.2830200195312, + "y": -130.6320037841797 }, { - "x": 593.4829711914062, - "y": -142.23199462890625 + "x": 543.3060302734375, + "y": -129.46299743652344 }, { - "x": 597.8499755859375, - "y": -140.76199340820312 + "x": 547.302978515625, + "y": -128.21099853515625 }, { - "x": 602.1849975585938, - "y": -139.20199584960938 + "x": 551.2730102539062, + "y": -126.875 }, { - "x": 606.4869995117188, - "y": -137.5500030517578 + "x": 555.2139892578125, + "y": -125.45600128173828 }, { - "x": 610.7529907226562, - "y": -135.8090057373047 + "x": 559.1240234375, + "y": -123.95500183105469 }, { - "x": 614.9819946289062, - "y": -133.97999572753906 + "x": 563.0029907226562, + "y": -122.37200164794922 }, { - "x": 619.1710205078125, - "y": -132.06100463867188 + "x": 566.8469848632812, + "y": -120.70899963378906 }, { - "x": 623.3189697265625, - "y": -130.05599975585938 + "x": 570.655029296875, + "y": -118.96499633789062 }, { - "x": 627.4249877929688, - "y": -127.96399688720703 + "x": 574.427001953125, + "y": -117.14199829101562 }, { - "x": 631.4849853515625, - "y": -125.78700256347656 + "x": 578.1589965820312, + "y": -115.23999786376953 }, { - "x": 635.5, - "y": -123.5250015258789 + "x": 581.8499755859375, + "y": -113.26100158691406 }, { - "x": 639.4650268554688, - "y": -121.18000030517578 + "x": 585.5, + "y": -111.20500183105469 }, { - "x": 643.3809814453125, - "y": -118.75199890136719 + "x": 589.10498046875, + "y": -109.0719985961914 }, { - "x": 647.2459716796875, - "y": -116.24199676513672 + "x": 592.6649780273438, + "y": -106.86499786376953 }, { - "x": 651.0560302734375, - "y": -113.6520004272461 + "x": 596.177978515625, + "y": -104.58399963378906 }, { - "x": 654.81201171875, - "y": -110.98300170898438 + "x": 599.6420288085938, + "y": -102.22899627685547 }, { - "x": 658.510986328125, - "y": -108.23600006103516 + "x": 603.0570068359375, + "y": -99.8030014038086 }, { - "x": 662.1519775390625, - "y": -105.41200256347656 + "x": 606.4190063476562, + "y": -97.30500030517578 }, { - "x": 665.7329711914062, - "y": -102.51200103759766 + "x": 609.72900390625, + "y": -94.73799896240234 }, { - "x": 669.2520141601562, - "y": -99.53800201416016 + "x": 612.9840087890625, + "y": -92.10199737548828 }, { - "x": 672.7080078125, - "y": -96.49099731445312 + "x": 616.1840209960938, + "y": -89.39900207519531 }, { - "x": 676.0999755859375, - "y": -93.37300109863281 + "x": 619.3259887695312, + "y": -86.62799835205078 }, { - "x": 679.4249877929688, - "y": -90.18299865722656 + "x": 622.4089965820312, + "y": -83.79299926757812 }, { - "x": 682.6829833984375, - "y": -86.92500305175781 + "x": 625.4320068359375, + "y": -80.89399719238281 }, { - "x": 685.8729858398438, - "y": -83.5999984741211 + "x": 628.3939819335938, + "y": -77.93199920654297 }, { - "x": 688.9910278320312, - "y": -80.20800018310547 + "x": 631.2930297851562, + "y": -74.90899658203125 }, { - "x": 692.0380249023438, - "y": -76.75199890136719 + "x": 634.1279907226562, + "y": -71.82599639892578 }, { - "x": 695.0120239257812, - "y": -73.23300170898438 + "x": 636.8989868164062, + "y": -68.68399810791016 }, { - "x": 697.9119873046875, - "y": -69.6520004272461 + "x": 639.6019897460938, + "y": -65.48400115966797 }, { - "x": 700.7360229492188, - "y": -66.01100158691406 + "x": 642.2379760742188, + "y": -62.229000091552734 }, { - "x": 703.4829711914062, - "y": -62.3120002746582 + "x": 644.8049926757812, + "y": -58.91899871826172 }, { - "x": 706.1519775390625, - "y": -58.555999755859375 + "x": 647.302978515625, + "y": -55.55699920654297 }, { - "x": 708.7420043945312, - "y": -54.74599838256836 + "x": 649.72900390625, + "y": -52.141998291015625 }, { - "x": 711.2520141601562, - "y": -50.88100051879883 + "x": 652.083984375, + "y": -48.678001403808594 }, { - "x": 713.6799926757812, - "y": -46.96500015258789 + "x": 654.364990234375, + "y": -45.165000915527344 }, { - "x": 716.0250244140625, - "y": -43 + "x": 656.572021484375, + "y": -41.60499954223633 }, { - "x": 718.2869873046875, - "y": -38.98500061035156 + "x": 658.7050170898438, + "y": -38 }, { - "x": 720.4639892578125, - "y": -34.92499923706055 + "x": 660.760986328125, + "y": -34.349998474121094 }, { - "x": 722.5560302734375, - "y": -30.819000244140625 + "x": 662.739990234375, + "y": -30.659000396728516 }, { - "x": 724.5609741210938, - "y": -26.67099952697754 + "x": 664.6420288085938, + "y": -26.927000045776367 }, { - "x": 726.47998046875, - "y": -22.48200035095215 + "x": 666.4650268554688, + "y": -23.155000686645508 }, { - "x": 728.3090209960938, - "y": -18.253000259399414 + "x": 668.208984375, + "y": -19.347000122070312 }, { - "x": 730.0499877929688, - "y": -13.987000465393066 + "x": 669.8720092773438, + "y": -15.503000259399414 }, { - "x": 731.7020263671875, - "y": -9.6850004196167 + "x": 671.4550170898438, + "y": -11.62399959564209 }, { - "x": 733.2620239257812, - "y": -5.349999904632568 + "x": 672.9559936523438, + "y": -7.714000225067139 }, { - "x": 734.7319946289062, - "y": -0.9829999804496765 + "x": 674.375, + "y": -3.7730000019073486 }, { - "x": 736.1099853515625, - "y": 3.4130001068115234 + "x": 675.7109985351562, + "y": 0.19599999487400055 }, { - "x": 737.39501953125, - "y": 7.836999893188477 + "x": 676.9630126953125, + "y": 4.192999839782715 }, { - "x": 738.5880126953125, - "y": 12.288000106811523 + "x": 678.1320190429688, + "y": 8.215999603271484 }, { - "x": 739.68701171875, - "y": 16.761999130249023 + "x": 679.2160034179688, + "y": 12.26200008392334 }, { - "x": 740.6920166015625, - "y": 21.259000778198242 + "x": 680.2150268554688, + "y": 16.32900047302246 }, { - "x": 741.60302734375, - "y": 25.775999069213867 + "x": 681.1290283203125, + "y": 20.41699981689453 }, { - "x": 742.4190063476562, - "y": 30.309999465942383 + "x": 681.9569702148438, + "y": 24.523000717163086 }, { - "x": 743.1389770507812, - "y": 34.861000061035156 + "x": 682.698974609375, + "y": 28.645999908447266 }, { - "x": 743.7650146484375, - "y": 39.42599868774414 + "x": 683.35400390625, + "y": 32.78300094604492 }, { - "x": 744.2940063476562, - "y": 44.00299835205078 + "x": 683.9219970703125, + "y": 36.93299865722656 }, { - "x": 744.72802734375, - "y": 48.59000015258789 + "x": 684.4039916992188, + "y": 41.09400177001953 }, { - "x": 745.0650024414062, - "y": 53.18600082397461 + "x": 684.7979736328125, + "y": 45.263999938964844 }, { - "x": 745.3070068359375, - "y": 57.7869987487793 + "x": 685.10498046875, + "y": 49.441001892089844 }, { - "x": 745.4509887695312, - "y": 62.391998291015625 + "x": 685.323974609375, + "y": 53.624000549316406 }, { - "x": 745.5, - "y": 66.9990005493164 + "x": 685.4559936523438, + "y": 57.81100082397461 }, { - "x": 745.4509887695312, - "y": 71.60700225830078 + "x": 685.5, + "y": 61.999000549316406 }, { - "x": 745.3070068359375, - "y": 76.21199798583984 + "x": 685.4559936523438, + "y": 66.18800354003906 }, { - "x": 745.0650024414062, - "y": 80.81300354003906 + "x": 685.323974609375, + "y": 70.375 }, { - "x": 744.72802734375, - "y": 85.40899658203125 + "x": 685.10498046875, + "y": 74.55799865722656 }, { - "x": 744.2940063476562, - "y": 89.99600219726562 + "x": 684.7979736328125, + "y": 78.73500061035156 }, { - "x": 743.7650146484375, - "y": 94.572998046875 + "x": 684.4039916992188, + "y": 82.90499877929688 }, { - "x": 743.1389770507812, - "y": 99.13800048828125 + "x": 683.9219970703125, + "y": 87.06600189208984 }, { - "x": 742.4190063476562, - "y": 103.68900299072266 + "x": 683.35400390625, + "y": 91.21600341796875 }, { - "x": 741.60302734375, - "y": 108.2229995727539 + "x": 682.698974609375, + "y": 95.35299682617188 }, { - "x": 740.6920166015625, - "y": 112.73999786376953 + "x": 681.9569702148438, + "y": 99.47599792480469 }, { - "x": 739.68701171875, - "y": 117.23699951171875 + "x": 681.1290283203125, + "y": 103.58200073242188 }, { - "x": 738.5880126953125, - "y": 121.71099853515625 + "x": 680.2150268554688, + "y": 107.66999816894531 }, { - "x": 737.39501953125, - "y": 126.16200256347656 + "x": 679.2160034179688, + "y": 111.73699951171875 }, { - "x": 736.1099853515625, - "y": 130.58599853515625 + "x": 678.1320190429688, + "y": 115.78299713134766 }, { - "x": 734.7319946289062, - "y": 134.98300170898438 + "x": 676.9630126953125, + "y": 119.80599975585938 }, { - "x": 733.2620239257812, - "y": 139.35000610351562 + "x": 675.7109985351562, + "y": 123.8030014038086 }, { - "x": 733.0369873046875, - "y": 140.10400390625 + "x": 675.3259887695312, + "y": 125.08100128173828 }, { - "x": 731.5809936523438, - "y": 143.99899291992188 + "x": 673.9329833984375, + "y": 128.99899291992188 } ], "isCurve": true, @@ -2588,344 +2556,336 @@ "link": "", "route": [ { - "x": 692.6740112304688, - "y": 209.99899291992188 - }, - { - "x": 692.0380249023438, - "y": 210.7519989013672 - }, - { - "x": 688.9910278320312, - "y": 214.20799255371094 + "x": 634.8569946289062, + "y": 194.99899291992188 }, { - "x": 685.8729858398438, - "y": 217.60000610351562 + "x": 634.1279907226562, + "y": 195.8260040283203 }, { - "x": 682.6829833984375, - "y": 220.9250030517578 + "x": 631.2930297851562, + "y": 198.90899658203125 }, { - "x": 679.4249877929688, - "y": 224.18299865722656 + "x": 628.3939819335938, + "y": 201.9320068359375 }, { - "x": 676.0999755859375, - "y": 227.3730010986328 + "x": 625.4320068359375, + "y": 204.8939971923828 }, { - "x": 672.7080078125, - "y": 230.49099731445312 + "x": 622.4089965820312, + "y": 207.79299926757812 }, { - "x": 669.2520141601562, - "y": 233.53799438476562 + "x": 619.3259887695312, + "y": 210.6280059814453 }, { - "x": 665.7329711914062, - "y": 236.51199340820312 + "x": 616.1840209960938, + "y": 213.3990020751953 }, { - "x": 662.1519775390625, - "y": 239.41200256347656 + "x": 612.9840087890625, + "y": 216.1020050048828 }, { - "x": 658.510986328125, - "y": 242.23599243164062 + "x": 609.72900390625, + "y": 218.73800659179688 }, { - "x": 654.81201171875, - "y": 244.98300170898438 + "x": 606.4190063476562, + "y": 221.30499267578125 }, { - "x": 651.0560302734375, - "y": 247.65199279785156 + "x": 603.0570068359375, + "y": 223.80299377441406 }, { - "x": 647.2459716796875, - "y": 250.24200439453125 + "x": 599.6420288085938, + "y": 226.22900390625 }, { - "x": 643.3809814453125, - "y": 252.7519989013672 + "x": 596.177978515625, + "y": 228.58399963378906 }, { - "x": 639.4650268554688, - "y": 255.17999267578125 + "x": 592.6649780273438, + "y": 230.86500549316406 }, { - "x": 635.5, - "y": 257.5249938964844 + "x": 589.10498046875, + "y": 233.07200622558594 }, { - "x": 631.4849853515625, - "y": 259.7869873046875 + "x": 585.5, + "y": 235.2050018310547 }, { - "x": 627.4249877929688, - "y": 261.9639892578125 + "x": 581.8499755859375, + "y": 237.26100158691406 }, { - "x": 623.3189697265625, - "y": 264.0559997558594 + "x": 578.1589965820312, + "y": 239.24000549316406 }, { - "x": 619.1710205078125, - "y": 266.0610046386719 + "x": 574.427001953125, + "y": 241.14199829101562 }, { - "x": 614.9819946289062, - "y": 267.9800109863281 + "x": 570.655029296875, + "y": 242.96499633789062 }, { - "x": 610.7529907226562, - "y": 269.8089904785156 + "x": 566.8469848632812, + "y": 244.70899963378906 }, { - "x": 606.4869995117188, - "y": 271.54998779296875 + "x": 563.0029907226562, + "y": 246.3719940185547 }, { - "x": 602.1849975585938, - "y": 273.2019958496094 + "x": 559.1240234375, + "y": 247.9550018310547 }, { - "x": 597.8499755859375, - "y": 274.7619934082031 + "x": 555.2139892578125, + "y": 249.45599365234375 }, { - "x": 593.4829711914062, - "y": 276.23199462890625 + "x": 551.2730102539062, + "y": 250.875 }, { - "x": 589.0859985351562, - "y": 277.6099853515625 + "x": 547.302978515625, + "y": 252.21099853515625 }, { - "x": 584.6619873046875, - "y": 278.8949890136719 + "x": 543.3060302734375, + "y": 253.46299743652344 }, { - "x": 580.2109985351562, - "y": 280.0880126953125 + "x": 539.2830200195312, + "y": 254.6320037841797 }, { - "x": 575.7369995117188, - "y": 281.18701171875 + "x": 535.2369995117188, + "y": 255.71600341796875 }, { - "x": 571.239990234375, - "y": 282.1919860839844 + "x": 531.1699829101562, + "y": 256.7149963378906 }, { - "x": 566.7230224609375, - "y": 283.1029968261719 + "x": 527.0819702148438, + "y": 257.6289978027344 }, { - "x": 562.1890258789062, - "y": 283.91900634765625 + "x": 522.9760131835938, + "y": 258.4570007324219 }, { - "x": 557.6380004882812, - "y": 284.6390075683594 + "x": 518.85302734375, + "y": 259.1990051269531 }, { - "x": 553.072998046875, - "y": 285.2650146484375 + "x": 514.7160034179688, + "y": 259.85400390625 }, { - "x": 548.4959716796875, - "y": 285.79400634765625 + "x": 510.5660095214844, + "y": 260.4219970703125 }, { - "x": 543.9089965820312, - "y": 286.2279968261719 + "x": 506.4049987792969, + "y": 260.90399169921875 }, { - "x": 539.31298828125, - "y": 286.56500244140625 + "x": 502.2349853515625, + "y": 261.2980041503906 }, { - "x": 534.7119750976562, - "y": 286.8070068359375 + "x": 498.0580139160156, + "y": 261.6050109863281 }, { - "x": 530.1069946289062, - "y": 286.95098876953125 + "x": 493.875, + "y": 261.8240051269531 }, { - "x": 525.5, - "y": 287 + "x": 489.68798828125, + "y": 261.95599365234375 }, { - "x": 520.8920288085938, - "y": 286.95098876953125 + "x": 485.5, + "y": 262 }, { - "x": 516.2869873046875, - "y": 286.8070068359375 + "x": 481.3110046386719, + "y": 261.95599365234375 }, { - "x": 511.6860046386719, - "y": 286.56500244140625 + "x": 477.1239929199219, + "y": 261.8240051269531 }, { - "x": 507.0899963378906, - "y": 286.2279968261719 + "x": 472.9410095214844, + "y": 261.6050109863281 }, { - "x": 502.50299072265625, - "y": 285.79400634765625 + "x": 468.7640075683594, + "y": 261.2980041503906 }, { - "x": 497.9259948730469, - "y": 285.2650146484375 + "x": 464.593994140625, + "y": 260.90399169921875 }, { - "x": 493.3609924316406, - "y": 284.6390075683594 + "x": 460.4330139160156, + "y": 260.4219970703125 }, { - "x": 488.80999755859375, - "y": 283.91900634765625 + "x": 456.2829895019531, + "y": 259.85400390625 }, { - "x": 484.2760009765625, - "y": 283.1029968261719 + "x": 452.14599609375, + "y": 259.1990051269531 }, { - "x": 479.7590026855469, - "y": 282.1919860839844 + "x": 448.02301025390625, + "y": 258.4570007324219 }, { - "x": 475.2619934082031, - "y": 281.18701171875 + "x": 443.9169921875, + "y": 257.6289978027344 }, { - "x": 470.7879943847656, - "y": 280.0880126953125 + "x": 439.8290100097656, + "y": 256.7149963378906 }, { - "x": 466.3370056152344, - "y": 278.8949890136719 + "x": 435.7619934082031, + "y": 255.71600341796875 }, { - "x": 461.9129943847656, - "y": 277.6099853515625 + "x": 431.71600341796875, + "y": 254.6320037841797 }, { - "x": 457.5159912109375, - "y": 276.23199462890625 + "x": 427.6929931640625, + "y": 253.46299743652344 }, { - "x": 453.14898681640625, - "y": 274.7619934082031 + "x": 423.6960144042969, + "y": 252.21099853515625 }, { - "x": 448.8139953613281, - "y": 273.2019958496094 + "x": 419.72601318359375, + "y": 250.875 }, { - "x": 444.5119934082031, - "y": 271.54998779296875 + "x": 415.7850036621094, + "y": 249.45599365234375 }, { - "x": 440.2460021972656, - "y": 269.8089904785156 + "x": 411.875, + "y": 247.9550018310547 }, { - "x": 436.0169982910156, - "y": 267.9800109863281 + "x": 407.9960021972656, + "y": 246.3719940185547 }, { - "x": 431.8280029296875, - "y": 266.0610046386719 + "x": 404.1520080566406, + "y": 244.70899963378906 }, { - "x": 427.67999267578125, - "y": 264.0559997558594 + "x": 400.343994140625, + "y": 242.96499633789062 }, { - "x": 423.5740051269531, - "y": 261.9639892578125 + "x": 396.5719909667969, + "y": 241.14199829101562 }, { - "x": 419.5140075683594, - "y": 259.7869873046875 + "x": 392.8399963378906, + "y": 239.24000549316406 }, { - "x": 415.5, - "y": 257.5249938964844 + "x": 389.14898681640625, + "y": 237.26100158691406 }, { - "x": 411.53399658203125, - "y": 255.17999267578125 + "x": 385.5, + "y": 235.2050018310547 }, { - "x": 407.6180114746094, - "y": 252.7519989013672 + "x": 381.8940124511719, + "y": 233.07200622558594 }, { - "x": 403.75299072265625, - "y": 250.24200439453125 + "x": 378.3340148925781, + "y": 230.86500549316406 }, { - "x": 399.9429931640625, - "y": 247.65199279785156 + "x": 374.8210144042969, + "y": 228.58399963378906 }, { - "x": 396.18701171875, - "y": 244.98300170898438 + "x": 371.35699462890625, + "y": 226.22900390625 }, { - "x": 392.4880065917969, - "y": 242.23599243164062 + "x": 367.9419860839844, + "y": 223.80299377441406 }, { - "x": 388.84698486328125, - "y": 239.41200256347656 + "x": 364.5799865722656, + "y": 221.30499267578125 }, { - "x": 385.2659912109375, - "y": 236.51199340820312 + "x": 361.2699890136719, + "y": 218.73800659179688 }, { - "x": 381.74700927734375, - "y": 233.53799438476562 + "x": 358.0150146484375, + "y": 216.1020050048828 }, { - "x": 378.2909851074219, - "y": 230.49099731445312 + "x": 354.81500244140625, + "y": 213.3990020751953 }, { - "x": 374.89898681640625, - "y": 227.3730010986328 + "x": 351.6730041503906, + "y": 210.6280059814453 }, { - "x": 371.5740051269531, - "y": 224.18299865722656 + "x": 348.5899963378906, + "y": 207.79299926757812 }, { - "x": 368.3160095214844, - "y": 220.9250030517578 + "x": 345.5669860839844, + "y": 204.8939971923828 }, { - "x": 365.1260070800781, - "y": 217.60000610351562 + "x": 342.6050109863281, + "y": 201.9320068359375 }, { - "x": 362.00799560546875, - "y": 214.20799255371094 + "x": 339.70599365234375, + "y": 198.90899658203125 }, { - "x": 361.02801513671875, - "y": 213.16000366210938 + "x": 338.9079895019531, + "y": 198.1060028076172 }, { - "x": 358.32501220703125, - "y": 210 + "x": 336.1419982910156, + "y": 195 } ], "isCurve": true, @@ -2960,384 +2920,376 @@ "link": "", "route": [ { - "x": 1006.051025390625, - "y": -206.38299560546875 + "x": 931.4099731445312, + "y": -186.21800231933594 }, { - "x": 1007.1240234375, - "y": -206.26499938964844 + "x": 936.197021484375, + "y": -185.53700256347656 }, { - "x": 1013.9660034179688, - "y": -205.29100036621094 + "x": 942.385986328125, + "y": -184.45700073242188 }, { - "x": 1020.7750244140625, - "y": -204.10299682617188 + "x": 948.5380249023438, + "y": -183.18299865722656 }, { - "x": 1027.5419921875, - "y": -202.7010040283203 + "x": 954.6480102539062, + "y": -181.71600341796875 }, { - "x": 1034.261962890625, - "y": -201.08799743652344 + "x": 960.7080078125, + "y": -180.05799865722656 }, { - "x": 1040.928955078125, - "y": -199.26400756835938 + "x": 966.7130126953125, + "y": -178.21099853515625 }, { - "x": 1047.5340576171875, - "y": -197.23199462890625 + "x": 972.656982421875, + "y": -176.17599487304688 }, { - "x": 1054.072998046875, - "y": -194.9929962158203 + "x": 978.5349731445312, + "y": -173.9550018310547 }, { - "x": 1060.5379638671875, - "y": -192.5500030517578 + "x": 984.3389892578125, + "y": -171.5500030517578 }, { - "x": 1066.9229736328125, - "y": -189.906005859375 + "x": 990.0659790039062, + "y": -168.96499633789062 }, { - "x": 1073.2220458984375, - "y": -187.06100463867188 + "x": 995.7080078125, + "y": -166.2010040283203 }, { - "x": 1079.428955078125, - "y": -184.02099609375 + "x": 1001.260009765625, + "y": -163.26100158691406 }, { - "x": 1085.5360107421875, - "y": -180.78700256347656 + "x": 1006.718017578125, + "y": -160.1479949951172 }, { - "x": 1091.5400390625, - "y": -177.36300659179688 + "x": 1012.0750122070312, + "y": -156.86500549316406 }, { - "x": 1097.4329833984375, - "y": -173.7519989013672 + "x": 1017.3259887695312, + "y": -153.41600036621094 }, { - "x": 1103.208984375, - "y": -169.95700073242188 + "x": 1022.4669799804688, + "y": -149.80299377441406 }, { - "x": 1108.863037109375, - "y": -165.98300170898438 + "x": 1027.490966796875, + "y": -146.031005859375 }, { - "x": 1114.3900146484375, - "y": -161.83399963378906 + "x": 1032.39404296875, + "y": -142.1020050048828 }, { - "x": 1119.7840576171875, - "y": -157.51199340820312 + "x": 1037.1719970703125, + "y": -138.02200317382812 }, { - "x": 1125.0389404296875, - "y": -153.0240020751953 + "x": 1041.8189697265625, + "y": -133.79299926757812 }, { - "x": 1130.1510009765625, - "y": -148.3730010986328 + "x": 1046.3310546875, + "y": -129.42100524902344 }, { - "x": 1135.114013671875, - "y": -143.56300354003906 + "x": 1050.7030029296875, + "y": -124.90899658203125 }, { - "x": 1139.9239501953125, - "y": -138.60000610351562 + "x": 1054.9320068359375, + "y": -120.26200103759766 }, { - "x": 1144.574951171875, - "y": -133.48800659179688 + "x": 1059.011962890625, + "y": -115.48400115966797 }, { - "x": 1149.06396484375, - "y": -128.23300170898438 + "x": 1062.9410400390625, + "y": -110.58100128173828 }, { - "x": 1153.385009765625, - "y": -122.83899688720703 + "x": 1066.7130126953125, + "y": -105.55699920654297 }, { - "x": 1157.5340576171875, - "y": -117.31199645996094 + "x": 1070.3260498046875, + "y": -100.41600036621094 }, { - "x": 1161.508056640625, - "y": -111.65799713134766 + "x": 1073.7750244140625, + "y": -95.16500091552734 }, { - "x": 1165.302978515625, - "y": -105.88099670410156 + "x": 1077.0579833984375, + "y": -89.80799865722656 }, { - "x": 1168.9139404296875, - "y": -99.98899841308594 + "x": 1080.1710205078125, + "y": -84.3499984741211 }, { - "x": 1172.3380126953125, - "y": -93.98500061035156 + "x": 1083.1109619140625, + "y": -78.7979965209961 }, { - "x": 1175.572021484375, - "y": -87.87699890136719 + "x": 1085.875, + "y": -73.15499877929688 }, { - "x": 1178.613037109375, - "y": -81.6709976196289 + "x": 1088.4610595703125, + "y": -67.42900085449219 }, { - "x": 1181.45703125, - "y": -75.37200164794922 + "x": 1090.864990234375, + "y": -61.624000549316406 }, { - "x": 1184.10205078125, - "y": -68.98699951171875 + "x": 1093.0860595703125, + "y": -55.74700164794922 }, { - "x": 1186.5439453125, - "y": -62.52199935913086 + "x": 1095.1209716796875, + "y": -49.803001403808594 }, { - "x": 1188.782958984375, - "y": -55.983001708984375 + "x": 1096.968017578125, + "y": -43.79800033569336 }, { - "x": 1190.81494140625, - "y": -49.37799835205078 + "x": 1098.6259765625, + "y": -37.73699951171875 }, { - "x": 1192.6390380859375, - "y": -42.71099853515625 + "x": 1100.093017578125, + "y": -31.628000259399414 }, { - "x": 1194.251953125, - "y": -35.99100112915039 + "x": 1101.366943359375, + "y": -25.47599983215332 }, { - "x": 1195.654052734375, - "y": -29.222999572753906 + "x": 1102.447021484375, + "y": -19.285999298095703 }, { - "x": 1196.842041015625, - "y": -22.415000915527344 + "x": 1103.3330078125, + "y": -13.065999984741211 }, { - "x": 1197.8160400390625, - "y": -15.572999954223633 + "x": 1104.02197265625, + "y": -6.821000099182129 }, { - "x": 1198.573974609375, - "y": -8.70300006866455 + "x": 1104.5150146484375, + "y": -0.5580000281333923 }, { - "x": 1199.116943359375, - "y": -1.812999963760376 + "x": 1104.81103515625, + "y": 5.7170000076293945 }, { - "x": 1199.4420166015625, - "y": 5.089000225067139 - }, - { - "x": 1199.551025390625, + "x": 1104.9100341796875, "y": 12 }, { - "x": 1199.4420166015625, - "y": 18.90999984741211 + "x": 1104.81103515625, + "y": 18.281999588012695 }, { - "x": 1199.116943359375, - "y": 25.812999725341797 + "x": 1104.5150146484375, + "y": 24.558000564575195 }, { - "x": 1198.573974609375, - "y": 32.702999114990234 + "x": 1104.02197265625, + "y": 30.820999145507812 }, { - "x": 1197.8160400390625, - "y": 39.573001861572266 + "x": 1103.3330078125, + "y": 37.066001892089844 }, { - "x": 1196.842041015625, - "y": 46.415000915527344 + "x": 1102.447021484375, + "y": 43.2859992980957 }, { - "x": 1195.654052734375, - "y": 53.222999572753906 + "x": 1101.366943359375, + "y": 49.47600173950195 }, { - "x": 1194.251953125, - "y": 59.99100112915039 + "x": 1100.093017578125, + "y": 55.62799835205078 }, { - "x": 1192.6390380859375, - "y": 66.71099853515625 + "x": 1098.6259765625, + "y": 61.73699951171875 }, { - "x": 1190.81494140625, - "y": 73.37799835205078 + "x": 1096.968017578125, + "y": 67.7979965209961 }, { - "x": 1188.782958984375, - "y": 79.98300170898438 + "x": 1095.1209716796875, + "y": 73.8030014038086 }, { - "x": 1186.5439453125, - "y": 86.52200317382812 + "x": 1093.0860595703125, + "y": 79.74700164794922 }, { - "x": 1184.10205078125, - "y": 92.98699951171875 + "x": 1090.864990234375, + "y": 85.6240005493164 }, { - "x": 1181.45703125, - "y": 99.37200164794922 + "x": 1088.4610595703125, + "y": 91.42900085449219 }, { - "x": 1178.613037109375, - "y": 105.6709976196289 + "x": 1085.875, + "y": 97.15499877929688 }, { - "x": 1175.572021484375, - "y": 111.87699890136719 + "x": 1083.1109619140625, + "y": 102.7979965209961 }, { - "x": 1172.3380126953125, - "y": 117.98500061035156 + "x": 1080.1710205078125, + "y": 108.3499984741211 }, { - "x": 1168.9139404296875, - "y": 123.98899841308594 + "x": 1077.0579833984375, + "y": 113.80799865722656 }, { - "x": 1165.302978515625, - "y": 129.88099670410156 + "x": 1073.7750244140625, + "y": 119.16500091552734 }, { - "x": 1161.508056640625, - "y": 135.6580047607422 + "x": 1070.3260498046875, + "y": 124.41600036621094 }, { - "x": 1157.5340576171875, - "y": 141.31199645996094 + "x": 1066.7130126953125, + "y": 129.5570068359375 }, { - "x": 1153.385009765625, - "y": 146.83900451660156 + "x": 1062.9410400390625, + "y": 134.58099365234375 }, { - "x": 1149.06396484375, - "y": 152.23300170898438 + "x": 1059.011962890625, + "y": 139.48399353027344 }, { - "x": 1144.574951171875, - "y": 157.48800659179688 + "x": 1054.9320068359375, + "y": 144.26199340820312 }, { - "x": 1139.9239501953125, - "y": 162.60000610351562 + "x": 1050.7030029296875, + "y": 148.90899658203125 }, { - "x": 1135.114013671875, - "y": 167.56300354003906 + "x": 1046.3310546875, + "y": 153.42100524902344 }, { - "x": 1130.1510009765625, - "y": 172.3730010986328 + "x": 1041.8189697265625, + "y": 157.79299926757812 }, { - "x": 1125.0389404296875, - "y": 177.0240020751953 + "x": 1037.1719970703125, + "y": 162.02200317382812 }, { - "x": 1119.7840576171875, - "y": 181.51199340820312 + "x": 1032.39404296875, + "y": 166.1020050048828 }, { - "x": 1114.3900146484375, - "y": 185.83399963378906 + "x": 1027.490966796875, + "y": 170.031005859375 }, { - "x": 1108.863037109375, - "y": 189.98300170898438 + "x": 1022.4669799804688, + "y": 173.80299377441406 }, { - "x": 1103.208984375, - "y": 193.95700073242188 + "x": 1017.3259887695312, + "y": 177.41600036621094 }, { - "x": 1097.4329833984375, - "y": 197.7519989013672 + "x": 1012.0750122070312, + "y": 180.86500549316406 }, { - "x": 1091.5400390625, - "y": 201.36300659179688 + "x": 1006.718017578125, + "y": 184.1479949951172 }, { - "x": 1085.5360107421875, - "y": 204.78700256347656 + "x": 1001.260009765625, + "y": 187.26100158691406 }, { - "x": 1079.428955078125, - "y": 208.02099609375 + "x": 995.7080078125, + "y": 190.2010040283203 }, { - "x": 1073.2220458984375, - "y": 211.06100463867188 + "x": 990.0659790039062, + "y": 192.96499633789062 }, { - "x": 1066.9229736328125, - "y": 213.906005859375 + "x": 984.3389892578125, + "y": 195.5500030517578 }, { - "x": 1060.5379638671875, - "y": 216.5500030517578 + "x": 978.5349731445312, + "y": 197.9550018310547 }, { - "x": 1054.072998046875, - "y": 218.9929962158203 + "x": 972.656982421875, + "y": 200.17599487304688 }, { - "x": 1047.5340576171875, - "y": 221.23199462890625 + "x": 966.7130126953125, + "y": 202.21099853515625 }, { - "x": 1040.928955078125, - "y": 223.26400756835938 + "x": 960.7080078125, + "y": 204.05799865722656 }, { - "x": 1034.261962890625, - "y": 225.08799743652344 + "x": 954.6480102539062, + "y": 205.71600341796875 }, { - "x": 1027.5419921875, - "y": 226.7010040283203 + "x": 948.5380249023438, + "y": 207.18299865722656 }, { - "x": 1020.7750244140625, - "y": 228.10299682617188 + "x": 942.385986328125, + "y": 208.45700073242188 }, { - "x": 1013.9660034179688, - "y": 229.29100036621094 + "x": 936.197021484375, + "y": 209.53700256347656 }, { - "x": 1010.1790161132812, - "y": 229.8820037841797 - }, - { - "x": 1006.051025390625, - "y": 230.38299560546875 + "x": 931.4099731445312, + "y": 210.21800231933594 } ], "isCurve": true, @@ -3372,296 +3324,284 @@ "link": "", "route": [ { - "x": 1079.051025390625, - "y": -206.39500427246094 - }, - { - "x": 1080.1240234375, - "y": -206.26499938964844 - }, - { - "x": 1082.407958984375, - "y": -205.96400451660156 - }, - { - "x": 1084.68896484375, - "y": -205.63900756835938 + "x": 1004.4099731445312, + "y": -186.23399353027344 }, { - "x": 1086.9659423828125, - "y": -205.29100036621094 + "x": 1005.052978515625, + "y": -186.1490020751953 }, { - "x": 1089.239990234375, - "y": -204.91900634765625 + "x": 1007.1259765625, + "y": -185.85400390625 }, { - "x": 1091.509033203125, - "y": -204.5229949951172 + "x": 1009.197021484375, + "y": -185.53700256347656 }, { - "x": 1093.7750244140625, - "y": -204.10299682617188 + "x": 1011.2630004882812, + "y": -185.19900512695312 }, { - "x": 1096.0350341796875, - "y": -203.65899658203125 + "x": 1013.3270263671875, + "y": -184.83900451660156 }, { - "x": 1098.291015625, - "y": -203.19200134277344 + "x": 1015.385986328125, + "y": -184.45700073242188 }, { - "x": 1100.5419921875, - "y": -202.7010040283203 + "x": 1017.4409790039062, + "y": -184.0540008544922 }, { - "x": 1102.7879638671875, - "y": -202.18699645996094 + "x": 1019.4920043945312, + "y": -183.62899780273438 }, { - "x": 1105.0279541015625, - "y": -201.6490020751953 + "x": 1021.5380249023438, + "y": -183.18299865722656 }, { - "x": 1107.261962890625, - "y": -201.08799743652344 + "x": 1023.5800170898438, + "y": -182.71499633789062 }, { - "x": 1109.490966796875, - "y": -200.5030059814453 + "x": 1025.615966796875, + "y": -182.2259979248047 }, { - "x": 1111.7130126953125, - "y": -199.89500427246094 + "x": 1027.64794921875, + "y": -181.71600341796875 }, { - "x": 1113.928955078125, - "y": -199.26400756835938 + "x": 1029.6729736328125, + "y": -181.18499755859375 }, { - "x": 1116.137939453125, - "y": -198.61000061035156 + "x": 1031.6939697265625, + "y": -180.6320037841797 }, { - "x": 1118.3399658203125, - "y": -197.9320068359375 + "x": 1033.7080078125, + "y": -180.05799865722656 }, { - "x": 1120.5340576171875, - "y": -197.23199462890625 + "x": 1035.7159423828125, + "y": -179.46299743652344 }, { - "x": 1122.7220458984375, - "y": -196.50900268554688 + "x": 1037.718017578125, + "y": -178.84800720214844 }, { - "x": 1124.9010009765625, - "y": -195.76199340820312 + "x": 1039.7130126953125, + "y": -178.21099853515625 }, { - "x": 1127.072998046875, - "y": -194.9929962158203 + "x": 1041.7020263671875, + "y": -177.55299377441406 }, { - "x": 1129.237060546875, - "y": -194.20199584960938 + "x": 1043.6829833984375, + "y": -176.875 }, { - "x": 1131.3919677734375, - "y": -193.38699340820312 + "x": 1045.656982421875, + "y": -176.17599487304688 }, { - "x": 1133.5379638671875, - "y": -192.5500030517578 + "x": 1047.6240234375, + "y": -175.45599365234375 }, { - "x": 1135.676025390625, - "y": -191.6909942626953 + "x": 1049.5830078125, + "y": -174.71600341796875 }, { - "x": 1137.803955078125, - "y": -190.8090057373047 + "x": 1051.5350341796875, + "y": -173.9550018310547 }, { - "x": 1139.9229736328125, - "y": -189.906005859375 + "x": 1053.47802734375, + "y": -173.1739959716797 }, { - "x": 1142.032958984375, - "y": -188.97999572753906 + "x": 1055.4129638671875, + "y": -172.3719940185547 }, { - "x": 1144.1319580078125, - "y": -188.031005859375 + "x": 1057.3389892578125, + "y": -171.5500030517578 }, { - "x": 1146.2220458984375, - "y": -187.06100463867188 + "x": 1059.2569580078125, + "y": -170.70899963378906 }, { - "x": 1148.302001953125, - "y": -186.07000732421875 + "x": 1061.166015625, + "y": -169.8470001220703 }, { - "x": 1150.3699951171875, - "y": -185.05599975585938 + "x": 1063.0660400390625, + "y": -168.96499633789062 }, { - "x": 1152.428955078125, - "y": -184.02099609375 + "x": 1064.9560546875, + "y": -168.06300354003906 }, { - "x": 1154.4759521484375, - "y": -182.96400451660156 + "x": 1066.8370361328125, + "y": -167.14199829101562 }, { - "x": 1156.511962890625, - "y": -181.88600158691406 + "x": 1068.7080078125, + "y": -166.2010040283203 }, { - "x": 1158.5360107421875, - "y": -180.78700256347656 + "x": 1070.5689697265625, + "y": -165.24000549316406 }, { - "x": 1160.550048828125, - "y": -179.66700744628906 + "x": 1072.4200439453125, + "y": -164.25999450683594 }, { - "x": 1162.551025390625, - "y": -178.52499389648438 + "x": 1074.260009765625, + "y": -163.26100158691406 }, { - "x": 1164.5400390625, - "y": -177.36300659179688 + "x": 1076.0899658203125, + "y": -162.24200439453125 }, { - "x": 1166.5169677734375, - "y": -176.17999267578125 + "x": 1077.9100341796875, + "y": -161.2050018310547 }, { - "x": 1168.48095703125, - "y": -174.9759979248047 + "x": 1079.718017578125, + "y": -160.1479949951172 }, { - "x": 1170.4329833984375, - "y": -173.7519989013672 + "x": 1081.5150146484375, + "y": -159.07200622558594 }, { - "x": 1172.3709716796875, - "y": -172.5070037841797 + "x": 1083.301025390625, + "y": -157.97799682617188 }, { - "x": 1174.2969970703125, - "y": -171.24200439453125 + "x": 1085.074951171875, + "y": -156.86500549316406 }, { - "x": 1176.208984375, - "y": -169.95700073242188 + "x": 1086.8370361328125, + "y": -155.73399353027344 }, { - "x": 1178.1080322265625, - "y": -168.65199279785156 + "x": 1088.5880126953125, + "y": -154.58399963378906 }, { - "x": 1179.9930419921875, - "y": -167.3280029296875 + "x": 1090.3260498046875, + "y": -153.41600036621094 }, { - "x": 1181.863037109375, - "y": -165.98300170898438 + "x": 1092.052001953125, + "y": -152.22900390625 }, { - "x": 1183.719970703125, - "y": -164.61900329589844 + "x": 1093.7659912109375, + "y": -151.02499389648438 }, { - "x": 1185.56201171875, - "y": -163.23599243164062 + "x": 1095.467041015625, + "y": -149.80299377441406 }, { - "x": 1187.3900146484375, - "y": -161.83399963378906 + "x": 1097.155029296875, + "y": -148.56300354003906 }, { - "x": 1189.2030029296875, - "y": -160.41200256347656 + "x": 1098.8289794921875, + "y": -147.30499267578125 }, { - "x": 1191.0009765625, - "y": -158.9720001220703 + "x": 1100.490966796875, + "y": -146.031005859375 }, { - "x": 1192.7840576171875, - "y": -157.51199340820312 + "x": 1102.1390380859375, + "y": -144.73800659179688 }, { - "x": 1194.551025390625, - "y": -156.03500366210938 + "x": 1103.7740478515625, + "y": -143.4290008544922 }, { - "x": 1196.302978515625, - "y": -154.53799438476562 + "x": 1105.39404296875, + "y": -142.1020050048828 }, { - "x": 1198.0389404296875, - "y": -153.0240020751953 + "x": 1107.0009765625, + "y": -140.75900268554688 }, { - "x": 1199.759033203125, - "y": -151.49099731445312 + "x": 1108.593994140625, + "y": -139.3990020751953 }, { - "x": 1201.4630126953125, - "y": -149.9409942626953 + "x": 1110.1719970703125, + "y": -138.02200317382812 }, { - "x": 1203.1510009765625, - "y": -148.3730010986328 + "x": 1111.7359619140625, + "y": -136.6280059814453 }, { - "x": 1204.822021484375, - "y": -146.78700256347656 + "x": 1113.2850341796875, + "y": -135.218994140625 }, { - "x": 1206.47705078125, - "y": -145.18299865722656 + "x": 1114.8189697265625, + "y": -133.79299926757812 }, { - "x": 1208.114013671875, - "y": -143.56300354003906 + "x": 1116.3380126953125, + "y": -132.3520050048828 }, { - "x": 1209.7349853515625, - "y": -141.9250030517578 + "x": 1117.842041015625, + "y": -130.8939971923828 }, { - "x": 1211.3380126953125, - "y": -140.27099609375 + "x": 1119.3310546875, + "y": -129.42100524902344 }, { - "x": 1212.9239501953125, - "y": -138.60000610351562 + "x": 1120.803955078125, + "y": -127.93199920654297 }, { - "x": 1214.491943359375, - "y": -136.91200256347656 + "x": 1122.261962890625, + "y": -126.4280014038086 }, { - "x": 1216.04296875, - "y": -135.20799255371094 + "x": 1123.7030029296875, + "y": -124.90899658203125 }, { - "x": 1217.574951171875, - "y": -133.48800659179688 + "x": 1125.1290283203125, + "y": -123.375 }, { - "x": 1217.029052734375, - "y": -134.16000366210938 + "x": 1124.509033203125, + "y": -124.10600280761719 }, { - "x": 1219.7320556640625, - "y": -131 + "x": 1127.2750244140625, + "y": -121 } ], "isCurve": true, @@ -3696,288 +3636,272 @@ "link": "", "route": [ { - "x": 1258.634033203125, - "y": -65 + "x": 1166.3509521484375, + "y": -55 }, { - "x": 1258.7530517578125, - "y": -64.68499755859375 + "x": 1166.7850341796875, + "y": -53.77299880981445 }, { - "x": 1259.5439453125, - "y": -62.52199935913086 + "x": 1167.4630126953125, + "y": -51.79100036621094 }, { - "x": 1260.31298828125, - "y": -60.349998474121094 + "x": 1168.1209716796875, + "y": -49.803001403808594 }, { - "x": 1261.06005859375, - "y": -58.17100143432617 + "x": 1168.758056640625, + "y": -47.80799865722656 }, { - "x": 1261.782958984375, - "y": -55.983001708984375 + "x": 1169.3740234375, + "y": -45.805999755859375 }, { - "x": 1262.4840087890625, - "y": -53.78799819946289 + "x": 1169.968017578125, + "y": -43.79800033569336 }, { - "x": 1263.1610107421875, - "y": -51.58599853515625 + "x": 1170.5419921875, + "y": -41.78300094604492 }, { - "x": 1263.81494140625, - "y": -49.37799835205078 + "x": 1171.094970703125, + "y": -39.76300048828125 }, { - "x": 1264.446044921875, - "y": -47.1619987487793 + "x": 1171.6259765625, + "y": -37.73699951171875 }, { - "x": 1265.053955078125, - "y": -44.939998626708984 + "x": 1172.136962890625, + "y": -35.70600128173828 }, { - "x": 1265.6390380859375, - "y": -42.71099853515625 + "x": 1172.625, + "y": -33.66999816894531 }, { - "x": 1266.199951171875, - "y": -40.47700119018555 + "x": 1173.093017578125, + "y": -31.628000259399414 }, { - "x": 1266.738037109375, - "y": -38.23699951171875 + "x": 1173.5389404296875, + "y": -29.582000732421875 }, { - "x": 1267.251953125, - "y": -35.99100112915039 + "x": 1173.9639892578125, + "y": -27.5310001373291 }, { - "x": 1267.7430419921875, - "y": -33.7400016784668 + "x": 1174.366943359375, + "y": -25.47599983215332 }, { - "x": 1268.2099609375, - "y": -31.483999252319336 + "x": 1174.7490234375, + "y": -23.416000366210938 }, { - "x": 1268.654052734375, - "y": -29.222999572753906 + "x": 1175.1090087890625, + "y": -21.35300064086914 }, { - "x": 1269.073974609375, - "y": -26.95800018310547 + "x": 1175.447021484375, + "y": -19.285999298095703 }, { - "x": 1269.469970703125, - "y": -24.68899917602539 + "x": 1175.7640380859375, + "y": -17.215999603271484 }, { - "x": 1269.842041015625, - "y": -22.415000915527344 + "x": 1176.0589599609375, + "y": -15.142999649047852 }, { - "x": 1270.1910400390625, - "y": -20.13800048828125 + "x": 1176.3330078125, + "y": -13.065999984741211 }, { - "x": 1270.5150146484375, - "y": -17.85700035095215 + "x": 1176.583984375, + "y": -10.987000465393066 }, { - "x": 1270.8160400390625, - "y": -15.572999954223633 + "x": 1176.81396484375, + "y": -8.904999732971191 }, { - "x": 1271.093017578125, - "y": -13.28600025177002 + "x": 1177.02197265625, + "y": -6.821000099182129 }, { - "x": 1271.344970703125, - "y": -10.996000289916992 + "x": 1177.2080078125, + "y": -4.735000133514404 }, { - "x": 1271.573974609375, - "y": -8.70300006866455 + "x": 1177.373046875, + "y": -2.6470000743865967 }, { - "x": 1271.779052734375, - "y": -6.408999919891357 + "x": 1177.5150146484375, + "y": -0.5580000281333923 }, { - "x": 1271.9599609375, - "y": -4.111999988555908 + "x": 1177.635986328125, + "y": 1.531999945640564 }, { - "x": 1272.116943359375, - "y": -1.812999963760376 + "x": 1177.7340087890625, + "y": 3.624000072479248 }, { - "x": 1272.2490234375, - "y": 0.4860000014305115 + "x": 1177.81103515625, + "y": 5.7170000076293945 }, { - "x": 1272.3580322265625, - "y": 2.7869999408721924 + "x": 1177.865966796875, + "y": 7.810999870300293 }, { - "x": 1272.4420166015625, - "y": 5.089000225067139 + "x": 1177.8990478515625, + "y": 9.904999732971191 }, { - "x": 1272.501953125, - "y": 7.392000198364258 - }, - { - "x": 1272.5389404296875, - "y": 9.696000099182129 - }, - { - "x": 1272.551025390625, + "x": 1177.9100341796875, "y": 11.99899959564209 }, { - "x": 1272.5389404296875, - "y": 14.303000450134277 + "x": 1177.8990478515625, + "y": 14.093999862670898 }, { - "x": 1272.501953125, - "y": 16.60700035095215 + "x": 1177.865966796875, + "y": 16.187999725341797 }, { - "x": 1272.4420166015625, - "y": 18.90999984741211 + "x": 1177.81103515625, + "y": 18.281999588012695 }, { - "x": 1272.3580322265625, - "y": 21.211999893188477 + "x": 1177.7340087890625, + "y": 20.375 }, { - "x": 1272.2490234375, - "y": 23.51300048828125 + "x": 1177.635986328125, + "y": 22.466999053955078 }, { - "x": 1272.116943359375, - "y": 25.812999725341797 + "x": 1177.5150146484375, + "y": 24.558000564575195 }, { - "x": 1271.9599609375, - "y": 28.11199951171875 + "x": 1177.373046875, + "y": 26.64699935913086 }, { - "x": 1271.779052734375, - "y": 30.409000396728516 + "x": 1177.2080078125, + "y": 28.735000610351562 }, { - "x": 1271.573974609375, - "y": 32.702999114990234 + "x": 1177.02197265625, + "y": 30.820999145507812 }, { - "x": 1271.344970703125, - "y": 34.99599838256836 + "x": 1176.81396484375, + "y": 32.904998779296875 }, { - "x": 1271.093017578125, - "y": 37.2859992980957 + "x": 1176.583984375, + "y": 34.98699951171875 }, { - "x": 1270.8160400390625, - "y": 39.573001861572266 + "x": 1176.3330078125, + "y": 37.066001892089844 }, { - "x": 1270.5150146484375, - "y": 41.856998443603516 + "x": 1176.0589599609375, + "y": 39.143001556396484 }, { - "x": 1270.1910400390625, - "y": 44.13800048828125 + "x": 1175.7640380859375, + "y": 41.215999603271484 }, { - "x": 1269.842041015625, - "y": 46.415000915527344 + "x": 1175.447021484375, + "y": 43.2859992980957 }, { - "x": 1269.469970703125, - "y": 48.68899917602539 + "x": 1175.1090087890625, + "y": 45.35300064086914 }, { - "x": 1269.073974609375, - "y": 50.95800018310547 + "x": 1174.7490234375, + "y": 47.41600036621094 }, { - "x": 1268.654052734375, - "y": 53.222999572753906 + "x": 1174.366943359375, + "y": 49.47600173950195 }, { - "x": 1268.2099609375, - "y": 55.48400115966797 + "x": 1173.9639892578125, + "y": 51.53099822998047 }, { - "x": 1267.7430419921875, - "y": 57.7400016784668 + "x": 1173.5389404296875, + "y": 53.582000732421875 }, { - "x": 1267.251953125, - "y": 59.99100112915039 + "x": 1173.093017578125, + "y": 55.62799835205078 }, { - "x": 1266.738037109375, - "y": 62.23699951171875 + "x": 1172.625, + "y": 57.66999816894531 }, { - "x": 1266.199951171875, - "y": 64.47699737548828 + "x": 1172.136962890625, + "y": 59.70600128173828 }, { - "x": 1265.6390380859375, - "y": 66.71099853515625 + "x": 1171.6259765625, + "y": 61.73699951171875 }, { - "x": 1265.053955078125, - "y": 68.94000244140625 + "x": 1171.094970703125, + "y": 63.76300048828125 }, { - "x": 1264.446044921875, - "y": 71.16200256347656 + "x": 1170.5419921875, + "y": 65.78299713134766 }, { - "x": 1263.81494140625, - "y": 73.37799835205078 + "x": 1169.968017578125, + "y": 67.7979965209961 }, { - "x": 1263.1610107421875, - "y": 75.58599853515625 + "x": 1169.3740234375, + "y": 69.80599975585938 }, { - "x": 1262.4840087890625, - "y": 77.78800201416016 + "x": 1168.758056640625, + "y": 71.80799865722656 }, { - "x": 1261.782958984375, - "y": 79.98300170898438 + "x": 1168.1209716796875, + "y": 73.8030014038086 }, { - "x": 1261.06005859375, - "y": 82.1709976196289 + "x": 1167.4630126953125, + "y": 75.79100036621094 }, { - "x": 1260.31298828125, - "y": 84.3499984741211 + "x": 1167.7440185546875, + "y": 75.08100128173828 }, { - "x": 1259.5439453125, - "y": 86.52200317382812 - }, - { - "x": 1260.0899658203125, - "y": 85.10399627685547 - }, - { - "x": 1258.634033203125, - "y": 88.9990005493164 + "x": 1166.3509521484375, + "y": 78.9990005493164 } ], "isCurve": true, @@ -4012,296 +3936,284 @@ "link": "", "route": [ { - "x": 1219.7320556640625, - "y": 154.99899291992188 - }, - { - "x": 1219.0899658203125, - "y": 155.7519989013672 - }, - { - "x": 1217.574951171875, - "y": 157.48800659179688 - }, - { - "x": 1216.04296875, - "y": 159.20799255371094 + "x": 1127.2750244140625, + "y": 144.99899291992188 }, { - "x": 1214.491943359375, - "y": 160.91200256347656 + "x": 1126.5389404296875, + "y": 145.8260040283203 }, { - "x": 1212.9239501953125, - "y": 162.60000610351562 + "x": 1125.1290283203125, + "y": 147.375 }, { - "x": 1211.3380126953125, - "y": 164.27099609375 + "x": 1123.7030029296875, + "y": 148.90899658203125 }, { - "x": 1209.7349853515625, - "y": 165.9250030517578 + "x": 1122.261962890625, + "y": 150.42799377441406 }, { - "x": 1208.114013671875, - "y": 167.56300354003906 + "x": 1120.803955078125, + "y": 151.9320068359375 }, { - "x": 1206.47705078125, - "y": 169.18299865722656 + "x": 1119.3310546875, + "y": 153.42100524902344 }, { - "x": 1204.822021484375, - "y": 170.78700256347656 + "x": 1117.842041015625, + "y": 154.8939971923828 }, { - "x": 1203.1510009765625, - "y": 172.3730010986328 + "x": 1116.3380126953125, + "y": 156.3520050048828 }, { - "x": 1201.4630126953125, - "y": 173.9409942626953 + "x": 1114.8189697265625, + "y": 157.79299926757812 }, { - "x": 1199.759033203125, - "y": 175.49099731445312 + "x": 1113.2850341796875, + "y": 159.218994140625 }, { - "x": 1198.0389404296875, - "y": 177.0240020751953 + "x": 1111.7359619140625, + "y": 160.6280059814453 }, { - "x": 1196.302978515625, - "y": 178.53799438476562 + "x": 1110.1719970703125, + "y": 162.02200317382812 }, { - "x": 1194.551025390625, - "y": 180.03500366210938 + "x": 1108.593994140625, + "y": 163.3990020751953 }, { - "x": 1192.7840576171875, - "y": 181.51199340820312 + "x": 1107.0009765625, + "y": 164.75900268554688 }, { - "x": 1191.0009765625, - "y": 182.9720001220703 + "x": 1105.39404296875, + "y": 166.1020050048828 }, { - "x": 1189.2030029296875, - "y": 184.41200256347656 + "x": 1103.7740478515625, + "y": 167.4290008544922 }, { - "x": 1187.3900146484375, - "y": 185.83399963378906 + "x": 1102.1390380859375, + "y": 168.73800659179688 }, { - "x": 1185.56201171875, - "y": 187.23599243164062 + "x": 1100.490966796875, + "y": 170.031005859375 }, { - "x": 1183.719970703125, - "y": 188.61900329589844 + "x": 1098.8289794921875, + "y": 171.30499267578125 }, { - "x": 1181.863037109375, - "y": 189.98300170898438 + "x": 1097.155029296875, + "y": 172.56300354003906 }, { - "x": 1179.9930419921875, - "y": 191.3280029296875 + "x": 1095.467041015625, + "y": 173.80299377441406 }, { - "x": 1178.1080322265625, - "y": 192.65199279785156 + "x": 1093.7659912109375, + "y": 175.02499389648438 }, { - "x": 1176.208984375, - "y": 193.95700073242188 + "x": 1092.052001953125, + "y": 176.22900390625 }, { - "x": 1174.2969970703125, - "y": 195.24200439453125 + "x": 1090.3260498046875, + "y": 177.41600036621094 }, { - "x": 1172.3709716796875, - "y": 196.5070037841797 + "x": 1088.5880126953125, + "y": 178.58399963378906 }, { - "x": 1170.4329833984375, - "y": 197.7519989013672 + "x": 1086.8370361328125, + "y": 179.73399353027344 }, { - "x": 1168.48095703125, - "y": 198.9759979248047 + "x": 1085.074951171875, + "y": 180.86500549316406 }, { - "x": 1166.5169677734375, - "y": 200.17999267578125 + "x": 1083.301025390625, + "y": 181.97799682617188 }, { - "x": 1164.5400390625, - "y": 201.36300659179688 + "x": 1081.5150146484375, + "y": 183.07200622558594 }, { - "x": 1162.551025390625, - "y": 202.52499389648438 + "x": 1079.718017578125, + "y": 184.1479949951172 }, { - "x": 1160.550048828125, - "y": 203.66700744628906 + "x": 1077.9100341796875, + "y": 185.2050018310547 }, { - "x": 1158.5360107421875, - "y": 204.78700256347656 + "x": 1076.0899658203125, + "y": 186.24200439453125 }, { - "x": 1156.511962890625, - "y": 205.88600158691406 + "x": 1074.260009765625, + "y": 187.26100158691406 }, { - "x": 1154.4759521484375, - "y": 206.96400451660156 + "x": 1072.4200439453125, + "y": 188.25999450683594 }, { - "x": 1152.428955078125, - "y": 208.02099609375 + "x": 1070.5689697265625, + "y": 189.24000549316406 }, { - "x": 1150.3699951171875, - "y": 209.05599975585938 + "x": 1068.7080078125, + "y": 190.2010040283203 }, { - "x": 1148.302001953125, - "y": 210.07000732421875 + "x": 1066.8370361328125, + "y": 191.14199829101562 }, { - "x": 1146.2220458984375, - "y": 211.06100463867188 + "x": 1064.9560546875, + "y": 192.06300354003906 }, { - "x": 1144.1319580078125, - "y": 212.031005859375 + "x": 1063.0660400390625, + "y": 192.96499633789062 }, { - "x": 1142.032958984375, - "y": 212.97999572753906 + "x": 1061.166015625, + "y": 193.8470001220703 }, { - "x": 1139.9229736328125, - "y": 213.906005859375 + "x": 1059.2569580078125, + "y": 194.70899963378906 }, { - "x": 1137.803955078125, - "y": 214.8090057373047 + "x": 1057.3389892578125, + "y": 195.5500030517578 }, { - "x": 1135.676025390625, - "y": 215.6909942626953 + "x": 1055.4129638671875, + "y": 196.3719940185547 }, { - "x": 1133.5379638671875, - "y": 216.5500030517578 + "x": 1053.47802734375, + "y": 197.1739959716797 }, { - "x": 1131.3919677734375, - "y": 217.38699340820312 + "x": 1051.5350341796875, + "y": 197.9550018310547 }, { - "x": 1129.237060546875, - "y": 218.20199584960938 + "x": 1049.5830078125, + "y": 198.71600341796875 }, { - "x": 1127.072998046875, - "y": 218.9929962158203 + "x": 1047.6240234375, + "y": 199.45599365234375 }, { - "x": 1124.9010009765625, - "y": 219.76199340820312 + "x": 1045.656982421875, + "y": 200.17599487304688 }, { - "x": 1122.7220458984375, - "y": 220.50900268554688 + "x": 1043.6829833984375, + "y": 200.875 }, { - "x": 1120.5340576171875, - "y": 221.23199462890625 + "x": 1041.7020263671875, + "y": 201.55299377441406 }, { - "x": 1118.3399658203125, - "y": 221.9320068359375 + "x": 1039.7130126953125, + "y": 202.21099853515625 }, { - "x": 1116.137939453125, - "y": 222.61000061035156 + "x": 1037.718017578125, + "y": 202.84800720214844 }, { - "x": 1113.928955078125, - "y": 223.26400756835938 + "x": 1035.7159423828125, + "y": 203.46299743652344 }, { - "x": 1111.7130126953125, - "y": 223.89500427246094 + "x": 1033.7080078125, + "y": 204.05799865722656 }, { - "x": 1109.490966796875, - "y": 224.5030059814453 + "x": 1031.6939697265625, + "y": 204.6320037841797 }, { - "x": 1107.261962890625, - "y": 225.08799743652344 + "x": 1029.6729736328125, + "y": 205.18499755859375 }, { - "x": 1105.0279541015625, - "y": 225.6490020751953 + "x": 1027.64794921875, + "y": 205.71600341796875 }, { - "x": 1102.7879638671875, - "y": 226.18699645996094 + "x": 1025.615966796875, + "y": 206.2259979248047 }, { - "x": 1100.5419921875, - "y": 226.7010040283203 + "x": 1023.5800170898438, + "y": 206.71499633789062 }, { - "x": 1098.291015625, - "y": 227.19200134277344 + "x": 1021.5380249023438, + "y": 207.18299865722656 }, { - "x": 1096.0350341796875, - "y": 227.65899658203125 + "x": 1019.4920043945312, + "y": 207.62899780273438 }, { - "x": 1093.7750244140625, - "y": 228.10299682617188 + "x": 1017.4409790039062, + "y": 208.0540008544922 }, { - "x": 1091.509033203125, - "y": 228.5229949951172 + "x": 1015.385986328125, + "y": 208.45700073242188 }, { - "x": 1089.239990234375, - "y": 228.91900634765625 + "x": 1013.3270263671875, + "y": 208.83900451660156 }, { - "x": 1086.9659423828125, - "y": 229.29100036621094 + "x": 1011.2630004882812, + "y": 209.19900512695312 }, { - "x": 1084.68896484375, - "y": 229.63900756835938 + "x": 1009.197021484375, + "y": 209.53700256347656 }, { - "x": 1082.407958984375, - "y": 229.96400451660156 + "x": 1007.1259765625, + "y": 209.85400390625 }, { - "x": 1083.677978515625, - "y": 229.82400512695312 + "x": 1009.031005859375, + "y": 209.6060028076172 }, { - "x": 1079.551025390625, - "y": 230.33399963378906 + "x": 1004.9099731445312, + "y": 210.16799926757812 } ], "isCurve": true, @@ -4336,296 +4248,284 @@ "link": "", "route": [ { - "x": 1025.551025390625, - "y": 230.33399963378906 - }, - { - "x": 1024.97705078125, - "y": 230.26499938964844 - }, - { - "x": 1022.6929931640625, - "y": 229.96400451660156 - }, - { - "x": 1020.4119873046875, - "y": 229.63900756835938 + "x": 950.9099731445312, + "y": 210.16799926757812 }, { - "x": 1018.135009765625, - "y": 229.29100036621094 + "x": 950.7670288085938, + "y": 210.1490020751953 }, { - "x": 1015.8619995117188, - "y": 228.91900634765625 + "x": 948.6929931640625, + "y": 209.85400390625 }, { - "x": 1013.5919799804688, - "y": 228.5229949951172 + "x": 946.6229858398438, + "y": 209.53700256347656 }, { - "x": 1011.3270263671875, - "y": 228.10299682617188 + "x": 944.5560302734375, + "y": 209.19900512695312 }, { - "x": 1009.0659790039062, - "y": 227.65899658203125 + "x": 942.4929809570312, + "y": 208.83900451660156 }, { - "x": 1006.8099975585938, - "y": 227.19200134277344 + "x": 940.4329833984375, + "y": 208.45700073242188 }, { - "x": 1004.5590209960938, - "y": 226.7010040283203 + "x": 938.3779907226562, + "y": 208.0540008544922 }, { - "x": 1002.31298828125, - "y": 226.18699645996094 + "x": 936.3270263671875, + "y": 207.62899780273438 }, { - "x": 1000.072998046875, - "y": 225.6490020751953 + "x": 934.281005859375, + "y": 207.18299865722656 }, { - "x": 997.8389892578125, - "y": 225.08799743652344 + "x": 932.239013671875, + "y": 206.71499633789062 }, { - "x": 995.6099853515625, - "y": 224.5030059814453 + "x": 930.2030029296875, + "y": 206.2259979248047 }, { - "x": 993.3880004882812, - "y": 223.89500427246094 + "x": 928.1719970703125, + "y": 205.71600341796875 }, { - "x": 991.1729736328125, - "y": 223.26400756835938 + "x": 926.14599609375, + "y": 205.18499755859375 }, { - "x": 988.9639892578125, - "y": 222.61000061035156 + "x": 924.1259765625, + "y": 204.6320037841797 }, { - "x": 986.7620239257812, - "y": 221.9320068359375 + "x": 922.1110229492188, + "y": 204.05799865722656 }, { - "x": 984.5670166015625, - "y": 221.23199462890625 + "x": 920.10302734375, + "y": 203.46299743652344 }, { - "x": 982.3800048828125, - "y": 220.50900268554688 + "x": 918.1019897460938, + "y": 202.84800720214844 }, { - "x": 980.2000122070312, - "y": 219.76199340820312 + "x": 916.1060180664062, + "y": 202.21099853515625 }, { - "x": 978.0280151367188, - "y": 218.9929962158203 + "x": 914.1179809570312, + "y": 201.55299377441406 }, { - "x": 975.864990234375, - "y": 218.20199584960938 + "x": 912.135986328125, + "y": 200.875 }, { - "x": 973.7100219726562, - "y": 217.38699340820312 + "x": 910.1619873046875, + "y": 200.17599487304688 }, { - "x": 971.56298828125, - "y": 216.5500030517578 + "x": 908.1950073242188, + "y": 199.45599365234375 }, { - "x": 969.426025390625, - "y": 215.6909942626953 + "x": 906.2360229492188, + "y": 198.71600341796875 }, { - "x": 967.2969970703125, - "y": 214.8090057373047 + "x": 904.2849731445312, + "y": 197.9550018310547 }, { - "x": 965.177978515625, - "y": 213.906005859375 + "x": 902.3419799804688, + "y": 197.1739959716797 }, { - "x": 963.0689697265625, - "y": 212.97999572753906 + "x": 900.406982421875, + "y": 196.3719940185547 }, { - "x": 960.968994140625, - "y": 212.031005859375 + "x": 898.47998046875, + "y": 195.5500030517578 }, { - "x": 958.8790283203125, - "y": 211.06100463867188 + "x": 896.56201171875, + "y": 194.70899963378906 }, { - "x": 956.7999877929688, - "y": 210.07000732421875 + "x": 894.6539916992188, + "y": 193.8470001220703 }, { - "x": 954.7310180664062, - "y": 209.05599975585938 + "x": 892.7540283203125, + "y": 192.96499633789062 }, { - "x": 952.6729736328125, - "y": 208.02099609375 + "x": 890.8629760742188, + "y": 192.06300354003906 }, { - "x": 950.6259765625, - "y": 206.96400451660156 + "x": 888.9829711914062, + "y": 191.14199829101562 }, { - "x": 948.5900268554688, - "y": 205.88600158691406 + "x": 887.1119995117188, + "y": 190.2010040283203 }, { - "x": 946.5650024414062, - "y": 204.78700256347656 + "x": 885.25, + "y": 189.24000549316406 }, { - "x": 944.552001953125, - "y": 203.66700744628906 + "x": 883.4000244140625, + "y": 188.25999450683594 }, { - "x": 942.551025390625, - "y": 202.52499389648438 + "x": 881.5590209960938, + "y": 187.26100158691406 }, { - "x": 940.56201171875, - "y": 201.36300659179688 + "x": 879.72900390625, + "y": 186.24200439453125 }, { - "x": 938.5850219726562, - "y": 200.17999267578125 + "x": 877.9099731445312, + "y": 185.2050018310547 }, { - "x": 936.6199951171875, - "y": 198.9759979248047 + "x": 876.1010131835938, + "y": 184.1479949951172 }, { - "x": 934.6690063476562, - "y": 197.7519989013672 + "x": 874.3040161132812, + "y": 183.07200622558594 }, { - "x": 932.72998046875, - "y": 196.5070037841797 + "x": 872.5189819335938, + "y": 181.97799682617188 }, { - "x": 930.8049926757812, - "y": 195.24200439453125 + "x": 870.7440185546875, + "y": 180.86500549316406 }, { - "x": 928.8920288085938, - "y": 193.95700073242188 + "x": 868.9819946289062, + "y": 179.73399353027344 }, { - "x": 926.9940185546875, - "y": 192.65199279785156 + "x": 867.2310180664062, + "y": 178.58399963378906 }, { - "x": 925.1090087890625, - "y": 191.3280029296875 + "x": 865.4929809570312, + "y": 177.41600036621094 }, { - "x": 923.2379760742188, - "y": 189.98300170898438 + "x": 863.7670288085938, + "y": 176.22900390625 }, { - "x": 921.3809814453125, - "y": 188.61900329589844 + "x": 862.052978515625, + "y": 175.02499389648438 }, { - "x": 919.5390014648438, - "y": 187.23599243164062 + "x": 860.35302734375, + "y": 173.80299377441406 }, { - "x": 917.7109985351562, - "y": 185.83399963378906 + "x": 858.6649780273438, + "y": 172.56300354003906 }, { - "x": 915.8980102539062, - "y": 184.41200256347656 + "x": 856.989990234375, + "y": 171.30499267578125 }, { - "x": 914.0999755859375, - "y": 182.9720001220703 + "x": 855.3280029296875, + "y": 170.031005859375 }, { - "x": 912.3170166015625, - "y": 181.51199340820312 + "x": 853.6799926757812, + "y": 168.73800659179688 }, { - "x": 910.5499877929688, - "y": 180.03500366210938 + "x": 852.0460205078125, + "y": 167.4290008544922 }, { - "x": 908.7979736328125, - "y": 178.53799438476562 + "x": 850.4249877929688, + "y": 166.1020050048828 }, { - "x": 907.06201171875, - "y": 177.0240020751953 + "x": 848.8179931640625, + "y": 164.75900268554688 }, { - "x": 905.3419799804688, - "y": 175.49099731445312 + "x": 847.2260131835938, + "y": 163.3990020751953 }, { - "x": 903.6380004882812, - "y": 173.9409942626953 + "x": 845.64697265625, + "y": 162.02200317382812 }, { - "x": 901.9500122070312, - "y": 172.3730010986328 + "x": 844.083984375, + "y": 160.6280059814453 }, { - "x": 900.2789916992188, - "y": 170.78700256347656 + "x": 842.5339965820312, + "y": 159.218994140625 }, { - "x": 898.625, - "y": 169.18299865722656 + "x": 841, + "y": 157.79299926757812 }, { - "x": 896.9869995117188, - "y": 167.56300354003906 + "x": 839.4810180664062, + "y": 156.3520050048828 }, { - "x": 895.3670043945312, - "y": 165.9250030517578 + "x": 837.9769897460938, + "y": 154.8939971923828 }, { - "x": 893.7630004882812, - "y": 164.27099609375 + "x": 836.4879760742188, + "y": 153.42100524902344 }, { - "x": 892.177978515625, - "y": 162.60000610351562 + "x": 835.0150146484375, + "y": 151.9320068359375 }, { - "x": 890.6090087890625, - "y": 160.91200256347656 + "x": 833.5579833984375, + "y": 150.42799377441406 }, { - "x": 889.0590209960938, - "y": 159.20799255371094 + "x": 832.1160278320312, + "y": 148.90899658203125 }, { - "x": 887.5260009765625, - "y": 157.48800659179688 + "x": 830.6900024414062, + "y": 147.375 }, { - "x": 888.072021484375, - "y": 158.16000366210938 + "x": 831.3099975585938, + "y": 148.1060028076172 }, { - "x": 885.3690185546875, - "y": 155 + "x": 828.5449829101562, + "y": 145 } ], "isCurve": true, @@ -4660,288 +4560,272 @@ "link": "", "route": [ { - "x": 846.4669799804688, - "y": 89 - }, - { - "x": 846.3489990234375, - "y": 88.68499755859375 - }, - { - "x": 845.5570068359375, - "y": 86.52200317382812 + "x": 789.468994140625, + "y": 79 }, { - "x": 844.7880249023438, - "y": 84.3499984741211 + "x": 789.0339965820312, + "y": 77.77300262451172 }, { - "x": 844.0419921875, - "y": 82.1709976196289 + "x": 788.3560180664062, + "y": 75.79100036621094 }, { - "x": 843.3179931640625, - "y": 79.98300170898438 + "x": 787.697998046875, + "y": 73.8030014038086 }, { - "x": 842.6179809570312, - "y": 77.78800201416016 + "x": 787.06201171875, + "y": 71.80799865722656 }, { - "x": 841.9400024414062, - "y": 75.58599853515625 + "x": 786.4459838867188, + "y": 69.80599975585938 }, { - "x": 841.2860107421875, - "y": 73.37799835205078 + "x": 785.8510131835938, + "y": 67.7979965209961 }, { - "x": 840.655029296875, - "y": 71.16200256347656 + "x": 785.2769775390625, + "y": 65.78299713134766 }, { - "x": 840.0469970703125, - "y": 68.94000244140625 + "x": 784.7239990234375, + "y": 63.76300048828125 }, { - "x": 839.4619750976562, - "y": 66.71099853515625 + "x": 784.1929931640625, + "y": 61.73699951171875 }, { - "x": 838.9010009765625, - "y": 64.47699737548828 + "x": 783.6829833984375, + "y": 59.70600128173828 }, { - "x": 838.3629760742188, - "y": 62.23699951171875 + "x": 783.1939697265625, + "y": 57.66999816894531 }, { - "x": 837.8489990234375, - "y": 59.99100112915039 + "x": 782.7260131835938, + "y": 55.62799835205078 }, { - "x": 837.3579711914062, - "y": 57.7400016784668 + "x": 782.280029296875, + "y": 53.582000732421875 }, { - "x": 836.8909912109375, - "y": 55.48400115966797 + "x": 781.85498046875, + "y": 51.53099822998047 }, { - "x": 836.447021484375, - "y": 53.222999572753906 + "x": 781.4520263671875, + "y": 49.47600173950195 }, { - "x": 836.0280151367188, - "y": 50.95800018310547 + "x": 781.0709838867188, + "y": 47.41600036621094 }, { - "x": 835.6320190429688, - "y": 48.68899917602539 + "x": 780.7100219726562, + "y": 45.35300064086914 }, { - "x": 835.2589721679688, - "y": 46.415000915527344 + "x": 780.3720092773438, + "y": 43.2859992980957 }, { - "x": 834.9110107421875, - "y": 44.13800048828125 + "x": 780.0549926757812, + "y": 41.215999603271484 }, { - "x": 834.5859985351562, - "y": 41.856998443603516 + "x": 779.760009765625, + "y": 39.143001556396484 }, { - "x": 834.2849731445312, - "y": 39.573001861572266 + "x": 779.4869995117188, + "y": 37.066001892089844 }, { - "x": 834.0089721679688, - "y": 37.2859992980957 + "x": 779.2349853515625, + "y": 34.98699951171875 }, { - "x": 833.7559814453125, - "y": 34.99599838256836 + "x": 779.0050048828125, + "y": 32.904998779296875 }, { - "x": 833.5269775390625, - "y": 32.702999114990234 + "x": 778.7969970703125, + "y": 30.820999145507812 }, { - "x": 833.322021484375, - "y": 30.409000396728516 + "x": 778.6110229492188, + "y": 28.735000610351562 }, { - "x": 833.1409912109375, - "y": 28.11199951171875 + "x": 778.447021484375, + "y": 26.64699935913086 }, { - "x": 832.9849853515625, - "y": 25.812999725341797 + "x": 778.3040161132812, + "y": 24.558000564575195 }, { - "x": 832.8519897460938, - "y": 23.51300048828125 + "x": 778.1840209960938, + "y": 22.466999053955078 }, { - "x": 832.7440185546875, - "y": 21.211999893188477 + "x": 778.0850219726562, + "y": 20.375 }, { - "x": 832.6589965820312, - "y": 18.90999984741211 + "x": 778.0079956054688, + "y": 18.281999588012695 }, { - "x": 832.5989990234375, - "y": 16.60700035095215 + "x": 777.9539794921875, + "y": 16.187999725341797 }, { - "x": 832.56298828125, - "y": 14.303000450134277 + "x": 777.9210205078125, + "y": 14.093999862670898 }, { - "x": 832.551025390625, + "x": 777.9099731445312, "y": 12 }, { - "x": 832.56298828125, - "y": 9.696000099182129 + "x": 777.9210205078125, + "y": 9.904999732971191 }, { - "x": 832.5989990234375, - "y": 7.392000198364258 + "x": 777.9539794921875, + "y": 7.810999870300293 }, { - "x": 832.6589965820312, - "y": 5.089000225067139 + "x": 778.0079956054688, + "y": 5.7170000076293945 }, { - "x": 832.7440185546875, - "y": 2.7869999408721924 + "x": 778.0850219726562, + "y": 3.624000072479248 }, { - "x": 832.8519897460938, - "y": 0.4860000014305115 + "x": 778.1840209960938, + "y": 1.531999945640564 }, { - "x": 832.9849853515625, - "y": -1.812999963760376 + "x": 778.3040161132812, + "y": -0.5580000281333923 }, { - "x": 833.1409912109375, - "y": -4.111999988555908 + "x": 778.447021484375, + "y": -2.6470000743865967 }, { - "x": 833.322021484375, - "y": -6.408999919891357 + "x": 778.6110229492188, + "y": -4.735000133514404 }, { - "x": 833.5269775390625, - "y": -8.70300006866455 + "x": 778.7969970703125, + "y": -6.821000099182129 }, { - "x": 833.7559814453125, - "y": -10.996000289916992 + "x": 779.0050048828125, + "y": -8.904999732971191 }, { - "x": 834.0089721679688, - "y": -13.28600025177002 + "x": 779.2349853515625, + "y": -10.987000465393066 }, { - "x": 834.2849731445312, - "y": -15.572999954223633 + "x": 779.4869995117188, + "y": -13.065999984741211 }, { - "x": 834.5859985351562, - "y": -17.85700035095215 + "x": 779.760009765625, + "y": -15.142999649047852 }, { - "x": 834.9110107421875, - "y": -20.13800048828125 + "x": 780.0549926757812, + "y": -17.215999603271484 }, { - "x": 835.2589721679688, - "y": -22.415000915527344 + "x": 780.3720092773438, + "y": -19.285999298095703 }, { - "x": 835.6320190429688, - "y": -24.68899917602539 + "x": 780.7100219726562, + "y": -21.35300064086914 }, { - "x": 836.0280151367188, - "y": -26.95800018310547 + "x": 781.0709838867188, + "y": -23.416000366210938 }, { - "x": 836.447021484375, - "y": -29.222999572753906 + "x": 781.4520263671875, + "y": -25.47599983215332 }, { - "x": 836.8909912109375, - "y": -31.483999252319336 + "x": 781.85498046875, + "y": -27.5310001373291 }, { - "x": 837.3579711914062, - "y": -33.7400016784668 + "x": 782.280029296875, + "y": -29.582000732421875 }, { - "x": 837.8489990234375, - "y": -35.99100112915039 + "x": 782.7260131835938, + "y": -31.628000259399414 }, { - "x": 838.3629760742188, - "y": -38.23699951171875 + "x": 783.1939697265625, + "y": -33.66999816894531 }, { - "x": 838.9010009765625, - "y": -40.47700119018555 + "x": 783.6829833984375, + "y": -35.70600128173828 }, { - "x": 839.4619750976562, - "y": -42.71099853515625 + "x": 784.1929931640625, + "y": -37.73699951171875 }, { - "x": 840.0469970703125, - "y": -44.939998626708984 + "x": 784.7239990234375, + "y": -39.76300048828125 }, { - "x": 840.655029296875, - "y": -47.1619987487793 + "x": 785.2769775390625, + "y": -41.78300094604492 }, { - "x": 841.2860107421875, - "y": -49.37799835205078 + "x": 785.8510131835938, + "y": -43.79800033569336 }, { - "x": 841.9400024414062, - "y": -51.58599853515625 + "x": 786.4459838867188, + "y": -45.805999755859375 }, { - "x": 842.6179809570312, - "y": -53.78799819946289 + "x": 787.06201171875, + "y": -47.80799865722656 }, { - "x": 843.3179931640625, - "y": -55.983001708984375 + "x": 787.697998046875, + "y": -49.803001403808594 }, { - "x": 844.0419921875, - "y": -58.17100143432617 + "x": 788.3560180664062, + "y": -51.79100036621094 }, { - "x": 844.7880249023438, - "y": -60.349998474121094 + "x": 788.0750122070312, + "y": -51.08100128173828 }, { - "x": 845.5570068359375, - "y": -62.52199935913086 - }, - { - "x": 845.0120239257812, - "y": -61.104000091552734 - }, - { - "x": 846.4669799804688, - "y": -65 + "x": 789.468994140625, + "y": -55 } ], "isCurve": true, @@ -4976,324 +4860,312 @@ "link": "", "route": [ { - "x": 1533.10205078125, - "y": -185.38499450683594 + "x": 1423.8199462890625, + "y": -167.13400268554688 }, { - "x": 1534.175048828125, - "y": -185.2570037841797 + "x": 1424.8780517578125, + "y": -166.9929962158203 }, { - "x": 1536.916015625, - "y": -184.89300537109375 + "x": 1427.364990234375, + "y": -166.6320037841797 }, { - "x": 1539.6510009765625, - "y": -184.4949951171875 + "x": 1429.8470458984375, + "y": -166.23800659179688 }, { - "x": 1542.3819580078125, - "y": -184.06199645996094 + "x": 1432.323974609375, + "y": -165.81399536132812 }, { - "x": 1545.1070556640625, - "y": -183.5959930419922 + "x": 1434.7960205078125, + "y": -165.35899353027344 }, { - "x": 1547.8260498046875, - "y": -183.09500122070312 + "x": 1437.261962890625, + "y": -164.8719940185547 }, { - "x": 1550.5379638671875, - "y": -182.5590057373047 + "x": 1439.720947265625, + "y": -164.35499572753906 }, { - "x": 1553.2430419921875, - "y": -181.99000549316406 + "x": 1442.1739501953125, + "y": -163.8070068359375 }, { - "x": 1555.9410400390625, - "y": -181.38699340820312 + "x": 1444.6199951171875, + "y": -163.22799682617188 }, { - "x": 1558.6319580078125, - "y": -180.75 + "x": 1447.0579833984375, + "y": -162.6179962158203 }, { - "x": 1561.31396484375, - "y": -180.0800018310547 + "x": 1449.488037109375, + "y": -161.97799682617188 }, { - "x": 1563.987060546875, - "y": -179.375 + "x": 1451.9100341796875, + "y": -161.3070068359375 }, { - "x": 1566.6510009765625, - "y": -178.63699340820312 + "x": 1454.323974609375, + "y": -160.6060028076172 }, { - "x": 1569.3060302734375, - "y": -177.86599731445312 + "x": 1456.72802734375, + "y": -159.87399291992188 }, { - "x": 1571.9510498046875, - "y": -177.06199645996094 + "x": 1459.123046875, + "y": -159.11300659179688 }, { - "x": 1574.5860595703125, - "y": -176.2239990234375 + "x": 1461.509033203125, + "y": -158.3209991455078 }, { - "x": 1577.208984375, - "y": -175.35299682617188 + "x": 1463.884033203125, + "y": -157.49899291992188 }, { - "x": 1579.822021484375, - "y": -174.44900512695312 + "x": 1466.248046875, + "y": -156.6479949951172 }, { - "x": 1582.4229736328125, - "y": -173.51300048828125 + "x": 1468.60205078125, + "y": -155.76699829101562 }, { - "x": 1585.011962890625, - "y": -172.54400634765625 + "x": 1470.9449462890625, + "y": -154.8560028076172 }, { - "x": 1587.5889892578125, - "y": -171.54200744628906 + "x": 1473.2760009765625, + "y": -153.91700744628906 }, { - "x": 1590.1529541015625, - "y": -170.50799560546875 + "x": 1475.594970703125, + "y": -152.947998046875 }, { - "x": 1592.7039794921875, - "y": -169.44200134277344 + "x": 1477.9010009765625, + "y": -151.94900512695312 }, { - "x": 1595.240966796875, - "y": -168.343994140625 + "x": 1480.1949462890625, + "y": -150.9219970703125 }, { - "x": 1597.7640380859375, - "y": -167.21499633789062 + "x": 1482.4759521484375, + "y": -149.86700439453125 }, { - "x": 1600.27294921875, - "y": -166.05299377441406 + "x": 1484.7430419921875, + "y": -148.78199768066406 }, { - "x": 1602.7669677734375, - "y": -164.86099243164062 + "x": 1486.9959716796875, + "y": -147.66900634765625 }, { - "x": 1605.2459716796875, - "y": -163.63600158691406 + "x": 1489.2359619140625, + "y": -146.5279998779297 }, { - "x": 1607.708984375, - "y": -162.38099670410156 + "x": 1491.4610595703125, + "y": -145.35899353027344 }, { - "x": 1610.156982421875, - "y": -161.09500122070312 + "x": 1493.6710205078125, + "y": -144.16299438476562 }, { - "x": 1612.5880126953125, - "y": -159.7790069580078 + "x": 1495.864990234375, + "y": -142.93800354003906 }, { - "x": 1615.001953125, - "y": -158.4320068359375 + "x": 1498.0439453125, + "y": -141.68600463867188 }, { - "x": 1617.3990478515625, - "y": -157.05499267578125 + "x": 1500.2080078125, + "y": -140.40699768066406 }, { - "x": 1619.779052734375, - "y": -155.64700317382812 + "x": 1502.35498046875, + "y": -139.10000610351562 }, { - "x": 1622.1400146484375, - "y": -154.2100067138672 + "x": 1504.4849853515625, + "y": -137.76699829101562 }, { - "x": 1624.4840087890625, - "y": -152.74400329589844 + "x": 1506.5989990234375, + "y": -136.40699768066406 }, { - "x": 1626.8089599609375, - "y": -151.2480010986328 + "x": 1508.6949462890625, + "y": -135.02000427246094 }, { - "x": 1629.114013671875, - "y": -149.7220001220703 + "x": 1510.7740478515625, + "y": -133.60800170898438 }, { - "x": 1631.4010009765625, - "y": -148.16900634765625 + "x": 1512.833984375, + "y": -132.16900634765625 }, { - "x": 1633.66796875, - "y": -146.58599853515625 + "x": 1514.876953125, + "y": -130.7050018310547 }, { - "x": 1635.9150390625, - "y": -144.97500610351562 + "x": 1516.9010009765625, + "y": -129.21499633789062 }, { - "x": 1638.1409912109375, - "y": -143.33599853515625 + "x": 1518.906005859375, + "y": -127.6989974975586 }, { - "x": 1640.3470458984375, - "y": -141.66900634765625 + "x": 1520.8919677734375, + "y": -126.15899658203125 }, { - "x": 1642.531005859375, - "y": -139.97500610351562 + "x": 1522.8580322265625, + "y": -124.59400177001953 }, { - "x": 1644.6939697265625, - "y": -138.2530059814453 + "x": 1524.8050537109375, + "y": -123.00399780273438 }, { - "x": 1646.8349609375, - "y": -136.50399780273438 + "x": 1526.73095703125, + "y": -121.38999938964844 }, { - "x": 1648.9539794921875, - "y": -134.72900390625 + "x": 1528.636962890625, + "y": -119.7509994506836 }, { - "x": 1651.051025390625, - "y": -132.927001953125 + "x": 1530.52197265625, + "y": -118.08899688720703 }, { - "x": 1653.1240234375, - "y": -131.09800720214844 + "x": 1532.385986328125, + "y": -116.40399932861328 }, { - "x": 1655.175048828125, - "y": -129.24400329589844 + "x": 1534.22900390625, + "y": -114.69499969482422 }, { - "x": 1657.2020263671875, - "y": -127.36399841308594 + "x": 1536.050048828125, + "y": -112.96299743652344 }, { - "x": 1659.2060546875, - "y": -125.45899963378906 + "x": 1537.8499755859375, + "y": -111.20800018310547 }, { - "x": 1661.18505859375, - "y": -123.52899932861328 + "x": 1539.626953125, + "y": -109.43099975585938 }, { - "x": 1663.1400146484375, - "y": -121.5739974975586 + "x": 1541.3819580078125, + "y": -107.63200378417969 }, { - "x": 1665.0699462890625, - "y": -119.59500122070312 + "x": 1543.114013671875, + "y": -105.81099700927734 }, { - "x": 1666.9749755859375, - "y": -117.59200286865234 + "x": 1544.822021484375, + "y": -103.96800231933594 }, { - "x": 1668.85498046875, - "y": -115.56500244140625 + "x": 1546.508056640625, + "y": -102.10399627685547 }, { - "x": 1670.708984375, - "y": -113.51399993896484 + "x": 1548.1700439453125, + "y": -100.21800231933594 }, { - "x": 1672.5369873046875, - "y": -111.44000244140625 + "x": 1549.8079833984375, + "y": -98.31199645996094 }, { - "x": 1674.3389892578125, - "y": -109.34400177001953 + "x": 1551.4219970703125, + "y": -96.38600158691406 }, { - "x": 1676.114990234375, - "y": -107.2249984741211 + "x": 1553.011962890625, + "y": -94.43900299072266 }, { - "x": 1677.864013671875, - "y": -105.08300018310547 + "x": 1554.5780029296875, + "y": -92.4729995727539 }, { - "x": 1679.5849609375, - "y": -102.91999816894531 + "x": 1556.1180419921875, + "y": -90.48699951171875 }, { - "x": 1681.280029296875, - "y": -100.73600006103516 + "x": 1557.633056640625, + "y": -88.48200225830078 }, { - "x": 1682.947021484375, - "y": -98.52999877929688 + "x": 1559.123046875, + "y": -86.45800018310547 }, { - "x": 1684.5860595703125, - "y": -96.30400085449219 + "x": 1560.5880126953125, + "y": -84.41600036621094 }, { - "x": 1686.196044921875, - "y": -94.05699920654297 + "x": 1562.0260009765625, + "y": -82.3550033569336 }, { - "x": 1687.779052734375, - "y": -91.79100036621094 + "x": 1563.43896484375, + "y": -80.2760009765625 }, { - "x": 1689.3330078125, - "y": -89.50399780273438 + "x": 1564.824951171875, + "y": -78.18000030517578 }, { - "x": 1690.8580322265625, - "y": -87.197998046875 + "x": 1566.18505859375, + "y": -76.06700134277344 }, { - "x": 1692.35400390625, - "y": -84.87300109863281 + "x": 1567.51904296875, + "y": -73.93599700927734 }, { - "x": 1693.821044921875, - "y": -82.52999877929688 + "x": 1568.824951171875, + "y": -71.78900146484375 }, { - "x": 1695.258056640625, - "y": -80.16799926757812 + "x": 1570.10498046875, + "y": -69.6259994506836 }, { - "x": 1696.6650390625, - "y": -77.78800201416016 + "x": 1571.3570556640625, + "y": -67.4469985961914 }, { - "x": 1698.0419921875, - "y": -75.39099884033203 + "x": 1571.447998046875, + "y": -67.36699676513672 }, { - "x": 1699.3890380859375, - "y": -72.97699737548828 - }, - { - "x": 1700.7060546875, - "y": -70.5459976196289 - }, - { - "x": 1700.14599609375, - "y": -71.66999816894531 - }, - { - "x": 1702.0550537109375, - "y": -67.9749984741211 + "x": 1573.4189453125, + "y": -63.70500183105469 } ], "isCurve": true, @@ -5328,312 +5200,304 @@ "link": "", "route": [ { - "x": 1723.7989501953125, - "y": -1.975000023841858 + "x": 1595.23095703125, + "y": 2.2939999103546143 }, { - "x": 1724.10498046875, - "y": -0.04100000113248825 + "x": 1595.4119873046875, + "y": 3.5399999618530273 }, { - "x": 1724.5030517578125, - "y": 2.694000005722046 + "x": 1595.7430419921875, + "y": 6.031000137329102 }, { - "x": 1724.866943359375, - "y": 5.434000015258789 + "x": 1596.0419921875, + "y": 8.527000427246094 }, { - "x": 1725.196044921875, - "y": 8.178999900817871 + "x": 1596.31005859375, + "y": 11.024999618530273 }, { - "x": 1725.490966796875, - "y": 10.928000450134277 + "x": 1596.5469970703125, + "y": 13.527999877929688 }, { - "x": 1725.7509765625, - "y": 13.680000305175781 + "x": 1596.751953125, + "y": 16.031999588012695 }, { - "x": 1725.97705078125, - "y": 16.43600082397461 + "x": 1596.925048828125, + "y": 18.540000915527344 }, { - "x": 1726.16796875, - "y": 19.194000244140625 + "x": 1597.0670166015625, + "y": 21.048999786376953 }, { - "x": 1726.323974609375, - "y": 21.95400047302246 + "x": 1597.177978515625, + "y": 23.559999465942383 }, { - "x": 1726.446044921875, - "y": 24.715999603271484 + "x": 1597.2569580078125, + "y": 26.07200050354004 }, { - "x": 1726.531982421875, - "y": 27.479000091552734 + "x": 1597.303955078125, + "y": 28.584999084472656 }, { - "x": 1726.583984375, - "y": 30.243000030517578 + "x": 1597.3199462890625, + "y": 31.097999572753906 }, { - "x": 1726.60205078125, - "y": 33.007999420166016 + "x": 1597.303955078125, + "y": 33.611000061035156 }, { - "x": 1726.583984375, - "y": 35.77199935913086 + "x": 1597.2569580078125, + "y": 36.124000549316406 }, { - "x": 1726.531982421875, - "y": 38.5359992980957 + "x": 1597.177978515625, + "y": 38.63600158691406 }, { - "x": 1726.446044921875, - "y": 41.29899978637695 + "x": 1597.0670166015625, + "y": 41.14699935913086 }, { - "x": 1726.323974609375, - "y": 44.06100082397461 + "x": 1596.925048828125, + "y": 43.65599822998047 }, { - "x": 1726.16796875, - "y": 46.821998596191406 + "x": 1596.751953125, + "y": 46.16299819946289 }, { - "x": 1725.97705078125, - "y": 49.58000183105469 + "x": 1596.5469970703125, + "y": 48.667999267578125 }, { - "x": 1725.7509765625, - "y": 52.334999084472656 + "x": 1596.31005859375, + "y": 51.16999816894531 }, { - "x": 1725.490966796875, - "y": 55.08700180053711 + "x": 1596.0419921875, + "y": 53.66899871826172 }, { - "x": 1725.196044921875, - "y": 57.83599853515625 + "x": 1595.7430419921875, + "y": 56.16400146484375 }, { - "x": 1724.866943359375, - "y": 60.58100128173828 + "x": 1595.4119873046875, + "y": 58.65599822998047 }, { - "x": 1724.5030517578125, - "y": 63.32099914550781 + "x": 1595.050048828125, + "y": 61.143001556396484 }, { - "x": 1724.10498046875, - "y": 66.05699920654297 + "x": 1594.656982421875, + "y": 63.625 }, { - "x": 1723.6729736328125, - "y": 68.78800201416016 + "x": 1594.2330322265625, + "y": 66.10199737548828 }, { - "x": 1723.2060546875, - "y": 71.51300048828125 + "x": 1593.7769775390625, + "y": 68.5739974975586 }, { - "x": 1722.7049560546875, - "y": 74.23200225830078 + "x": 1593.291015625, + "y": 71.04000091552734 }, { - "x": 1722.1700439453125, - "y": 76.94400024414062 + "x": 1592.77294921875, + "y": 73.4990005493164 }, { - "x": 1721.6009521484375, - "y": 79.64900207519531 + "x": 1592.2249755859375, + "y": 75.9520034790039 }, { - "x": 1720.998046875, - "y": 82.34700012207031 + "x": 1591.64599609375, + "y": 78.39800262451172 }, { - "x": 1720.3609619140625, - "y": 85.03700256347656 + "x": 1591.0360107421875, + "y": 80.83599853515625 }, { - "x": 1719.68994140625, - "y": 87.71900177001953 + "x": 1590.39599609375, + "y": 83.26599884033203 }, { - "x": 1718.9859619140625, - "y": 90.39299774169922 + "x": 1589.7249755859375, + "y": 85.68800354003906 }, { - "x": 1718.248046875, - "y": 93.05699920654297 + "x": 1589.0240478515625, + "y": 88.10199737548828 }, { - "x": 1717.47705078125, - "y": 95.71199798583984 + "x": 1588.29296875, + "y": 90.50599670410156 }, { - "x": 1716.6719970703125, - "y": 98.35700225830078 + "x": 1587.531005859375, + "y": 92.9010009765625 }, { - "x": 1715.833984375, - "y": 100.99099731445312 + "x": 1586.739013671875, + "y": 95.28700256347656 }, { - "x": 1714.9630126953125, - "y": 103.61499786376953 + "x": 1585.91796875, + "y": 97.66200256347656 }, { - "x": 1714.06005859375, - "y": 106.22799682617188 + "x": 1585.0670166015625, + "y": 100.0260009765625 }, { - "x": 1713.123046875, - "y": 108.8290023803711 + "x": 1584.18603515625, + "y": 102.37999725341797 }, { - "x": 1712.154052734375, - "y": 111.41799926757812 + "x": 1583.2750244140625, + "y": 104.7229995727539 }, { - "x": 1711.1529541015625, - "y": 113.99500274658203 + "x": 1582.3349609375, + "y": 107.05400085449219 }, { - "x": 1710.1190185546875, - "y": 116.55899810791016 + "x": 1581.365966796875, + "y": 109.37300109863281 }, { - "x": 1709.052978515625, - "y": 119.11000061035156 + "x": 1580.3680419921875, + "y": 111.67900085449219 }, { - "x": 1707.9549560546875, - "y": 121.64700317382812 + "x": 1579.3409423828125, + "y": 113.9729995727539 }, { - "x": 1706.824951171875, - "y": 124.16999816894531 + "x": 1578.2850341796875, + "y": 116.25399780273438 }, { - "x": 1705.6639404296875, - "y": 126.67900085449219 + "x": 1577.2010498046875, + "y": 118.52100372314453 }, { - "x": 1704.470947265625, - "y": 129.17300415039062 + "x": 1576.0880126953125, + "y": 120.77400207519531 }, { - "x": 1703.2469482421875, - "y": 131.65199279785156 + "x": 1574.947021484375, + "y": 123.01399993896484 }, { - "x": 1701.991943359375, - "y": 134.11500549316406 + "x": 1573.7779541015625, + "y": 125.23899841308594 }, { - "x": 1700.7060546875, - "y": 136.56199645996094 + "x": 1572.5810546875, + "y": 127.4489974975586 }, { - "x": 1699.3890380859375, - "y": 138.9929962158203 + "x": 1571.3570556640625, + "y": 129.64300537109375 }, { - "x": 1698.0419921875, - "y": 141.4080047607422 + "x": 1570.10498046875, + "y": 131.82200622558594 }, { - "x": 1696.6650390625, - "y": 143.80499267578125 + "x": 1568.824951171875, + "y": 133.98599243164062 }, { - "x": 1695.258056640625, - "y": 146.1840057373047 + "x": 1567.51904296875, + "y": 136.13299560546875 }, { - "x": 1693.821044921875, - "y": 148.54600524902344 + "x": 1566.18505859375, + "y": 138.26300048828125 }, { - "x": 1692.35400390625, - "y": 150.88999938964844 + "x": 1564.824951171875, + "y": 140.3769989013672 }, { - "x": 1690.8580322265625, - "y": 153.21400451660156 + "x": 1563.43896484375, + "y": 142.47300720214844 }, { - "x": 1689.3330078125, - "y": 155.52000427246094 + "x": 1562.0260009765625, + "y": 144.552001953125 }, { - "x": 1687.779052734375, - "y": 157.8070068359375 + "x": 1560.5880126953125, + "y": 146.61199951171875 }, { - "x": 1686.196044921875, - "y": 160.07400512695312 + "x": 1559.123046875, + "y": 148.65499877929688 }, { - "x": 1684.5860595703125, - "y": 162.32000732421875 + "x": 1557.633056640625, + "y": 150.6790008544922 }, { - "x": 1682.947021484375, - "y": 164.5469970703125 + "x": 1556.1180419921875, + "y": 152.6840057373047 }, { - "x": 1681.280029296875, - "y": 166.7519989013672 + "x": 1554.5780029296875, + "y": 154.6699981689453 }, { - "x": 1679.5849609375, - "y": 168.93699645996094 + "x": 1553.011962890625, + "y": 156.63600158691406 }, { - "x": 1677.864013671875, - "y": 171.10000610351562 + "x": 1551.4219970703125, + "y": 158.58299255371094 }, { - "x": 1676.114990234375, - "y": 173.24099731445312 + "x": 1549.8079833984375, + "y": 160.50900268554688 }, { - "x": 1674.3389892578125, - "y": 175.36000061035156 + "x": 1548.1700439453125, + "y": 162.4149932861328 }, { - "x": 1672.5369873046875, - "y": 177.45599365234375 + "x": 1546.508056640625, + "y": 164.3000030517578 }, { - "x": 1670.708984375, - "y": 179.52999877929688 + "x": 1544.822021484375, + "y": 166.16400146484375 }, { - "x": 1668.85498046875, - "y": 181.58099365234375 + "x": 1543.114013671875, + "y": 168.0070037841797 }, { - "x": 1666.9749755859375, - "y": 183.60800170898438 + "x": 1544.261962890625, + "y": 166.83799743652344 }, { - "x": 1665.0699462890625, - "y": 185.61099243164062 - }, - { - "x": 1665.3509521484375, - "y": 185.3699951171875 - }, - { - "x": 1662.4150390625, - "y": 188.3159942626953 + "x": 1541.376953125, + "y": 169.83299255371094 } ], "isCurve": true, @@ -5668,320 +5532,312 @@ "link": "", "route": [ { - "x": 1609.4150390625, - "y": 227.5019989013672 + "x": 1488.376953125, + "y": 209.16299438476562 }, { - "x": 1607.708984375, - "y": 228.3979949951172 + "x": 1486.9959716796875, + "y": 209.86599731445312 }, { - "x": 1605.2459716796875, - "y": 229.6529998779297 + "x": 1484.7430419921875, + "y": 210.97900390625 }, { - "x": 1602.7669677734375, - "y": 230.8769989013672 + "x": 1482.4759521484375, + "y": 212.06300354003906 }, { - "x": 1600.27294921875, - "y": 232.07000732421875 + "x": 1480.1949462890625, + "y": 213.11900329589844 }, { - "x": 1597.7640380859375, - "y": 233.2310028076172 + "x": 1477.9010009765625, + "y": 214.14599609375 }, { - "x": 1595.240966796875, - "y": 234.36099243164062 + "x": 1475.594970703125, + "y": 215.1439971923828 }, { - "x": 1592.7039794921875, - "y": 235.45899963378906 + "x": 1473.2760009765625, + "y": 216.11300659179688 }, { - "x": 1590.1529541015625, - "y": 236.52499389648438 + "x": 1470.9449462890625, + "y": 217.05299377441406 }, { - "x": 1587.5889892578125, - "y": 237.55799865722656 + "x": 1468.60205078125, + "y": 217.96400451660156 }, { - "x": 1585.011962890625, - "y": 238.55999755859375 + "x": 1466.248046875, + "y": 218.84500122070312 }, { - "x": 1582.4229736328125, - "y": 239.5290069580078 + "x": 1463.884033203125, + "y": 219.6959991455078 }, { - "x": 1579.822021484375, - "y": 240.46600341796875 + "x": 1461.509033203125, + "y": 220.51699829101562 }, { - "x": 1577.208984375, - "y": 241.36900329589844 + "x": 1459.123046875, + "y": 221.3090057373047 }, { - "x": 1574.5860595703125, - "y": 242.24000549316406 + "x": 1456.72802734375, + "y": 222.0709991455078 }, { - "x": 1571.9510498046875, - "y": 243.0780029296875 + "x": 1454.323974609375, + "y": 222.802001953125 }, { - "x": 1569.3060302734375, - "y": 243.8820037841797 + "x": 1451.9100341796875, + "y": 223.5030059814453 }, { - "x": 1566.6510009765625, - "y": 244.6540069580078 + "x": 1449.488037109375, + "y": 224.1739959716797 }, { - "x": 1563.987060546875, - "y": 245.39199829101562 + "x": 1447.0579833984375, + "y": 224.81399536132812 }, { - "x": 1561.31396484375, - "y": 246.0959930419922 + "x": 1444.6199951171875, + "y": 225.4239959716797 }, { - "x": 1558.6319580078125, - "y": 246.76699829101562 + "x": 1442.1739501953125, + "y": 226.0030059814453 }, { - "x": 1555.9410400390625, - "y": 247.4040069580078 + "x": 1439.720947265625, + "y": 226.55099487304688 }, { - "x": 1553.2430419921875, - "y": 248.0070037841797 + "x": 1437.261962890625, + "y": 227.06900024414062 }, { - "x": 1550.5379638671875, - "y": 248.5760040283203 + "x": 1434.7960205078125, + "y": 227.55499267578125 }, { - "x": 1547.8260498046875, - "y": 249.11099243164062 + "x": 1432.323974609375, + "y": 228.01100158691406 }, { - "x": 1545.1070556640625, - "y": 249.61199951171875 + "x": 1429.8470458984375, + "y": 228.43499755859375 }, { - "x": 1542.3819580078125, - "y": 250.07899475097656 + "x": 1427.364990234375, + "y": 228.8280029296875 }, { - "x": 1539.6510009765625, - "y": 250.51100158691406 + "x": 1424.8780517578125, + "y": 229.19000244140625 }, { - "x": 1536.916015625, - "y": 250.90899658203125 + "x": 1422.385986328125, + "y": 229.52099609375 }, { - "x": 1534.175048828125, - "y": 251.2729949951172 + "x": 1419.8909912109375, + "y": 229.82000732421875 }, { - "x": 1531.4300537109375, - "y": 251.6020050048828 + "x": 1417.3919677734375, + "y": 230.08799743652344 }, { - "x": 1528.6810302734375, - "y": 251.89700317382812 + "x": 1414.8900146484375, + "y": 230.3249969482422 }, { - "x": 1525.928955078125, - "y": 252.15699768066406 + "x": 1412.385009765625, + "y": 230.52999877929688 }, { - "x": 1523.1739501953125, - "y": 252.38299560546875 + "x": 1409.8780517578125, + "y": 230.7030029296875 }, { - "x": 1520.416015625, - "y": 252.57400512695312 + "x": 1407.3690185546875, + "y": 230.84500122070312 }, { - "x": 1517.656005859375, - "y": 252.72999572753906 + "x": 1404.8580322265625, + "y": 230.95599365234375 }, { - "x": 1514.89404296875, - "y": 252.8509979248047 + "x": 1402.345947265625, + "y": 231.03500366210938 }, { - "x": 1512.1300048828125, - "y": 252.93800354003906 + "x": 1399.8330078125, + "y": 231.08200073242188 }, { - "x": 1509.365966796875, - "y": 252.99000549316406 + "x": 1397.3199462890625, + "y": 231.09800720214844 }, { - "x": 1506.60205078125, - "y": 253.00799560546875 + "x": 1394.8070068359375, + "y": 231.08200073242188 }, { - "x": 1503.8370361328125, - "y": 252.99000549316406 + "x": 1392.2939453125, + "y": 231.03500366210938 }, { - "x": 1501.072998046875, - "y": 252.93800354003906 + "x": 1389.781982421875, + "y": 230.95599365234375 }, { - "x": 1498.31005859375, - "y": 252.8509979248047 + "x": 1387.27099609375, + "y": 230.84500122070312 }, { - "x": 1495.5479736328125, - "y": 252.72999572753906 + "x": 1384.761962890625, + "y": 230.7030029296875 }, { - "x": 1492.7879638671875, - "y": 252.57400512695312 + "x": 1382.2540283203125, + "y": 230.52999877929688 }, { - "x": 1490.030029296875, - "y": 252.38299560546875 + "x": 1379.75, + "y": 230.3249969482422 }, { - "x": 1487.2750244140625, - "y": 252.15699768066406 + "x": 1377.2469482421875, + "y": 230.08799743652344 }, { - "x": 1484.52197265625, - "y": 251.89700317382812 + "x": 1374.7490234375, + "y": 229.82000732421875 }, { - "x": 1481.77294921875, - "y": 251.6020050048828 + "x": 1372.2530517578125, + "y": 229.52099609375 }, { - "x": 1479.029052734375, - "y": 251.2729949951172 + "x": 1369.761962890625, + "y": 229.19000244140625 }, { - "x": 1476.2879638671875, - "y": 250.90899658203125 + "x": 1367.2750244140625, + "y": 228.8280029296875 }, { - "x": 1473.552001953125, - "y": 250.51100158691406 + "x": 1364.7919921875, + "y": 228.43499755859375 }, { - "x": 1470.822021484375, - "y": 250.07899475097656 + "x": 1362.31494140625, + "y": 228.01100158691406 }, { - "x": 1468.0970458984375, - "y": 249.61199951171875 + "x": 1359.843994140625, + "y": 227.55499267578125 }, { - "x": 1465.3780517578125, - "y": 249.11099243164062 + "x": 1357.3780517578125, + "y": 227.06900024414062 }, { - "x": 1462.666015625, - "y": 248.5760040283203 + "x": 1354.91796875, + "y": 226.55099487304688 }, { - "x": 1459.9599609375, - "y": 248.0070037841797 + "x": 1352.4659423828125, + "y": 226.0030059814453 }, { - "x": 1457.261962890625, - "y": 247.4040069580078 + "x": 1350.02001953125, + "y": 225.4239959716797 }, { - "x": 1454.572021484375, - "y": 246.76699829101562 + "x": 1347.58203125, + "y": 224.81399536132812 }, { - "x": 1451.8900146484375, - "y": 246.0959930419922 + "x": 1345.1519775390625, + "y": 224.1739959716797 }, { - "x": 1449.217041015625, - "y": 245.39199829101562 + "x": 1342.72900390625, + "y": 223.5030059814453 }, { - "x": 1446.552001953125, - "y": 244.6540069580078 + "x": 1340.3160400390625, + "y": 222.802001953125 }, { - "x": 1443.89794921875, - "y": 243.8820037841797 + "x": 1337.9119873046875, + "y": 222.0709991455078 }, { - "x": 1441.2530517578125, - "y": 243.0780029296875 + "x": 1335.5159912109375, + "y": 221.3090057373047 }, { - "x": 1438.6180419921875, - "y": 242.24000549316406 + "x": 1333.1309814453125, + "y": 220.51699829101562 }, { - "x": 1435.9940185546875, - "y": 241.36900329589844 + "x": 1330.7559814453125, + "y": 219.6959991455078 }, { - "x": 1433.3819580078125, - "y": 240.46600341796875 + "x": 1328.3909912109375, + "y": 218.84500122070312 }, { - "x": 1430.780029296875, - "y": 239.5290069580078 + "x": 1326.0369873046875, + "y": 217.96400451660156 }, { - "x": 1428.1910400390625, - "y": 238.55999755859375 + "x": 1323.6949462890625, + "y": 217.05299377441406 }, { - "x": 1425.614013671875, - "y": 237.55799865722656 + "x": 1321.364013671875, + "y": 216.11300659179688 }, { - "x": 1423.050048828125, - "y": 236.52499389648438 + "x": 1319.0450439453125, + "y": 215.1439971923828 }, { - "x": 1420.5, - "y": 235.45899963378906 + "x": 1316.739013671875, + "y": 214.14599609375 }, { - "x": 1417.9620361328125, - "y": 234.36099243164062 + "x": 1314.4449462890625, + "y": 213.11900329589844 }, { - "x": 1415.43896484375, - "y": 233.2310028076172 + "x": 1312.1639404296875, + "y": 212.06300354003906 }, { - "x": 1412.9300537109375, - "y": 232.07000732421875 + "x": 1309.89697265625, + "y": 210.97900390625 }, { - "x": 1410.43603515625, - "y": 230.8769989013672 + "x": 1310.470947265625, + "y": 211.30099487304688 }, { - "x": 1407.9580078125, - "y": 229.6529998779297 - }, - { - "x": 1407.970947265625, - "y": 229.69900512695312 - }, - { - "x": 1404.2889404296875, - "y": 227.76400756835938 + "x": 1306.762939453125, + "y": 209.41700744628906 } ], "isCurve": true, @@ -6016,312 +5872,300 @@ "link": "", "route": [ { - "x": 1350.2889404296875, - "y": 187.8159942626953 - }, - { - "x": 1350.06396484375, - "y": 187.59100341796875 - }, - { - "x": 1348.134033203125, - "y": 185.61099243164062 - }, - { - "x": 1346.22900390625, - "y": 183.60800170898438 + "x": 1252.762939453125, + "y": 169.30799865722656 }, { - "x": 1344.3489990234375, - "y": 181.58099365234375 + "x": 1251.5260009765625, + "y": 168.0070037841797 }, { - "x": 1342.4949951171875, - "y": 179.52999877929688 + "x": 1249.8170166015625, + "y": 166.16400146484375 }, { - "x": 1340.6669921875, - "y": 177.45599365234375 + "x": 1248.1319580078125, + "y": 164.3000030517578 }, { - "x": 1338.864990234375, - "y": 175.36000061035156 + "x": 1246.469970703125, + "y": 162.4149932861328 }, { - "x": 1337.0889892578125, - "y": 173.24099731445312 + "x": 1244.8310546875, + "y": 160.50900268554688 }, { - "x": 1335.3399658203125, - "y": 171.10000610351562 + "x": 1243.217041015625, + "y": 158.58299255371094 }, { - "x": 1333.6180419921875, - "y": 168.93699645996094 + "x": 1241.626953125, + "y": 156.63600158691406 }, { - "x": 1331.9239501953125, - "y": 166.7519989013672 + "x": 1240.06201171875, + "y": 154.6699981689453 }, { - "x": 1330.2569580078125, - "y": 164.5469970703125 + "x": 1238.52197265625, + "y": 152.6840057373047 }, { - "x": 1328.6180419921875, - "y": 162.32000732421875 + "x": 1237.0059814453125, + "y": 150.6790008544922 }, { - "x": 1327.0069580078125, - "y": 160.07400512695312 + "x": 1235.5159912109375, + "y": 148.65499877929688 }, { - "x": 1325.425048828125, - "y": 157.8070068359375 + "x": 1234.052001953125, + "y": 146.61199951171875 }, { - "x": 1323.8709716796875, - "y": 155.52000427246094 + "x": 1232.613037109375, + "y": 144.552001953125 }, { - "x": 1322.345947265625, - "y": 153.21400451660156 + "x": 1231.2010498046875, + "y": 142.47300720214844 }, { - "x": 1320.8499755859375, - "y": 150.88999938964844 + "x": 1229.81396484375, + "y": 140.3769989013672 }, { - "x": 1319.383056640625, - "y": 148.54600524902344 + "x": 1228.4539794921875, + "y": 138.26300048828125 }, { - "x": 1317.946044921875, - "y": 146.1840057373047 + "x": 1227.1209716796875, + "y": 136.13299560546875 }, { - "x": 1316.5389404296875, - "y": 143.80499267578125 + "x": 1225.81396484375, + "y": 133.98599243164062 }, { - "x": 1315.1610107421875, - "y": 141.4080047607422 + "x": 1224.5350341796875, + "y": 131.82200622558594 }, { - "x": 1313.81396484375, - "y": 138.9929962158203 + "x": 1223.282958984375, + "y": 129.64300537109375 }, { - "x": 1312.498046875, - "y": 136.56199645996094 + "x": 1222.0579833984375, + "y": 127.4489974975586 }, { - "x": 1311.2120361328125, - "y": 134.11500549316406 + "x": 1220.862060546875, + "y": 125.23899841308594 }, { - "x": 1309.95703125, - "y": 131.65199279785156 + "x": 1219.6929931640625, + "y": 123.01399993896484 }, { - "x": 1308.7330322265625, - "y": 129.17300415039062 + "x": 1218.552001953125, + "y": 120.77400207519531 }, { - "x": 1307.5400390625, - "y": 126.67900085449219 + "x": 1217.43896484375, + "y": 118.52100372314453 }, { - "x": 1306.3790283203125, - "y": 124.16999816894531 + "x": 1216.35400390625, + "y": 116.25399780273438 }, { - "x": 1305.2490234375, - "y": 121.64700317382812 + "x": 1215.2989501953125, + "y": 113.9729995727539 }, { - "x": 1304.1510009765625, - "y": 119.11000061035156 + "x": 1214.27197265625, + "y": 111.67900085449219 }, { - "x": 1303.0849609375, - "y": 116.55899810791016 + "x": 1213.27294921875, + "y": 109.37300109863281 }, { - "x": 1302.051025390625, - "y": 113.99500274658203 + "x": 1212.303955078125, + "y": 107.05400085449219 }, { - "x": 1301.0489501953125, - "y": 111.41799926757812 + "x": 1211.364990234375, + "y": 104.7229995727539 }, { - "x": 1300.0799560546875, - "y": 108.8290023803711 + "x": 1210.4539794921875, + "y": 102.37999725341797 }, { - "x": 1299.14404296875, - "y": 106.22799682617188 + "x": 1209.572998046875, + "y": 100.0260009765625 }, { - "x": 1298.239990234375, - "y": 103.61499786376953 + "x": 1208.7220458984375, + "y": 97.66200256347656 }, { - "x": 1297.3690185546875, - "y": 100.99099731445312 + "x": 1207.9000244140625, + "y": 95.28700256347656 }, { - "x": 1296.531982421875, - "y": 98.35700225830078 + "x": 1207.1090087890625, + "y": 92.9010009765625 }, { - "x": 1295.72705078125, - "y": 95.71199798583984 + "x": 1206.3470458984375, + "y": 90.50599670410156 }, { - "x": 1294.9560546875, - "y": 93.05699920654297 + "x": 1205.614990234375, + "y": 88.10199737548828 }, { - "x": 1294.218017578125, - "y": 90.39299774169922 + "x": 1204.9139404296875, + "y": 85.68800354003906 }, { - "x": 1293.5140380859375, - "y": 87.71900177001953 + "x": 1204.2430419921875, + "y": 83.26599884033203 }, { - "x": 1292.843017578125, - "y": 85.03700256347656 + "x": 1203.60302734375, + "y": 80.83599853515625 }, { - "x": 1292.2060546875, - "y": 82.34700012207031 + "x": 1202.9930419921875, + "y": 78.39800262451172 }, { - "x": 1291.60302734375, - "y": 79.64900207519531 + "x": 1202.4139404296875, + "y": 75.9520034790039 }, { - "x": 1291.0340576171875, - "y": 76.94400024414062 + "x": 1201.865966796875, + "y": 73.4990005493164 }, { - "x": 1290.4990234375, - "y": 74.23200225830078 + "x": 1201.3489990234375, + "y": 71.04000091552734 }, { - "x": 1289.998046875, - "y": 71.51300048828125 + "x": 1200.862060546875, + "y": 68.5739974975586 }, { - "x": 1289.531005859375, - "y": 68.78800201416016 + "x": 1200.406982421875, + "y": 66.10199737548828 }, { - "x": 1289.0980224609375, - "y": 66.05699920654297 + "x": 1199.9830322265625, + "y": 63.625 }, { - "x": 1288.699951171875, - "y": 63.32099914550781 + "x": 1199.5889892578125, + "y": 61.143001556396484 }, { - "x": 1288.3370361328125, - "y": 60.58100128173828 + "x": 1199.22802734375, + "y": 58.65599822998047 }, { - "x": 1288.0069580078125, - "y": 57.83599853515625 + "x": 1198.89697265625, + "y": 56.16400146484375 }, { - "x": 1287.7130126953125, - "y": 55.08700180053711 + "x": 1198.5980224609375, + "y": 53.66899871826172 }, { - "x": 1287.4520263671875, - "y": 52.334999084472656 + "x": 1198.3299560546875, + "y": 51.16999816894531 }, { - "x": 1287.22705078125, - "y": 49.58000183105469 + "x": 1198.093017578125, + "y": 48.667999267578125 }, { - "x": 1287.0360107421875, - "y": 46.821998596191406 + "x": 1197.887939453125, + "y": 46.16299819946289 }, { - "x": 1286.8800048828125, - "y": 44.06100082397461 + "x": 1197.7139892578125, + "y": 43.65599822998047 }, { - "x": 1286.758056640625, - "y": 41.29899978637695 + "x": 1197.572021484375, + "y": 41.14699935913086 }, { - "x": 1286.6710205078125, - "y": 38.5359992980957 + "x": 1197.4620361328125, + "y": 38.63600158691406 }, { - "x": 1286.6190185546875, - "y": 35.77199935913086 + "x": 1197.383056640625, + "y": 36.124000549316406 }, { - "x": 1286.60205078125, - "y": 33.007999420166016 + "x": 1197.3360595703125, + "y": 33.611000061035156 }, { - "x": 1286.6190185546875, - "y": 30.243000030517578 + "x": 1197.3199462890625, + "y": 31.097999572753906 }, { - "x": 1286.6710205078125, - "y": 27.479000091552734 + "x": 1197.3360595703125, + "y": 28.584999084472656 }, { - "x": 1286.758056640625, - "y": 24.715999603271484 + "x": 1197.383056640625, + "y": 26.07200050354004 }, { - "x": 1286.8800048828125, - "y": 21.95400047302246 + "x": 1197.4620361328125, + "y": 23.559999465942383 }, { - "x": 1287.0360107421875, - "y": 19.194000244140625 + "x": 1197.572021484375, + "y": 21.048999786376953 }, { - "x": 1287.22705078125, - "y": 16.43600082397461 + "x": 1197.7139892578125, + "y": 18.540000915527344 }, { - "x": 1287.4520263671875, - "y": 13.680000305175781 + "x": 1197.887939453125, + "y": 16.031999588012695 }, { - "x": 1287.7130126953125, - "y": 10.928000450134277 + "x": 1198.093017578125, + "y": 13.527999877929688 }, { - "x": 1288.0069580078125, - "y": 8.178999900817871 + "x": 1198.3299560546875, + "y": 11.024999618530273 }, { - "x": 1288.3370361328125, - "y": 5.434000015258789 + "x": 1198.5980224609375, + "y": 8.527000427246094 }, { - "x": 1288.699951171875, - "y": 2.694000005722046 + "x": 1198.89697265625, + "y": 6.031000137329102 }, { - "x": 1288.7430419921875, - "y": 2.130000114440918 + "x": 1198.81005859375, + "y": 6.409999847412109 }, { - "x": 1289.405029296875, - "y": -1.975000023841858 + "x": 1199.4090576171875, + "y": 2.2939999103546143 } ], "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 6cab848fcf..35f09dec2b 100644 --- a/e2etests/testdata/txtar/cycle-diagram/elk/sketch.exp.svg +++ b/e2etests/testdata/txtar/cycle-diagram/elk/sketch.exp.svg @@ -1,9 +1,9 @@ -abcdabcababcdefabcde - - - - - - - - - - - - - - - - - - - - - + .d2-2546323388 .fill-N1{fill:#0A0F25;} + .d2-2546323388 .fill-N2{fill:#676C7E;} + .d2-2546323388 .fill-N3{fill:#9499AB;} + .d2-2546323388 .fill-N4{fill:#CFD2DD;} + .d2-2546323388 .fill-N5{fill:#DEE1EB;} + .d2-2546323388 .fill-N6{fill:#EEF1F8;} + .d2-2546323388 .fill-N7{fill:#FFFFFF;} + .d2-2546323388 .fill-B1{fill:#0D32B2;} + .d2-2546323388 .fill-B2{fill:#0D32B2;} + .d2-2546323388 .fill-B3{fill:#E3E9FD;} + .d2-2546323388 .fill-B4{fill:#E3E9FD;} + .d2-2546323388 .fill-B5{fill:#EDF0FD;} + .d2-2546323388 .fill-B6{fill:#F7F8FE;} + .d2-2546323388 .fill-AA2{fill:#4A6FF3;} + .d2-2546323388 .fill-AA4{fill:#EDF0FD;} + .d2-2546323388 .fill-AA5{fill:#F7F8FE;} + .d2-2546323388 .fill-AB4{fill:#EDF0FD;} + .d2-2546323388 .fill-AB5{fill:#F7F8FE;} + .d2-2546323388 .stroke-N1{stroke:#0A0F25;} + .d2-2546323388 .stroke-N2{stroke:#676C7E;} + .d2-2546323388 .stroke-N3{stroke:#9499AB;} + .d2-2546323388 .stroke-N4{stroke:#CFD2DD;} + .d2-2546323388 .stroke-N5{stroke:#DEE1EB;} + .d2-2546323388 .stroke-N6{stroke:#EEF1F8;} + .d2-2546323388 .stroke-N7{stroke:#FFFFFF;} + .d2-2546323388 .stroke-B1{stroke:#0D32B2;} + .d2-2546323388 .stroke-B2{stroke:#0D32B2;} + .d2-2546323388 .stroke-B3{stroke:#E3E9FD;} + .d2-2546323388 .stroke-B4{stroke:#E3E9FD;} + .d2-2546323388 .stroke-B5{stroke:#EDF0FD;} + .d2-2546323388 .stroke-B6{stroke:#F7F8FE;} + .d2-2546323388 .stroke-AA2{stroke:#4A6FF3;} + .d2-2546323388 .stroke-AA4{stroke:#EDF0FD;} + .d2-2546323388 .stroke-AA5{stroke:#F7F8FE;} + .d2-2546323388 .stroke-AB4{stroke:#EDF0FD;} + .d2-2546323388 .stroke-AB5{stroke:#F7F8FE;} + .d2-2546323388 .background-color-N1{background-color:#0A0F25;} + .d2-2546323388 .background-color-N2{background-color:#676C7E;} + .d2-2546323388 .background-color-N3{background-color:#9499AB;} + .d2-2546323388 .background-color-N4{background-color:#CFD2DD;} + .d2-2546323388 .background-color-N5{background-color:#DEE1EB;} + .d2-2546323388 .background-color-N6{background-color:#EEF1F8;} + .d2-2546323388 .background-color-N7{background-color:#FFFFFF;} + .d2-2546323388 .background-color-B1{background-color:#0D32B2;} + .d2-2546323388 .background-color-B2{background-color:#0D32B2;} + .d2-2546323388 .background-color-B3{background-color:#E3E9FD;} + .d2-2546323388 .background-color-B4{background-color:#E3E9FD;} + .d2-2546323388 .background-color-B5{background-color:#EDF0FD;} + .d2-2546323388 .background-color-B6{background-color:#F7F8FE;} + .d2-2546323388 .background-color-AA2{background-color:#4A6FF3;} + .d2-2546323388 .background-color-AA4{background-color:#EDF0FD;} + .d2-2546323388 .background-color-AA5{background-color:#F7F8FE;} + .d2-2546323388 .background-color-AB4{background-color:#EDF0FD;} + .d2-2546323388 .background-color-AB5{background-color:#F7F8FE;} + .d2-2546323388 .color-N1{color:#0A0F25;} + .d2-2546323388 .color-N2{color:#676C7E;} + .d2-2546323388 .color-N3{color:#9499AB;} + .d2-2546323388 .color-N4{color:#CFD2DD;} + .d2-2546323388 .color-N5{color:#DEE1EB;} + .d2-2546323388 .color-N6{color:#EEF1F8;} + .d2-2546323388 .color-N7{color:#FFFFFF;} + .d2-2546323388 .color-B1{color:#0D32B2;} + .d2-2546323388 .color-B2{color:#0D32B2;} + .d2-2546323388 .color-B3{color:#E3E9FD;} + .d2-2546323388 .color-B4{color:#E3E9FD;} + .d2-2546323388 .color-B5{color:#EDF0FD;} + .d2-2546323388 .color-B6{color:#F7F8FE;} + .d2-2546323388 .color-AA2{color:#4A6FF3;} + .d2-2546323388 .color-AA4{color:#EDF0FD;} + .d2-2546323388 .color-AA5{color:#F7F8FE;} + .d2-2546323388 .color-AB4{color:#EDF0FD;} + .d2-2546323388 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker-d2-2546323388);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker-d2-2546323388);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright-d2-2546323388);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright-d2-2546323388);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright-d2-2546323388);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright-d2-2546323388);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark-d2-2546323388);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright-d2-2546323388);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright-d2-2546323388);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright-d2-2546323388);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright-d2-2546323388);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker-d2-2546323388);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark-d2-2546323388);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal-d2-2546323388);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal-d2-2546323388);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright-d2-2546323388);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright-d2-2546323388);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright-d2-2546323388);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>abcdabcababcdefabcde + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file From f37193a2c6267cb21f057848540ddfc238bae94f Mon Sep 17 00:00:00 2001 From: Mayank Mohapatra <125661248+Mayank77maruti@users.noreply.github.com> Date: Sat, 8 Mar 2025 11:20:18 +0000 Subject: [PATCH 73/73] try --- d2layouts/d2cycle/layout.go | 572 ++++++++++++++++++------------------ 1 file changed, 286 insertions(+), 286 deletions(-) diff --git a/d2layouts/d2cycle/layout.go b/d2layouts/d2cycle/layout.go index eea19a68e4..7f166529e3 100644 --- a/d2layouts/d2cycle/layout.go +++ b/d2layouts/d2cycle/layout.go @@ -1,337 +1,337 @@ package d2cycle import ( - "context" - "math" - "sort" - - "oss.terrastruct.com/d2/d2graph" - "oss.terrastruct.com/d2/lib/geo" - "oss.terrastruct.com/d2/lib/label" - "oss.terrastruct.com/util-go/go2" + "context" + "math" + "sort" + + "oss.terrastruct.com/d2/d2graph" + "oss.terrastruct.com/d2/lib/geo" + "oss.terrastruct.com/d2/lib/label" + "oss.terrastruct.com/util-go/go2" ) const ( - MIN_RADIUS = 200 - PADDING = 20 - MIN_SEGMENT_LEN = 10 - ARC_STEPS = 100 + MIN_RADIUS = 200 + PADDING = 20 + MIN_SEGMENT_LEN = 10 + ARC_STEPS = 100 ) // Layout lays out the graph and computes curved edge routes. func Layout(ctx context.Context, g *d2graph.Graph, layout d2graph.LayoutGraph) error { - objects := g.Root.ChildrenArray - if len(objects) == 0 { - return nil - } + objects := g.Root.ChildrenArray + if len(objects) == 0 { + return nil + } - for _, obj := range g.Objects { - positionLabelsIcons(obj) - } + for _, obj := range g.Objects { + positionLabelsIcons(obj) + } - radius := calculateRadius(objects) - positionObjects(objects, radius) + radius := calculateRadius(objects) + positionObjects(objects, radius) - for _, edge := range g.Edges { - createCircularArc(edge) - } + for _, edge := range g.Edges { + createCircularArc(edge) + } - return nil + return nil } // calculateRadius computes a radius ensuring that the circular layout does not overlap. // For each object we compute the half-diagonal (i.e. the radius of the minimal enclosing circle), // then ensure the chord between two adjacent centers (2*radius*sin(π/n)) is at least -// 2*(maxHalfDiagonal + PADDING). We also add a safety factor (1.2) to avoid floating-point issues. +// 2*(maxHalfDiag + PADDING). We also add a safety factor (1.2) to avoid floating-point issues. func calculateRadius(objects []*d2graph.Object) float64 { - if len(objects) < 2 { - return MIN_RADIUS - } - numObjects := float64(len(objects)) - maxHalfDiag := 0.0 - for _, obj := range objects { - halfDiag := math.Hypot(obj.Box.Width/2, obj.Box.Height/2) - if halfDiag > maxHalfDiag { - maxHalfDiag = halfDiag - } - } - // We need the chord (distance between adjacent centers) to be at least: - // 2*(maxHalfDiag + PADDING) - // and since chord = 2*radius*sin(π/n), we require: - // radius >= (maxHalfDiag + PADDING) / sin(π/n) - minRadius := (maxHalfDiag + PADDING) / math.Sin(math.Pi/numObjects) - // Apply a safety factor of 1.2 and ensure it doesn't fall below MIN_RADIUS. - return math.Max(minRadius*1.2, MIN_RADIUS) + if len(objects) < 2 { + return MIN_RADIUS + } + numObjects := float64(len(objects)) + maxHalfDiag := 0.0 + for _, obj := range objects { + halfDiag := math.Hypot(obj.Box.Width/2, obj.Box.Height/2) + if halfDiag > maxHalfDiag { + maxHalfDiag = halfDiag + } + } + // We need the chord (distance between adjacent centers) to be at least: + // 2*(maxHalfDiag + PADDING) + // and since chord = 2*radius*sin(π/n), we require: + // radius >= (maxHalfDiag + PADDING) / sin(π/n) + minRadius := (maxHalfDiag + PADDING) / math.Sin(math.Pi/numObjects) + // Apply a safety factor of 1.2 and ensure it doesn't fall below MIN_RADIUS. + return math.Max(minRadius*1.2, MIN_RADIUS) } func positionObjects(objects []*d2graph.Object, radius float64) { - numObjects := float64(len(objects)) - angleOffset := -math.Pi / 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, - ) - } + numObjects := float64(len(objects)) + angleOffset := -math.Pi / 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, + ) + } } func createCircularArc(edge *d2graph.Edge) { - if edge.Src == nil || edge.Dst == nil { - return - } - - srcCenter := edge.Src.Center() - dstCenter := edge.Dst.Center() - - srcAngle := math.Atan2(srcCenter.Y, srcCenter.X) - dstAngle := math.Atan2(dstCenter.Y, dstCenter.X) - if dstAngle < srcAngle { - dstAngle += 2 * math.Pi - } - - arcRadius := math.Hypot(srcCenter.X, srcCenter.Y) - - path := make([]*geo.Point, 0, ARC_STEPS+1) - 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) - path = append(path, geo.NewPoint(x, y)) - } - path[0] = srcCenter - path[len(path)-1] = dstCenter - - // Clamp endpoints to the boundaries of the source and destination 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. - path = trimPathPoints(path, edge.Src.Box) - path = trimPathPoints(path, edge.Dst.Box) - - edge.Route = path - edge.IsCurve = true - - if len(edge.Route) >= 2 { - lastIndex := len(edge.Route) - 1 - lastPoint := edge.Route[lastIndex] - secondLastPoint := edge.Route[lastIndex-1] - - tangentX := -lastPoint.Y - tangentY := lastPoint.X - mag := math.Hypot(tangentX, tangentY) - if mag > 0 { - tangentX /= mag - tangentY /= mag - } - const MIN_SEGMENT_LEN = 4.159 - - dx := lastPoint.X - secondLastPoint.X - dy := lastPoint.Y - secondLastPoint.Y - segLength := math.Hypot(dx, dy) - if segLength > 0 { - currentDirX := dx / segLength - currentDirY := dy / segLength - - // Check if we need to adjust the direction - if segLength < MIN_SEGMENT_LEN || (currentDirX*tangentX+currentDirY*tangentY) < 0.999 { - adjustLength := MIN_SEGMENT_LEN - if segLength >= MIN_SEGMENT_LEN { - adjustLength = segLength - } - newSecondLastX := lastPoint.X - tangentX*adjustLength - newSecondLastY := lastPoint.Y - tangentY*adjustLength - edge.Route[lastIndex-1] = geo.NewPoint(newSecondLastX, newSecondLastY) - } - } - } + if edge.Src == nil || edge.Dst == nil { + return + } + + srcCenter := edge.Src.Center() + dstCenter := edge.Dst.Center() + + srcAngle := math.Atan2(srcCenter.Y, srcCenter.X) + dstAngle := math.Atan2(dstCenter.Y, dstCenter.X) + if dstAngle < srcAngle { + dstAngle += 2 * math.Pi + } + + arcRadius := math.Hypot(srcCenter.X, srcCenter.Y) + + path := make([]*geo.Point, 0, ARC_STEPS+1) + 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) + path = append(path, geo.NewPoint(x, y)) + } + path[0] = srcCenter + path[len(path)-1] = dstCenter + + // Clamp endpoints to the boundaries of the source and destination 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. + path = trimPathPoints(path, edge.Src.Box) + path = trimPathPoints(path, edge.Dst.Box) + + edge.Route = path + edge.IsCurve = true + + if len(edge.Route) >= 2 { + lastIndex := len(edge.Route) - 1 + lastPoint := edge.Route[lastIndex] + secondLastPoint := edge.Route[lastIndex-1] + + tangentX := -lastPoint.Y + tangentY := lastPoint.X + mag := math.Hypot(tangentX, tangentY) + if mag > 0 { + tangentX /= mag + tangentY /= mag + } + const MIN_SEGMENT_LEN = 4.159 + + dx := lastPoint.X - secondLastPoint.X + dy := lastPoint.Y - secondLastPoint.Y + segLength := math.Hypot(dx, dy) + if segLength > 0 { + currentDirX := dx / segLength + currentDirY := dy / segLength + + // Check if we need to adjust the direction + if segLength < MIN_SEGMENT_LEN || (currentDirX*tangentX+currentDirY*tangentY) < 0.999 { + adjustLength := MIN_SEGMENT_LEN + if segLength >= MIN_SEGMENT_LEN { + adjustLength = segLength + } + newSecondLastX := lastPoint.X - tangentX*adjustLength + newSecondLastY := lastPoint.Y - tangentY*adjustLength + edge.Route[lastIndex-1] = geo.NewPoint(newSecondLastX, newSecondLastY) + } + } + } } // clampPointOutsideBox walks forward along the path until it finds a point outside the box, // then replaces the point with a precise intersection. func clampPointOutsideBox(box *geo.Box, path []*geo.Point, startIdx int) (int, *geo.Point) { - if startIdx >= len(path)-1 { - return startIdx, path[startIdx] - } - if !boxContains(box, path[startIdx]) { - return startIdx, path[startIdx] - } - - for i := startIdx + 1; i < len(path); i++ { - if boxContains(box, path[i]) { - continue - } - seg := geo.NewSegment(path[i-1], path[i]) - inter := findPreciseIntersection(box, *seg) - if inter != nil { - return i, inter - } - return i, path[i] - } - return len(path)-1, path[len(path)-1] + if startIdx >= len(path)-1 { + return startIdx, path[startIdx] + } + if !boxContains(box, path[startIdx]) { + return startIdx, path[startIdx] + } + + for i := startIdx + 1; i < len(path); i++ { + if boxContains(box, path[i]) { + continue + } + seg := geo.NewSegment(path[i-1], path[i]) + inter := findPreciseIntersection(box, *seg) + if inter != nil { + return i, inter + } + return i, path[i] + } + return len(path)-1, path[len(path)-1] } // clampPointOutsideBoxReverse works similarly but in reverse order. func clampPointOutsideBoxReverse(box *geo.Box, path []*geo.Point, endIdx int) (int, *geo.Point) { - if endIdx <= 0 { - return endIdx, path[endIdx] - } - if !boxContains(box, path[endIdx]) { - return endIdx, path[endIdx] - } - - for j := endIdx - 1; j >= 0; j-- { - if boxContains(box, path[j]) { - continue - } - seg := geo.NewSegment(path[j], path[j+1]) - inter := findPreciseIntersection(box, *seg) - if inter != nil { - return j, inter - } - return j, path[j] - } - return 0, path[0] + if endIdx <= 0 { + return endIdx, path[endIdx] + } + if !boxContains(box, path[endIdx]) { + return endIdx, path[endIdx] + } + + for j := endIdx - 1; j >= 0; j-- { + if boxContains(box, path[j]) { + continue + } + seg := geo.NewSegment(path[j], path[j+1]) + inter := findPreciseIntersection(box, *seg) + if inter != nil { + return j, inter + } + return j, path[j] + } + return 0, path[0] } // findPreciseIntersection calculates intersection points between seg and all four sides of the box, // then returns the intersection closest to seg.Start. func findPreciseIntersection(box *geo.Box, seg geo.Segment) *geo.Point { - intersections := []struct { - point *geo.Point - t float64 - }{} - - left := box.TopLeft.X - right := box.TopLeft.X + box.Width - top := box.TopLeft.Y - bottom := box.TopLeft.Y + box.Height - - dx := seg.End.X - seg.Start.X - dy := seg.End.Y - seg.Start.Y - - // Check vertical boundaries. - if dx != 0 { - t := (left - seg.Start.X) / dx - if t >= 0 && t <= 1 { - y := seg.Start.Y + t*dy - if y >= top && y <= bottom { - intersections = append(intersections, struct { - point *geo.Point - t float64 - }{geo.NewPoint(left, y), t}) - } - } - t = (right - seg.Start.X) / dx - if t >= 0 && t <= 1 { - y := seg.Start.Y + t*dy - if y >= top && y <= bottom { - intersections = append(intersections, struct { - point *geo.Point - t float64 - }{geo.NewPoint(right, y), t}) - } - } - } - - // Check horizontal boundaries. - if dy != 0 { - t := (top - seg.Start.Y) / dy - if t >= 0 && t <= 1 { - x := seg.Start.X + t*dx - if x >= left && x <= right { - intersections = append(intersections, struct { - point *geo.Point - t float64 - }{geo.NewPoint(x, top), t}) - } - } - t = (bottom - seg.Start.Y) / dy - if t >= 0 && t <= 1 { - x := seg.Start.X + t*dx - if x >= left && x <= right { - intersections = append(intersections, struct { - point *geo.Point - t float64 - }{geo.NewPoint(x, bottom), t}) - } - } - } - - if len(intersections) == 0 { - return nil - } - - // Sort intersections by t (distance from seg.Start) and return the closest. - sort.Slice(intersections, func(i, j int) bool { - return intersections[i].t < intersections[j].t - }) - return intersections[0].point + intersections := []struct { + point *geo.Point + t float64 + }{} + + left := box.TopLeft.X + right := box.TopLeft.X + box.Width + top := box.TopLeft.Y + bottom := box.TopLeft.Y + box.Height + + dx := seg.End.X - seg.Start.X + dy := seg.End.Y - seg.Start.Y + + // Check vertical boundaries. + if dx != 0 { + t := (left - seg.Start.X) / dx + if t >= 0 && t <= 1 { + y := seg.Start.Y + t*dy + if y >= top && y <= bottom { + intersections = append(intersections, struct { + point *geo.Point + t float64 + }{geo.NewPoint(left, y), t}) + } + } + t = (right - seg.Start.X) / dx + if t >= 0 && t <= 1 { + y := seg.Start.Y + t*dy + if y >= top && y <= bottom { + intersections = append(intersections, struct { + point *geo.Point + t float64 + }{geo.NewPoint(right, y), t}) + } + } + } + + // Check horizontal boundaries. + if dy != 0 { + t := (top - seg.Start.Y) / dy + if t >= 0 && t <= 1 { + x := seg.Start.X + t*dx + if x >= left && x <= right { + intersections = append(intersections, struct { + point *geo.Point + t float64 + }{geo.NewPoint(x, top), t}) + } + } + t = (bottom - seg.Start.Y) / dy + if t >= 0 && t <= 1 { + x := seg.Start.X + t*dx + if x >= left && x <= right { + intersections = append(intersections, struct { + point *geo.Point + t float64 + }{geo.NewPoint(x, bottom), t}) + } + } + } + + if len(intersections) == 0 { + return nil + } + + // Sort intersections by t (distance from seg.Start) and return the closest. + sort.Slice(intersections, func(i, j int) bool { + return intersections[i].t < intersections[j].t + }) + return intersections[0].point } // trimPathPoints removes intermediate points that fall inside the given box while preserving endpoints. func trimPathPoints(path []*geo.Point, box *geo.Box) []*geo.Point { - if len(path) <= 2 { - return path - } - trimmed := []*geo.Point{path[0]} - for i := 1; i < len(path)-1; i++ { - if !boxContains(box, path[i]) { - trimmed = append(trimmed, path[i]) - } - } - trimmed = append(trimmed, path[len(path)-1]) - return trimmed + if len(path) <= 2 { + return path + } + trimmed := []*geo.Point{path[0]} + for i := 1; i < len(path)-1; i++ { + if !boxContains(box, path[i]) { + trimmed = append(trimmed, path[i]) + } + } + trimmed = append(trimmed, path[len(path)-1]) + return trimmed } // boxContains uses strict inequalities so that points exactly on the boundary are considered outside. func boxContains(b *geo.Box, p *geo.Point) bool { - return p.X > b.TopLeft.X && - p.X < b.TopLeft.X+b.Width && - p.Y > b.TopLeft.Y && - p.Y < b.TopLeft.Y+b.Height + return p.X > b.TopLeft.X && + p.X < b.TopLeft.X+b.Width && + p.Y > b.TopLeft.Y && + p.Y < b.TopLeft.Y+b.Height } func positionLabelsIcons(obj *d2graph.Object) { - if obj.Icon != nil && obj.IconPosition == nil { - if len(obj.ChildrenArray) > 0 { - obj.IconPosition = go2.Pointer(label.OutsideTopLeft.String()) - if obj.LabelPosition == nil { - obj.LabelPosition = go2.Pointer(label.OutsideTopRight.String()) - return - } - } else if obj.SQLTable != nil || obj.Class != nil || obj.Language != "" { - obj.IconPosition = go2.Pointer(label.OutsideTopLeft.String()) - } else { - obj.IconPosition = go2.Pointer(label.InsideMiddleCenter.String()) - } - } - - if obj.HasLabel() && obj.LabelPosition == nil { - if len(obj.ChildrenArray) > 0 { - obj.LabelPosition = go2.Pointer(label.OutsideTopCenter.String()) - } else if obj.HasOutsideBottomLabel() { - obj.LabelPosition = go2.Pointer(label.OutsideBottomCenter.String()) - } else if obj.Icon != nil { - obj.LabelPosition = go2.Pointer(label.InsideTopCenter.String()) - } else { - obj.LabelPosition = go2.Pointer(label.InsideMiddleCenter.String()) - } - - if float64(obj.LabelDimensions.Width) > obj.Width || - float64(obj.LabelDimensions.Height) > obj.Height { - if len(obj.ChildrenArray) > 0 { - obj.LabelPosition = go2.Pointer(label.OutsideTopCenter.String()) - } else { - obj.LabelPosition = go2.Pointer(label.OutsideBottomCenter.String()) - } - } - } -} + if obj.Icon != nil && obj.IconPosition == nil { + if len(obj.ChildrenArray) > 0 { + obj.IconPosition = go2.Pointer(label.OutsideTopLeft.String()) + if obj.LabelPosition == nil { + obj.LabelPosition = go2.Pointer(label.OutsideTopRight.String()) + return + } + } else if obj.SQLTable != nil || obj.Class != nil || obj.Language != "" { + obj.IconPosition = go2.Pointer(label.OutsideTopLeft.String()) + } else { + obj.IconPosition = go2.Pointer(label.InsideMiddleCenter.String()) + } + } + + if obj.HasLabel() && obj.LabelPosition == nil { + if len(obj.ChildrenArray) > 0 { + obj.LabelPosition = go2.Pointer(label.OutsideTopCenter.String()) + } else if obj.HasOutsideBottomLabel() { + obj.LabelPosition = go2.Pointer(label.OutsideBottomCenter.String()) + } else if obj.Icon != nil { + obj.LabelPosition = go2.Pointer(label.InsideTopCenter.String()) + } else { + obj.LabelPosition = go2.Pointer(label.InsideMiddleCenter.String()) + } + + if float64(obj.LabelDimensions.Width) > obj.Width || + float64(obj.LabelDimensions.Height) > obj.Height { + if len(obj.ChildrenArray) > 0 { + obj.LabelPosition = go2.Pointer(label.OutsideTopCenter.String()) + } else { + obj.LabelPosition = go2.Pointer(label.OutsideBottomCenter.String()) + } + } + } +} \ No newline at end of file