@itwin/ecschema-rpcinterface-tests 3.2.0-dev.41 → 3.2.0-dev.42

package/lib/dist/bundled-tests.js

@@ -70015,6 +70015,8 @@ class IModelReadRpcInterface extends _RpcInterface__WEBPACK_IMPORTED_MODULE_0__[
     /** @deprecated */
     async getViewThumbnail(_iModelToken, _viewId) { return this.forward(arguments); }
     async getDefaultViewId(_iModelToken) { return this.forward(arguments); }
+    async getCustomViewState3dData(_iModelToken, _options) { return this.forward(arguments); }
+    async hydrateViewState(_iModelToken, _options) { return this.forward(arguments); }
     async requestSnap(_iModelToken, _sessionId, _props) { return this.forward(arguments); }
     async cancelSnap(_iModelToken, _sessionId) { return this.forward(arguments); }
     async getGeometryContainment(_iModelToken, _props) { return this.forward(arguments); }
@@ -73466,7 +73468,7 @@ class WebAppRpcRequest extends _core_RpcRequest__WEBPACK_IMPORTED_MODULE_4__["Rp
 /** The maximum size permitted for an encoded component in a URL.
  * @note This is used for features like encoding the payload of a cacheable request in the URL.
  */
-WebAppRpcRequest.maxUrlComponentSize = 1024;
+WebAppRpcRequest.maxUrlComponentSize = 4096;
 
 /* WEBPACK VAR INJECTION */}.call(this, __webpack_require__(/*! ./../../../../../../common/temp/node_modules/.pnpm/buffer@4.9.2/node_modules/buffer/index.js */ "../../common/temp/node_modules/.pnpm/buffer@4.9.2/node_modules/buffer/index.js").Buffer))
 
@@ -91559,6 +91561,21 @@ class SectionAttachmentInfo {
     clone() {
         return new SectionAttachmentInfo(this._spatialView, this._drawingToSpatialTransform, this._displaySpatialView);
     }
+    preload(options) {
+        if (!this.wantDisplayed)
+            return;
+        if (this._spatialView instanceof _ViewState__WEBPACK_IMPORTED_MODULE_14__["ViewState3d"])
+            return;
+        if (!_itwin_core_bentley__WEBPACK_IMPORTED_MODULE_0__["Id64"].isValidId64(this._spatialView))
+            return;
+        options.spatialViewId = this._spatialView;
+        options.viewStateLoadProps = {
+            displayStyle: {
+                omitScheduleScriptElementIds: true,
+                compressExcludedElementIds: true,
+            },
+        };
+    }
     async load(iModel) {
         if (!this.wantDisplayed)
             return;
@@ -91570,6 +91587,14 @@ class SectionAttachmentInfo {
         if (spatialView instanceof _ViewState__WEBPACK_IMPORTED_MODULE_14__["ViewState3d"])
             this._spatialView = spatialView;
     }
+    async postload(options, iModel) {
+        let spatialView;
+        if (options.spatialViewProps) {
+            spatialView = await iModel.views.convertViewStatePropsToViewState(options.spatialViewProps);
+        }
+        if (spatialView instanceof _ViewState__WEBPACK_IMPORTED_MODULE_14__["ViewState3d"])
+            this._spatialView = spatialView;
+    }
     createAttachment(toSheet) {
         if (!this.wantDisplayed || !(this._spatialView instanceof _ViewState__WEBPACK_IMPORTED_MODULE_14__["ViewState3d"]))
             return undefined;
@@ -91787,10 +91812,17 @@ class DrawingViewState extends _ViewState__WEBPACK_IMPORTED_MODULE_14__["ViewSta
         return { spatialView, displaySpatialView, drawingToSpatialTransform };
     }
     /** @internal */
-    async load() {
+    preload(hydrateRequest) {
         Object(_itwin_core_bentley__WEBPACK_IMPORTED_MODULE_0__["assert"])(!this.isAttachedToViewport);
-        await super.load();
-        await this._attachmentInfo.load(this.iModel);
+        super.preload(hydrateRequest);
+        this._attachmentInfo.preload(hydrateRequest);
+    }
+    /** @internal */
+    async postload(hydrateResponse) {
+        const promises = [];
+        promises.push(super.postload(hydrateResponse));
+        promises.push(this._attachmentInfo.postload(hydrateResponse, this.iModel));
+        await Promise.all(promises);
     }
     static createFromProps(props, iModel) {
         const cat = new _CategorySelectorState__WEBPACK_IMPORTED_MODULE_3__["CategorySelectorState"](props.categorySelectorProps, iModel);
@@ -95915,7 +95947,16 @@ class SnapshotConnection extends IModelConnection {
                 return; // all requested models are already loaded
             try {
                 const propArray = await this.getProps(notLoaded);
-                for (const props of propArray) {
+                await this.updateLoadedWithModelProps(propArray);
+            }
+            catch (err) {
+                // ignore error, we had nothing to do.
+            }
+        }
+        /** Given an array of modelProps, find the class for each model and construct it. save it in the iModelConnection's loaded set. */
+        async updateLoadedWithModelProps(modelProps) {
+            try {
+                for (const props of modelProps) {
                     const ctor = await this._iModel.findClassFor(props.classFullName, _ModelState__WEBPACK_IMPORTED_MODULE_7__["ModelState"]);
                     if (undefined === this.getLoaded(props.id)) { // do not overwrite if someone else loads it while we await
                         const modelState = new ctor(props, this._iModel); // create a new instance of the appropriate ModelState subclass
@@ -96194,6 +96235,11 @@ class SnapshotConnection extends IModelConnection {
                 },
             };
             const viewProps = await _itwin_core_common__WEBPACK_IMPORTED_MODULE_1__["IModelReadRpcInterface"].getClientForRouting(this._iModel.routingContext.token).getViewStateData(this._iModel.getRpcProps(), viewDefinitionId, options);
+            const viewState = await this.convertViewStatePropsToViewState(viewProps);
+            return viewState;
+        }
+        /** Return the [[ViewState]] object associated with the [[ViewStateProps]] passed in. */
+        async convertViewStatePropsToViewState(viewProps) {
             const className = viewProps.viewDefinitionProps.classFullName;
             const ctor = await this._iModel.findClassFor(className, undefined);
             if (undefined === ctor)
@@ -100104,6 +100150,52 @@ class ViewAttachmentsInfo {
         // No reason to clone the array.
         return new ViewAttachmentsInfo(this._attachments);
     }
+    preload(options) {
+        if (this.isLoaded)
+            return;
+        options.sheetViewAttachmentIds = _itwin_core_bentley__WEBPACK_IMPORTED_MODULE_0__["CompressedId64Set"].sortAndCompress(this._ids);
+        options.viewStateLoadProps = {
+            displayStyle: {
+                omitScheduleScriptElementIds: true,
+                compressExcludedElementIds: true,
+            },
+        };
+    }
+    async postload(options, iModel) {
+        if (options.sheetViewViews === undefined)
+            return;
+        if (options.sheetViewAttachmentProps === undefined)
+            return;
+        const viewStateProps = options.sheetViewViews; // This is viewstateProps, need to turn this into ViewState
+        const promises = [];
+        for (const viewProps of viewStateProps) {
+            const loadView = async () => {
+                try {
+                    if (viewProps === undefined)
+                        return undefined;
+                    const view = await iModel.views.convertViewStatePropsToViewState(viewProps);
+                    return view;
+                }
+                catch {
+                    return undefined;
+                }
+            };
+            promises.push(loadView());
+        }
+        const views = await Promise.all(promises);
+        const attachmentProps = options.sheetViewAttachmentProps;
+        Object(_itwin_core_bentley__WEBPACK_IMPORTED_MODULE_0__["assert"])(views.length === attachmentProps.length);
+        const attachments = [];
+        for (let i = 0; i < views.length; i++) {
+            const view = views[i];
+            if (view && !(view instanceof SheetViewState)) {
+                const props = attachmentProps[i];
+                props.attachedView = view;
+                attachments.push(props);
+            }
+        }
+        this._attachments = attachments;
+    }
     async load(iModel) {
         if (this.isLoaded)
             return;
@@ -100280,12 +100372,17 @@ class SheetViewState extends _ViewState__WEBPACK_IMPORTED_MODULE_14__["ViewState
     getViewedExtents() {
         return this._viewedExtents;
     }
-    /** Load the size and attachment for this sheet, as well as any other 2d view state characteristics.
-     * @internal override
-     */
-    async load() {
-        await super.load();
-        await this._attachmentsInfo.load(this.iModel);
+    /** @internal */
+    preload(hydrateRequest) {
+        super.preload(hydrateRequest);
+        this._attachmentsInfo.preload(hydrateRequest);
+    }
+    /** @internal */
+    async postload(hydrateResponse) {
+        const promises = [];
+        promises.push(super.postload(hydrateResponse));
+        promises.push(this._attachmentsInfo.postload(hydrateResponse, this.iModel));
+        await Promise.all(promises);
     }
     /** @internal */
     createScene(context) {
@@ -100910,9 +101007,21 @@ class SpatialViewState extends _ViewState__WEBPACK_IMPORTED_MODULE_6__["ViewStat
         val.modelSelectorId = this.modelSelector.id;
         return val;
     }
-    async load() {
-        await super.load();
-        return this.modelSelector.load();
+    /** @internal */
+    preload(hydrateRequest) {
+        super.preload(hydrateRequest);
+        const notLoaded = this.iModel.models.filterLoaded(this.modelSelector.models);
+        if (undefined === notLoaded)
+            return; // all requested models are already loaded
+        hydrateRequest.notLoadedModelSelectorStateModels = _itwin_core_bentley__WEBPACK_IMPORTED_MODULE_0__["CompressedId64Set"].sortAndCompress(notLoaded);
+    }
+    /** @internal */
+    async postload(hydrateResponse) {
+        const promises = [];
+        promises.push(super.postload(hydrateResponse));
+        if (hydrateResponse.modelSelectorStateModels !== undefined)
+            promises.push(this.iModel.models.updateLoadedWithModelProps(hydrateResponse.modelSelectorStateModels));
+        await Promise.all(promises);
     }
     viewsModel(modelId) { return this.modelSelector.containsModel(modelId); }
     clearViewedModels() { this.modelSelector.models.clear(); }
@@ -101263,14 +101372,7 @@ class SubCategoriesCache {
      * containing the corresponding promise and the set of categories still to be loaded.
      */
     load(categoryIds) {
-        let missing;
-        for (const catId of _itwin_core_bentley__WEBPACK_IMPORTED_MODULE_0__["Id64"].iterable(categoryIds)) {
-            if (undefined === this._byCategoryId.get(catId)) {
-                if (undefined === missing)
-                    missing = new Set();
-                missing.add(catId);
-            }
-        }
+        const missing = this.getMissing(categoryIds);
         if (undefined === missing)
             return undefined;
         const request = new SubCategoriesCache.Request(missing, this._imodel);
@@ -101285,6 +101387,41 @@ class SubCategoriesCache {
             cancel: () => request.cancel(),
         };
     }
+    /**
+     * Populates the notLoadedCategoryIds property of the HydrateViewStateRequestProps.
+     * notLoadedCategoryIds is a subset of categoryIds, filtering out any ids which already have an entry in the cache.
+     */
+    preload(options, categoryIds) {
+        const missing = this.getMissing(categoryIds);
+        if (undefined === missing)
+            return;
+        this._missingAtTimeOfPreload = missing;
+        options.notLoadedCategoryIds = _itwin_core_bentley__WEBPACK_IMPORTED_MODULE_0__["CompressedId64Set"].sortAndCompress(missing);
+    }
+    /**
+     * Populates the SubCategoriesCache using the categoryIdsResult of the HydrateViewStateResponseProps
+     */
+    postload(options) {
+        if (options.categoryIdsResult === undefined)
+            return;
+        // missingAtTimeOfPreload shouldn't be undefined if options.categoryIdsResult is defined... but just to be safe we'll check
+        const missing = this._missingAtTimeOfPreload === undefined ? new Set() : this._missingAtTimeOfPreload;
+        this.processResults(options.categoryIdsResult, missing);
+        // clear missing
+        this._missingAtTimeOfPreload = undefined;
+    }
+    /** Given categoryIds, return which of these are not cached. */
+    getMissing(categoryIds) {
+        let missing;
+        for (const catId of _itwin_core_bentley__WEBPACK_IMPORTED_MODULE_0__["Id64"].iterable(categoryIds)) {
+            if (undefined === this._byCategoryId.get(catId)) {
+                if (undefined === missing)
+                    missing = new Set();
+                missing.add(catId);
+            }
+        }
+        return missing;
+    }
     clear() {
         this._byCategoryId.clear();
         this._appearances.clear();
@@ -102767,13 +102904,22 @@ ViewCreator2d._sheetModelClasses = [_ModelState__WEBPACK_IMPORTED_MODULE_4__["Sh
 "use strict";
 __webpack_require__.r(__webpack_exports__);
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "ViewCreator3d", function() { return ViewCreator3d; });
-/* harmony import */ var _itwin_core_common__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! @itwin/core-common */ "../../core/common/lib/esm/core-common.js");
-/* harmony import */ var _itwin_core_geometry__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! @itwin/core-geometry */ "../../core/geometry/lib/esm/core-geometry.js");
-/* harmony import */ var _SpatialViewState__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! ./SpatialViewState */ "../../core/frontend/lib/esm/SpatialViewState.js");
+/* harmony import */ var _itwin_core_bentley__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! @itwin/core-bentley */ "../../core/bentley/lib/esm/core-bentley.js");
+/* harmony import */ var _itwin_core_common__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! @itwin/core-common */ "../../core/common/lib/esm/core-common.js");
+/* harmony import */ var _itwin_core_geometry__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! @itwin/core-geometry */ "../../core/geometry/lib/esm/core-geometry.js");
+/* harmony import */ var _SpatialViewState__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(/*! ./SpatialViewState */ "../../core/frontend/lib/esm/SpatialViewState.js");
 /*---------------------------------------------------------------------------------------------
 * Copyright (c) Bentley Systems, Incorporated. All rights reserved.
 * See LICENSE.md in the project root for license terms and full copyright notice.
 *--------------------------------------------------------------------------------------------*/
+/** @packageDocumentation
+ * @module Views
+ */
+/*
+API for creating a 3D default view for an iModel.
+Either takes in a list of modelIds, or displays all 3D models by default.
+*/
+
 
 
 
@@ -102799,7 +102945,7 @@ class ViewCreator3d {
          */
         this._executeQuery = async (query) => {
             const rows = [];
-            for await (const row of this._imodel.query(query, undefined, { rowFormat: _itwin_core_common__WEBPACK_IMPORTED_MODULE_0__["QueryRowFormat"].UseJsPropertyNames }))
+            for await (const row of this._imodel.query(query, undefined, { rowFormat: _itwin_core_common__WEBPACK_IMPORTED_MODULE_1__["QueryRowFormat"].UseJsPropertyNames }))
                 rows.push(row.id);
             return rows;
         };
@@ -102811,9 +102957,9 @@ class ViewCreator3d {
      * @throws [IModelError]($common) If no 3d models are found in the iModel.
      */
     async createDefaultView(options, modelIds) {
-        const models = modelIds !== null && modelIds !== void 0 ? modelIds : await this._getAllModels();
-        const props = await this._createViewStateProps(models, options);
-        const viewState = _SpatialViewState__WEBPACK_IMPORTED_MODULE_2__["SpatialViewState"].createFromProps(props, this._imodel);
+        const serializedProps = await _itwin_core_common__WEBPACK_IMPORTED_MODULE_1__["IModelReadRpcInterface"].getClientForRouting(this._imodel.routingContext.token).getCustomViewState3dData(this._imodel.getRpcProps(), modelIds === undefined ? {} : { modelIds: _itwin_core_bentley__WEBPACK_IMPORTED_MODULE_0__["CompressedId64Set"].sortAndCompress(modelIds) });
+        const props = await this._createViewStateProps(_itwin_core_bentley__WEBPACK_IMPORTED_MODULE_0__["CompressedId64Set"].decompressArray(serializedProps.modelIds), _itwin_core_bentley__WEBPACK_IMPORTED_MODULE_0__["CompressedId64Set"].decompressArray(serializedProps.categoryIds), _itwin_core_geometry__WEBPACK_IMPORTED_MODULE_2__["Range3d"].fromJSON(serializedProps.modelExtents), options);
+        const viewState = _SpatialViewState__WEBPACK_IMPORTED_MODULE_3__["SpatialViewState"].createFromProps(props, this._imodel);
         try {
             await viewState.load();
         }
@@ -102830,17 +102976,9 @@ class ViewCreator3d {
      * @param models Models to put in view props
      * @param options view creation options like camera On and skybox On
      */
-    async _createViewStateProps(models, options) {
+    async _createViewStateProps(models, categories, modelExtents, options) {
         // Use dictionary model in all props
-        const dictionaryId = _itwin_core_common__WEBPACK_IMPORTED_MODULE_0__["IModel"].dictionaryId;
-        const categories = await this._getAllCategories();
-        // model extents
-        const modelExtents = new _itwin_core_geometry__WEBPACK_IMPORTED_MODULE_1__["Range3d"]();
-        if (models.length > 0) {
-            const modelProps = await this._imodel.models.queryModelRanges(models);
-            for (const props of modelProps)
-                modelExtents.union(_itwin_core_geometry__WEBPACK_IMPORTED_MODULE_1__["Range3d"].fromJSON(props), modelExtents);
-        }
+        const dictionaryId = _itwin_core_common__WEBPACK_IMPORTED_MODULE_1__["IModel"].dictionaryId;
         if (modelExtents.isNull)
             modelExtents.setFrom(this._imodel.projectExtents);
         let originX = modelExtents.low.x;
@@ -102865,22 +103003,22 @@ class ViewCreator3d {
         }
         const categorySelectorProps = {
             categories,
-            code: _itwin_core_common__WEBPACK_IMPORTED_MODULE_0__["Code"].createEmpty(),
+            code: _itwin_core_common__WEBPACK_IMPORTED_MODULE_1__["Code"].createEmpty(),
             model: dictionaryId,
             classFullName: "BisCore:CategorySelector",
         };
         const modelSelectorProps = {
             models,
-            code: _itwin_core_common__WEBPACK_IMPORTED_MODULE_0__["Code"].createEmpty(),
+            code: _itwin_core_common__WEBPACK_IMPORTED_MODULE_1__["Code"].createEmpty(),
             model: dictionaryId,
             classFullName: "BisCore:ModelSelector",
         };
-        const cameraData = new _itwin_core_common__WEBPACK_IMPORTED_MODULE_0__["Camera"]();
+        const cameraData = new _itwin_core_common__WEBPACK_IMPORTED_MODULE_1__["Camera"]();
         const cameraOn = (options === null || options === void 0 ? void 0 : options.cameraOn) !== false;
         const viewDefinitionProps = {
             categorySelectorId: "",
             displayStyleId: "",
-            code: _itwin_core_common__WEBPACK_IMPORTED_MODULE_0__["Code"].createEmpty(),
+            code: _itwin_core_common__WEBPACK_IMPORTED_MODULE_1__["Code"].createEmpty(),
             model: dictionaryId,
             origin: { x: originX, y: originY, z: originZ },
             extents: { x: deltaX, y: deltaY, z: deltaZ },
@@ -102893,13 +103031,13 @@ class ViewCreator3d {
             },
         };
         const displayStyleProps = {
-            code: _itwin_core_common__WEBPACK_IMPORTED_MODULE_0__["Code"].createEmpty(),
+            code: _itwin_core_common__WEBPACK_IMPORTED_MODULE_1__["Code"].createEmpty(),
             model: dictionaryId,
             classFullName: "BisCore:DisplayStyle3d",
             jsonProperties: {
                 styles: {
                     viewflags: {
-                        renderMode: _itwin_core_common__WEBPACK_IMPORTED_MODULE_0__["RenderMode"].SmoothShade,
+                        renderMode: _itwin_core_common__WEBPACK_IMPORTED_MODULE_1__["RenderMode"].SmoothShade,
                         noSourceLights: false,
                         noCameraLights: false,
                         noSolarLight: false,
@@ -102911,7 +103049,7 @@ class ViewCreator3d {
                     environment: options !== undefined &&
                         options.skyboxOn !== undefined &&
                         options.skyboxOn
-                        ? _itwin_core_common__WEBPACK_IMPORTED_MODULE_0__["Environment"].defaults.withDisplay({ sky: true }).toJSON()
+                        ? _itwin_core_common__WEBPACK_IMPORTED_MODULE_1__["Environment"].defaults.withDisplay({ sky: true }).toJSON()
                         : undefined,
                 },
             },
@@ -102956,10 +103094,10 @@ class ViewCreator3d {
     async _getDefaultViewId() {
         const viewId = await this._imodel.views.queryDefaultViewId();
         const params = {};
-        params.from = _SpatialViewState__WEBPACK_IMPORTED_MODULE_2__["SpatialViewState"].classFullName;
+        params.from = _SpatialViewState__WEBPACK_IMPORTED_MODULE_3__["SpatialViewState"].classFullName;
         params.where = `ECInstanceId=${viewId}`;
         // Check validity of default view
-        const viewProps = await _itwin_core_common__WEBPACK_IMPORTED_MODULE_0__["IModelReadRpcInterface"].getClient().queryElementProps(this._imodel.getRpcProps(), params);
+        const viewProps = await _itwin_core_common__WEBPACK_IMPORTED_MODULE_1__["IModelReadRpcInterface"].getClient().queryElementProps(this._imodel.getRpcProps(), params);
         if (viewProps.length === 0) {
             // Return the first view we can find
             const viewList = await this._imodel.views.getViewList({ wantPrivate: false });
@@ -102972,33 +103110,6 @@ class ViewCreator3d {
         }
         return viewId;
     }
-    /**
-     * Get all categories containing elements
-     */
-    async _getAllCategories() {
-        // Only use categories with elements in them
-        const query = `SELECT DISTINCT Category.Id AS id FROM BisCore.GeometricElement3d WHERE Category.Id IN (SELECT ECInstanceId FROM BisCore.SpatialCategory)`;
-        const categories = await this._executeQuery(query);
-        return categories;
-    }
-    /**
-     * Get all PhysicalModel ids in the connection
-     */
-    async _getAllModels() {
-        // Note: IsNotSpatiallyLocated was introduced in a later version of the BisCore ECSchema.
-        // If the iModel has an earlier version, the statement will throw because the property does not exist.
-        // If the iModel was created from an earlier version and later upgraded to a newer version, the property may be NULL for models created prior to the upgrade.
-        const select = "SELECT ECInstanceId FROM Bis.GeometricModel3D WHERE IsPrivate = false AND IsTemplate = false";
-        const spatialCriterion = "AND (IsNotSpatiallyLocated IS NULL OR IsNotSpatiallyLocated = false)";
-        let models = [];
-        try {
-            models = await this._executeQuery(`${select} ${spatialCriterion}`);
-        }
-        catch {
-            models = await this._executeQuery(select);
-        }
-        return models;
-    }
 }
 
 
@@ -104100,19 +104211,37 @@ class ViewState extends _EntityState__WEBPACK_IMPORTED_MODULE_5__["ElementState"
             catch { }
         }
     }
+    /**
+     * Populates the hydrateRequest object stored on the ViewState with:
+     *  not loaded categoryIds based off of the ViewStates categorySelector.
+     *  Auxiliary coordinate system id if valid.
+     */
+    preload(hydrateRequest) {
+        const acsId = this.getAuxiliaryCoordinateSystemId();
+        if (_itwin_core_bentley__WEBPACK_IMPORTED_MODULE_0__["Id64"].isValid(acsId))
+            hydrateRequest.acsId = acsId;
+        this.iModel.subcategories.preload(hydrateRequest, this.categorySelector.categories);
+    }
     /** Asynchronously load any required data for this ViewState from the backend.
+     * FINAL, No subclass should override load. If additional load behavior is needed, see preload and postload.
      * @note callers should await the Promise returned by this method before using this ViewState.
      * @see [Views]($docs/learning/frontend/Views.md)
      */
     async load() {
+        const hydrateRequest = {};
+        this.preload(hydrateRequest);
         const promises = [
-            this.loadAcs(),
+            _itwin_core_common__WEBPACK_IMPORTED_MODULE_2__["IModelReadRpcInterface"].getClientForRouting(this.iModel.routingContext.token).hydrateViewState(this.iModel.getRpcProps(), hydrateRequest),
             this.displayStyle.load(),
         ];
-        const subcategories = this.iModel.subcategories.load(this.categorySelector.categories);
-        if (undefined !== subcategories)
-            promises.push(subcategories.promise.then((_) => { }));
-        await Promise.all(promises);
+        const result = await Promise.all(promises);
+        const hydrateResponse = result[0];
+        await this.postload(hydrateResponse);
+    }
+    async postload(hydrateResponse) {
+        this.iModel.subcategories.postload(hydrateResponse);
+        if (hydrateResponse.acsElementProps)
+            this._auxCoordSystem = _AuxCoordSys__WEBPACK_IMPORTED_MODULE_3__["AuxCoordSystemState"].fromProps(hydrateResponse.acsElementProps, this.iModel);
     }
     /** Returns true if all [[TileTree]]s required by this view have been loaded.
      * Note that the map tile trees associated to the viewport rather than the view, to check the
@@ -105642,9 +105771,17 @@ class ViewState2d extends ViewState {
     computeFitRange() {
         return this.getViewedExtents();
     }
-    async load() {
-        await super.load();
-        return this.iModel.models.load(this.baseModelId);
+    /** @internal */
+    preload(hydrateRequest) {
+        super.preload(hydrateRequest);
+        if (this.iModel.models.getLoaded(this.baseModelId) === undefined)
+            hydrateRequest.baseModelId = this.baseModelId;
+    }
+    /** @internal */
+    async postload(hydrateResponse) {
+        if (hydrateResponse.baseModelProps === undefined)
+            return;
+        await this.iModel.models.updateLoadedWithModelProps([hydrateResponse.baseModelProps]);
     }
     /** Provides access to optional detail settings for this view. */
     get details() {
@@ -176682,7 +176819,6 @@ class DefaultViewTouchTool extends ViewManip {
         this._startDistance = 0.0;
         this._startTouchCount = 0;
         this._singleTouch = false;
-        this._hasZoom = false;
         this._rotate2dDisabled = false;
         this._only2dManipulations = false;
         this._only2dManipulations = only2dManipulations;
@@ -176729,7 +176865,6 @@ class DefaultViewTouchTool extends ViewManip {
         this._startDistance = (2 === ev.touchCount ? this._startDirection.magnitude() : 0.0);
     }
     computeZoomRatio(ev) {
-        this._hasZoom = false;
         if (undefined === ev || 0.0 === this._startDistance)
             return 1.0;
         const vp = this.viewport;
@@ -176737,7 +176872,8 @@ class DefaultViewTouchTool extends ViewManip {
         const threshold = this.viewport.pixelsFromInches(_ToolSettings__WEBPACK_IMPORTED_MODULE_22__["ToolSettings"].touchZoomChangeThresholdInches);
         if (0.0 === distance || Math.abs(this._startDistance - distance) < threshold)
             return 1.0;
-        this._hasZoom = true;
+        // Remove inertia if the viewing operation includes zoom, only use it for pan and rotate.
+        this._inertiaVec = undefined;
         const adjustedDist = (distance > this._startDistance ? (distance - threshold) : (distance + threshold)); // Avoid sudden jump in zoom scale by subtracting zoom threshold distance...
         return _itwin_core_geometry__WEBPACK_IMPORTED_MODULE_1__["Geometry"].clamp(this._startDistance / adjustedDist, .1, 10);
     }
@@ -176849,8 +176985,7 @@ class DefaultViewTouchTool extends ViewManip {
             this._lastPtView.setFrom(this._startPtView);
         }
         else {
-            // Don't add inertia if the viewing operation included zoom, only do this for pan and rotate.
-            if (!samePoint && !this._hasZoom) {
+            if (!samePoint) {
                 this._inertiaVec = this._lastPtView.vectorTo(thisPt);
                 this._inertiaVec.z = 0;
             }
@@ -176870,6 +177005,10 @@ class DefaultViewTouchTool extends ViewManip {
     }
     async onDataButtonDown(_ev) { return _Tool__WEBPACK_IMPORTED_MODULE_20__["EventHandled"].Yes; }
     async onDataButtonUp(_ev) { return _Tool__WEBPACK_IMPORTED_MODULE_20__["EventHandled"].Yes; }
+    async onTouchStart(ev) {
+        if (undefined !== this.viewport)
+            this.onStart(ev);
+    }
     async onTouchMove(ev) {
         this.handleEvent(ev);
     }
@@ -177363,7 +177502,7 @@ SetupWalkCameraTool.iconSpec = "icon-camera-location";
 /*! exports provided: name, version, description, main, module, typings, license, scripts, repository, keywords, author, peerDependencies, //devDependencies, devDependencies, //dependencies, dependencies, nyc, eslintConfig, default */
 /***/ (function(module) {
 
-module.exports = JSON.parse("{\"name\":\"@itwin/core-frontend\",\"version\":\"3.2.0-dev.41\",\"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\",\"build:ci\":\"npm run -s build && npm run -s build:esm\",\"build:cjs\":\"tsc 1>&2 --outDir lib/cjs\",\"build:esm\":\"tsc 1>&2 --module ES2020 --outDir lib/esm\",\"clean\":\"rimraf lib .rush/temp/package-deps*.json\",\"copy:public\":\"cpx \\\"./src/public/**/*\\\" ./lib/public\",\"docs\":\"betools docs --includes=../../generated-docs/extract --json=../../generated-docs/core/core-frontend/file.json --tsIndexFile=./core-frontend.ts --onlyJson --excludes=webgl/**/*,**/primitives,**/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-eslintrc -c \\\"../../tools/eslint-plugin/dist/configs/extension-exports-config.js\\\" \\\"./src/**/*.ts\\\" 1>&2\",\"lint\":\"eslint -f visualstudio \\\"./src/**/*.ts\\\" 1>&2\",\"pseudolocalize\":\"betools pseudolocalize --englishDir ./src/public/locales/en --out ./public/locales/en-PSEUDO\",\"test\":\"npm run -s webpackTests && certa -r chrome\",\"cover\":\"npm -s test\",\"test:debug\":\"certa -r chrome --debug\",\"webpackTests\":\"webpack --config ./src/test/utils/webpack.config.js 1>&2\"},\"repository\":{\"type\":\"git\",\"url\":\"https://github.com/iTwin/itwinjs-core/tree/master/core/frontend\"},\"keywords\":[\"Bentley\",\"BIM\",\"iModel\",\"digital-twin\",\"iTwin\"],\"author\":{\"name\":\"Bentley Systems, Inc.\",\"url\":\"http://www.bentley.com\"},\"peerDependencies\":{\"@itwin/appui-abstract\":\"workspace:^3.2.0-dev.41\",\"@itwin/core-bentley\":\"workspace:^3.2.0-dev.41\",\"@itwin/core-common\":\"workspace:^3.2.0-dev.41\",\"@itwin/core-geometry\":\"workspace:^3.2.0-dev.41\",\"@itwin/core-orbitgt\":\"workspace:^3.2.0-dev.41\",\"@itwin/core-quantity\":\"workspace:^3.2.0-dev.41\",\"@itwin/webgl-compatibility\":\"workspace:^3.2.0-dev.41\"},\"//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/certa\":\"workspace:*\",\"@itwin/eslint-plugin\":\"workspace:*\",\"@itwin/webgl-compatibility\":\"workspace:*\",\"@types/chai\":\"^4.1.4\",\"@types/chai-as-promised\":\"^7\",\"@types/deep-assign\":\"^0.1.0\",\"@types/lodash\":\"^4.14.0\",\"@types/mocha\":\"^8.2.2\",\"@types/node\":\"14.14.31\",\"@types/qs\":\"^6.5.0\",\"@types/semver\":\"^5.5.0\",\"@types/superagent\":\"^4.1.14\",\"@types/sinon\":\"^9.0.0\",\"chai\":\"^4.1.2\",\"chai-as-promised\":\"^7\",\"cpx2\":\"^3.0.0\",\"eslint\":\"^7.11.0\",\"glob\":\"^7.1.2\",\"mocha\":\"^8.3.2\",\"nyc\":\"^15.1.0\",\"rimraf\":\"^3.0.2\",\"sinon\":\"^9.0.2\",\"source-map-loader\":\"^1.0.0\",\"typescript\":\"~4.4.0\",\"webpack\":\"4.42.0\"},\"//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/core-telemetry\":\"workspace:*\",\"@loaders.gl/core\":\"^3.1.6\",\"@loaders.gl/draco\":\"^3.1.6\",\"deep-assign\":\"^2.0.0\",\"fuse.js\":\"^3.3.0\",\"lodash\":\"^4.17.10\",\"qs\":\"^6.5.1\",\"semver\":\"^5.5.0\",\"superagent\":\"^7.0.1\",\"wms-capabilities\":\"0.4.0\",\"xml-js\":\"~1.6.11\"},\"nyc\":{\"extends\":\"./node_modules/@itwin/build-tools/.nycrc\"},\"eslintConfig\":{\"plugins\":[\"@itwin\"],\"extends\":\"plugin:@itwin/itwinjs-recommended\",\"rules\":{\"@itwin/no-internal-barrel-imports\":[\"error\",{\"required-barrel-modules\":[\"./src/tile/internal.ts\"]}],\"@itwin/public-extension-exports\":[\"error\",{\"releaseTags\":[\"public\",\"preview\"],\"outputApiFile\":false}]},\"overrides\":[{\"files\":[\"*.test.ts\",\"*.test.tsx\",\"**/test/**/*.ts\",\"**/test/**/*.tsx\"],\"rules\":{\"@itwin/no-internal-barrel-imports\":\"off\"}}]}}");
+module.exports = JSON.parse("{\"name\":\"@itwin/core-frontend\",\"version\":\"3.2.0-dev.42\",\"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\",\"build:ci\":\"npm run -s build && npm run -s build:esm\",\"build:cjs\":\"tsc 1>&2 --outDir lib/cjs\",\"build:esm\":\"tsc 1>&2 --module ES2020 --outDir lib/esm\",\"clean\":\"rimraf lib .rush/temp/package-deps*.json\",\"copy:public\":\"cpx \\\"./src/public/**/*\\\" ./lib/public\",\"docs\":\"betools docs --includes=../../generated-docs/extract --json=../../generated-docs/core/core-frontend/file.json --tsIndexFile=./core-frontend.ts --onlyJson --excludes=webgl/**/*,**/primitives,**/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-eslintrc -c \\\"../../tools/eslint-plugin/dist/configs/extension-exports-config.js\\\" \\\"./src/**/*.ts\\\" 1>&2\",\"lint\":\"eslint -f visualstudio \\\"./src/**/*.ts\\\" 1>&2\",\"pseudolocalize\":\"betools pseudolocalize --englishDir ./src/public/locales/en --out ./public/locales/en-PSEUDO\",\"test\":\"npm run -s webpackTests && certa -r chrome\",\"cover\":\"npm -s test\",\"test:debug\":\"certa -r chrome --debug\",\"webpackTests\":\"webpack --config ./src/test/utils/webpack.config.js 1>&2\"},\"repository\":{\"type\":\"git\",\"url\":\"https://github.com/iTwin/itwinjs-core/tree/master/core/frontend\"},\"keywords\":[\"Bentley\",\"BIM\",\"iModel\",\"digital-twin\",\"iTwin\"],\"author\":{\"name\":\"Bentley Systems, Inc.\",\"url\":\"http://www.bentley.com\"},\"peerDependencies\":{\"@itwin/appui-abstract\":\"workspace:^3.2.0-dev.42\",\"@itwin/core-bentley\":\"workspace:^3.2.0-dev.42\",\"@itwin/core-common\":\"workspace:^3.2.0-dev.42\",\"@itwin/core-geometry\":\"workspace:^3.2.0-dev.42\",\"@itwin/core-orbitgt\":\"workspace:^3.2.0-dev.42\",\"@itwin/core-quantity\":\"workspace:^3.2.0-dev.42\",\"@itwin/webgl-compatibility\":\"workspace:^3.2.0-dev.42\"},\"//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/certa\":\"workspace:*\",\"@itwin/eslint-plugin\":\"workspace:*\",\"@itwin/webgl-compatibility\":\"workspace:*\",\"@types/chai\":\"^4.1.4\",\"@types/chai-as-promised\":\"^7\",\"@types/deep-assign\":\"^0.1.0\",\"@types/lodash\":\"^4.14.0\",\"@types/mocha\":\"^8.2.2\",\"@types/node\":\"14.14.31\",\"@types/qs\":\"^6.5.0\",\"@types/semver\":\"^5.5.0\",\"@types/superagent\":\"^4.1.14\",\"@types/sinon\":\"^9.0.0\",\"chai\":\"^4.1.2\",\"chai-as-promised\":\"^7\",\"cpx2\":\"^3.0.0\",\"eslint\":\"^7.11.0\",\"glob\":\"^7.1.2\",\"mocha\":\"^8.3.2\",\"nyc\":\"^15.1.0\",\"rimraf\":\"^3.0.2\",\"sinon\":\"^9.0.2\",\"source-map-loader\":\"^1.0.0\",\"typescript\":\"~4.4.0\",\"webpack\":\"4.42.0\"},\"//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/core-telemetry\":\"workspace:*\",\"@loaders.gl/core\":\"^3.1.6\",\"@loaders.gl/draco\":\"^3.1.6\",\"deep-assign\":\"^2.0.0\",\"fuse.js\":\"^3.3.0\",\"lodash\":\"^4.17.10\",\"qs\":\"^6.5.1\",\"semver\":\"^5.5.0\",\"superagent\":\"^7.0.1\",\"wms-capabilities\":\"0.4.0\",\"xml-js\":\"~1.6.11\"},\"nyc\":{\"extends\":\"./node_modules/@itwin/build-tools/.nycrc\"},\"eslintConfig\":{\"plugins\":[\"@itwin\"],\"extends\":\"plugin:@itwin/itwinjs-recommended\",\"rules\":{\"@itwin/no-internal-barrel-imports\":[\"error\",{\"required-barrel-modules\":[\"./src/tile/internal.ts\"]}],\"@itwin/public-extension-exports\":[\"error\",{\"releaseTags\":[\"public\",\"preview\"],\"outputApiFile\":false}]},\"overrides\":[{\"files\":[\"*.test.ts\",\"*.test.tsx\",\"**/test/**/*.ts\",\"**/test/**/*.tsx\"],\"rules\":{\"@itwin/no-internal-barrel-imports\":\"off\"}}]}}");
 
 /***/ }),