@itwin/core-geometry 5.0.0-dev.82 → 5.0.0-dev.84

package/lib/cjs/serialization/IModelJsonSchema.js

@@ -194,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;
             }
@@ -207,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;
@@ -467,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);
@@ -479,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;
         }
@@ -567,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. */
@@ -708,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
@@ -861,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) {