@itwin/ecschema-rpcinterface-tests 5.6.1 → 5.6.3

package/lib/dist/bundled-tests.js

@@ -152020,26 +152020,53 @@ class RealityTileLoader {
     }
     async loadGeometryFromStream(tile, streamBuffer, system) {
         const format = this._getFormat(streamBuffer);
-        if (format !== _itwin_core_common__WEBPACK_IMPORTED_MODULE_2__.TileFormat.B3dm)
+        if (format !== _itwin_core_common__WEBPACK_IMPORTED_MODULE_2__.TileFormat.B3dm && format !== _itwin_core_common__WEBPACK_IMPORTED_MODULE_2__.TileFormat.Gltf) {
             return {};
+        }
         const { is3d, yAxisUp, iModel, modelId } = tile.realityRoot;
-        const reader = _tile_internal__WEBPACK_IMPORTED_MODULE_7__.B3dmReader.create(streamBuffer, iModel, modelId, is3d, tile.contentRange, system, yAxisUp, tile.isLeaf, tile.center, tile.transformToRoot, undefined, this.getBatchIdMap());
-        if (reader)
-            reader.defaultWrapMode = _common_gltf_GltfSchema__WEBPACK_IMPORTED_MODULE_6__.GltfWrapMode.ClampToEdge;
+        let reader;
+        // Create final transform from tree's iModelTransform and transformToRoot
         let transform = tile.tree.iModelTransform;
         if (tile.transformToRoot) {
             transform = transform.multiplyTransformTransform(tile.transformToRoot);
         }
-        const geom = reader?.readGltfAndCreateGeometry(transform);
+        switch (format) {
+            case _itwin_core_common__WEBPACK_IMPORTED_MODULE_2__.TileFormat.Gltf:
+                const props = createReaderPropsWithBaseUrl(streamBuffer, yAxisUp, tile.tree.baseUrl);
+                if (props) {
+                    reader = new _tile_internal__WEBPACK_IMPORTED_MODULE_7__.GltfGraphicsReader(props, {
+                        iModel,
+                        gltf: props.glTF,
+                        contentRange: tile.contentRange,
+                        transform: tile.transformToRoot,
+                        hasChildren: !tile.isLeaf,
+                        pickableOptions: { id: modelId },
+                        idMap: this.getBatchIdMap()
+                    });
+                }
+                break;
+            case _itwin_core_common__WEBPACK_IMPORTED_MODULE_2__.TileFormat.B3dm:
+                reader = _tile_internal__WEBPACK_IMPORTED_MODULE_7__.B3dmReader.create(streamBuffer, iModel, modelId, is3d, tile.contentRange, system, yAxisUp, tile.isLeaf, tile.center, tile.transformToRoot, undefined, this.getBatchIdMap());
+                if (reader)
+                    reader.defaultWrapMode = _common_gltf_GltfSchema__WEBPACK_IMPORTED_MODULE_6__.GltfWrapMode.ClampToEdge;
+                break;
+        }
+        const geom = await reader?.readGltfAndCreateGeometry(transform);
         // See RealityTileTree.reprojectAndResolveChildren for how reprojectionTransform is calculated
+        // xForm is defined in root tile CRS, while geom is defined in iModel CRS
         const xForm = tile.reprojectionTransform;
-        if (tile.tree.reprojectGeometry && geom?.polyfaces && xForm) {
-            const polyfaces = geom.polyfaces.map((pf) => pf.cloneTransformed(xForm));
-            return { geometry: { polyfaces } };
-        }
-        else {
-            return { geometry: geom };
+        if (tile.tree.reprojectGeometry && geom?.polyfaces?.length && xForm) {
+            // Transform from iModel/Db CRS -> root tile CRS
+            const dbToRoot = tile.tree.iModelTransform.inverse();
+            if (dbToRoot) {
+                // Conjugate xForm to apply it to polyfaces in iModel CRS:
+                // dbToRoot converts to root tile CRS, xForm applies reprojection, iModelTransform converts back
+                const polyfaceReprojectionTransform = tile.tree.iModelTransform.multiplyTransformTransform(xForm).multiplyTransformTransform(dbToRoot);
+                const polyfaces = geom.polyfaces.map((pf) => pf.cloneTransformed(polyfaceReprojectionTransform));
+                return { geometry: { polyfaces } };
+            }
         }
+        return { geometry: geom };
     }
     async loadGraphicsFromStream(tile, streamBuffer, system, isCanceled) {
         const format = this._getFormat(streamBuffer);
@@ -154928,7 +154955,13 @@ class WmtsMapLayerImageryProvider extends _tile_internal__WEBPACK_IMPORTED_MODUL
             (0,_itwin_core_bentley__WEBPACK_IMPORTED_MODULE_0__.assert)(false); // Must always hava a matrix set.
             return;
         }
-        const limits = matrixSetAndLimits.limits?.[quadId.level + 1]?.limits;
+        const childLevel = quadId.level + 1;
+        const childMatrixId = matrixSetAndLimits.tileMatrixSet.tileMatrix.length > childLevel
+            ? matrixSetAndLimits.tileMatrixSet.tileMatrix[childLevel].identifier
+            : undefined;
+        const limits = childMatrixId !== undefined
+            ? matrixSetAndLimits.limits?.find((l) => l.tileMatrix === childMatrixId)?.limits
+            : undefined;
         if (!limits) {
             resolveChildren(childIds);
             return;
@@ -155961,7 +155994,7 @@ var WmtsCapability;
             this.tileMatrixSet = (0,_itwin_core_bentley__WEBPACK_IMPORTED_MODULE_0__.expectDefined)(getElementTextContent(elem, "TileMatrixSet", ""));
             const tileMatrixLimitsRoot = elem.getElementsByTagName("TileMatrixSetLimits");
             if (tileMatrixLimitsRoot.length > 0) {
-                const tileMatrixLimits = tileMatrixLimitsRoot[0].getElementsByTagName("TileMatrixSetLimits");
+                const tileMatrixLimits = tileMatrixLimitsRoot[0].getElementsByTagName("TileMatrixLimits");
                 for (const tmsl of tileMatrixLimits) {
                     this.tileMatrixSetLimits.push(new TileMatrixSetLimits(tmsl));
                 }
@@ -156988,7 +157021,7 @@ class QuantityTypeFormatsProvider {
         ["DefaultToolsUnits.VOLUME", QuantityType.Volume],
         ["DefaultToolsUnits.LENGTH_COORDINATE", QuantityType.Coordinate],
         ["CivilUnits.STATION", QuantityType.Stationing],
-        ["CivilUnits.LENGTH", QuantityType.LengthSurvey],
+        ["CivilUnits.LENGTH", QuantityType.LengthEngineering],
         ["AecUnits.LENGTH", QuantityType.LengthEngineering]
     ]);
     async getFormat(name) {
@@ -160965,7 +160998,7 @@ class GltfReaderProps {
 }
 /** The GltfMeshData contains the raw GLTF mesh data. If the data is suitable to create a [[RealityMesh]] directly, basically in the quantized format produced by
   * ContextCapture, then a RealityMesh is created directly from this data. Otherwise, the mesh primitive is populated from the raw data and a MeshPrimitive
-  * is generated. The MeshPrimitve path is much less efficient but should be rarely used.
+  * is generated. The MeshPrimitive path is much less efficient but should be rarely used.
   *
   * @internal
   */
@@ -161252,7 +161285,8 @@ class GltfReader {
             }),
         };
     }
-    readGltfAndCreateGeometry(transformToRoot, needNormals = false, needParams = false) {
+    async readGltfAndCreateGeometry(transformToRoot, needNormals = false, needParams = false) {
+        await this.resolveResources();
         const transformStack = new TransformStack(this.getTileTransform(transformToRoot));
         const polyfaces = [];
         for (const nodeKey of this._sceneNodes) {
@@ -161487,9 +161521,18 @@ class GltfReader {
         }
     }
     polyfaceFromGltfMesh(mesh, transform, needNormals, needParams) {
-        if (!mesh.pointQParams || !mesh.points || !mesh.indices)
+        if (mesh.pointQParams && mesh.points && mesh.indices)
+            return this.polyfaceFromQuantizedData(mesh.pointQParams, mesh.points, mesh.indices, mesh.normals, mesh.uvQParams, mesh.uvs, transform, needNormals, needParams);
+        const meshPrim = mesh.primitive;
+        const triangles = meshPrim.triangles;
+        const points = meshPrim.points;
+        if (!triangles || triangles.isEmpty || points.length === 0)
             return undefined;
-        const { points, pointQParams, normals, uvs, uvQParams, indices } = mesh;
+        // This will likely only be the case for Draco-compressed meshes-- see where readDracoMeshPrimitive is called within readMeshPrimitive
+        // That is the only case where mesh.primitive is populated but mesh.pointQParams, mesh.points, & mesh.indices are not
+        return this.polyfaceFromMeshPrimitive(triangles, points, meshPrim.normals, meshPrim.uvParams, transform, needNormals, needParams);
+    }
+    polyfaceFromQuantizedData(pointQParams, points, indices, normals, uvQParams, uvs, transform, needNormals, needParams) {
         const includeNormals = needNormals && undefined !== normals;
         const includeParams = needParams && undefined !== uvQParams && undefined !== uvs;
         const polyface = _itwin_core_geometry__WEBPACK_IMPORTED_MODULE_1__.IndexedPolyface.create(includeNormals, includeParams);
@@ -161517,6 +161560,46 @@ class GltfReader {
         }
         return polyface;
     }
+    polyfaceFromMeshPrimitive(triangles, points, normals, uvParams, transform, needNormals, needParams) {
+        const includeNormals = needNormals && normals.length > 0;
+        const includeParams = needParams && uvParams.length > 0;
+        const polyface = _itwin_core_geometry__WEBPACK_IMPORTED_MODULE_1__.IndexedPolyface.create(includeNormals, includeParams);
+        if (points instanceof _itwin_core_common__WEBPACK_IMPORTED_MODULE_2__.QPoint3dList) {
+            for (let i = 0; i < points.length; i++) {
+                const point = points.unquantize(i);
+                if (transform)
+                    transform.multiplyPoint3d(point, point);
+                polyface.addPoint(point);
+            }
+        }
+        else {
+            const center = points.range.center;
+            for (const pt of points) {
+                const point = pt.plus(center);
+                if (transform)
+                    transform.multiplyPoint3d(point, point);
+                polyface.addPoint(point);
+            }
+        }
+        if (includeNormals)
+            for (const normal of normals)
+                polyface.addNormal(_itwin_core_common__WEBPACK_IMPORTED_MODULE_2__.OctEncodedNormal.decodeValue(normal.value));
+        if (includeParams)
+            for (const uv of uvParams)
+                polyface.addParam(uv);
+        const indices = triangles.indices;
+        let j = 0;
+        for (const index of indices) {
+            polyface.addPointIndex(index);
+            if (includeNormals)
+                polyface.addNormalIndex(index);
+            if (includeParams)
+                polyface.addParamIndex(index);
+            if (0 === (++j % 3))
+                polyface.terminateFacet();
+        }
+        return polyface;
+    }
     // ###TODO what is the actual type of `json`?
     getBufferView(json, accessorName) {
         try {
@@ -168895,20 +168978,19 @@ class ImageryMapTile extends _internal__WEBPACK_IMPORTED_MODULE_4__.RealityTile
     setContent(content) {
         this._texture = content.imageryTexture; // No dispose - textures may be shared by terrain tiles so let garbage collector dispose them.
         if (undefined === content.imageryTexture)
-            (0,_itwin_core_bentley__WEBPACK_IMPORTED_MODULE_0__.expectDefined)(this.parent).setLeaf(); // Avoid traversing bing branches after no graphics is found.
+            this.setLeaf(); // No imagery here — don't traverse deeper, but leave siblings unaffected.
         this.setIsReady();
     }
     selectCartoDrapeTiles(drapeTiles, highResolutionReplacementTiles, rectangleToDrape, drapePixelSize, args) {
         // Base draping overlap on width rather than height so that tiling schemes with multiple root nodes overlay correctly.
         const isSmallerThanDrape = (this.rectangle.xLength() / this.maximumSize) < drapePixelSize;
-        if ((this.isLeaf) // Include leaves so tiles get stretched past max LOD levels. (Only for base imagery layer)
-            || isSmallerThanDrape
-            || this._anyChildNotFound) {
+        if ((this.isLeaf && !this.isNotFound) // Include leaves so tiles get stretched past max LOD levels. (Only for base imagery layer)
+            || isSmallerThanDrape) {
             if (this.isOutOfLodRange) {
                 drapeTiles.push(this);
                 this.setIsReady();
             }
-            else if (this.isLeaf && !isSmallerThanDrape && !this._anyChildNotFound) {
+            else if (this.isLeaf && !isSmallerThanDrape) {
                 // These tiles are selected because we are beyond the max LOD of the tile tree,
                 // might be used to display "stretched" tiles instead of having blank.
                 highResolutionReplacementTiles.push(this);
@@ -168926,8 +169008,9 @@ class ImageryMapTile extends _internal__WEBPACK_IMPORTED_MODULE_4__.RealityTile
             if (undefined !== this.children) {
                 for (const child of this.children) {
                     const mapChild = child;
-                    if (mapChild.rectangle.intersectsRange(rectangleToDrape))
-                        status = mapChild.selectCartoDrapeTiles(drapeTiles, highResolutionReplacementTiles, rectangleToDrape, drapePixelSize, args);
+                    if (!mapChild.rectangle.intersectsRange(rectangleToDrape))
+                        continue;
+                    status = mapChild.selectCartoDrapeTiles(drapeTiles, highResolutionReplacementTiles, rectangleToDrape, drapePixelSize, args);
                     if (_internal__WEBPACK_IMPORTED_MODULE_4__.TileTreeLoadStatus.Loaded !== status)
                         break;
                 }
@@ -321355,7 +321438,7 @@ var loadLanguages = instance.loadLanguages;
 /***/ ((module) => {
 
 "use strict";
-module.exports = /*#__PURE__*/JSON.parse('{"name":"@itwin/core-frontend","version":"5.6.1","description":"iTwin.js frontend components","main":"lib/cjs/core-frontend.js","module":"lib/esm/core-frontend.js","typings":"lib/cjs/core-frontend","license":"MIT","scripts":{"build":"npm run -s copy:public && npm run -s build:cjs && npm run -s build:esm && npm run -s webpackWorkers && npm run -s copy:workers && npm run -s copy:draco","build:cjs":"npm run -s copy:js:cjs && tsc 1>&2 --outDir lib/cjs","build:esm":"npm run -s copy:js:esm && tsc 1>&2 --module ES2022 --outDir lib/esm","clean":"rimraf -g lib .rush/temp/package-deps*.json","copy:public":"cpx \\"./src/public/**/*\\" ./lib/public","copy:js:cjs":"cpx \\"./src/**/*.js\\" ./lib/cjs","copy:js:esm":"cpx \\"./src/**/*.js\\" ./lib/esm","copy:workers":"cpx \\"./lib/workers/webpack/parse-imdl-worker.js\\" ./lib/public/scripts","copy:draco":"cpx \\"./node_modules/@loaders.gl/draco/dist/libs/*\\" ./lib/public/scripts","docs":"betools docs --json=../../generated-docs/core/core-frontend/file.json --tsIndexFile=./core-frontend.ts --onlyJson --excludes=webgl/**/*,**/map/*.d.ts,**/tile/*.d.ts,**/*-css.ts","extract-api":"betools extract-api --entry=core-frontend && npm run extract-extension-api","extract-extension-api":"eslint --no-inline-config -c extraction.eslint.config.js  \\"./src/**/*.ts\\" 1>&2","lint":"eslint \\"./src/**/*.ts\\" 1>&2","lint-fix":"eslint --fix -f visualstudio \\"./src/**/*.ts\\" 1>&2","lint-deprecation":"eslint --fix -f visualstudio --no-inline-config -c ../../common/config/eslint/eslint.config.deprecation-policy.js \\"./src/**/*.ts\\"","pseudolocalize":"betools pseudolocalize --englishDir ./src/public/locales/en --out ./public/locales/en-PSEUDO","test":"npm run webpackTestWorker && vitest --run","cover":"npm run webpackTestWorker && vitest --run","webpackTests":"webpack --config ./src/test/utils/webpack.config.js 1>&2 && npm run -s webpackTestWorker","webpackTestWorker":"webpack --config ./src/test/worker/webpack.config.js 1>&2 && cpx \\"./lib/test/test-worker.js\\" ./lib/test","webpackWorkers":"webpack --config ./src/workers/ImdlParser/webpack.config.js 1>&2"},"repository":{"type":"git","url":"https://github.com/iTwin/itwinjs-core.git","directory":"core/frontend"},"keywords":["Bentley","BIM","iModel","digital-twin","iTwin"],"author":{"name":"Bentley Systems, Inc.","url":"http://www.bentley.com"},"peerDependencies":{"@itwin/appui-abstract":"workspace:*","@itwin/core-bentley":"workspace:*","@itwin/core-common":"workspace:*","@itwin/core-geometry":"workspace:*","@itwin/core-orbitgt":"workspace:*","@itwin/core-quantity":"workspace:*","@itwin/ecschema-metadata":"workspace:*","@itwin/ecschema-rpcinterface-common":"workspace:*"},"//devDependencies":["NOTE: All peerDependencies should also be listed as devDependencies since peerDependencies are not considered by npm install","NOTE: All tools used by scripts in this package must be listed as devDependencies"],"devDependencies":{"@itwin/appui-abstract":"workspace:*","@itwin/build-tools":"workspace:*","@itwin/core-bentley":"workspace:*","@itwin/core-common":"workspace:*","@itwin/core-geometry":"workspace:*","@itwin/core-orbitgt":"workspace:*","@itwin/core-quantity":"workspace:*","@itwin/ecschema-metadata":"workspace:*","@itwin/ecschema-rpcinterface-common":"workspace:*","@itwin/object-storage-core":"^3.0.4","@itwin/eslint-plugin":"^6.0.0","@types/chai-as-promised":"^7","@types/draco3d":"^1.4.10","@types/sinon":"^17.0.2","@vitest/browser":"^3.0.6","@vitest/coverage-v8":"^3.0.6","cpx2":"^8.0.0","eslint":"^9.31.0","glob":"^10.5.0","playwright":"~1.56.1","rimraf":"^6.0.1","sinon":"^17.0.2","source-map-loader":"^5.0.0","typescript":"~5.6.2","typemoq":"^2.1.0","vitest":"^3.0.6","vite-multiple-assets":"^1.3.1","vite-plugin-static-copy":"2.2.0","webpack":"^5.97.1"},"//dependencies":["NOTE: these dependencies should be only for things that DO NOT APPEAR IN THE API","NOTE: core-frontend should remain UI technology agnostic, so no react/angular dependencies are allowed"],"dependencies":{"@itwin/core-i18n":"workspace:*","@itwin/webgl-compatibility":"workspace:*","@loaders.gl/core":"^4.3.4","@loaders.gl/draco":"^4.3.4","fuse.js":"^3.3.0","wms-capabilities":"0.4.0"}}');
+module.exports = /*#__PURE__*/JSON.parse('{"name":"@itwin/core-frontend","version":"5.6.3","description":"iTwin.js frontend components","main":"lib/cjs/core-frontend.js","module":"lib/esm/core-frontend.js","typings":"lib/cjs/core-frontend","license":"MIT","scripts":{"build":"npm run -s copy:public && npm run -s build:cjs && npm run -s build:esm && npm run -s webpackWorkers && npm run -s copy:workers && npm run -s copy:draco","build:cjs":"npm run -s copy:js:cjs && tsc 1>&2 --outDir lib/cjs","build:esm":"npm run -s copy:js:esm && tsc 1>&2 --module ES2022 --outDir lib/esm","clean":"rimraf -g lib .rush/temp/package-deps*.json","copy:public":"cpx \\"./src/public/**/*\\" ./lib/public","copy:js:cjs":"cpx \\"./src/**/*.js\\" ./lib/cjs","copy:js:esm":"cpx \\"./src/**/*.js\\" ./lib/esm","copy:workers":"cpx \\"./lib/workers/webpack/parse-imdl-worker.js\\" ./lib/public/scripts","copy:draco":"cpx \\"./node_modules/@loaders.gl/draco/dist/libs/*\\" ./lib/public/scripts","docs":"betools docs --json=../../generated-docs/core/core-frontend/file.json --tsIndexFile=./core-frontend.ts --onlyJson --excludes=webgl/**/*,**/map/*.d.ts,**/tile/*.d.ts,**/*-css.ts","extract-api":"betools extract-api --entry=core-frontend && npm run extract-extension-api","extract-extension-api":"eslint --no-inline-config -c extraction.eslint.config.js  \\"./src/**/*.ts\\" 1>&2","lint":"eslint \\"./src/**/*.ts\\" 1>&2","lint-fix":"eslint --fix -f visualstudio \\"./src/**/*.ts\\" 1>&2","lint-deprecation":"eslint --fix -f visualstudio --no-inline-config -c ../../common/config/eslint/eslint.config.deprecation-policy.js \\"./src/**/*.ts\\"","pseudolocalize":"betools pseudolocalize --englishDir ./src/public/locales/en --out ./public/locales/en-PSEUDO","test":"npm run webpackTestWorker && vitest --run","cover":"npm run webpackTestWorker && vitest --run","webpackTests":"webpack --config ./src/test/utils/webpack.config.js 1>&2 && npm run -s webpackTestWorker","webpackTestWorker":"webpack --config ./src/test/worker/webpack.config.js 1>&2 && cpx \\"./lib/test/test-worker.js\\" ./lib/test","webpackWorkers":"webpack --config ./src/workers/ImdlParser/webpack.config.js 1>&2"},"repository":{"type":"git","url":"https://github.com/iTwin/itwinjs-core.git","directory":"core/frontend"},"keywords":["Bentley","BIM","iModel","digital-twin","iTwin"],"author":{"name":"Bentley Systems, Inc.","url":"http://www.bentley.com"},"peerDependencies":{"@itwin/appui-abstract":"workspace:*","@itwin/core-bentley":"workspace:*","@itwin/core-common":"workspace:*","@itwin/core-geometry":"workspace:*","@itwin/core-orbitgt":"workspace:*","@itwin/core-quantity":"workspace:*","@itwin/ecschema-metadata":"workspace:*","@itwin/ecschema-rpcinterface-common":"workspace:*"},"//devDependencies":["NOTE: All peerDependencies should also be listed as devDependencies since peerDependencies are not considered by npm install","NOTE: All tools used by scripts in this package must be listed as devDependencies"],"devDependencies":{"@itwin/appui-abstract":"workspace:*","@itwin/build-tools":"workspace:*","@itwin/core-bentley":"workspace:*","@itwin/core-common":"workspace:*","@itwin/core-geometry":"workspace:*","@itwin/core-orbitgt":"workspace:*","@itwin/core-quantity":"workspace:*","@itwin/ecschema-metadata":"workspace:*","@itwin/ecschema-rpcinterface-common":"workspace:*","@itwin/object-storage-core":"^3.0.4","@itwin/eslint-plugin":"^6.0.0","@types/chai-as-promised":"^7","@types/draco3d":"^1.4.10","@types/sinon":"^17.0.2","@vitest/browser":"^3.0.6","@vitest/coverage-v8":"^3.0.6","cpx2":"^8.0.0","eslint":"^9.31.0","glob":"^10.5.0","playwright":"~1.56.1","rimraf":"^6.0.1","sinon":"^17.0.2","source-map-loader":"^5.0.0","typescript":"~5.6.2","typemoq":"^2.1.0","vitest":"^3.0.6","vite-multiple-assets":"^1.3.1","vite-plugin-static-copy":"2.2.0","webpack":"^5.97.1"},"//dependencies":["NOTE: these dependencies should be only for things that DO NOT APPEAR IN THE API","NOTE: core-frontend should remain UI technology agnostic, so no react/angular dependencies are allowed"],"dependencies":{"@itwin/core-i18n":"workspace:*","@itwin/webgl-compatibility":"workspace:*","@loaders.gl/core":"^4.3.4","@loaders.gl/draco":"^4.3.4","fuse.js":"^3.3.0","wms-capabilities":"0.4.0"}}');
 
 /***/ })