@node-projects/acad-ts 1.0.0 → 1.2.0

package/dist/Entities/Dimension.js

@@ -1,11 +1,19 @@
 import { Entity } from './Entity.js';
 import { CadObject } from '../CadObject.js';
 import { DxfSubclassMarker } from '../DxfSubclassMarker.js';
+import { AppId } from '../Tables/AppId.js';
 import { DimensionStyle } from '../Tables/DimensionStyle.js';
 import { BlockRecord } from '../Tables/BlockRecord.js';
+import { Layer } from '../Tables/Layer.js';
 import { DimensionType } from './DimensionType.js';
 import { AttachmentPointType } from './AttachmentPointType.js';
 import { LineSpacingStyleType } from './LineSpacingStyleType.js';
+import { DxfClassMap } from '../DxfClassMap.js';
+import { Line } from './Line.js';
+import { MText } from './MText.js';
+import { Point } from './Point.js';
+import { ExtendedData } from '../XData/ExtendedData.js';
+import { ExtendedDataInteger16 } from '../XData/ExtendedDataInteger16.js';
 import { XYZ } from '../Math/XYZ.js';
 export class Dimension extends Entity {
     attachmentPoint = AttachmentPointType.TopLeft;
@@ -31,7 +39,11 @@ export class Dimension extends Entity {
     flipArrow1 = false;
     flipArrow2 = false;
     get hasStyleOverride() {
-        // TODO: ExtendedData access not available
+        for (const [appName, data] of this.extendedData.getExtendedDataByName()) {
+            if (data.records.length > 0 && (appName === AppId.DefaultName.toUpperCase() || appName.startsWith(`${AppId.DefaultName.toUpperCase()}_DSTYLE`))) {
+                return true;
+            }
+        }
         return false;
     }
     horizontalDirection = 0;
@@ -83,7 +95,14 @@ export class Dimension extends Entity {
         this._flags |= DimensionType.BlockReference;
     }
     applyTransform(transform) {
-        // TODO: Complex transform with world matrix
+        this.definitionPoint = this.applyTransformToPoint(transform, this.definitionPoint);
+        this.insertionPoint = this.applyTransformToPoint(transform, this.insertionPoint);
+        this.textMiddlePoint = this.applyTransformToPoint(transform, this.textMiddlePoint);
+        this.normal = this.applyTransformToVector(transform, this.normal).normalize();
+        const rotation = transform?.eulerRotation?.z;
+        if (typeof rotation === 'number') {
+            this.textRotation += rotation;
+        }
     }
     clone() {
         const clone = super.clone();
@@ -95,22 +114,97 @@ export class Dimension extends Entity {
         if (!this.hasStyleOverride) {
             return this.style;
         }
-        // TODO: Style override map not available
-        return this.style;
+        const style = this.style.clone();
+        const map = this.getStyleOverrideMap();
+        if (map == null) {
+            return style;
+        }
+        const classMap = DxfClassMap.Create(DimensionStyle);
+        for (const [code, value] of map) {
+            const property = classMap.dxfProperties.get(code);
+            if (property != null) {
+                property.setValue(code, style, value);
+            }
+        }
+        return style;
     }
     getMeasurementText(style) {
-        // TODO: Complex measurement text formatting not available
-        return this.measurement.toString();
+        const activeStyle = style ?? this.getActiveDimensionStyle();
+        const measurement = this.formatMeasurement(this.measurement, activeStyle);
+        if (this.text.length > 0) {
+            return this.text.includes('<>') ? this.text.replace(/<>/g, measurement) : this.text;
+        }
+        return `${activeStyle.prefix}${measurement}${activeStyle.suffix}`;
     }
     getStyleOverrideMap() {
-        // TODO: DxfClassMap not available
-        return null;
+        const map = new Map();
+        const classMap = DxfClassMap.Create(DimensionStyle);
+        for (const [name, extendedData] of this.extendedData.getExtendedDataByName()) {
+            if (name !== AppId.DefaultName.toUpperCase() && !name.startsWith(`${AppId.DefaultName.toUpperCase()}_${DimensionStyle.StyleOverrideEntryName}`)) {
+                continue;
+            }
+            for (let index = 0; index < extendedData.records.length - 1; index++) {
+                const codeRecord = extendedData.records[index];
+                const valueRecord = extendedData.records[index + 1];
+                if (!(codeRecord instanceof ExtendedDataInteger16)) {
+                    continue;
+                }
+                if (classMap.dxfProperties.has(codeRecord.value)) {
+                    map.set(codeRecord.value, valueRecord.rawValue);
+                }
+                index += 1;
+            }
+        }
+        return map.size > 0 ? map : null;
     }
     setDimensionOverride(styleOverride) {
-        // TODO: DxfClassMap not available
+        const current = this.style;
+        const classMap = DxfClassMap.Create(DimensionStyle);
+        const overrides = new Map();
+        for (const [code, property] of classMap.dxfProperties) {
+            const baseValue = property.getRawValue(current);
+            const overrideValue = property.getRawValue(styleOverride);
+            if (overrideValue !== undefined && overrideValue !== null && overrideValue !== baseValue) {
+                overrides.set(code, overrideValue);
+            }
+        }
+        this.setStyleOverrideMap(overrides);
     }
     setStyleOverrideMap(map) {
-        // TODO: ExtendedData not available
+        const appName = `${AppId.DefaultName}_${DimensionStyle.StyleOverrideEntryName}`;
+        const nextRecords = [];
+        if (map != null) {
+            const classMap = DxfClassMap.Create(DimensionStyle);
+            for (const [code, value] of map) {
+                const property = classMap.dxfProperties.get(code);
+                if (property == null) {
+                    continue;
+                }
+                property.storedValue = value;
+                nextRecords.push(...property.toXDataRecords());
+            }
+        }
+        const existing = this.extendedData.tryGetByName(appName);
+        if (map == null || map.size === 0) {
+            if (existing.found && existing.value != null) {
+                for (const [app] of this.extendedData) {
+                    if (app.name.toUpperCase() === appName.toUpperCase()) {
+                        this.extendedData.set(app, new ExtendedData());
+                    }
+                }
+            }
+            return;
+        }
+        const records = new ExtendedData(nextRecords);
+        if (existing.found) {
+            for (const [app] of this.extendedData) {
+                if (app.name.toUpperCase() === appName.toUpperCase()) {
+                    this.extendedData.set(app, records);
+                }
+            }
+            return;
+        }
+        this.extendedData.addByName(appName, records);
     }
     updateBlock() {
         this.createBlock();
@@ -139,15 +233,91 @@ export class Dimension extends Entity {
         if (this.document != null) {
             this._block = CadObject.updateCollection(this._block, this.document.blockRecords);
         }
-        this._block.entities?.clear?.();
+        this._block.entities.clear();
     }
     createDefinitionPoint(location) {
-        // TODO: Point with Defpoints layer
-        return null;
+        const point = new Point(new XYZ(location.x, location.y, location.z));
+        point.layer = this.document?.layers.get(Layer.DefpointsName) ?? Layer.Defpoints;
+        point.normal = this.normal;
+        return point;
     }
     createTextEntity(insertPoint, text) {
-        // TODO: MText creation
-        return null;
+        const style = this.getActiveDimensionStyle();
+        const entity = new MText();
+        entity.insertPoint = new XYZ(insertPoint.x, insertPoint.y, insertPoint.z);
+        entity.alignmentPoint = new XYZ(Math.cos(this.textRotation), Math.sin(this.textRotation), 0);
+        entity.attachmentPoint = this.attachmentPoint;
+        entity.color = style.textColor;
+        entity.height = style.textHeight;
+        entity.layer = this.layer;
+        entity.lineSpacing = this.lineSpacingFactor === 0 ? entity.lineSpacing : this.lineSpacingFactor;
+        entity.lineSpacingStyle = this.lineSpacingStyle;
+        entity.normal = this.normal;
+        entity.rotation = this.textRotation;
+        entity.style = style.style;
+        entity.value = text;
+        return entity;
+    }
+    populateBlock(lineSegments, definitionPoints, textPoint = this.textMiddlePoint) {
+        this.createBlock();
+        for (const [start, end] of lineSegments) {
+            this.addBlockLine(start, end);
+        }
+        const seenPoints = new Set();
+        for (const point of definitionPoints) {
+            if (!this.isFinitePoint(point)) {
+                continue;
+            }
+            const key = `${point.x}:${point.y}:${point.z}`;
+            if (seenPoints.has(key)) {
+                continue;
+            }
+            seenPoints.add(key);
+            this._block.entities.add(this.createDefinitionPoint(point));
+        }
+        if (this.isFinitePoint(textPoint)) {
+            this._block.entities.add(this.createTextEntity(textPoint, this.getMeasurementText()));
+        }
+    }
+    static angleBetweenVectors(first, second) {
+        const lengthProduct = first.getLength() * second.getLength();
+        if (lengthProduct === 0) {
+            return 0;
+        }
+        const cosine = first.dot(second) / lengthProduct;
+        const clamped = Math.max(-1, Math.min(1, cosine));
+        return Math.acos(clamped);
+    }
+    static areParallel(first, second) {
+        return Dimension.isZeroVector(first.cross(second));
+    }
+    isFinitePoint(point) {
+        return Number.isFinite(point.x) && Number.isFinite(point.y) && Number.isFinite(point.z);
+    }
+    addBlockLine(start, end) {
+        if (!this.isFinitePoint(start) || !this.isFinitePoint(end) || start.equals(end)) {
+            return;
+        }
+        const line = new Line(new XYZ(start.x, start.y, start.z), new XYZ(end.x, end.y, end.z));
+        line.layer = this.layer;
+        line.normal = this.normal;
+        this._block.entities.add(line);
+    }
+    static intersectLinesXY(firstStart, firstEnd, secondStart, secondEnd) {
+        const denominator = (firstStart.x - firstEnd.x) * (secondStart.y - secondEnd.y) -
+            (firstStart.y - firstEnd.y) * (secondStart.x - secondEnd.x);
+        if (Math.abs(denominator) <= 1e-12) {
+            return XYZ.NaN;
+        }
+        const firstDeterminant = firstStart.x * firstEnd.y - firstStart.y * firstEnd.x;
+        const secondDeterminant = secondStart.x * secondEnd.y - secondStart.y * secondEnd.x;
+        return new XYZ((firstDeterminant * (secondStart.x - secondEnd.x) - (firstStart.x - firstEnd.x) * secondDeterminant) / denominator, (firstDeterminant * (secondStart.y - secondEnd.y) - (firstStart.y - firstEnd.y) * secondDeterminant) / denominator, firstStart.z);
+    }
+    static isZeroVector(vector, epsilon = 1e-12) {
+        return Math.abs(vector.x) <= epsilon && Math.abs(vector.y) <= epsilon && Math.abs(vector.z) <= epsilon;
+    }
+    static subtractPoints(first, second) {
+        return new XYZ(first.x - second.x, first.y - second.y, first.z - second.z);
     }
     _tableOnRemove(sender, e) {
         super._tableOnRemove(sender, e);
@@ -161,6 +331,16 @@ export class Dimension extends Entity {
     generateBlockName() {
         return `*D${this.handle}`;
     }
+    formatMeasurement(value, style) {
+        if (!Number.isFinite(value)) {
+            return '';
+        }
+        let measurement = value;
+        if (style.rounding > 0) {
+            measurement = Math.round(measurement / style.rounding) * style.rounding;
+        }
+        return measurement.toFixed(style.decimalPlaces);
+    }
 }
 export { DimensionType } from './DimensionType.js';
 //# sourceMappingURL=Dimension.js.map

package/dist/Entities/Dimension.js.map

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

package/dist/Entities/DimensionAligned.d.ts

@@ -1,4 +1,5 @@
 import { Dimension } from './Dimension.js';
+import { BoundingBox } from '../Math/BoundingBox.js';
 import { ObjectType } from '../Types/ObjectType.js';
 import { DimensionType } from './DimensionType.js';
 import { XYZ } from '../Math/XYZ.js';
@@ -15,8 +16,8 @@ export declare class DimensionAligned extends Dimension {
     constructor(firstPoint?: XYZ, secondPoint?: XYZ);
     /** @internal */
     protected static createWithType(type: DimensionType): DimensionAligned;
-    applyTransform(transform: any): void;
-    getBoundingBox(): any;
+    applyTransform(transform: unknown): void;
+    getBoundingBox(): BoundingBox;
     updateBlock(): void;
 }
 //# sourceMappingURL=DimensionAligned.d.ts.map

package/dist/Entities/DimensionAligned.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"DimensionAligned.d.ts","sourceRoot":"","sources":["../../src/Entities/DimensionAligned.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,gBAAgB,CAAC;AAG3C,OAAO,EAAE,UAAU,EAAE,MAAM,wBAAwB,CAAC;AACpD,OAAO,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC;AACnD,OAAO,EAAE,GAAG,EAAE,MAAM,gBAAgB,CAAC;AASrC,qBAAa,gBAAiB,SAAQ,SAAS;IAC9C,eAAe,EAAE,MAAM,CAAK;IAE5B,UAAU,EAAE,GAAG,CAAoB;IAEnC,IAAI,WAAW,IAAI,MAAM,CAExB;IAED,IAAa,UAAU,IAAI,MAAM,CAEhC;IAED,IAAa,UAAU,IAAI,UAAU,CAEpC;IAED,IAAI,MAAM,IAAI,MAAM,CAEnB;IACD,IAAI,MAAM,CAAC,KAAK,EAAE,MAAM,EAEvB;IAED,WAAW,EAAE,GAAG,CAAoB;IAEpC,IAAa,cAAc,IAAI,MAAM,CAEpC;gBAEW,UAAU,CAAC,EAAE,GAAG,EAAE,WAAW,CAAC,EAAE,GAAG;IAU/C,gBAAgB;IAChB,SAAS,CAAC,MAAM,CAAC,cAAc,CAAC,IAAI,EAAE,aAAa,GAAG,gBAAgB;IAO7D,cAAc,CAAC,SAAS,EAAE,GAAG,GAAG,IAAI;IAKpC,cAAc,IAAI,GAAG;IAerB,WAAW,IAAI,IAAI;CAI5B"}
+{"version":3,"file":"DimensionAligned.d.ts","sourceRoot":"","sources":["../../src/Entities/DimensionAligned.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,gBAAgB,CAAC;AAG3C,OAAO,EAAE,WAAW,EAAE,MAAM,wBAAwB,CAAC;AACrD,OAAO,EAAE,UAAU,EAAE,MAAM,wBAAwB,CAAC;AACpD,OAAO,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC;AACnD,OAAO,EAAE,GAAG,EAAE,MAAM,gBAAgB,CAAC;AASrC,qBAAa,gBAAiB,SAAQ,SAAS;IAC9C,eAAe,EAAE,MAAM,CAAK;IAE5B,UAAU,EAAE,GAAG,CAAoB;IAEnC,IAAI,WAAW,IAAI,MAAM,CAExB;IAED,IAAa,UAAU,IAAI,MAAM,CAEhC;IAED,IAAa,UAAU,IAAI,UAAU,CAEpC;IAED,IAAI,MAAM,IAAI,MAAM,CAEnB;IACD,IAAI,MAAM,CAAC,KAAK,EAAE,MAAM,EAQvB;IAED,WAAW,EAAE,GAAG,CAAoB;IAEpC,IAAa,cAAc,IAAI,MAAM,CAEpC;gBAEW,UAAU,CAAC,EAAE,GAAG,EAAE,WAAW,CAAC,EAAE,GAAG;IAU/C,gBAAgB;IAChB,SAAS,CAAC,MAAM,CAAC,cAAc,CAAC,IAAI,EAAE,aAAa,GAAG,gBAAgB;IAO7D,cAAc,CAAC,SAAS,EAAE,OAAO,GAAG,IAAI;IAMxC,cAAc,IAAI,WAAW;IAI7B,WAAW,IAAI,IAAI;CAM5B"}

package/dist/Entities/DimensionAligned.js

@@ -1,6 +1,7 @@
 import { Dimension } from './Dimension.js';
 import { DxfFileToken } from '../DxfFileToken.js';
 import { DxfSubclassMarker } from '../DxfSubclassMarker.js';
+import { BoundingBox } from '../Math/BoundingBox.js';
 import { ObjectType } from '../Types/ObjectType.js';
 import { DimensionType } from './DimensionType.js';
 import { XYZ } from '../Math/XYZ.js';
@@ -26,7 +27,9 @@ export class DimensionAligned extends Dimension {
         return distanceFrom(this.secondPoint, this.definitionPoint);
     }
     set offset(value) {
-        // TODO: XYZ.Cross not available for perpendicular calculation
+        const direction = Dimension.subtractPoints(this.secondPoint, this.firstPoint);
+        const perpendicular = this.normal.cross(direction).normalize();
+        this.definitionPoint = new XYZ(this.secondPoint.x + perpendicular.x * value, this.secondPoint.y + perpendicular.y * value, this.secondPoint.z + perpendicular.z * value);
     }
     secondPoint = new XYZ(0, 0, 0);
     get subclassMarker() {
@@ -50,25 +53,14 @@ export class DimensionAligned extends Dimension {
     }
     applyTransform(transform) {
         super.applyTransform(transform);
-        // TODO: Transform FirstPoint and SecondPoint
+        this.firstPoint = this.applyTransformToPoint(transform, this.firstPoint);
+        this.secondPoint = this.applyTransformToPoint(transform, this.secondPoint);
     }
     getBoundingBox() {
-        return {
-            min: {
-                x: Math.min(this.firstPoint.x, this.secondPoint.x),
-                y: Math.min(this.firstPoint.y, this.secondPoint.y),
-                z: Math.min(this.firstPoint.z, this.secondPoint.z),
-            },
-            max: {
-                x: Math.max(this.firstPoint.x, this.secondPoint.x),
-                y: Math.max(this.firstPoint.y, this.secondPoint.y),
-                z: Math.max(this.firstPoint.z, this.secondPoint.z),
-            },
-        };
+        return BoundingBox.FromPoints([this.firstPoint, this.secondPoint, this.definitionPoint]);
     }
     updateBlock() {
-        super.updateBlock();
-        // TODO: Complex block generation
+        this.populateBlock([[this.firstPoint, this.secondPoint]], [this.firstPoint, this.secondPoint, this.definitionPoint]);
     }
 }
 //# sourceMappingURL=DimensionAligned.js.map

package/dist/Entities/DimensionAligned.js.map

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

package/dist/Entities/DimensionAngular2Line.d.ts

@@ -1,4 +1,5 @@
 import { Dimension } from './Dimension.js';
+import { BoundingBox } from '../Math/BoundingBox.js';
 import { ObjectType } from '../Types/ObjectType.js';
 import { XYZ } from '../Math/XYZ.js';
 export declare class DimensionAngular2Line extends Dimension {
@@ -14,8 +15,8 @@ export declare class DimensionAngular2Line extends Dimension {
     secondPoint: XYZ;
     get subclassMarker(): string;
     constructor();
-    applyTransform(transform: any): void;
-    getBoundingBox(): any;
+    applyTransform(transform: unknown): void;
+    getBoundingBox(): BoundingBox;
     updateBlock(): void;
 }
 //# sourceMappingURL=DimensionAngular2Line.d.ts.map

package/dist/Entities/DimensionAngular2Line.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"DimensionAngular2Line.d.ts","sourceRoot":"","sources":["../../src/Entities/DimensionAngular2Line.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,gBAAgB,CAAC;AAG3C,OAAO,EAAE,UAAU,EAAE,MAAM,wBAAwB,CAAC;AAEpD,OAAO,EAAE,GAAG,EAAE,MAAM,gBAAgB,CAAC;AAErC,qBAAa,qBAAsB,SAAQ,SAAS;IACnD,WAAW,EAAE,GAAG,CAAoB;IAEpC,IAAI,MAAM,IAAI,GAAG,CAGhB;IAED,YAAY,EAAE,GAAG,CAAoB;IAErC,UAAU,EAAE,GAAG,CAAoB;IAEnC,IAAI,WAAW,IAAI,MAAM,CAGxB;IAED,IAAa,UAAU,IAAI,MAAM,CAEhC;IAED,IAAa,UAAU,IAAI,UAAU,CAEpC;IAED,IAAI,MAAM,IAAI,MAAM,CAKnB;IACD,IAAI,MAAM,CAAC,KAAK,EAAE,MAAM,EAEvB;IAED,WAAW,EAAE,GAAG,CAAoB;IAEpC,IAAa,cAAc,IAAI,MAAM,CAEpC;;IAMQ,cAAc,CAAC,SAAS,EAAE,GAAG,GAAG,IAAI;IAKpC,cAAc,IAAI,GAAG;IAerB,WAAW,IAAI,IAAI;CAI5B"}
+{"version":3,"file":"DimensionAngular2Line.d.ts","sourceRoot":"","sources":["../../src/Entities/DimensionAngular2Line.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,gBAAgB,CAAC;AAG3C,OAAO,EAAE,WAAW,EAAE,MAAM,wBAAwB,CAAC;AACrD,OAAO,EAAE,UAAU,EAAE,MAAM,wBAAwB,CAAC;AAEpD,OAAO,EAAE,GAAG,EAAE,MAAM,gBAAgB,CAAC;AAErC,qBAAa,qBAAsB,SAAQ,SAAS;IACnD,WAAW,EAAE,GAAG,CAAoB;IAEpC,IAAI,MAAM,IAAI,GAAG,CAEhB;IAED,YAAY,EAAE,GAAG,CAAoB;IAErC,UAAU,EAAE,GAAG,CAAoB;IAEnC,IAAI,WAAW,IAAI,MAAM,CAuBxB;IAED,IAAa,UAAU,IAAI,MAAM,CAEhC;IAED,IAAa,UAAU,IAAI,UAAU,CAEpC;IAED,IAAI,MAAM,IAAI,MAAM,CAKnB;IACD,IAAI,MAAM,CAAC,KAAK,EAAE,MAAM,EAQvB;IAED,WAAW,EAAE,GAAG,CAAoB;IAEpC,IAAa,cAAc,IAAI,MAAM,CAEpC;;IAMQ,cAAc,CAAC,SAAS,EAAE,OAAO,GAAG,IAAI;IAQxC,cAAc,IAAI,WAAW;IAI7B,WAAW,IAAI,IAAI;CAI5B"}

package/dist/Entities/DimensionAngular2Line.js

@@ -1,20 +1,36 @@
 import { Dimension } from './Dimension.js';
 import { DxfFileToken } from '../DxfFileToken.js';
 import { DxfSubclassMarker } from '../DxfSubclassMarker.js';
+import { BoundingBox } from '../Math/BoundingBox.js';
 import { ObjectType } from '../Types/ObjectType.js';
 import { DimensionType } from './DimensionType.js';
 import { XYZ } from '../Math/XYZ.js';
 export class DimensionAngular2Line extends Dimension {
     angleVertex = new XYZ(0, 0, 0);
     get center() {
-        // TODO: Line3D intersection not available
-        return new XYZ(0, 0, 0);
+        return Dimension.intersectLinesXY(this.definitionPoint, this.angleVertex, this.firstPoint, this.secondPoint);
     }
     dimensionArc = new XYZ(0, 0, 0);
     firstPoint = new XYZ(0, 0, 0);
     get measurement() {
-        // TODO: AngleBetweenVectors not available
-        return 0;
+        const firstVector = Dimension.subtractPoints(this.secondPoint, this.firstPoint);
+        const secondVector = Dimension.subtractPoints(this.definitionPoint, this.angleVertex);
+        let angle = Dimension.angleBetweenVectors(firstVector, secondVector);
+        const center = this.center;
+        if (!Number.isFinite(center.x) || !Number.isFinite(center.y) || !Number.isFinite(center.z)) {
+            return angle;
+        }
+        const arcVector = Dimension.subtractPoints(this.dimensionArc, center);
+        if (Dimension.isZeroVector(arcVector)) {
+            return angle;
+        }
+        const dot1 = firstVector.cross(arcVector).dot(this.normal);
+        const dot2 = arcVector.cross(secondVector).dot(this.normal);
+        const isInOppositeSector = (dot1 < 0 && dot2 > 0) || (dot1 > 0 && dot2 < 0);
+        if (isInOppositeSector) {
+            angle = Math.PI - angle;
+        }
+        return angle;
     }
     get objectName() {
         return DxfFileToken.EntityDimension;
@@ -29,7 +45,9 @@ export class DimensionAngular2Line extends Dimension {
         return Math.sqrt(dx * dx + dy * dy + dz * dz);
     }
     set offset(value) {
-        // TODO: Cross product not available
+        const direction = Dimension.subtractPoints(this.secondPoint, this.firstPoint);
+        const perpendicular = this.normal.cross(direction).normalize();
+        this.definitionPoint = new XYZ(this.secondPoint.x + perpendicular.x * value, this.secondPoint.y + perpendicular.y * value, this.secondPoint.z + perpendicular.z * value);
     }
     secondPoint = new XYZ(0, 0, 0);
     get subclassMarker() {
@@ -40,21 +58,13 @@ export class DimensionAngular2Line extends Dimension {
     }
     applyTransform(transform) {
         super.applyTransform(transform);
-        // TODO: Transform points
+        this.angleVertex = this.applyTransformToPoint(transform, this.angleVertex);
+        this.dimensionArc = this.applyTransformToPoint(transform, this.dimensionArc);
+        this.firstPoint = this.applyTransformToPoint(transform, this.firstPoint);
+        this.secondPoint = this.applyTransformToPoint(transform, this.secondPoint);
     }
     getBoundingBox() {
-        return {
-            min: {
-                x: Math.min(this.firstPoint.x, this.secondPoint.x),
-                y: Math.min(this.firstPoint.y, this.secondPoint.y),
-                z: Math.min(this.firstPoint.z, this.secondPoint.z),
-            },
-            max: {
-                x: Math.max(this.firstPoint.x, this.secondPoint.x),
-                y: Math.max(this.firstPoint.y, this.secondPoint.y),
-                z: Math.max(this.firstPoint.z, this.secondPoint.z),
-            },
-        };
+        return BoundingBox.FromPoints([this.angleVertex, this.dimensionArc, this.firstPoint, this.secondPoint, this.definitionPoint]);
     }
     updateBlock() {
         // Not yet implemented in C# source

package/dist/Entities/DimensionAngular2Line.js.map

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

package/dist/Entities/DimensionAngular3Pt.d.ts

@@ -1,4 +1,5 @@
 import { Dimension } from './Dimension.js';
+import { BoundingBox } from '../Math/BoundingBox.js';
 import { ObjectType } from '../Types/ObjectType.js';
 import { XYZ } from '../Math/XYZ.js';
 export declare class DimensionAngular3Pt extends Dimension {
@@ -10,8 +11,8 @@ export declare class DimensionAngular3Pt extends Dimension {
     secondPoint: XYZ;
     get subclassMarker(): string;
     constructor();
-    applyTransform(transform: any): void;
-    getBoundingBox(): any;
+    applyTransform(transform: unknown): void;
+    getBoundingBox(): BoundingBox;
     updateBlock(): void;
 }
 //# sourceMappingURL=DimensionAngular3Pt.d.ts.map

package/dist/Entities/DimensionAngular3Pt.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"DimensionAngular3Pt.d.ts","sourceRoot":"","sources":["../../src/Entities/DimensionAngular3Pt.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,gBAAgB,CAAC;AAG3C,OAAO,EAAE,UAAU,EAAE,MAAM,wBAAwB,CAAC;AAEpD,OAAO,EAAE,GAAG,EAAE,MAAM,gBAAgB,CAAC;AAErC,qBAAa,mBAAoB,SAAQ,SAAS;IACjD,WAAW,EAAE,GAAG,CAAoB;IAEpC,UAAU,EAAE,GAAG,CAAoB;IAEnC,IAAI,WAAW,IAAI,MAAM,CAGxB;IAED,IAAa,UAAU,IAAI,MAAM,CAEhC;IAED,IAAa,UAAU,IAAI,UAAU,CAEpC;IAED,WAAW,EAAE,GAAG,CAAoB;IAEpC,IAAa,cAAc,IAAI,MAAM,CAEpC;;IAMQ,cAAc,CAAC,SAAS,EAAE,GAAG,GAAG,IAAI;IAKpC,cAAc,IAAI,GAAG;IAerB,WAAW,IAAI,IAAI;CAG5B"}
+{"version":3,"file":"DimensionAngular3Pt.d.ts","sourceRoot":"","sources":["../../src/Entities/DimensionAngular3Pt.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,gBAAgB,CAAC;AAG3C,OAAO,EAAE,WAAW,EAAE,MAAM,wBAAwB,CAAC;AACrD,OAAO,EAAE,UAAU,EAAE,MAAM,wBAAwB,CAAC;AAEpD,OAAO,EAAE,GAAG,EAAE,MAAM,gBAAgB,CAAC;AAErC,qBAAa,mBAAoB,SAAQ,SAAS;IACjD,WAAW,EAAE,GAAG,CAAoB;IAEpC,UAAU,EAAE,GAAG,CAAoB;IAEnC,IAAI,WAAW,IAAI,MAAM,CAaxB;IAED,IAAa,UAAU,IAAI,MAAM,CAEhC;IAED,IAAa,UAAU,IAAI,UAAU,CAEpC;IAED,WAAW,EAAE,GAAG,CAAoB;IAEpC,IAAa,cAAc,IAAI,MAAM,CAEpC;;IAMQ,cAAc,CAAC,SAAS,EAAE,OAAO,GAAG,IAAI;IAOxC,cAAc,IAAI,WAAW;IAI7B,WAAW,IAAI,IAAI;CAG5B"}

package/dist/Entities/DimensionAngular3Pt.js

@@ -1,6 +1,7 @@
 import { Dimension } from './Dimension.js';
 import { DxfFileToken } from '../DxfFileToken.js';
 import { DxfSubclassMarker } from '../DxfSubclassMarker.js';
+import { BoundingBox } from '../Math/BoundingBox.js';
 import { ObjectType } from '../Types/ObjectType.js';
 import { DimensionType } from './DimensionType.js';
 import { XYZ } from '../Math/XYZ.js';
@@ -8,8 +9,15 @@ export class DimensionAngular3Pt extends Dimension {
     angleVertex = new XYZ(0, 0, 0);
     firstPoint = new XYZ(0, 0, 0);
     get measurement() {
-        // TODO: AngleBetweenVectors / IsParallel not available
-        return 0;
+        const firstVector = Dimension.subtractPoints(this.firstPoint, this.angleVertex);
+        const secondVector = Dimension.subtractPoints(this.secondPoint, this.angleVertex);
+        if (firstVector.equals(secondVector)) {
+            return 0;
+        }
+        if (Dimension.areParallel(firstVector, secondVector)) {
+            return Math.PI;
+        }
+        return Dimension.angleBetweenVectors(firstVector, secondVector);
     }
     get objectName() {
         return DxfFileToken.EntityDimension;
@@ -26,21 +34,12 @@ export class DimensionAngular3Pt extends Dimension {
     }
     applyTransform(transform) {
         super.applyTransform(transform);
-        // TODO: Transform points
+        this.angleVertex = this.applyTransformToPoint(transform, this.angleVertex);
+        this.firstPoint = this.applyTransformToPoint(transform, this.firstPoint);
+        this.secondPoint = this.applyTransformToPoint(transform, this.secondPoint);
     }
     getBoundingBox() {
-        return {
-            min: {
-                x: Math.min(this.firstPoint.x, this.secondPoint.x),
-                y: Math.min(this.firstPoint.y, this.secondPoint.y),
-                z: Math.min(this.firstPoint.z, this.secondPoint.z),
-            },
-            max: {
-                x: Math.max(this.firstPoint.x, this.secondPoint.x),
-                y: Math.max(this.firstPoint.y, this.secondPoint.y),
-                z: Math.max(this.firstPoint.z, this.secondPoint.z),
-            },
-        };
+        return BoundingBox.FromPoints([this.angleVertex, this.firstPoint, this.secondPoint, this.definitionPoint]);
     }
     updateBlock() {
         super.updateBlock();

package/dist/Entities/DimensionAngular3Pt.js.map

@@ -1 +1 @@
-{"version":3,"file":"DimensionAngular3Pt.js","sourceRoot":"","sources":["../../src/Entities/DimensionAngular3Pt.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,gBAAgB,CAAC;AAC3C,OAAO,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAC;AAClD,OAAO,EAAE,iBAAiB,EAAE,MAAM,yBAAyB,CAAC;AAC5D,OAAO,EAAE,UAAU,EAAE,MAAM,wBAAwB,CAAC;AACpD,OAAO,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC;AACnD,OAAO,EAAE,GAAG,EAAE,MAAM,gBAAgB,CAAC;AAErC,MAAM,OAAO,mBAAoB,SAAQ,SAAS;IACjD,WAAW,GAAQ,IAAI,GAAG,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC;IAEpC,UAAU,GAAQ,IAAI,GAAG,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC;IAEnC,IAAI,WAAW;QACd,uDAAuD;QACvD,OAAO,CAAC,CAAC;IACV,CAAC;IAED,IAAa,UAAU;QACtB,OAAO,YAAY,CAAC,eAAe,CAAC;IACrC,CAAC;IAED,IAAa,UAAU;QACtB,OAAO,UAAU,CAAC,kBAAkB,CAAC;IACtC,CAAC;IAED,WAAW,GAAQ,IAAI,GAAG,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC;IAEpC,IAAa,cAAc;QAC1B,OAAO,iBAAiB,CAAC,sBAAsB,CAAC;IACjD,CAAC;IAED;QACC,KAAK,CAAC,aAAa,CAAC,aAAa,CAAC,CAAC;IACpC,CAAC;IAEQ,cAAc,CAAC,SAAc;QACrC,KAAK,CAAC,cAAc,CAAC,SAAS,CAAC,CAAC;QAChC,yBAAyB;IAC1B,CAAC;IAEQ,cAAc;QACtB,OAAO;YACN,GAAG,EAAE;gBACJ,CAAC,EAAE,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC,EAAE,IAAI,CAAC,WAAW,CAAC,CAAC,CAAC;gBAClD,CAAC,EAAE,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC,EAAE,IAAI,CAAC,WAAW,CAAC,CAAC,CAAC;gBAClD,CAAC,EAAE,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC,EAAE,IAAI,CAAC,WAAW,CAAC,CAAC,CAAC;aAClD;YACD,GAAG,EAAE;gBACJ,CAAC,EAAE,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC,EAAE,IAAI,CAAC,WAAW,CAAC,CAAC,CAAC;gBAClD,CAAC,EAAE,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC,EAAE,IAAI,CAAC,WAAW,CAAC,CAAC,CAAC;gBAClD,CAAC,EAAE,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC,EAAE,IAAI,CAAC,WAAW,CAAC,CAAC,CAAC;aAClD;SACD,CAAC;IACH,CAAC;IAEQ,WAAW;QACnB,KAAK,CAAC,WAAW,EAAE,CAAC;IACrB,CAAC;CACD"}
+{"version":3,"file":"DimensionAngular3Pt.js","sourceRoot":"","sources":["../../src/Entities/DimensionAngular3Pt.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,gBAAgB,CAAC;AAC3C,OAAO,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAC;AAClD,OAAO,EAAE,iBAAiB,EAAE,MAAM,yBAAyB,CAAC;AAC5D,OAAO,EAAE,WAAW,EAAE,MAAM,wBAAwB,CAAC;AACrD,OAAO,EAAE,UAAU,EAAE,MAAM,wBAAwB,CAAC;AACpD,OAAO,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC;AACnD,OAAO,EAAE,GAAG,EAAE,MAAM,gBAAgB,CAAC;AAErC,MAAM,OAAO,mBAAoB,SAAQ,SAAS;IACjD,WAAW,GAAQ,IAAI,GAAG,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC;IAEpC,UAAU,GAAQ,IAAI,GAAG,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC;IAEnC,IAAI,WAAW;QACd,MAAM,WAAW,GAAG,SAAS,CAAC,cAAc,CAAC,IAAI,CAAC,UAAU,EAAE,IAAI,CAAC,WAAW,CAAC,CAAC;QAChF,MAAM,YAAY,GAAG,SAAS,CAAC,cAAc,CAAC,IAAI,CAAC,WAAW,EAAE,IAAI,CAAC,WAAW,CAAC,CAAC;QAElF,IAAI,WAAW,CAAC,MAAM,CAAC,YAAY,CAAC,EAAE,CAAC;YACtC,OAAO,CAAC,CAAC;QACV,CAAC;QAED,IAAI,SAAS,CAAC,WAAW,CAAC,WAAW,EAAE,YAAY,CAAC,EAAE,CAAC;YACtD,OAAO,IAAI,CAAC,EAAE,CAAC;QAChB,CAAC;QAED,OAAO,SAAS,CAAC,mBAAmB,CAAC,WAAW,EAAE,YAAY,CAAC,CAAC;IACjE,CAAC;IAED,IAAa,UAAU;QACtB,OAAO,YAAY,CAAC,eAAe,CAAC;IACrC,CAAC;IAED,IAAa,UAAU;QACtB,OAAO,UAAU,CAAC,kBAAkB,CAAC;IACtC,CAAC;IAED,WAAW,GAAQ,IAAI,GAAG,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC;IAEpC,IAAa,cAAc;QAC1B,OAAO,iBAAiB,CAAC,sBAAsB,CAAC;IACjD,CAAC;IAED;QACC,KAAK,CAAC,aAAa,CAAC,aAAa,CAAC,CAAC;IACpC,CAAC;IAEQ,cAAc,CAAC,SAAkB;QACzC,KAAK,CAAC,cAAc,CAAC,SAAS,CAAC,CAAC;QAChC,IAAI,CAAC,WAAW,GAAG,IAAI,CAAC,qBAAqB,CAAC,SAAS,EAAE,IAAI,CAAC,WAAW,CAAC,CAAC;QAC3E,IAAI,CAAC,UAAU,GAAG,IAAI,CAAC,qBAAqB,CAAC,SAAS,EAAE,IAAI,CAAC,UAAU,CAAC,CAAC;QACzE,IAAI,CAAC,WAAW,GAAG,IAAI,CAAC,qBAAqB,CAAC,SAAS,EAAE,IAAI,CAAC,WAAW,CAAC,CAAC;IAC5E,CAAC;IAEQ,cAAc;QACtB,OAAO,WAAW,CAAC,UAAU,CAAC,CAAC,IAAI,CAAC,WAAW,EAAE,IAAI,CAAC,UAAU,EAAE,IAAI,CAAC,WAAW,EAAE,IAAI,CAAC,eAAe,CAAC,CAAC,CAAC;IAC5G,CAAC;IAEQ,WAAW;QACnB,KAAK,CAAC,WAAW,EAAE,CAAC;IACrB,CAAC;CACD"}

package/dist/Entities/DimensionDiameter.d.ts

@@ -1,4 +1,5 @@
 import { Dimension } from './Dimension.js';
+import { BoundingBox } from '../Math/BoundingBox.js';
 import { ObjectType } from '../Types/ObjectType.js';
 import { XYZ } from '../Math/XYZ.js';
 export declare class DimensionDiameter extends Dimension {
@@ -10,8 +11,8 @@ export declare class DimensionDiameter extends Dimension {
     get objectType(): ObjectType;
     get subclassMarker(): string;
     constructor();
-    applyTransform(transform: any): void;
-    getBoundingBox(): any;
+    applyTransform(transform: unknown): void;
+    getBoundingBox(): BoundingBox;
     updateBlock(): void;
 }
 //# sourceMappingURL=DimensionDiameter.d.ts.map