draw: support old-style connectors w/ no angle, but x, y

For compatability.

README.md

@@ -135,10 +135,9 @@ CommonJS modules in the `lib/` directory.
 TODO
 ----
 
-- fix sweep/inverse flags in connectors
+- refactor/add-in support for old-style connectors w/o `angle` attrib
 - intersection of arc w/ rectangle for takeoff from stock
 - intersection of arc w/ rounded-rect for takeoff from module
-- refactor/add-in support for old-style connectors w/o `angle` attrib
 - add-back isee compat support
 - logging framework
 

lib/draw.js

@@ -633,14 +633,13 @@ var DConnector = (function () {
     DConnector.prototype.drawLabel = function () { };
     DConnector.prototype.visualize = function () { };
     DConnector.prototype.arcCircle = function () {
-        if (!this.e.hasOwnProperty('angle')) {
-            console.log('FIXME: support non-spec x,y connectors');
-            return null;
-        }
         var from = this.drawing.namedEnts[this.e.from];
         var to = this.drawing.namedEnts[this.e.to];
         if (!from || !to)
             return;
+        if (!this.e.hasOwnProperty('angle')) {
+            return circleFromPoints({ x: from.cx, y: from.cy }, { x: to.cx, y: to.cy }, { x: this.e.x, y: this.e.y });
+        }
         var slopeTakeoff = tan(this.takeoffθ());
         var slopePerpToTakeoff = -1 / slopeTakeoff;
         if (isZero(slopePerpToTakeoff))

sd.js

@@ -13926,14 +13926,13 @@ define('draw',["require", "exports", './runtime', "./util", "../bower_components
         DConnector.prototype.drawLabel = function () { };
         DConnector.prototype.visualize = function () { };
         DConnector.prototype.arcCircle = function () {
-            if (!this.e.hasOwnProperty('angle')) {
-                console.log('FIXME: support non-spec x,y connectors');
-                return null;
-            }
             var from = this.drawing.namedEnts[this.e.from];
             var to = this.drawing.namedEnts[this.e.to];
             if (!from || !to)
                 return;
+            if (!this.e.hasOwnProperty('angle')) {
+                return circleFromPoints({ x: from.cx, y: from.cy }, { x: to.cx, y: to.cy }, { x: this.e.x, y: this.e.y });
+            }
             var slopeTakeoff = tan(this.takeoffθ());
             var slopePerpToTakeoff = -1 / slopeTakeoff;
             if (isZero(slopePerpToTakeoff))

src/draw.ts

@@ -875,16 +875,18 @@ class DConnector implements Ent {
 
 	// TODO: handle old-style connectors w/ x and y but no angle.
 	private arcCircle(): Circle {
-		if (!this.e.hasOwnProperty('angle')) {
-			console.log('FIXME: support non-spec x,y connectors');
-			return null;
-		}
-
 		const from = this.drawing.namedEnts[this.e.from];
 		const to = this.drawing.namedEnts[this.e.to];
 		if (!from || !to)
 			return;
 
+		if (!this.e.hasOwnProperty('angle')) {
+			return circleFromPoints(
+				{x: from.cx, y: from.cy},
+				{x: to.cx, y: to.cy},
+				{x: this.e.x, y: this.e.y});
+		}
+
 		// Find cx, cy from 'takeoff angle', and center of
 		// 'from', and center of 'to'.  This means we have 2
 		// points on the edge of a cirlce, and the tangent at