@itwin/core-geometry 5.0.0-dev.9 → 5.0.0-dev.90

package/lib/cjs/serialization/IModelJsonSchema.d.ts

@@ -33,7 +33,7 @@ import { RuledSweep } from "../solid/RuledSweep";
 import { Sphere } from "../solid/Sphere";
 import { TorusPipe } from "../solid/TorusPipe";
 /**
- * `ImodelJson` namespace has classes for serializing and deserialization json objects
+ * `IModelJson` namespace has classes for serializing and deserialization json objects
  * @public
  */
 export declare namespace IModelJson {
@@ -100,14 +100,19 @@ export declare namespace IModelJson {
         closedV?: boolean;
     }
     /**
-     * Interface for a collection of curves, eg. as used as a swept contour.
+     * Interface for a collection of curves, e.g. as used as a swept contour.
      * @public
      */
     interface CurveCollectionProps extends PlanarRegionProps {
-        /** A sequence of curves joined head to tail: */
+        /** A sequence of curves joined head to tail. */
         path?: [CurvePrimitiveProps];
-        /** A collection of curves with no required structure or connections: */
+        /**
+         * A collection of curves with no required structure or connections
+         * @deprecated in 5.x. Instead use bagOfCurves, which has correct capitalization and type. The old name has never been persisted.
+        */
         bagofCurves?: [CurveCollectionProps];
+        /** A collection of curves with no required structure or connections. */
+        bagOfCurves?: [CurveCollectionProps | CurvePrimitiveProps];
     }
     /**
      * Interface for a collection of curves that bound a planar region
@@ -153,43 +158,43 @@ export declare namespace IModelJson {
         ruledSweep?: RuledSweepProps;
     }
     /**
-     * * There are multiple ways to specify an orientation
-     * * A "Best" among these is application specific.
-     * * An object with AxesProps should only specify one of the variants.
-     * * YawPitchRollAngles uses 3 angles.
-     * * * Cases where only one of the 3 is nonzero are intuitive
-     * * * Cases where more than one is nonzero have difficult interactions and order issues.
-     * * xyVectors uses a vector along the x direction and a vector into positive xy plane
-     *    along any direction not parallel to x.
-     * * * In most cases, users supply a normalized x and the actual normalized y vector.
-     * * zxVectors uses a z vector and another vector into the positive zx plane.
-     * * * In most cases, users supply a normalized z and the actual normalized x vector.
+     * Ways to specify an object's local coordinate frame.
+     * * Most objects that implement AxesProps specify their local coordinate frame by a right-handed
+     * rotation matrix (`yawPitchRollAngles`, `xyVectors`, `zxVectors`).
+     * * A general invertible matrix can be specified by `xyzVectors`.
+     * * An object that implements AxesProps typically specifies only one variant, or none for Identity.
      * @public
      */
     interface AxesProps {
         /**
-         * See YawPitchAngles class for further information about using 3 rotations to specify orientation.
+         * A rotation specified by yaw, pitch, roll angles.
+         * * Cases where only one of these angles is nonzero are intuitive.
+         * * Cases where more than one is nonzero have difficult interactions and order issues.
+         * * See [[YawPitchRollAngles]] for further information.
          * @public
          */
         yawPitchRollAngles?: YawPitchRollProps;
         /**
-         * Cartesian coordinate directions defined by X direction then Y direction.
-         * * The right side contains two vectors in an array.
-         * * The first vector gives the x axis direction
-         * * * This is normalized to unit length.
-         * * The second vector gives the positive y direction in the xy plane.
-         * * * This vector is adjusted to be unit length and perpendicular to the x direction.
+         * A rotation specified by an array of two vectors [xAxis, yAxis].
+         * * The first vector gives the local x-axis direction; the second determines the local xy-plane.
+         * * A third implied axis is perpendicular to these.
+         * * The implied rotation is `Matrix3d.createRigidFromColumns(xAxis, yAxis, AxisOrder.XYZ)`.
          */
         xyVectors?: [XYZProps, XYZProps];
         /**
-         * Cartesian coordinate directions defined by Z direction then X direction.
-         * * The right side contains two vectors in an array.
-         * * The first vector gives the z axis direction
-         * * * This is normalized to unit length.
-         * * The second vector gives the positive x direction in the zx plane.
-         * * * This vector is adjusted to be unit length and perpendicular to the z direction.
+         * A rotation specified by an array of two vectors [zAxis, xAxis].
+         * * The first vector gives the local z-axis direction; the second determines the local zx-plane.
+         * * A third implied axis is perpendicular to these.
+         * * The implied rotation is `Matrix3d.createRigidFromColumns(zAxis, xAxis, AxisOrder.ZXY)`.
          */
         zxVectors?: [XYZProps, XYZProps];
+        /**
+         * A local coordinate system specified by an array of three vectors [xAxis, yAxis, zAxis].
+         * * The vectors should have positive length and be linearly independent, but otherwise they are unrestricted.
+         * * This allows skew coordinate systems, left-handed frames, and non-uniform scaling.
+         * * The implied matrix is `Matrix3d.createColumns(xAxis, yAxis, zAxis)`.
+         */
+        xyzVectors?: [XYZProps, XYZProps, XYZProps];
     }
     /**
      * Interface for Arc3d value defined by center, vectorX, vectorY and sweepStartEnd.
@@ -206,25 +211,34 @@ export declare namespace IModelJson {
         sweepStartEnd: AngleSweepProps;
     }
     /**
-     * Interface for Cone value defined by centers, radii, and (optional) vectors for circular section planes.
-     * * VectorX and vectorY are optional.
-     * * If either one is missing, both vectors are constructed perpendicular to the vector from start to end.
+     * Interface for a [[Cone]], defined by two centers and radii.
+     * * A Cone typically has circular sections perpendicular to the axis line between centers.
+     * * The cross section xy-plane is specified by an [[IModelJson.AxesProps]]:
+     *   * Typically this is an `xyVectors`.
+     *   * Elliptical cross sections can be specified with `xyzVectors`, which admits skew vectors
+     * and/or vectors of different lengths. Elliptical cross sections are scaled by radius.
      * @public
      */
     interface ConeProps extends AxesProps {
-        /** Point on axis at start section. */
+        /** Point on axis at center of start section. */
         start: XYZProps;
-        /** Point on axis at end section  */
+        /** Point on axis at center of end section. */
         end: XYZProps;
-        /** radius at `start` section */
+        /** Radius of the section at `start` if circular, or scale factor if elliptical. */
         startRadius?: number;
-        /** radius at `end` section */
+        /** Radius of the section at `end` if circular, or scale factor if elliptical. */
         endRadius?: number;
-        /** single radius to be applied as both start and end */
+        /** Constant radius of all sections if circular, or scale factor if elliptical. */
         radius?: number;
-        /** optional x vector in start section.  Omit for circular sections perpendicular to axis. */
+        /**
+         * Optional section x-axis.
+         * @deprecated in 5.x. This property has never been written. Optional axes are specified by an AxesProps.
+         */
         vectorX?: XYZProps;
-        /** optional y vector in start section.  Omit for circular sections perpendicular to axis. */
+        /**
+         * Optional section y-axis.
+         * @deprecated in 5.x. This property has never been written. Optional axes are specified by an AxesProps.
+         */
         vectorY?: XYZProps;
         /** flag for circular end caps. */
         capped?: boolean;
@@ -272,13 +286,13 @@ export declare namespace IModelJson {
         capped?: boolean;
     }
     /**
-     * Interface for a surface with ruled sweeps between corresponding curves on successive contours
+     * Interface for a surface with rule lines between corresponding curves on successive contours
      * @public
      */
     interface RuledSweepProps {
-        /** The swept curve or region.  An array of curve collections.  */
+        /** An array of swept curves or regions. */
         contour: [CurveCollectionProps];
-        /** flag for circular end caps. */
+        /** Optional capping flag. */
         capped?: boolean;
     }
     /**
@@ -354,9 +368,8 @@ export declare namespace IModelJson {
         origin: XYZProps;
         /** A previous mismatch existed between native and TypeScript code: TypeScript used "origin" where native used "baseOrigin".
          * Now both native and TypeScript will output both and accept either, preferring "origin".
-         * "baseOrigin" is undocumented in TypeScript; it's also "deprecated" so that the linter will warn to use the documented property instead.
+         * "baseOrigin" is undocumented in TypeScript; it should not be used.
          * @internal
-         * @deprecated in 3.x. use origin
          */
         baseOrigin?: XYZProps;
         /** base x size (required) */
@@ -386,8 +399,11 @@ export declare namespace IModelJson {
         capped?: boolean;
     }
     /**
-     * Interface for Sphere (with optionally different radius to pole versus equator)
-     * * Orientation may be given in any `AxesProp`s way (yawPitchRoll, xyVectors, zxVectors)
+     * Interface for a [[Sphere]].
+     * * Local coordinate frame is supplied by an [[IModelJson.AxesProps]]:
+     *   * Typically this is a `zxVectors`.
+     *   * Skew axes can be specified with `xyzVectors`, in which case any specified radii scale these axes;
+     * all other AxesProps specify a right-handed orthonormal triad.
      * @public
      */
     interface SphereProps extends AxesProps {
@@ -399,7 +415,7 @@ export declare namespace IModelJson {
         radiusX?: number;
         /** optional y radius */
         radiusY?: number;
-        /** optional radius at poles.  */
+        /** optional z radius */
         radiusZ?: number;
         /** optional sweep range for latitude.  Default latitude limits are [-90,90 ] degrees. */
         latitudeStartEnd?: AngleSweepProps;
@@ -431,16 +447,6 @@ export declare namespace IModelJson {
         /** optional capping flag. If missing, implied false */
         capped?: boolean;
     }
-    /**
-     * Interface for a ruled sweep.
-     * @public
-     */
-    interface RuledSweepProps {
-        /** Array of contours */
-        contour: [CurveCollectionProps];
-        /** optional capping flag. */
-        capped?: boolean;
-    }
     /**
      * Interface for the analytical data in a channel at a single input value.
      * See `AuxChannelData` for further information.
@@ -563,10 +569,11 @@ export declare namespace IModelJson {
         private static parseAxesFromVectors;
         /**
          * Look for orientation data and convert to Matrix3d.
-         * * Search order is:
-         * * * yawPitchRollAngles
-         * * * xyVectors
-         * * * zxVectors
+         * * Search order and interpretation:
+         * * * xyzVectors - general matrix, axes preserved
+         * * * yawPitchRollAngles - right-handed rotation via axial rotations
+         * * * xyVectors - right-handed rotation, xy-plane specified, axes squared and normalized
+         * * * zxVectors - right-handed rotation, zx-plane specified, axes squared and normalized
          * @param json [in] json source data
          * @param createDefaultIdentity [in] If true and no orientation is present, return an identity matrix.  If false and no orientation is present, return undefined.
          */
@@ -576,13 +583,13 @@ export declare namespace IModelJson {
         private static parseArcObject;
         /** Parse point content (right side) `[1,2,3]` to a CoordinateXYZ object. */
         static parseCoordinate(data?: any): CoordinateXYZ | undefined;
-        /** Parse TransitionSpiral content (right side) to TransitionSpiral3d. */
+        /** Parse `transitionSpiral` content (right side) to TransitionSpiral3d. */
         static parseTransitionSpiral(data?: TransitionSpiralProps): TransitionSpiral3d | undefined;
         /** Parse `bcurve` content to BSplineCurve3d or BSplineCurve3dH object. */
         static parseBcurve(data?: any): BSplineCurve3d | BSplineCurve3dH | undefined;
-        /** Parse `bcurve` content to an InterpolationCurve3d object. */
+        /** Parse `interpolationCurve` content to an InterpolationCurve3d object. */
         static parseInterpolationCurve(data?: any): InterpolationCurve3d | undefined;
-        /** Parse `bcurve` content to an Akima curve object. */
+        /** Parse `akimaCurve` content to an Akima curve object. */
         static parseAkimaCurve3d(data?: any): AkimaCurve3d | undefined;
         /** Parse array of json objects to array of instances. */
         static parseArray(data?: any): any[] | undefined;

package/lib/cjs/serialization/IModelJsonSchema.d.ts.map

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

package/lib/cjs/serialization/IModelJsonSchema.js

@@ -51,9 +51,8 @@ const RuledSweep_1 = require("../solid/RuledSweep");
 const Sphere_1 = require("../solid/Sphere");
 const TorusPipe_1 = require("../solid/TorusPipe");
 const SerializationHelpers_1 = require("./SerializationHelpers");
-// cspell:word bagof
 /**
- * `ImodelJson` namespace has classes for serializing and deserialization json objects
+ * `IModelJson` namespace has classes for serializing and deserialization json objects
  * @public
  */
 var IModelJson;
@@ -195,10 +194,19 @@ var IModelJson;
             return defaultValue;
         }
         static parseAxesFromVectors(json, axisOrder, createDefaultIdentity) {
-            if (Array.isArray(json) && json.length === 2) {
-                const xVector = Point3dVector3d_1.Vector3d.fromJSON(json[0]);
-                const yVector = Point3dVector3d_1.Vector3d.fromJSON(json[1]);
-                const matrix = Matrix3d_1.Matrix3d.createRigidFromColumns(xVector, yVector, axisOrder);
+            if (Array.isArray(json)) {
+                let matrix;
+                if (json.length === 2) { // square and normalize
+                    const xVector = Point3dVector3d_1.Vector3d.fromJSON(json[0]);
+                    const yVector = Point3dVector3d_1.Vector3d.fromJSON(json[1]);
+                    matrix = Matrix3d_1.Matrix3d.createRigidFromColumns(xVector, yVector, axisOrder);
+                }
+                else if (json.length === 3) { // preserve axes
+                    const xVector = Point3dVector3d_1.Vector3d.fromJSON(json[0]);
+                    const yVector = Point3dVector3d_1.Vector3d.fromJSON(json[1]);
+                    const zVector = Point3dVector3d_1.Vector3d.fromJSON(json[2]);
+                    matrix = Matrix3d_1.Matrix3d.createColumnsInAxisOrder(axisOrder, xVector, yVector, zVector);
+                }
                 if (matrix)
                     return matrix;
             }
@@ -208,23 +216,23 @@ var IModelJson;
         }
         /**
          * Look for orientation data and convert to Matrix3d.
-         * * Search order is:
-         * * * yawPitchRollAngles
-         * * * xyVectors
-         * * * zxVectors
+         * * Search order and interpretation:
+         * * * xyzVectors - general matrix, axes preserved
+         * * * yawPitchRollAngles - right-handed rotation via axial rotations
+         * * * xyVectors - right-handed rotation, xy-plane specified, axes squared and normalized
+         * * * zxVectors - right-handed rotation, zx-plane specified, axes squared and normalized
          * @param json [in] json source data
          * @param createDefaultIdentity [in] If true and no orientation is present, return an identity matrix.  If false and no orientation is present, return undefined.
          */
         static parseOrientation(json, createDefaultIdentity) {
-            if (json.yawPitchRollAngles) {
+            if (json.xyzVectors)
+                return Reader.parseAxesFromVectors(json.xyzVectors, Geometry_1.AxisOrder.XYZ, createDefaultIdentity);
+            if (json.yawPitchRollAngles)
                 return Reader.parseYawPitchRollAnglesToMatrix3d(json.yawPitchRollAngles);
-            }
-            else if (json.xyVectors) {
+            if (json.xyVectors)
                 return Reader.parseAxesFromVectors(json.xyVectors, Geometry_1.AxisOrder.XYZ, createDefaultIdentity);
-            }
-            else if (json.zxVectors) {
+            if (json.zxVectors)
                 return Reader.parseAxesFromVectors(json.zxVectors, Geometry_1.AxisOrder.ZXY, createDefaultIdentity);
-            }
             if (createDefaultIdentity)
                 return Matrix3d_1.Matrix3d.createIdentity();
             return undefined;
@@ -263,7 +271,7 @@ var IModelJson;
                 return CoordinateXYZ_1.CoordinateXYZ.create(point);
             return undefined;
         }
-        /** Parse TransitionSpiral content (right side) to TransitionSpiral3d. */
+        /** Parse `transitionSpiral` content (right side) to TransitionSpiral3d. */
         static parseTransitionSpiral(data) {
             const axes = Reader.parseOrientation(data, true);
             const origin = Reader.parsePoint3dProperty(data, "origin");
@@ -318,13 +326,13 @@ var IModelJson;
             }
             return newCurve;
         }
-        /** Parse `bcurve` content to an InterpolationCurve3d object. */
+        /** Parse `interpolationCurve` content to an InterpolationCurve3d object. */
         static parseInterpolationCurve(data) {
             if (data === undefined)
                 return undefined;
             return InterpolationCurve3d_1.InterpolationCurve3d.create(data);
         }
-        /** Parse `bcurve` content to an Akima curve object. */
+        /** Parse `akimaCurve` content to an Akima curve object. */
         static parseAkimaCurve3d(data) {
             if (data === undefined)
                 return undefined;
@@ -468,11 +476,8 @@ var IModelJson;
             const radius = Reader.parseNumberProperty(json, "radius");
             const startRadius = Reader.parseNumberProperty(json, "startRadius", radius);
             const endRadius = Reader.parseNumberProperty(json, "endRadius", startRadius);
-            const capped = Reader.parseBooleanProperty(json, "capped", false);
-            if (start
-                && end
-                && startRadius !== undefined
-                && endRadius !== undefined) {
+            const capped = Reader.parseBooleanProperty(json, "capped");
+            if (start && end && startRadius !== undefined && endRadius !== undefined) {
                 if (axes === undefined) {
                     const axisVector = Point3dVector3d_1.Vector3d.createStartEnd(start, end);
                     const frame = Matrix3d_1.Matrix3d.createRigidHeadsUp(axisVector, Geometry_1.AxisOrder.ZXY);
@@ -480,9 +485,7 @@ var IModelJson;
                     const vectorY = frame.columnY();
                     return Cone_1.Cone.createBaseAndTarget(start, end, vectorX, vectorY, startRadius, endRadius, capped);
                 }
-                else {
-                    return Cone_1.Cone.createBaseAndTarget(start, end, axes.columnX(), axes.columnY(), startRadius, endRadius, capped);
-                }
+                return Cone_1.Cone.createBaseAndTarget(start, end, axes.columnX(), axes.columnY(), startRadius, endRadius, capped);
             }
             return undefined;
         }
@@ -568,23 +571,15 @@ var IModelJson;
         /** Parse `SphereProps` to `Sphere` instance. */
         static parseSphere(json) {
             const center = Reader.parsePoint3dProperty(json, "center");
-            // optional unqualified radius . . .
             const radius = Reader.parseNumberProperty(json, "radius");
-            // optional specific X
             const radiusX = Reader.parseNumberProperty(json, "radiusX", radius);
-            // missing Y and Z both pick up radiusX  (which may have already been defaulted from unqualified radius)
             const radiusY = Reader.parseNumberProperty(json, "radiusY", radiusX);
-            const radiusZ = Reader.parseNumberProperty(json, "radiusZ", radiusX);
-            const latitudeStartEnd = Reader.parseAngleSweepProps(json, "latitudeStartEnd"); // this may be undefined!!
-            const axes = Reader.parseOrientation(json, true);
-            const capped = Reader.parseBooleanProperty(json, "capped", false);
-            if (center !== undefined
-                && radiusX !== undefined
-                && radiusY !== undefined
-                && radiusZ !== undefined
-                && capped !== undefined) {
+            const radiusZ = Reader.parseNumberProperty(json, "radiusZ", radiusY);
+            const latitudeStartEnd = Reader.parseAngleSweepProps(json, "latitudeStartEnd");
+            const axes = Reader.parseOrientation(json, false);
+            const capped = Reader.parseBooleanProperty(json, "capped");
+            if (center && radiusX && radiusY && radiusZ)
                 return Sphere_1.Sphere.createFromAxesAndScales(center, axes, radiusX, radiusY, radiusZ, latitudeStartEnd, capped);
-            }
             return undefined;
         }
         /** Parse RuledSweepProps to RuledSweep instance. */
@@ -709,11 +704,6 @@ var IModelJson;
         }
     }
     IModelJson.Reader = Reader;
-    // ISSUE: include 3d in names?
-    // ISSUE: would like shorter term than lineSegment
-    // ISSUE: is arc clear?
-    // ISSUE: label center, vectorX, vector90 on arc?
-    // ISSUE: sweep data on arc -- serialize as AngleSweep?
     /**
      * Class to deserialize json objects into GeometryQuery objects
      * @public
@@ -862,63 +852,86 @@ var IModelJson;
             const centerB = data.getCenterB();
             const vectorX = data.getVectorX();
             const vectorY = data.getVectorY();
+            const xMag = vectorX.magnitude();
+            const yMag = vectorY.magnitude();
+            const xySameLength = Geometry_1.Geometry.isSameCoordinate(xMag, yMag);
             const axisVector = Point3dVector3d_1.Vector3d.createStartEnd(centerA, centerB);
+            // special case of cylinder
             if (Geometry_1.Geometry.isSameCoordinate(radiusA, radiusB)
                 && vectorX.isPerpendicularTo(axisVector)
                 && vectorY.isPerpendicularTo(axisVector)
-                && Geometry_1.Geometry.isSameCoordinate(vectorX.magnitude(), 1.0)
-                && Geometry_1.Geometry.isSameCoordinate(vectorY.magnitude(), 1.0)) {
+                && xySameLength
+                && Geometry_1.Geometry.isSameCoordinate(xMag, 1.0)) {
                 return {
                     cylinder: {
                         capped: data.capped,
-                        start: data.getCenterA().toJSON(),
-                        end: data.getCenterB().toJSON(),
+                        start: centerA.toJSON(),
+                        end: centerB.toJSON(),
                         radius: radiusA,
                     },
                 };
             }
+            const coneProps = {
+                capped: data.capped,
+                start: centerA.toJSON(),
+                end: centerB.toJSON(),
+            };
+            if (Geometry_1.Geometry.isSameCoordinate(radiusA, radiusB)) {
+                coneProps.radius = radiusA;
+            }
             else {
-                const coneProps = {
-                    capped: data.capped,
-                    start: data.getCenterA().toJSON(),
-                    end: data.getCenterB().toJSON(),
-                    startRadius: data.getRadiusA(),
-                    endRadius: data.getRadiusB(),
-                };
-                Writer.insertOrientationFromXYVectors(coneProps, vectorX, vectorY, false);
-                return { cone: coneProps };
+                coneProps.startRadius = radiusA;
+                coneProps.endRadius = radiusB;
             }
+            // always specify an orthogonal frame for backwards compatibility
+            Writer.insertOrientationFromXYVectors(coneProps, vectorX, vectorY, false);
+            // specify a general matrix if elliptical sections
+            const ellipticalSections = !xySameLength || !vectorX.isPerpendicularTo(vectorY, true);
+            if (ellipticalSections)
+                coneProps.xyzVectors = [vectorX.toJSON(), vectorY.toJSON(), axisVector.toJSON()];
+            return { cone: coneProps };
         }
         /** Convert strongly typed instance to tagged json */
         handleSphere(data) {
             const xData = data.cloneVectorX().normalizeWithLength();
             const yData = data.cloneVectorY().normalizeWithLength();
             const zData = data.cloneVectorZ().normalizeWithLength();
+            if (!xData.v || !yData.v || !zData.v)
+                return undefined;
+            const rigid = Matrix3d_1.Matrix3d.createIdentity();
+            const skew = Matrix3d_1.Matrix3d.createIdentity();
+            if (!data.cloneLocalToWorld().matrix.factorRigidSkew(rigid, skew))
+                return undefined;
+            const value = { center: data.cloneCenter().toJSON() };
+            // always specify an orthogonal frame if !identity for backwards compatibility
+            if (!rigid.isIdentity)
+                value.zxVectors = [zData.v.toJSON(), xData.v.toJSON()];
+            // specify a general matrix if skew/mirror local frame
+            if (!skew.isDiagonal || skew.determinant() < 0.0)
+                value.xyzVectors = [xData.v.toJSON(), yData.v.toJSON(), zData.v.toJSON()];
             const latitudeSweep = data.cloneLatitudeSweep();
+            const fullSweep = latitudeSweep.isFullLatitudeSweep;
+            if (data.capped && !fullSweep)
+                value.capped = data.capped;
+            if (!fullSweep)
+                value.latitudeStartEnd = latitudeSweep.toJSON();
             const rX = xData.mag;
             const rY = yData.mag;
             const rZ = zData.mag;
-            if (xData.v && zData.v) {
-                const value = {
-                    center: data.cloneCenter().toJSON(),
-                };
-                if (!(data.getConstructiveFrame()).matrix.isIdentity)
-                    value.zxVectors = [zData.v.toJSON(), xData.v.toJSON()];
-                const fullSweep = latitudeSweep.isFullLatitudeSweep;
-                if (data.capped && !fullSweep)
-                    value.capped = data.capped;
-                if (Geometry_1.Geometry.isSameCoordinate(rX, rY) && Geometry_1.Geometry.isSameCoordinate(rX, rZ))
+            if (Geometry_1.Geometry.isSameCoordinate(rX, rY)) {
+                if (Geometry_1.Geometry.isSameCoordinate(rX, rZ))
                     value.radius = rX;
-                else {
+                else { // radiusY will pick up radiusX
                     value.radiusX = rX;
-                    value.radiusY = rY;
                     value.radiusZ = rZ;
                 }
-                if (!fullSweep)
-                    value.latitudeStartEnd = latitudeSweep.toJSON();
-                return { sphere: value };
             }
-            return undefined;
+            else {
+                value.radiusX = rX;
+                value.radiusY = rY;
+                value.radiusZ = rZ;
+            }
+            return { sphere: value };
         }
         /** Convert strongly typed instance to tagged json */
         handleTorusPipe(data) {