@mlightcad/cad-simple-viewer 1.4.13 → 1.5.1

package/lib/command/{AcApMeasureAngleCmd.js → measure/AcApMeasureAngleCmd.js}

@@ -50,9 +50,9 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
     }
 };
 import { AcDbLine, AcGiLineWeight } from '@mlightcad/data-model';
-import { AcEdCommand, AcEdCorsorType, AcEdOpenMode, AcEdPreviewJig, AcEdPromptPointOptions, AcEdPromptStatus, AcEdViewMode } from '../editor';
-import { AcApI18n } from '../i18n';
-import { cssColor, makeBadge, makeDot, makeLiveBadge, makeOverlayCanvas, measurementColor } from '../util';
+import { AcEdCommand, AcEdCorsorType, AcEdOpenMode, AcEdPreviewJig, AcEdPromptPointOptions, AcEdPromptStatus, AcEdViewMode } from '../../editor';
+import { AcApI18n } from '../../i18n';
+import { cssColor, makeBadge, makeDot, makeLiveBadge, makeOverlayCanvas, measurementColor } from '../../util';
 import { registerMeasurementCleanup } from './AcApClearMeasurementsCmd';
 /** Returns the angle in degrees between two arms sharing a common vertex. */
 function calcAngleDeg(vertex, arm1, arm2) {
@@ -177,13 +177,14 @@ var AcApMeasureArm1Jig = /** @class */ (function (_super) {
  */
 var AcApMeasureAngleJig = /** @class */ (function (_super) {
     __extends(AcApMeasureAngleJig, _super);
-    function AcApMeasureAngleJig(view, vertex, arm1, canvas, color) {
+    function AcApMeasureAngleJig(view, db, vertex, arm1, canvas, color) {
         var _this = _super.call(this, view) || this;
         _this._vertex = vertex;
         _this._arm1 = arm1;
         _this._view = view;
         _this._canvas = canvas;
         _this._color = color;
+        _this._db = db;
         _this._line = new AcDbLine(vertex, vertex);
         _this._line.color = color;
         _this._line.lineWeight = AcGiLineWeight.LineWeight070;
@@ -202,7 +203,11 @@ var AcApMeasureAngleJig = /** @class */ (function (_super) {
         // Redraw the first arm dashed line (stays in sync with pan/zoom)
         drawArm1OnCanvas(this._canvas, this._view, this._vertex, this._arm1, this._color);
         var deg = calcAngleDeg(this._vertex, this._arm1, p);
-        this._badge.textContent = "~ ".concat(deg.toFixed(2), "\u00B0");
+        this._badge.textContent = this._db.formatter.formatAngle((deg * Math.PI) / 180, {
+            showUnits: true,
+            showApproximate: true,
+            applyAngbaseAngdir: false
+        });
         this._badge.style.display = 'block';
         var rect = this._view.canvas.getBoundingClientRect();
         var sv = this._view.worldToScreen(this._vertex);
@@ -232,13 +237,14 @@ var AcApMeasureAngleCmd = /** @class */ (function (_super) {
     }
     AcApMeasureAngleCmd.prototype.execute = function (context) {
         return __awaiter(this, void 0, void 0, function () {
-            var editor, color;
+            var editor, db, color;
             var _this = this;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
                         editor = context.view.editor;
-                        color = measurementColor(context.doc.database);
+                        db = context.doc.database;
+                        color = measurementColor(db);
                         return [4 /*yield*/, context.view.withMode(AcEdViewMode.SELECTION, function () {
                                 return editor.withCursor(AcEdCorsorType.Crosshair, function () { return __awaiter(_this, void 0, void 0, function () {
                                     var vertexPrompt, vertexResult, vertex, arm1Prompt, arm1Result, arm1, armCanvas, redrawOnViewChange, arm2Prompt, arm2, arm2Result, _a, degrees, line1, line2, persistCanvas, redrawPersist, htManager, id, dx1, dy1, dx2, dy2, wLen1, wLen2, u1x, u1y, u2x, u2y, bx, by, bLen, badgeOffset, badgeWorld;
@@ -268,7 +274,7 @@ var AcApMeasureAngleCmd = /** @class */ (function (_super) {
                                                 };
                                                 context.view.events.viewChanged.addEventListener(redrawOnViewChange);
                                                 arm2Prompt = new AcEdPromptPointOptions(AcApI18n.t('jig.measureAngle.arm2'));
-                                                arm2Prompt.jig = new AcApMeasureAngleJig(context.view, vertex, arm1, armCanvas, color);
+                                                arm2Prompt.jig = new AcApMeasureAngleJig(context.view, db, vertex, arm1, armCanvas, color);
                                                 _b.label = 3;
                                             case 3:
                                                 _b.trys.push([3, 5, , 6]);
@@ -340,7 +346,10 @@ var AcApMeasureAngleCmd = /** @class */ (function (_super) {
                                                     x: vertex.x + bx * badgeOffset,
                                                     y: vertex.y + by * badgeOffset
                                                 };
-                                                htManager.add("".concat(id, "-badge"), makeBadge(color, "".concat(degrees.toFixed(2), "\u00B0")), badgeWorld, 'measurement');
+                                                htManager.add("".concat(id, "-badge"), makeBadge(color, db.formatter.formatAngle((degrees * Math.PI) / 180, {
+                                                    showUnits: true,
+                                                    applyAngbaseAngdir: false
+                                                })), badgeWorld, 'measurement');
                                                 registerMeasurementCleanup(function () {
                                                     context.view.removeTransientEntity(line1.objectId);
                                                     context.view.removeTransientEntity(line2.objectId);

package/lib/command/measure/AcApMeasureAngleCmd.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"AcApMeasureAngleCmd.js","sourceRoot":"","sources":["../../../src/command/measure/AcApMeasureAngleCmd.ts"],"names":[],"mappings":"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"}

package/lib/command/{AcApMeasureArcCmd.d.ts → measure/AcApMeasureArcCmd.d.ts}

@@ -1,5 +1,5 @@
-import { AcApContext } from '../app';
-import { AcEdCommand } from '../editor';
+import { AcApContext } from '../../app';
+import { AcEdCommand } from '../../editor';
 /**
  * Command that measures the length of an arc on an existing circle or arc entity.
  *

package/lib/command/measure/AcApMeasureArcCmd.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"AcApMeasureArcCmd.d.ts","sourceRoot":"","sources":["../../../src/command/measure/AcApMeasureArcCmd.ts"],"names":[],"mappings":"AAQA,OAAO,EAAE,WAAW,EAAE,MAAM,WAAW,CAAA;AACvC,OAAO,EAEL,WAAW,EAOZ,MAAM,cAAc,CAAA;AAwQrB;;;;;;;;;;;;;;;;;GAiBG;AACH,qBAAa,iBAAkB,SAAQ,WAAW;;IAM1C,OAAO,CAAC,OAAO,EAAE,WAAW;CAgKnC"}

package/lib/command/{AcApMeasureArcCmd.js → measure/AcApMeasureArcCmd.js}

@@ -61,9 +61,9 @@ var __values = (this && this.__values) || function(o) {
     throw new TypeError(s ? "Object is not iterable." : "Symbol.iterator is not defined.");
 };
 import { AcDbArc, AcDbCircle, AcDbLine } from '@mlightcad/data-model';
-import { AcEdCommand, AcEdCorsorType, AcEdOpenMode, AcEdPreviewJig, AcEdPromptPointOptions, AcEdPromptStatus, AcEdViewMode } from '../editor';
-import { AcApI18n } from '../i18n';
-import { cssColor, makeBadge, makeDot, makeLiveBadge, makeLiveDot, makeOverlayCanvas, makeSnapIndicator, measurementColor } from '../util';
+import { AcEdCommand, AcEdCorsorType, AcEdOpenMode, AcEdPreviewJig, AcEdPromptPointOptions, AcEdPromptStatus, AcEdViewMode } from '../../editor';
+import { AcApI18n } from '../../i18n';
+import { cssColor, makeBadge, makeDot, makeLiveBadge, makeLiveDot, makeOverlayCanvas, makeSnapIndicator, measurementColor } from '../../util';
 import { registerMeasurementCleanup } from './AcApClearMeasurementsCmd';
 /** Returns the world point snapped to the nearest point on the circle circumference */
 function snapToCircle(p, g) {
@@ -287,13 +287,14 @@ var AcApMeasureArcCmd = /** @class */ (function (_super) {
     }
     AcApMeasureArcCmd.prototype.execute = function (context) {
         return __awaiter(this, void 0, void 0, function () {
-            var editor, color, arcCanvas;
+            var editor, db, color, arcCanvas;
             var _this = this;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
                         editor = context.view.editor;
-                        color = measurementColor(context.doc.database);
+                        db = context.doc.database;
+                        color = measurementColor(db);
                         arcCanvas = makeOverlayCanvas(context.view.container);
                         return [4 /*yield*/, context.view.withMode(AcEdViewMode.SELECTION, function () {
                                 return editor.withCursor(AcEdCorsorType.Crosshair, function () { return __awaiter(_this, void 0, void 0, function () {
@@ -351,7 +352,10 @@ var AcApMeasureArcCmd = /** @class */ (function (_super) {
                                                 onMove = function (snapped) {
                                                     drawArcOnCanvas(arcCanvas, context.view, geom, start, snapped, color);
                                                     var len = shortArcLength(start, snapped, geom);
-                                                    liveBadge.textContent = "~ ".concat(len.toFixed(4), " m");
+                                                    liveBadge.textContent = db.formatter.formatLength(len, {
+                                                        showUnits: true,
+                                                        showApproximate: true
+                                                    });
                                                     liveBadge.style.display = '';
                                                     var mid = shortArcMid(start, snapped, geom);
                                                     var rect = context.view.canvas.getBoundingClientRect();
@@ -403,7 +407,10 @@ var AcApMeasureArcCmd = /** @class */ (function (_super) {
                                                 id = "arc-".concat(Date.now());
                                                 htManager.add("".concat(id, "-dot1"), makeDot(color), start, 'measurement');
                                                 htManager.add("".concat(id, "-dot2"), makeDot(color), end, 'measurement');
-                                                htManager.add("".concat(id, "-badge"), makeBadge(color, "~ ".concat(arcLen.toFixed(4), " m")), mid, 'measurement');
+                                                htManager.add("".concat(id, "-badge"), makeBadge(color, db.formatter.formatLength(arcLen, {
+                                                    showUnits: true,
+                                                    showApproximate: true
+                                                })), mid, 'measurement');
                                                 registerMeasurementCleanup(function () {
                                                     persistCanvas.remove();
                                                     context.view.events.viewChanged.removeEventListener(redrawPersist);

package/lib/command/measure/AcApMeasureArcCmd.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"AcApMeasureArcCmd.js","sourceRoot":"","sources":["../../../src/command/measure/AcApMeasureArcCmd.ts"],"names":[],"mappings":"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"}

package/lib/command/{AcApMeasureAreaCmd.d.ts → measure/AcApMeasureAreaCmd.d.ts}

@@ -1,5 +1,5 @@
-import { AcApContext } from '../app';
-import { AcEdCommand } from '../editor';
+import { AcApContext } from '../../app';
+import { AcEdCommand } from '../../editor';
 /**
  * Command that measures the area of a polygon drawn by the user.
  *

package/lib/command/measure/AcApMeasureAreaCmd.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"AcApMeasureAreaCmd.d.ts","sourceRoot":"","sources":["../../../src/command/measure/AcApMeasureAreaCmd.ts"],"names":[],"mappings":"AAOA,OAAO,EAAE,WAAW,EAAE,MAAM,WAAW,CAAA;AACvC,OAAO,EAEL,WAAW,EAOZ,MAAM,cAAc,CAAA;AAoIrB;;;;;;;;;;;;;GAaG;AACH,qBAAa,kBAAmB,SAAQ,WAAW;;IAM3C,OAAO,CAAC,OAAO,EAAE,WAAW;CAsMnC"}

package/lib/command/{AcApMeasureAreaCmd.js → measure/AcApMeasureAreaCmd.js}

@@ -75,9 +75,9 @@ var __spreadArray = (this && this.__spreadArray) || function (to, from, pack) {
     return to.concat(ar || Array.prototype.slice.call(from));
 };
 import { AcDbLine, AcGiLineWeight } from '@mlightcad/data-model';
-import { AcEdCommand, AcEdCorsorType, AcEdOpenMode, AcEdPreviewJig, AcEdPromptPointOptions, AcEdPromptStatus, AcEdViewMode } from '../editor';
-import { AcApI18n } from '../i18n';
-import { colorToCssAlpha, cssColor, makeBadge, makeDot, makeLiveBadge, makeOverlayCanvas, measurementColor } from '../util';
+import { AcEdCommand, AcEdCorsorType, AcEdOpenMode, AcEdPreviewJig, AcEdPromptPointOptions, AcEdPromptStatus, AcEdViewMode } from '../../editor';
+import { AcApI18n } from '../../i18n';
+import { colorToCssAlpha, cssColor, makeBadge, makeDot, makeLiveBadge, makeOverlayCanvas, measurementColor } from '../../util';
 import { registerMeasurementCleanup } from './AcApClearMeasurementsCmd';
 /**
  * Rubber-band jig: shows a preview line from the last confirmed
@@ -195,13 +195,14 @@ var AcApMeasureAreaCmd = /** @class */ (function (_super) {
     }
     AcApMeasureAreaCmd.prototype.execute = function (context) {
         return __awaiter(this, void 0, void 0, function () {
-            var editor, color, points, fillCanvas, liveBadge;
+            var editor, db, color, points, fillCanvas, liveBadge;
             var _this = this;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
                         editor = context.view.editor;
-                        color = measurementColor(context.doc.database);
+                        db = context.doc.database;
+                        color = measurementColor(db);
                         points = [];
                         fillCanvas = makeOverlayCanvas(context.view.container);
                         liveBadge = makeLiveBadge(color);
@@ -284,7 +285,10 @@ var AcApMeasureAreaCmd = /** @class */ (function (_super) {
                                                                         return;
                                                                     var tempPts = __spreadArray(__spreadArray([], __read(points), false), [cursor], false);
                                                                     var area = shoelaceArea(tempPts);
-                                                                    liveBadge.textContent = "~ ".concat(area.toFixed(3), " m\u00B2");
+                                                                    liveBadge.textContent = "".concat(db.formatter.formatLength(area, {
+                                                                        showUnits: true,
+                                                                        showApproximate: true
+                                                                    }), "\u00B2");
                                                                     liveBadge.style.display = '';
                                                                     var mid = centroid(tempPts);
                                                                     var rect = context.view.canvas.getBoundingClientRect();
@@ -360,7 +364,10 @@ var AcApMeasureAreaCmd = /** @class */ (function (_super) {
                                                 htManager = context.view.htmlTransientManager;
                                                 id = "area-".concat(Date.now());
                                                 mid = centroid(points);
-                                                htManager.add("".concat(id, "-badge"), makeBadge(color, "~ ".concat(area.toFixed(3), " m\u00B2")), mid, 'measurement');
+                                                htManager.add("".concat(id, "-badge"), makeBadge(color, "".concat(db.formatter.formatLength(area, {
+                                                    showUnits: true,
+                                                    showApproximate: true
+                                                }), "\u00B2")), mid, 'measurement');
                                                 points.forEach(function (p, i) {
                                                     htManager.add("".concat(id, "-dot").concat(i), makeDot(color), p, 'measurement');
                                                 });

package/lib/command/measure/AcApMeasureAreaCmd.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"AcApMeasureAreaCmd.js","sourceRoot":"","sources":["../../../src/command/measure/AcApMeasureAreaCmd.ts"],"names":[],"mappings":"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"}

package/lib/command/{AcApMeasureDistanceCmd.d.ts → measure/AcApMeasureDistanceCmd.d.ts}

@@ -1,6 +1,6 @@
-import { AcCmColor, AcDbLine, AcGePoint3dLike } from '@mlightcad/data-model';
-import { AcApContext } from '../app';
-import { AcEdBaseView, AcEdCommand, AcEdPreviewJig } from '../editor';
+import { AcCmColor, AcDbDatabase, AcDbLine, AcGePoint3dLike } from '@mlightcad/data-model';
+import { AcApContext } from '../../app';
+import { AcEdBaseView, AcEdCommand, AcEdPreviewJig } from '../../editor';
 /**
  * Preview jig for the distance measurement command.
  *
@@ -13,8 +13,9 @@ export declare class AcApMeasureDistanceJig extends AcEdPreviewJig<AcGePoint3dLi
     private _line;
     private _p1;
     private _view;
+    private _db;
     private _badge;
-    constructor(view: AcEdBaseView, p1: AcGePoint3dLike, color: AcCmColor);
+    constructor(view: AcEdBaseView, db: AcDbDatabase, p1: AcGePoint3dLike, color: AcCmColor);
     get entity(): AcDbLine;
     update(p2: AcGePoint3dLike): void;
     end(): void;

package/lib/command/measure/AcApMeasureDistanceCmd.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"AcApMeasureDistanceCmd.d.ts","sourceRoot":"","sources":["../../../src/command/measure/AcApMeasureDistanceCmd.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,SAAS,EACT,YAAY,EACZ,QAAQ,EACR,eAAe,EAEhB,MAAM,uBAAuB,CAAA;AAE9B,OAAO,EAAE,WAAW,EAAE,MAAM,WAAW,CAAA;AACvC,OAAO,EACL,YAAY,EACZ,WAAW,EAGX,cAAc,EAIf,MAAM,cAAc,CAAA;AAarB;;;;;;;GAOG;AACH,qBAAa,sBAAuB,SAAQ,cAAc,CAAC,eAAe,CAAC;IACzE,OAAO,CAAC,KAAK,CAAU;IACvB,OAAO,CAAC,GAAG,CAAiB;IAC5B,OAAO,CAAC,KAAK,CAAc;IAC3B,OAAO,CAAC,GAAG,CAAc;IACzB,OAAO,CAAC,MAAM,CAAgB;gBAG5B,IAAI,EAAE,YAAY,EAClB,EAAE,EAAE,YAAY,EAChB,EAAE,EAAE,eAAe,EACnB,KAAK,EAAE,SAAS;IAclB,IAAI,MAAM,IAAI,QAAQ,CAErB;IAED,MAAM,CAAC,EAAE,EAAE,eAAe;IAsB1B,GAAG;CAIJ;AAED;;;;;;;GAOG;AACH,qBAAa,sBAAuB,SAAQ,WAAW;;IAM/C,OAAO,CAAC,OAAO,EAAE,WAAW;CA4DnC"}

package/lib/command/{AcApMeasureDistanceCmd.js → measure/AcApMeasureDistanceCmd.js}

@@ -50,9 +50,9 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
     }
 };
 import { AcDbLine, AcGiLineWeight } from '@mlightcad/data-model';
-import { AcEdCommand, AcEdCorsorType, AcEdOpenMode, AcEdPreviewJig, AcEdPromptPointOptions, AcEdPromptStatus, AcEdViewMode } from '../editor';
-import { AcApI18n } from '../i18n';
-import { makeBadge, makeDot, makeLiveBadge, measurementColor } from '../util';
+import { AcEdCommand, AcEdCorsorType, AcEdOpenMode, AcEdPreviewJig, AcEdPromptPointOptions, AcEdPromptStatus, AcEdViewMode } from '../../editor';
+import { AcApI18n } from '../../i18n';
+import { makeBadge, makeDot, makeLiveBadge, measurementColor } from '../../util';
 import { registerMeasurementCleanup } from './AcApClearMeasurementsCmd';
 /** Returns the 2D Euclidean distance between two world points. */
 function calcDist(p1, p2) {
@@ -70,10 +70,11 @@ function calcDist(p1, p2) {
  */
 var AcApMeasureDistanceJig = /** @class */ (function (_super) {
     __extends(AcApMeasureDistanceJig, _super);
-    function AcApMeasureDistanceJig(view, p1, color) {
+    function AcApMeasureDistanceJig(view, db, p1, color) {
         var _this = _super.call(this, view) || this;
         _this._p1 = p1;
         _this._view = view;
+        _this._db = db;
         _this._line = new AcDbLine(p1, p1);
         _this._line.color = color;
         _this._line.lineWeight = AcGiLineWeight.LineWeight070;
@@ -95,7 +96,10 @@ var AcApMeasureDistanceJig = /** @class */ (function (_super) {
             this._badge.style.display = 'none';
             return;
         }
-        this._badge.textContent = "~ ".concat(dist.toFixed(3), " m");
+        this._badge.textContent = this._db.formatter.formatLength(dist, {
+            showUnits: true,
+            showApproximate: true
+        });
         this._badge.style.display = 'block';
         var mid = { x: (this._p1.x + p2.x) / 2, y: (this._p1.y + p2.y) / 2 };
         var rect = this._view.canvas.getBoundingClientRect();
@@ -127,13 +131,14 @@ var AcApMeasureDistanceCmd = /** @class */ (function (_super) {
     }
     AcApMeasureDistanceCmd.prototype.execute = function (context) {
         return __awaiter(this, void 0, void 0, function () {
-            var editor, color;
+            var editor, db, color;
             var _this = this;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
                         editor = context.view.editor;
-                        color = measurementColor(context.doc.database);
+                        db = context.doc.database;
+                        color = measurementColor(db);
                         return [4 /*yield*/, context.view.withMode(AcEdViewMode.SELECTION, function () {
                                 return editor.withCursor(AcEdCorsorType.Crosshair, function () { return __awaiter(_this, void 0, void 0, function () {
                                     var p1Prompt, p1Result, p1, p2Prompt, p2Result, p2, dist, line, htManager, id, mid;
@@ -149,7 +154,7 @@ var AcApMeasureDistanceCmd = /** @class */ (function (_super) {
                                                 p1 = p1Result.value;
                                                 p2Prompt = new AcEdPromptPointOptions(AcApI18n.t('jig.measureDistance.secondPoint'));
                                                 p2Prompt.useBasePoint = true;
-                                                p2Prompt.jig = new AcApMeasureDistanceJig(context.view, p1, color);
+                                                p2Prompt.jig = new AcApMeasureDistanceJig(context.view, db, p1, color);
                                                 return [4 /*yield*/, editor.getPoint(p2Prompt)];
                                             case 2:
                                                 p2Result = _a.sent();
@@ -166,7 +171,10 @@ var AcApMeasureDistanceCmd = /** @class */ (function (_super) {
                                                 mid = { x: (p1.x + p2.x) / 2, y: (p1.y + p2.y) / 2 };
                                                 htManager.add("".concat(id, "-dot1"), makeDot(color), p1, 'measurement');
                                                 htManager.add("".concat(id, "-dot2"), makeDot(color), p2, 'measurement');
-                                                htManager.add("".concat(id, "-badge"), makeBadge(color, "~ ".concat(dist.toFixed(3), " m")), mid, 'measurement');
+                                                htManager.add("".concat(id, "-badge"), makeBadge(color, db.formatter.formatLength(dist, {
+                                                    showUnits: true,
+                                                    showApproximate: true
+                                                })), mid, 'measurement');
                                                 registerMeasurementCleanup(function () {
                                                     context.view.removeTransientEntity(line.objectId);
                                                     htManager.remove("".concat(id, "-dot1"));

package/lib/command/measure/AcApMeasureDistanceCmd.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"AcApMeasureDistanceCmd.js","sourceRoot":"","sources":["../../../src/command/measure/AcApMeasureDistanceCmd.ts"],"names":[],"mappings":"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"}

package/lib/command/measure/index.d.ts

@@ -0,0 +1,6 @@
+export * from './AcApClearMeasurementsCmd';
+export * from './AcApMeasureAngleCmd';
+export * from './AcApMeasureAreaCmd';
+export * from './AcApMeasureArcCmd';
+export * from './AcApMeasureDistanceCmd';
+//# sourceMappingURL=index.d.ts.map

package/lib/command/measure/index.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/command/measure/index.ts"],"names":[],"mappings":"AAAA,cAAc,4BAA4B,CAAA;AAC1C,cAAc,uBAAuB,CAAA;AACrC,cAAc,sBAAsB,CAAA;AACpC,cAAc,qBAAqB,CAAA;AACnC,cAAc,0BAA0B,CAAA"}

package/lib/command/measure/index.js

@@ -0,0 +1,6 @@
+export * from './AcApClearMeasurementsCmd';
+export * from './AcApMeasureAngleCmd';
+export * from './AcApMeasureAreaCmd';
+export * from './AcApMeasureArcCmd';
+export * from './AcApMeasureDistanceCmd';
+//# sourceMappingURL=index.js.map

package/lib/command/measure/index.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/command/measure/index.ts"],"names":[],"mappings":"AAAA,cAAc,4BAA4B,CAAA;AAC1C,cAAc,uBAAuB,CAAA;AACrC,cAAc,sBAAsB,CAAA;AACpC,cAAc,qBAAqB,CAAA;AACnC,cAAc,0BAA0B,CAAA"}

package/lib/command/modify/AcApCopyCmd.d.ts

@@ -0,0 +1,94 @@
+import { AcApContext } from '../../app';
+import { AcEdCommand } from '../../editor';
+/**
+ * Command to copy selected entities by cloning and translating them.
+ *
+ * Supported AutoCAD-like workflow:
+ * 1) Select entities (or reuse preselection),
+ * 2) Specify base point or choose `Displacement` / `Mode` / `Multiple`,
+ * 3) Specify placement point, or create an evenly spaced array,
+ * 4) Append cloned copies without modifying the originals.
+ */
+export declare class AcApCopyCmd extends AcEdCommand {
+    private static _defaultMode;
+    /**
+     * Creates the COPY command and marks it as a review-mode command.
+     */
+    constructor();
+    /**
+     * Adds one localized keyword entry to a point/keyword prompt.
+     *
+     * @param prompt - Prompt instance that should expose the keyword.
+     * @param key - Translation key suffix describing which keyword to add.
+     */
+    private addKeyword;
+    /**
+     * Computes the vector from a copy base point to a target point.
+     *
+     * @param basePoint - Copy base point.
+     * @param targetPoint - Destination point selected by the user.
+     * @returns Translation vector that moves a clone from base to target.
+     */
+    private computeDisplacement;
+    /**
+     * Scales a displacement for one copy in a repeated copy/array operation.
+     *
+     * @param displacement - Raw placement displacement from the base point.
+     * @param factor - One-based copy index.
+     * @param copyCount - Total number of copies to generate.
+     * @param fitMode - Whether indexed copies should be distributed across the full span.
+     * @returns Displacement assigned to the requested copy index.
+     */
+    private scaleDisplacement;
+    /**
+     * Clones source entities and translates each clone batch into its final position.
+     *
+     * @param sourceEntities - Entities to duplicate.
+     * @param displacement - Raw placement displacement from base point to end point.
+     * @param copyCount - Number of translated copy batches to produce.
+     * @param fitMode - Whether batches should be distributed evenly across the full displacement.
+     * @returns Newly cloned and transformed entities ready to append to model space.
+     */
+    private buildCopies;
+    /**
+     * Prompts the user to choose between single-copy and repeated-copy behavior.
+     *
+     * @param currentMode - Mode shown as the current default in the prompt.
+     * @returns Selected mode, the current mode on empty input, or `undefined` on cancel/error.
+     */
+    private promptCopyMode;
+    /**
+     * Collects array placement settings for the `Array` COPY option.
+     *
+     * The routine first asks for the number of items, then asks for the final
+     * placement point. If the user chooses `Fit`, the returned placement marks
+     * copies as evenly distributed across the overall span.
+     *
+     * @param context - Current application/document context.
+     * @param sourceEntities - Entities used to build the transient preview.
+     * @param basePoint - Array start point shared by all placements.
+     * @returns Array placement settings, or `undefined` when input is canceled.
+     */
+    private promptArrayPlacement;
+    /**
+     * Runs the placement loop that repeatedly creates copies until the command ends.
+     *
+     * @param context - Current application/document context.
+     * @param sourceEntities - Entities selected for copying.
+     * @param basePoint - Base/displacement point used by the current copy session.
+     * @param copyMode - Whether the loop should stop after one placement or continue.
+     * @param useDisplacementPrompt - Whether prompt text should describe displacement instead of second point placement.
+     */
+    private executeCopyLoop;
+    /**
+     * Executes COPY using AutoCAD-like selection, base-point, and placement prompts.
+     *
+     * Existing selection is reused when available; otherwise the command requests
+     * a new selection. The command then resolves copy mode/base point options and
+     * appends cloned entities into model space for each accepted placement.
+     *
+     * @param context - Current application/document context.
+     */
+    execute(context: AcApContext): Promise<void>;
+}
+//# sourceMappingURL=AcApCopyCmd.d.ts.map

package/lib/command/modify/AcApCopyCmd.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"AcApCopyCmd.d.ts","sourceRoot":"","sources":["../../../src/command/modify/AcApCopyCmd.ts"],"names":[],"mappings":"AAOA,OAAO,EAAkB,WAAW,EAAkB,MAAM,WAAW,CAAA;AACvE,OAAO,EAEL,WAAW,EAQZ,MAAM,cAAc,CAAA;AAmJrB;;;;;;;;GAQG;AACH,qBAAa,WAAY,SAAQ,WAAW;IAC1C,OAAO,CAAC,MAAM,CAAC,YAAY,CAAuB;IAElD;;OAEG;;IAMH;;;;;OAKG;IACH,OAAO,CAAC,UAAU;IAWlB;;;;;;OAMG;IACH,OAAO,CAAC,mBAAmB;IAW3B;;;;;;;;OAQG;IACH,OAAO,CAAC,iBAAiB;IAczB;;;;;;;;OAQG;IACH,OAAO,CAAC,WAAW;IA8BnB;;;;;OAKG;YACW,cAAc;IAuB5B;;;;;;;;;;;OAWG;YACW,oBAAoB;IAgFlC;;;;;;;;OAQG;YACW,eAAe;IAsE7B;;;;;;;;OAQG;IACG,OAAO,CAAC,OAAO,EAAE,WAAW;CAqGnC"}