diff --git a/d2renderers/d2sketch/sketch.go b/d2renderers/d2sketch/sketch.go index 40bf7bc63..5aea26fcc 100644 --- a/d2renderers/d2sketch/sketch.go +++ b/d2renderers/d2sketch/sketch.go @@ -134,23 +134,23 @@ func Oval(r *Runner, shape d2target.Shape) (string, error) { } func DoubleOval(r *Runner, shape d2target.Shape) (string, error) { - js_big_circle := fmt.Sprintf(`node = rc.ellipse(%d, %d, %d, %d, { + jsBigCircle := fmt.Sprintf(`node = rc.ellipse(%d, %d, %d, %d, { fill: "%s", stroke: "%s", strokeWidth: %d, %s });`, shape.Width/2, shape.Height/2, shape.Width, shape.Height, shape.Fill, shape.Stroke, shape.StrokeWidth, baseRoughProps) - js_small_circle := fmt.Sprintf(`node = rc.ellipse(%d, %d, %d, %d, { + jsSmallCircle := fmt.Sprintf(`node = rc.ellipse(%d, %d, %d, %d, { fill: "%s", stroke: "%s", strokeWidth: %d, %s });`, shape.Width/2, shape.Height/2, shape.Width-15, shape.Height-15, shape.Fill, shape.Stroke, shape.StrokeWidth, baseRoughProps) - paths_big_circle, err := computeRoughPaths(r, js_big_circle) + paths_big_circle, err := computeRoughPaths(r, jsBigCircle) if err != nil { return "", err } - paths_small_circle, err := computeRoughPaths(r, js_small_circle) + paths_small_circle, err := computeRoughPaths(r, jsSmallCircle) if err != nil { return "", err } diff --git a/d2renderers/d2svg/d2svg.go b/d2renderers/d2svg/d2svg.go index 5117d4c2a..74df32e3d 100644 --- a/d2renderers/d2svg/d2svg.go +++ b/d2renderers/d2svg/d2svg.go @@ -494,14 +494,7 @@ func renderOval(tl *geo.Point, width, height float64, style string) string { } func renderDoubleCircle(tl *geo.Point, width, height float64, style string) string { - rx := width / 2 - ry := height / 2 - cx := tl.X + rx - cy := tl.Y + ry - return fmt.Sprintf(` - `, - cx, cy, rx-2, ry-2, style, - cx, cy, rx-10, ry-10, style) + return renderOval(tl, width, height, style) + renderOval(&geo.Point{X: tl.X + 5, Y: tl.Y + 5}, width-10, height-10, style) } func defineShadowFilter(writer io.Writer) {