@itwin/core-geometry 3.1.0-dev.7 → 3.1.1

package/lib/cjs/curve/internalContexts/PolygonOffsetContext.d.ts

@@ -7,8 +7,9 @@ import { CurveCollection } from "../CurveCollection";
 import { CurvePrimitive } from "../CurvePrimitive";
 import { Loop } from "../Loop";
 import { Path } from "../Path";
+import { StrokeOptions } from "../StrokeOptions";
 /**
- * * control parameters for joint construction.
+ * * Control parameters for joint construction.
  * * Decision order is:
  *   * if turn angle is greater than minArcDegrees, make an arc.
  *   * if turn angle is less than or equal maxChamferTurnDegrees, extend curves along tangent to single intersection point.
@@ -23,15 +24,22 @@ export declare class JointOptions {
      */
     minArcDegrees: number;
     maxChamferTurnDegrees: number;
+    /** Offset distance, positive to left of base curve. */
     leftOffsetDistance: number;
+    /** Whether to offset elliptical arcs as elliptical arcs (true) or as B-spline curves (false, default). */
+    preserveEllipticalArcs: boolean;
     /** Construct JointOptions.
      * * leftOffsetDistance is required
      * * minArcDegrees and maxChamferDegrees are optional.
      */
-    constructor(leftOffsetDistance: number, minArcDegrees?: number, maxChamferDegrees?: number);
+    constructor(leftOffsetDistance: number, minArcDegrees?: number, maxChamferDegrees?: number, preserveEllipticalArcs?: boolean);
+    /** Return a deep clone. */
+    clone(): JointOptions;
+    /** Copy values of input options */
+    setFrom(other: JointOptions): void;
     /**
-     * Parse a number of JointOptions up to JointOptions:
-     * * If leftOffsetDistanceOptions is a number, create a JointOptions with default arc and chamfer values.
+     * Parse a number or JointOptions up to JointOptions:
+     * * If leftOffsetDistanceOptions is a number, create a JointOptions with other options set to default values.
      * * If leftOffsetDistanceOrOptions is a JointOptions, return it unchanged.
      * @param leftOffsetDistanceOrOptions
      */
@@ -41,6 +49,34 @@ export declare class JointOptions {
     /** Test if turn by theta should be output as single point. */
     numChamferPoints(theta: Angle): number;
 }
+/**
+ * Options for offsetting a curve.
+ * @public
+ */
+export declare class OffsetOptions {
+    /** Options for offsetting and joining CurvePrimitives */
+    jointOptions: JointOptions;
+    /** Options for generating a B-spline curve offset */
+    strokeOptions: StrokeOptions;
+    /** Options that are provided are captured. */
+    constructor(offsetDistanceOrOptions: number | JointOptions, strokeOptions?: StrokeOptions);
+    get minArcDegrees(): number;
+    set minArcDegrees(value: number);
+    get maxChamferTurnDegrees(): number;
+    set maxChamferTurnDegrees(value: number);
+    get leftOffsetDistance(): number;
+    set leftOffsetDistance(value: number);
+    get preserveEllipticalArcs(): boolean;
+    set preserveEllipticalArcs(value: boolean);
+    /** Convert variant input into OffsetOptions.
+     * * If a JointOptions is provided, it is captured.
+     * * If an OffsetOptions is provided, a reference to it is returned. */
+    static create(offsetDistanceOrOptions: number | JointOptions | OffsetOptions): OffsetOptions;
+    /** Convert variant input into offset distance */
+    static getOffsetDistance(offsetDistanceOrOptions: number | JointOptions | OffsetOptions): number;
+    /** Return a deep clone. */
+    clone(): OffsetOptions;
+}
 /**
  * Context for building a wire offset.
  * @internal
@@ -69,11 +105,6 @@ export declare class PolygonWireOffsetContext {
 export declare class CurveChainWireOffsetContext {
     /** construct a context. */
     constructor();
-    private static _unitAlong;
-    private static _unitPerp;
-    private static _offsetA;
-    private static _offsetB;
-    private static createOffsetSegment;
     /**
      * Annotate a CurvePrimitive with properties `baseCurveStart` and `baseCurveEnd`.
      * * return cp
@@ -88,30 +119,23 @@ export declare class CurveChainWireOffsetContext {
      *   * `(primitive as any).baseCurveStart: Point3d`
      *   * `(primitive as any).baseCurveEnd: Point3d`
      * @param g primitive to offset
-     * @param distanceLeft
+     * @param offsetDistanceOrOptions offset distance (positive to left of g), or options object
      */
-    static createSingleOffsetPrimitiveXY(g: CurvePrimitive, distanceLeft: number): CurvePrimitive | CurvePrimitive[] | undefined;
+    static createSingleOffsetPrimitiveXY(g: CurvePrimitive, offsetDistanceOrOptions: number | OffsetOptions): CurvePrimitive | CurvePrimitive[] | undefined;
     /**
-     * Construct curves that are offset from a Path or Loop
+     * Construct curves that are offset from a Path or Loop as viewed in xy-plane (ignoring z).
      * * The construction will remove "some" local effects of features smaller than the offset distance, but will not detect self intersection among widely separated edges.
-     * * Offset distance is defined as positive to the left.
-     * * If offsetDistanceOrOptions is given as a number, default options are applied.
+     * * If offsetDistance is given as a number, default OffsetOptions are applied.
      * * When the offset needs to do an "outside" turn, the first applicable construction is applied:
      *   * If the turn is larger than `options.minArcDegrees`, a circular arc is constructed.
-     *   * if the turn is larger than `options.maxChamferDegrees`, the turn is constructed as a sequence of straight lines that are
+     *   * If the turn is less than or equal to `options.maxChamferTurnDegrees`, extend curves along tangent to single intersection point.
+     *   * If the turn is larger than `options.maxChamferDegrees`, the turn is constructed as a sequence of straight lines that are:
      *      * outside the arc
      *      * have uniform turn angle less than `options.maxChamferDegrees`
      *      * each line segment (except first and last) touches the arc at its midpoint.
-     *   * Otherwise the prior and successor curves are extended to simple intersection.
-     * @param curves input curves
-     * @param offsetDistanceOrOptions offset controls.
-     */
-    private static constructCurveXYOffsetGo;
-    /**
-     * Construct offset curves as viewed in xy.
      * @param curves base curves.
-     * @param offsetDistanceOrOptions distance (positive left, negative right) or options.
+     * @param offsetDistanceOrOptions offset distance (positive to left of curve, negative to right) or options object.
      */
-    static constructCurveXYOffset(curves: Path | Loop, offsetDistanceOrOptions: number | JointOptions): CurveCollection | undefined;
+    static constructCurveXYOffset(curves: Path | Loop, offsetDistanceOrOptions: number | JointOptions | OffsetOptions): CurveCollection | undefined;
 }
 //# sourceMappingURL=PolygonOffsetContext.d.ts.map

package/lib/cjs/curve/internalContexts/PolygonOffsetContext.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"PolygonOffsetContext.d.ts","sourceRoot":"","sources":["../../../../src/curve/internalContexts/PolygonOffsetContext.ts"],"names":[],"mappings":"AAIA;;GAEG;AAGH,OAAO,EAAE,KAAK,EAAE,MAAM,wBAAwB,CAAC;AAG/C,OAAO,EAAE,OAAO,EAAY,MAAM,kCAAkC,CAAC;AAGrE,OAAO,EAAE,eAAe,EAAE,MAAM,oBAAoB,CAAC;AAGrD,OAAO,EAAE,cAAc,EAAE,MAAM,mBAAmB,CAAC;AAGnD,OAAO,EAAE,IAAI,EAAE,MAAM,SAAS,CAAC;AAC/B,OAAO,EAAE,IAAI,EAAE,MAAM,SAAS,CAAC;AAgB/B;;;;;;;;;GASG;AACH,qBAAa,YAAY;IACvB;;OAEG;IACI,aAAa,SAAS;IACtB,qBAAqB,SAAM;IAC3B,kBAAkB,EAAE,MAAM,CAAK;IACtC;;;OAGG;gBACS,kBAAkB,EAAE,MAAM,EAAE,aAAa,SAAM,EAAE,iBAAiB,SAAK;IAKnF;;;;;OAKG;WACW,MAAM,CAAC,2BAA2B,EAAE,MAAM,GAAG,YAAY,GAAG,YAAY;IAMtF,6FAA6F;IACtF,OAAO,CAAC,KAAK,EAAE,KAAK,GAAG,OAAO;IAGrC,8DAA8D;IACvD,gBAAgB,CAAC,KAAK,EAAE,KAAK,GAAG,MAAM;CAO9C;AAyYD;;;GAGG;AACH,qBAAa,wBAAwB;IACnC,2BAA2B;;IAG3B,OAAO,CAAC,MAAM,CAAC,UAAU,CAAqB;IAC9C,OAAO,CAAC,MAAM,CAAC,SAAS,CAAqB;IAC7C,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAoB;IAC3C,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAoB;IAG3C,OAAO,CAAC,MAAM,CAAC,mBAAmB;IAalC;;;;;;OAMG;IACI,4BAA4B,CAAC,MAAM,EAAE,OAAO,EAAE,EAAE,IAAI,EAAE,OAAO,EAAE,2BAA2B,EAAE,MAAM,GAAG,YAAY,GAAG,eAAe,GAAG,SAAS;CA8CvJ;AAED;;;GAGG;AACH,qBAAa,2BAA2B;IACtC,2BAA2B;;IAI3B,OAAO,CAAC,MAAM,CAAC,UAAU,CAAqB;IAC9C,OAAO,CAAC,MAAM,CAAC,SAAS,CAAqB;IAC7C,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAoB;IAC3C,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAoB;IAG3C,OAAO,CAAC,MAAM,CAAC,mBAAmB;IAUlC;;;;;;OAMG;WACW,eAAe,CAAC,EAAE,EAAE,cAAc,GAAG,SAAS,EAAE,UAAU,EAAE,OAAO,GAAG,SAAS,EAAE,QAAQ,EAAE,OAAO,GAAG,SAAS,GAAG,cAAc,GAAG,SAAS;IASzJ;;;;;;;OAOG;WACW,6BAA6B,CAAC,CAAC,EAAE,cAAc,EAAE,YAAY,EAAE,MAAM,GAAG,cAAc,GAAG,cAAc,EAAE,GAAG,SAAS;IAuCnI;;;;;;;;;;;;;;OAcG;IACH,OAAO,CAAC,MAAM,CAAC,wBAAwB;IA8CvC;;;;OAIG;WACW,sBAAsB,CAAC,MAAM,EAAE,IAAI,GAAG,IAAI,EAAE,uBAAuB,EAAE,MAAM,GAAG,YAAY,GAAG,eAAe,GAAG,SAAS;CAIvI"}
+{"version":3,"file":"PolygonOffsetContext.d.ts","sourceRoot":"","sources":["../../../../src/curve/internalContexts/PolygonOffsetContext.ts"],"names":[],"mappings":"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"}

package/lib/cjs/curve/internalContexts/PolygonOffsetContext.js

@@ -7,10 +7,9 @@
  * @module Curve
  */
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.CurveChainWireOffsetContext = exports.PolygonWireOffsetContext = exports.JointOptions = void 0;
+exports.CurveChainWireOffsetContext = exports.PolygonWireOffsetContext = exports.OffsetOptions = exports.JointOptions = void 0;
 const Geometry_1 = require("../../Geometry");
 const AngleSweep_1 = require("../../geometry3d/AngleSweep");
-/* eslint-disable no-console */
 const Point3dVector3d_1 = require("../../geometry3d/Point3dVector3d");
 const Ray3d_1 = require("../../geometry3d/Ray3d");
 const Arc3d_1 = require("../Arc3d");
@@ -22,6 +21,7 @@ const LineString3d_1 = require("../LineString3d");
 const Loop_1 = require("../Loop");
 const Path_1 = require("../Path");
 const RegionOps_1 = require("../RegionOps");
+const StrokeOptions_1 = require("../StrokeOptions");
 /**
  * Classification of contortions at a joint.
  * @internal
@@ -36,7 +36,7 @@ var JointMode;
     JointMode[JointMode["Gap"] = 4] = "Gap";
 })(JointMode || (JointMode = {}));
 /**
- * * control parameters for joint construction.
+ * * Control parameters for joint construction.
  * * Decision order is:
  *   * if turn angle is greater than minArcDegrees, make an arc.
  *   * if turn angle is less than or equal maxChamferTurnDegrees, extend curves along tangent to single intersection point.
@@ -50,20 +50,35 @@ class JointOptions {
      * * leftOffsetDistance is required
      * * minArcDegrees and maxChamferDegrees are optional.
      */
-    constructor(leftOffsetDistance, minArcDegrees = 180, maxChamferDegrees = 90) {
+    constructor(leftOffsetDistance, minArcDegrees = 180, maxChamferDegrees = 90, preserveEllipticalArcs = false) {
         /** smallest arc to construct.
          * * If this control angle is large, arcs are never created.
          */
         this.minArcDegrees = 180.0;
         this.maxChamferTurnDegrees = 90;
+        /** Offset distance, positive to left of base curve. */
         this.leftOffsetDistance = 0;
+        /** Whether to offset elliptical arcs as elliptical arcs (true) or as B-spline curves (false, default). */
+        this.preserveEllipticalArcs = false;
         this.leftOffsetDistance = leftOffsetDistance;
         this.minArcDegrees = minArcDegrees;
         this.maxChamferTurnDegrees = maxChamferDegrees;
+        this.preserveEllipticalArcs = preserveEllipticalArcs;
+    }
+    /** Return a deep clone. */
+    clone() {
+        return new JointOptions(this.leftOffsetDistance, this.minArcDegrees, this.maxChamferTurnDegrees, this.preserveEllipticalArcs);
+    }
+    /** Copy values of input options */
+    setFrom(other) {
+        this.leftOffsetDistance = other.leftOffsetDistance;
+        this.minArcDegrees = other.minArcDegrees;
+        this.maxChamferTurnDegrees = other.maxChamferTurnDegrees;
+        this.preserveEllipticalArcs = other.preserveEllipticalArcs;
     }
     /**
-     * Parse a number of JointOptions up to JointOptions:
-     * * If leftOffsetDistanceOptions is a number, create a JointOptions with default arc and chamfer values.
+     * Parse a number or JointOptions up to JointOptions:
+     * * If leftOffsetDistanceOptions is a number, create a JointOptions with other options set to default values.
      * * If leftOffsetDistanceOrOptions is a JointOptions, return it unchanged.
      * @param leftOffsetDistanceOrOptions
      */
@@ -87,6 +102,44 @@ class JointOptions {
     }
 }
 exports.JointOptions = JointOptions;
+/**
+ * Options for offsetting a curve.
+ * @public
+ */
+class OffsetOptions {
+    /** Options that are provided are captured. */
+    constructor(offsetDistanceOrOptions, strokeOptions) {
+        this.jointOptions = JointOptions.create(offsetDistanceOrOptions);
+        this.strokeOptions = (strokeOptions !== undefined) ? strokeOptions : StrokeOptions_1.StrokeOptions.createForCurves();
+    }
+    get minArcDegrees() { return this.jointOptions.minArcDegrees; }
+    set minArcDegrees(value) { this.jointOptions.minArcDegrees = value; }
+    get maxChamferTurnDegrees() { return this.jointOptions.maxChamferTurnDegrees; }
+    set maxChamferTurnDegrees(value) { this.jointOptions.maxChamferTurnDegrees = value; }
+    get leftOffsetDistance() { return this.jointOptions.leftOffsetDistance; }
+    set leftOffsetDistance(value) { this.jointOptions.leftOffsetDistance = value; }
+    get preserveEllipticalArcs() { return this.jointOptions.preserveEllipticalArcs; }
+    set preserveEllipticalArcs(value) { this.jointOptions.preserveEllipticalArcs = value; }
+    /** Convert variant input into OffsetOptions.
+     * * If a JointOptions is provided, it is captured.
+     * * If an OffsetOptions is provided, a reference to it is returned. */
+    static create(offsetDistanceOrOptions) {
+        if (offsetDistanceOrOptions instanceof OffsetOptions)
+            return offsetDistanceOrOptions;
+        return new OffsetOptions(offsetDistanceOrOptions);
+    }
+    /** Convert variant input into offset distance */
+    static getOffsetDistance(offsetDistanceOrOptions) {
+        if (typeof offsetDistanceOrOptions === "number")
+            return offsetDistanceOrOptions;
+        return offsetDistanceOrOptions.leftOffsetDistance;
+    }
+    /** Return a deep clone. */
+    clone() {
+        return new OffsetOptions(this.jointOptions.clone(), this.strokeOptions.clone());
+    }
+}
+exports.OffsetOptions = OffsetOptions;
 /**
  * Description of geometry around a joint.
  * @internal
@@ -242,22 +295,21 @@ class Joint {
         }
         return true;
     }
+    /** NOTE: no assumption on type of curve0, curve1 */
     annotateExtension(options) {
         if (this.curve0 && this.curve1) {
-            const ray0 = this.curve0.fractionToPointAndDerivative(1.0); // And we know that is full length ray !
-            const ray1 = this.curve1.fractionToPointAndDerivative(0.0); // ditto
+            const ray0 = this.curve0.fractionToPointAndDerivative(1.0);
+            const ray1 = this.curve1.fractionToPointAndDerivative(0.0);
             const intersection = Ray3d_1.Ray3d.closestApproachRay3dRay3d(ray0, ray1);
             if (intersection.approachType === CurveLocationDetail_1.CurveCurveApproachType.Intersection) {
-                this.fraction0 = 1.0;
-                this.fraction1 = 0.0;
                 if (intersection.detailA.fraction >= 0.0 && intersection.detailB.fraction <= 0.0) {
+                    this.fraction0 = 1.0;
+                    this.fraction1 = 0.0;
                     this.flexure = JointMode.Extend;
                     const theta = ray0.getDirectionRef().angleToXY(ray1.getDirectionRef());
                     if (options.needArc(theta)) {
                         const arc = Joint.constructArc(ray0, this.curve0.baseCurveEnd, ray1);
                         if (arc) {
-                            this.fraction0 = 1.0;
-                            this.fraction1 = 0.0;
                             this.jointCurve = arc;
                             return;
                         }
@@ -325,37 +377,34 @@ class Joint {
             this.fraction1 = 0.0;
         }
         else if (this.curve0 && this.curve1) {
-            const ray0 = this.curve0.fractionToPointAndDerivative(0.0); // And we know that is full length ray !
-            const ray1 = this.curve1.fractionToPointAndDerivative(0.0); // ditto
-            if (this.curve0 instanceof LineSegment3d_1.LineSegment3d && this.curve1 instanceof LineSegment3d_1.LineSegment3d) {
-                // check for direct intersection -- occurs on offset of colinear base segments.
-                if (this.curve0.endPoint().isAlmostEqual(this.curve1.startPoint())) {
-                    this.fraction0 = 1.0;
-                    this.fraction1 = 0.0;
-                    this.flexure = JointMode.Trim;
-                }
-                else {
-                    const intersection = Ray3d_1.Ray3d.closestApproachRay3dRay3d(ray0, ray1);
-                    if (intersection.approachType === CurveLocationDetail_1.CurveCurveApproachType.Intersection) {
-                        this.fraction0 = intersection.detailA.fraction;
-                        this.fraction1 = intersection.detailB.fraction;
-                        if (this.fraction0 >= 1.0 && this.fraction1 <= 0.0) {
-                            this.annotateExtension(options);
-                        }
-                        else if (this.fraction0 < 1.0 && this.fraction1 > 0.0) {
-                            this.flexure = JointMode.Trim;
-                        }
-                        else if (this.fraction0 > 1.0 && this.fraction1 > 1.0) {
-                            this.flexure = JointMode.Gap;
-                            this.jointCurve = LineSegment3d_1.LineSegment3d.create(this.curve0.fractionToPoint(1.0), this.curve1.fractionToPoint(0.0));
-                            this.fraction0 = 1.0;
-                            this.fraction1 = 0.0;
-                        }
+            // check for direct intersection -- occurs on offset of colinear base segments, and closed primitives
+            if (this.curve0.endPoint().isAlmostEqual(this.curve1.startPoint())) {
+                this.fraction0 = 1.0;
+                this.fraction1 = 0.0;
+                this.flexure = JointMode.Trim;
+            }
+            else if (this.curve0 instanceof LineSegment3d_1.LineSegment3d && this.curve1 instanceof LineSegment3d_1.LineSegment3d) {
+                const ray0 = this.curve0.fractionToPointAndDerivative(0.0); // And we know that is full length ray !
+                const ray1 = this.curve1.fractionToPointAndDerivative(0.0); // ditto
+                const intersection = Ray3d_1.Ray3d.closestApproachRay3dRay3d(ray0, ray1);
+                if (intersection.approachType === CurveLocationDetail_1.CurveCurveApproachType.Intersection) {
+                    this.fraction0 = intersection.detailA.fraction;
+                    this.fraction1 = intersection.detailB.fraction;
+                    if (this.fraction0 >= 1.0 && this.fraction1 <= 0.0) {
+                        this.annotateExtension(options);
+                    }
+                    else if (this.fraction0 < 1.0 && this.fraction1 > 0.0) {
+                        this.flexure = JointMode.Trim;
+                    }
+                    else if (this.fraction0 > 1.0 && this.fraction1 > 1.0) {
+                        this.flexure = JointMode.Gap;
+                        this.jointCurve = LineSegment3d_1.LineSegment3d.create(this.curve0.fractionToPoint(1.0), this.curve1.fractionToPoint(0.0));
+                        this.fraction0 = 1.0;
+                        this.fraction1 = 0.0;
                     }
                 }
             }
-            else {
-                // generic pair of curves ...
+            else { // generic pair of curves ...
                 const intersections = CurveCurve_1.CurveCurve.intersectionXYPairs(this.curve0, false, this.curve1, false);
                 const intersectionIndex = this.selectIntersectionIndexByFraction(1.0, 0.0, intersections);
                 if (intersectionIndex >= 0) {
@@ -543,15 +592,6 @@ class CurveChainWireOffsetContext {
     /** construct a context. */
     constructor() {
     }
-    // Construct a single offset from base points
-    static createOffsetSegment(basePointA, basePointB, distanceLeft) {
-        Point3dVector3d_1.Vector3d.createStartEnd(basePointA, basePointB, this._unitAlong);
-        if (this._unitAlong.normalizeInPlace()) {
-            this._unitAlong.rotate90CCWXY(this._unitPerp);
-            return LineSegment3d_1.LineSegment3d.create(basePointA.plusScaled(this._unitPerp, distanceLeft, this._offsetA), basePointB.plusScaled(this._unitPerp, distanceLeft, this._offsetB));
-        }
-        return undefined;
-    }
     /**
      * Annotate a CurvePrimitive with properties `baseCurveStart` and `baseCurveEnd`.
      * * return cp
@@ -574,70 +614,44 @@ class CurveChainWireOffsetContext {
      *   * `(primitive as any).baseCurveStart: Point3d`
      *   * `(primitive as any).baseCurveEnd: Point3d`
      * @param g primitive to offset
-     * @param distanceLeft
+     * @param offsetDistanceOrOptions offset distance (positive to left of g), or options object
      */
-    static createSingleOffsetPrimitiveXY(g, distanceLeft) {
-        const point0 = g.fractionToPoint(0.0);
-        const point1 = g.fractionToPoint(1.0);
-        if (g instanceof LineSegment3d_1.LineSegment3d) {
-            return this.applyBasePoints(this.createOffsetSegment(point0, point1, distanceLeft), point0, point1);
-        }
-        else if (g instanceof Arc3d_1.Arc3d) {
-            const g1 = g.cloneAtZ();
-            if (g1.isCircular) {
-                const sign = g1.sweep.sweepRadians * g1.matrixRef.coffs[8] >= 0.0 ? 1.0 : -1.0;
-                const r = g1.matrixRef.columnXMagnitude();
-                const r1 = r - sign * distanceLeft;
-                if (!Geometry_1.Geometry.isSmallMetricDistance(r1) && r * r1 > 0.0) {
-                    const factor = r1 / r;
-                    const matrix = g1.matrixClone();
-                    matrix.scaleColumnsInPlace(factor, factor, 1.0);
-                    return this.applyBasePoints(Arc3d_1.Arc3d.createRefs(g1.center.clone(), matrix, g1.sweep.clone()), g.startPoint(), g.endPoint());
-                }
-            }
-        }
-        else if (g instanceof LineString3d_1.LineString3d) {
-            const n = g.numPoints();
-            if (n > 1) {
-                const offsets = [];
-                const pointA = Point3dVector3d_1.Point3d.create();
-                const pointB = Point3dVector3d_1.Point3d.create();
-                g.packedPoints.getPoint3dAtUncheckedPointIndex(0, pointA);
-                for (let i = 1; i < n; i++) {
-                    g.packedPoints.getPoint3dAtUncheckedPointIndex(i, pointB);
-                    const g1 = this.applyBasePoints(this.createOffsetSegment(pointA, pointB, distanceLeft), pointA.clone(), pointB.clone());
-                    if (g1 !== undefined)
-                        offsets.push(g1);
-                    pointA.setFromPoint3d(pointB);
-                }
-                return offsets;
-            }
+    static createSingleOffsetPrimitiveXY(g, offsetDistanceOrOptions) {
+        const offset = g.constructOffsetXY(offsetDistanceOrOptions);
+        if (offset === undefined)
+            return undefined;
+        // decorate each offset with its base curve's endpoints
+        if (Array.isArray(offset)) {
+            const basePrims = g.collectCurvePrimitives(undefined, true, true);
+            if (basePrims.length !== offset.length)
+                return undefined; // unexpected aggregate curve type!
+            for (let i = 0; i < basePrims.length; ++i)
+                this.applyBasePoints(offset[i], basePrims[i].startPoint(), basePrims[i].endPoint());
+            return offset;
         }
-        return undefined;
+        return this.applyBasePoints(offset, g.startPoint(), g.endPoint());
     }
     /**
-     * Construct curves that are offset from a Path or Loop
+     * Construct curves that are offset from a Path or Loop as viewed in xy-plane (ignoring z).
      * * The construction will remove "some" local effects of features smaller than the offset distance, but will not detect self intersection among widely separated edges.
-     * * Offset distance is defined as positive to the left.
-     * * If offsetDistanceOrOptions is given as a number, default options are applied.
+     * * If offsetDistance is given as a number, default OffsetOptions are applied.
      * * When the offset needs to do an "outside" turn, the first applicable construction is applied:
      *   * If the turn is larger than `options.minArcDegrees`, a circular arc is constructed.
-     *   * if the turn is larger than `options.maxChamferDegrees`, the turn is constructed as a sequence of straight lines that are
+     *   * If the turn is less than or equal to `options.maxChamferTurnDegrees`, extend curves along tangent to single intersection point.
+     *   * If the turn is larger than `options.maxChamferDegrees`, the turn is constructed as a sequence of straight lines that are:
      *      * outside the arc
      *      * have uniform turn angle less than `options.maxChamferDegrees`
      *      * each line segment (except first and last) touches the arc at its midpoint.
-     *   * Otherwise the prior and successor curves are extended to simple intersection.
-     * @param curves input curves
-     * @param offsetDistanceOrOptions offset controls.
+     * @param curves base curves.
+     * @param offsetDistanceOrOptions offset distance (positive to left of curve, negative to right) or options object.
      */
-    static constructCurveXYOffsetGo(curves, options) {
+    static constructCurveXYOffset(curves, offsetDistanceOrOptions) {
         const wrap = curves instanceof Loop_1.Loop;
-        if (options === undefined)
-            return undefined;
+        const offsetOptions = OffsetOptions.create(offsetDistanceOrOptions);
         const simpleOffsets = [];
         // setup pass: get simple offsets of each primitive
         for (const c of curves.children) {
-            const c1 = CurveChainWireOffsetContext.createSingleOffsetPrimitiveXY(c, options.leftOffsetDistance);
+            const c1 = CurveChainWireOffsetContext.createSingleOffsetPrimitiveXY(c, offsetOptions);
             if (c1 === undefined) {
                 // bad .. maybe arc to inside?
             }
@@ -669,24 +683,11 @@ class CurveChainWireOffsetContext {
         if (joint0 && previousJoint && curves instanceof Loop_1.Loop)
             Joint.link(previousJoint, joint0);
         const numOffset = simpleOffsets.length;
-        Joint.annotateChain(joint0, options, numOffset);
+        Joint.annotateChain(joint0, offsetOptions.jointOptions, numOffset);
         const outputCurves = [];
         Joint.collectCurvesFromChain(joint0, outputCurves, numOffset);
         return RegionOps_1.RegionOps.createLoopPathOrBagOfCurves(outputCurves, wrap, true);
     }
-    /**
-     * Construct offset curves as viewed in xy.
-     * @param curves base curves.
-     * @param offsetDistanceOrOptions distance (positive left, negative right) or options.
-     */
-    static constructCurveXYOffset(curves, offsetDistanceOrOptions) {
-        const options = JointOptions.create(offsetDistanceOrOptions);
-        return this.constructCurveXYOffsetGo(curves, options);
-    }
 }
 exports.CurveChainWireOffsetContext = CurveChainWireOffsetContext;
-CurveChainWireOffsetContext._unitAlong = Point3dVector3d_1.Vector3d.create();
-CurveChainWireOffsetContext._unitPerp = Point3dVector3d_1.Vector3d.create();
-CurveChainWireOffsetContext._offsetA = Point3dVector3d_1.Point3d.create();
-CurveChainWireOffsetContext._offsetB = Point3dVector3d_1.Point3d.create();
 //# sourceMappingURL=PolygonOffsetContext.js.map