tsdraft 0.2.0 → 0.2.1

package/dist/svg.js

@@ -1,6 +1,7 @@
 import { sweep } from "./drawing.js";
 import { extents } from "./extents.js";
 import { fmt } from "./format.js";
+import { layerKey } from "./layers.js";
 /** Screen colors for the standard ACI colors 1 to 7. Other indexes draw in currentColor. */
 const ACI = {
     1: "#ff0000",
@@ -19,10 +20,11 @@ export function toSVG(drawing, options = {}) {
     const y = -(maxY + margin);
     const w = maxX - minX + margin * 2;
     const h = maxY - minY + margin * 2;
-    const colors = new Map(drawing.layers.map((l) => [l.name, ACI[l.color] ?? "currentColor"]));
+    // Keyed as AutoCAD looks layers up, so an entity on `wall` takes the color of layer `WALL`.
+    const colors = new Map(drawing.layers.map((l) => [layerKey(l.name), ACI[l.color] ?? "currentColor"]));
     const stroke = options.strokeWidth ?? 1;
     const body = drawing.entities
-        .map((e) => entityToSvg(e, colors.get(e.layer) ?? "currentColor"))
+        .map((e) => entityToSvg(e, colors.get(layerKey(e.layer)) ?? "currentColor"))
         .join("\n    ");
     return [
         `<svg xmlns="http://www.w3.org/2000/svg" viewBox="${fmt(x)} ${fmt(y)} ${fmt(w)} ${fmt(h)}">`,
@@ -52,6 +54,11 @@ function entityToSvg(e, color) {
             const large = sweep(e.startAngle, e.endAngle) > 180 ? 1 : 0;
             const start = `${fmt(cx + e.radius * Math.cos(a0))} ${fmt(cy + e.radius * Math.sin(a0))}`;
             const end = `${fmt(cx + e.radius * Math.cos(a1))} ${fmt(cy + e.radius * Math.sin(a1))}`;
+            // SVG draws nothing for an arc that ends where it starts, which is where rounding can
+            // put the ends of an arc that is all but a full turn.
+            if (start === end && large === 1) {
+                return `<circle cx="${fmt(cx)}" cy="${fmt(cy)}" r="${fmt(e.radius)}" ${s}/>`;
+            }
             // sweep-flag 1 is the positive-angle direction in local (Y-up) coordinates: counterclockwise.
             return `<path d="M ${start} A ${fmt(e.radius)} ${fmt(e.radius)} 0 ${large} 1 ${end}" ${s}/>`;
         }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "tsdraft",
-  "version": "0.2.0",
+  "version": "0.2.1",
   "description": "2D CAD drawings as TypeScript: write the drawing in code, export DXF and SVG.",
   "keywords": [
     "2d",