@itwin/ecschema-rpcinterface-tests 5.1.0-dev.13 → 5.1.0-dev.15
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/lib/dist/bundled-tests.js +318 -173
- package/lib/dist/bundled-tests.js.map +1 -1
- package/package.json +16 -16
|
@@ -59183,13 +59183,13 @@ var CurrentImdlVersion;
|
|
|
59183
59183
|
* front-end is not capable of reading the tile content. Otherwise, this front-end can read the tile content even if the header specifies a
|
|
59184
59184
|
* greater minor version than CurrentVersion.Minor, although some data may be skipped.
|
|
59185
59185
|
*/
|
|
59186
|
-
CurrentImdlVersion[CurrentImdlVersion["Major"] =
|
|
59186
|
+
CurrentImdlVersion[CurrentImdlVersion["Major"] = 37] = "Major";
|
|
59187
59187
|
/** The unsigned 16-bit minor version number. If the major version in the tile header is equal to CurrentVersion.Major, then this package can
|
|
59188
59188
|
* read the tile content even if the minor version in the tile header is greater than this value, although some data may be skipped.
|
|
59189
59189
|
*/
|
|
59190
59190
|
CurrentImdlVersion[CurrentImdlVersion["Minor"] = 0] = "Minor";
|
|
59191
59191
|
/** The unsigned 32-bit version number derived from the 16-bit major and minor version numbers. */
|
|
59192
|
-
CurrentImdlVersion[CurrentImdlVersion["Combined"] =
|
|
59192
|
+
CurrentImdlVersion[CurrentImdlVersion["Combined"] = 2424832] = "Combined";
|
|
59193
59193
|
})(CurrentImdlVersion || (CurrentImdlVersion = {}));
|
|
59194
59194
|
/** Header embedded at the beginning of binary tile data in iMdl format describing its contents.
|
|
59195
59195
|
* @internal
|
|
@@ -59534,6 +59534,7 @@ var TileOptions;
|
|
|
59534
59534
|
disableMagnification: false,
|
|
59535
59535
|
alwaysSubdivideIncompleteTiles: false,
|
|
59536
59536
|
edgeOptions,
|
|
59537
|
+
disablePolyfaceDecimation: 0 !== (tree.flags & TreeFlags.DisablePolyfaceDecimation),
|
|
59537
59538
|
};
|
|
59538
59539
|
}
|
|
59539
59540
|
TileOptions.fromTreeIdAndContentId = fromTreeIdAndContentId;
|
|
@@ -59568,14 +59569,15 @@ class Parser {
|
|
|
59568
59569
|
}
|
|
59569
59570
|
if (Object.keys(parsedContentId).some((key) => parsedContentId.hasOwnProperty(key) && typeof parsedContentId[key] === "number" && !Number.isFinite(parsedContentId[key])))
|
|
59570
59571
|
throw new Error("Invalid content Id");
|
|
59572
|
+
const disablePolyfaceDecimation = options.disablePolyfaceDecimation;
|
|
59571
59573
|
let treeId;
|
|
59572
59574
|
if (classifier) {
|
|
59573
|
-
treeId = { ...classifier, animationId };
|
|
59575
|
+
treeId = { ...classifier, animationId, disablePolyfaceDecimation };
|
|
59574
59576
|
}
|
|
59575
59577
|
else {
|
|
59576
59578
|
(0,_itwin_core_bentley__WEBPACK_IMPORTED_MODULE_0__.assert)(undefined !== primary);
|
|
59577
59579
|
const enforceDisplayPriority = (treeFlags & TreeFlags.EnforceDisplayPriority) !== 0 ? true : undefined;
|
|
59578
|
-
treeId = { ...primary, animationId, type: _FeatureTable__WEBPACK_IMPORTED_MODULE_2__.BatchType.Primary, enforceDisplayPriority };
|
|
59580
|
+
treeId = { ...primary, animationId, type: _FeatureTable__WEBPACK_IMPORTED_MODULE_2__.BatchType.Primary, enforceDisplayPriority, disablePolyfaceDecimation };
|
|
59579
59581
|
}
|
|
59580
59582
|
return {
|
|
59581
59583
|
contentId: parsedContentId,
|
|
@@ -59678,6 +59680,7 @@ const defaultTileOptions = Object.freeze({
|
|
|
59678
59680
|
useLargerTiles: true,
|
|
59679
59681
|
disableMagnification: false,
|
|
59680
59682
|
alwaysSubdivideIncompleteTiles: false,
|
|
59683
|
+
disablePolyfaceDecimation: false,
|
|
59681
59684
|
edgeOptions: {
|
|
59682
59685
|
type: "compact",
|
|
59683
59686
|
smooth: true,
|
|
@@ -59773,7 +59776,8 @@ var TreeFlags;
|
|
|
59773
59776
|
TreeFlags[TreeFlags["EnforceDisplayPriority"] = 2] = "EnforceDisplayPriority";
|
|
59774
59777
|
TreeFlags[TreeFlags["OptimizeBRepProcessing"] = 4] = "OptimizeBRepProcessing";
|
|
59775
59778
|
TreeFlags[TreeFlags["UseLargerTiles"] = 8] = "UseLargerTiles";
|
|
59776
|
-
TreeFlags[TreeFlags["ExpandProjectExtents"] = 16] = "ExpandProjectExtents";
|
|
59779
|
+
TreeFlags[TreeFlags["ExpandProjectExtents"] = 16] = "ExpandProjectExtents";
|
|
59780
|
+
TreeFlags[TreeFlags["DisablePolyfaceDecimation"] = 32] = "DisablePolyfaceDecimation";
|
|
59777
59781
|
})(TreeFlags || (TreeFlags = {}));
|
|
59778
59782
|
function animationIdToString(animationId) {
|
|
59779
59783
|
return `A:${animationId}_`;
|
|
@@ -59786,6 +59790,8 @@ function iModelTileTreeIdToString(modelId, treeId, options) {
|
|
|
59786
59790
|
let flags = options.useProjectExtents ? TreeFlags.UseProjectExtents : TreeFlags.None;
|
|
59787
59791
|
if (options.optimizeBRepProcessing)
|
|
59788
59792
|
flags |= TreeFlags.OptimizeBRepProcessing;
|
|
59793
|
+
if (options.disablePolyfaceDecimation)
|
|
59794
|
+
flags |= TreeFlags.DisablePolyfaceDecimation;
|
|
59789
59795
|
if (options.useLargerTiles)
|
|
59790
59796
|
flags |= TreeFlags.UseLargerTiles;
|
|
59791
59797
|
if (options.expandProjectExtents)
|
|
@@ -83593,7 +83599,7 @@ __webpack_require__.r(__webpack_exports__);
|
|
|
83593
83599
|
|
|
83594
83600
|
/** @public */
|
|
83595
83601
|
const ITWINJS_CORE_VERSION = _package_json__WEBPACK_IMPORTED_MODULE_0__.version;
|
|
83596
|
-
const COPYRIGHT_NOTICE =
|
|
83602
|
+
const COPYRIGHT_NOTICE = `Copyright © 2017-${new Date().getFullYear()} <a href="https://www.bentley.com" target="_blank" rel="noopener noreferrer">Bentley Systems, Inc.</a>`;
|
|
83597
83603
|
|
|
83598
83604
|
|
|
83599
83605
|
|
|
@@ -83669,6 +83675,7 @@ class IModelApp {
|
|
|
83669
83675
|
static _hubAccess;
|
|
83670
83676
|
static _realityDataAccess;
|
|
83671
83677
|
static _publicPath;
|
|
83678
|
+
static _formatsProviderManager;
|
|
83672
83679
|
// No instances of IModelApp may be created. All members are static and must be on the singleton object IModelApp.
|
|
83673
83680
|
constructor() { }
|
|
83674
83681
|
/** Event raised just before the frontend IModelApp is to be [[shutdown]]. */
|
|
@@ -83743,6 +83750,14 @@ class IModelApp {
|
|
|
83743
83750
|
* The path should always end with a trailing `/`.
|
|
83744
83751
|
*/
|
|
83745
83752
|
static get publicPath() { return this._publicPath; }
|
|
83753
|
+
/** The [[FormatsProvider]] for this session.
|
|
83754
|
+
* @param provider The provider to use for formatting quantities.
|
|
83755
|
+
* @beta
|
|
83756
|
+
*/
|
|
83757
|
+
static get formatsProvider() { return this._formatsProviderManager; }
|
|
83758
|
+
static set formatsProvider(provider) {
|
|
83759
|
+
this._formatsProviderManager.formatsProvider = provider;
|
|
83760
|
+
}
|
|
83746
83761
|
/** @alpha */
|
|
83747
83762
|
static extensionAdmin = this._createExtensionAdmin();
|
|
83748
83763
|
/** Map of classFullName to EntityState class */
|
|
@@ -83843,6 +83858,7 @@ class IModelApp {
|
|
|
83843
83858
|
this._terrainProviderRegistry = new _tile_internal__WEBPACK_IMPORTED_MODULE_26__.TerrainProviderRegistry();
|
|
83844
83859
|
this._realityDataSourceProviders = new _RealityDataSource__WEBPACK_IMPORTED_MODULE_25__.RealityDataSourceProviderRegistry();
|
|
83845
83860
|
this._realityDataAccess = opts.realityDataAccess;
|
|
83861
|
+
this._formatsProviderManager = new _quantity_formatting_QuantityFormatter__WEBPACK_IMPORTED_MODULE_19__.FormatsProviderManager(opts.formatsProvider ?? new _quantity_formatting_QuantityFormatter__WEBPACK_IMPORTED_MODULE_19__.QuantityTypeFormatsProvider());
|
|
83846
83862
|
this._publicPath = opts.publicPath ?? "";
|
|
83847
83863
|
[
|
|
83848
83864
|
this.renderSystem,
|
|
@@ -83874,6 +83890,7 @@ class IModelApp {
|
|
|
83874
83890
|
this._entityClasses.clear();
|
|
83875
83891
|
this.authorizationClient = undefined;
|
|
83876
83892
|
this._initialized = false;
|
|
83893
|
+
this.resetFormatsProvider();
|
|
83877
83894
|
this.onAfterStartup.clear();
|
|
83878
83895
|
}
|
|
83879
83896
|
/** Controls how frequently the application polls for changes that may require a new animation frame to be requested.
|
|
@@ -84124,6 +84141,13 @@ class IModelApp {
|
|
|
84124
84141
|
}
|
|
84125
84142
|
return this.localization.getLocalizedString(`iModelJs:${key.scope}.${key.val}`, key);
|
|
84126
84143
|
}
|
|
84144
|
+
/**
|
|
84145
|
+
* Resets the formatsProvider back to the default [[QuantityTypeFormatsProvider]].
|
|
84146
|
+
* @beta
|
|
84147
|
+
*/
|
|
84148
|
+
static resetFormatsProvider() {
|
|
84149
|
+
this.formatsProvider = new _quantity_formatting_QuantityFormatter__WEBPACK_IMPORTED_MODULE_19__.QuantityTypeFormatsProvider();
|
|
84150
|
+
}
|
|
84127
84151
|
/**
|
|
84128
84152
|
* Creates an instance of the ExtensionAdmin
|
|
84129
84153
|
* and registers an event to execute after startup is complete
|
|
@@ -85477,6 +85501,7 @@ __webpack_require__.r(__webpack_exports__);
|
|
|
85477
85501
|
*/
|
|
85478
85502
|
class IpcApp {
|
|
85479
85503
|
static _ipc;
|
|
85504
|
+
static _removeAppNotify;
|
|
85480
85505
|
/** Get the implementation of the [[IpcSocketFrontend]] interface. */
|
|
85481
85506
|
static get ipc() { return this._ipc; }
|
|
85482
85507
|
/** Determine whether Ipc is available for this frontend. This will only be true if [[startup]] has been called on this class. */
|
|
@@ -85583,11 +85608,12 @@ class IpcApp {
|
|
|
85583
85608
|
* @note this should not be called directly. It is called by NativeApp.startup */
|
|
85584
85609
|
static async startup(ipc, opts) {
|
|
85585
85610
|
this._ipc = ipc;
|
|
85586
|
-
IpcAppNotifyHandler.register(); // receives notifications from backend
|
|
85611
|
+
this._removeAppNotify = IpcAppNotifyHandler.register(); // receives notifications from backend
|
|
85587
85612
|
await _IModelApp__WEBPACK_IMPORTED_MODULE_3__.IModelApp.startup(opts?.iModelApp);
|
|
85588
85613
|
}
|
|
85589
85614
|
/** @internal */
|
|
85590
85615
|
static async shutdown() {
|
|
85616
|
+
this._removeAppNotify?.();
|
|
85591
85617
|
this._ipc = undefined;
|
|
85592
85618
|
await _IModelApp__WEBPACK_IMPORTED_MODULE_3__.IModelApp.shutdown();
|
|
85593
85619
|
}
|
|
@@ -107037,6 +107063,7 @@ __webpack_require__.r(__webpack_exports__);
|
|
|
107037
107063
|
/* harmony export */ FlashMode: () => (/* reexport safe */ _FlashSettings__WEBPACK_IMPORTED_MODULE_22__.FlashMode),
|
|
107038
107064
|
/* harmony export */ FlashSettings: () => (/* reexport safe */ _FlashSettings__WEBPACK_IMPORTED_MODULE_22__.FlashSettings),
|
|
107039
107065
|
/* harmony export */ FlyViewTool: () => (/* reexport safe */ _tools_ViewTool__WEBPACK_IMPORTED_MODULE_114__.FlyViewTool),
|
|
107066
|
+
/* harmony export */ FormatsProviderManager: () => (/* reexport safe */ _quantity_formatting_QuantityFormatter__WEBPACK_IMPORTED_MODULE_72__.FormatsProviderManager),
|
|
107040
107067
|
/* harmony export */ FormattedQuantityDescription: () => (/* reexport safe */ _properties_FormattedQuantityDescription__WEBPACK_IMPORTED_MODULE_70__.FormattedQuantityDescription),
|
|
107041
107068
|
/* harmony export */ FrontendLoggerCategory: () => (/* reexport safe */ _common__WEBPACK_IMPORTED_MODULE_10__.FrontendLoggerCategory),
|
|
107042
107069
|
/* harmony export */ Frustum2d: () => (/* reexport safe */ _Frustum2d__WEBPACK_IMPORTED_MODULE_24__.Frustum2d),
|
|
@@ -107165,6 +107192,7 @@ __webpack_require__.r(__webpack_exports__);
|
|
|
107165
107192
|
/* harmony export */ QuadId: () => (/* reexport safe */ _tile_internal__WEBPACK_IMPORTED_MODULE_99__.QuadId),
|
|
107166
107193
|
/* harmony export */ QuantityFormatter: () => (/* reexport safe */ _quantity_formatting_QuantityFormatter__WEBPACK_IMPORTED_MODULE_72__.QuantityFormatter),
|
|
107167
107194
|
/* harmony export */ QuantityType: () => (/* reexport safe */ _quantity_formatting_QuantityFormatter__WEBPACK_IMPORTED_MODULE_72__.QuantityType),
|
|
107195
|
+
/* harmony export */ QuantityTypeFormatsProvider: () => (/* reexport safe */ _quantity_formatting_QuantityFormatter__WEBPACK_IMPORTED_MODULE_72__.QuantityTypeFormatsProvider),
|
|
107168
107196
|
/* harmony export */ RealityDataError: () => (/* reexport safe */ _RealityDataSource__WEBPACK_IMPORTED_MODULE_121__.RealityDataError),
|
|
107169
107197
|
/* harmony export */ RealityDataSource: () => (/* reexport safe */ _RealityDataSource__WEBPACK_IMPORTED_MODULE_121__.RealityDataSource),
|
|
107170
107198
|
/* harmony export */ RealityDataSourceProviderRegistry: () => (/* reexport safe */ _RealityDataSource__WEBPACK_IMPORTED_MODULE_121__.RealityDataSourceProviderRegistry),
|
|
@@ -108236,7 +108264,7 @@ __webpack_require__.r(__webpack_exports__);
|
|
|
108236
108264
|
* @internal
|
|
108237
108265
|
*/
|
|
108238
108266
|
async function loadScript(jsUrl) {
|
|
108239
|
-
const module = await
|
|
108267
|
+
const module = await import(/* webpackIgnore: true */ /* @vite-ignore */ jsUrl);
|
|
108240
108268
|
return execute(module);
|
|
108241
108269
|
}
|
|
108242
108270
|
/** attempts to execute an extension module */
|
|
@@ -140577,8 +140605,9 @@ function createClassifierTileTreeReference(classifiers, classifiedTree, iModel,
|
|
|
140577
140605
|
return new ClassifierTreeReference(classifiers, classifiedTree, iModel, source);
|
|
140578
140606
|
}
|
|
140579
140607
|
function createClassifierId(classifier, source) {
|
|
140608
|
+
const disablePolyfaceDecimation = _IModelApp__WEBPACK_IMPORTED_MODULE_2__.IModelApp.tileAdmin.disablePolyfaceDecimation;
|
|
140580
140609
|
if (undefined === classifier)
|
|
140581
|
-
return { modelId: _itwin_core_bentley__WEBPACK_IMPORTED_MODULE_0__.Id64.invalid, type: _itwin_core_common__WEBPACK_IMPORTED_MODULE_1__.BatchType.PlanarClassifier, expansion: 0, animationId: undefined };
|
|
140610
|
+
return { modelId: _itwin_core_bentley__WEBPACK_IMPORTED_MODULE_0__.Id64.invalid, type: _itwin_core_common__WEBPACK_IMPORTED_MODULE_1__.BatchType.PlanarClassifier, expansion: 0, animationId: undefined, disablePolyfaceDecimation };
|
|
140582
140611
|
const type = classifier.flags.isVolumeClassifier ? _itwin_core_common__WEBPACK_IMPORTED_MODULE_1__.BatchType.VolumeClassifier : _itwin_core_common__WEBPACK_IMPORTED_MODULE_1__.BatchType.PlanarClassifier;
|
|
140583
140612
|
const scriptInfo = _IModelApp__WEBPACK_IMPORTED_MODULE_2__.IModelApp.tileAdmin.getScriptInfoForTreeId(classifier.modelId, source ? source[_common_internal_Symbols__WEBPACK_IMPORTED_MODULE_5__._scheduleScriptReference] : undefined);
|
|
140584
140613
|
return {
|
|
@@ -140587,6 +140616,7 @@ function createClassifierId(classifier, source) {
|
|
|
140587
140616
|
expansion: classifier.expand,
|
|
140588
140617
|
animationId: scriptInfo?.animationId,
|
|
140589
140618
|
timeline: scriptInfo?.timeline,
|
|
140619
|
+
disablePolyfaceDecimation,
|
|
140590
140620
|
};
|
|
140591
140621
|
}
|
|
140592
140622
|
|
|
@@ -144595,7 +144625,8 @@ class PrimaryTreeReference extends _tile_internal__WEBPACK_IMPORTED_MODULE_6__.T
|
|
|
144595
144625
|
const edgesRequired = visibleEdges || _itwin_core_common__WEBPACK_IMPORTED_MODULE_1__.RenderMode.SmoothShade !== renderMode || _IModelApp__WEBPACK_IMPORTED_MODULE_3__.IModelApp.tileAdmin.alwaysRequestEdges;
|
|
144596
144626
|
const edges = edgesRequired ? _IModelApp__WEBPACK_IMPORTED_MODULE_3__.IModelApp.tileAdmin.edgeOptions : false;
|
|
144597
144627
|
const sectionCut = this._sectionClip?.clipString;
|
|
144598
|
-
|
|
144628
|
+
const disablePolyfaceDecimation = _IModelApp__WEBPACK_IMPORTED_MODULE_3__.IModelApp.tileAdmin.disablePolyfaceDecimation;
|
|
144629
|
+
return { type: _itwin_core_common__WEBPACK_IMPORTED_MODULE_1__.BatchType.Primary, edges, animationId, sectionCut, disablePolyfaceDecimation };
|
|
144599
144630
|
}
|
|
144600
144631
|
computeBaseTransform(tree) {
|
|
144601
144632
|
return super.computeTransform(tree);
|
|
@@ -144748,7 +144779,7 @@ class MaskTreeReference extends _tile_internal__WEBPACK_IMPORTED_MODULE_6__.Tile
|
|
|
144748
144779
|
return this._owner;
|
|
144749
144780
|
}
|
|
144750
144781
|
createTreeId() {
|
|
144751
|
-
return { type: _itwin_core_common__WEBPACK_IMPORTED_MODULE_1__.BatchType.Primary, edges: false };
|
|
144782
|
+
return { type: _itwin_core_common__WEBPACK_IMPORTED_MODULE_1__.BatchType.Primary, edges: false, disablePolyfaceDecimation: _IModelApp__WEBPACK_IMPORTED_MODULE_3__.IModelApp.tileAdmin.disablePolyfaceDecimation };
|
|
144752
144783
|
}
|
|
144753
144784
|
}
|
|
144754
144785
|
function createMaskTreeReference(view, model) {
|
|
@@ -144774,7 +144805,7 @@ class ModelMapLayerTileTreeReference extends _tile_internal__WEBPACK_IMPORTED_MO
|
|
|
144774
144805
|
this._owner = primaryTreeSupplier.getOwner(this._id, this.iModel);
|
|
144775
144806
|
}
|
|
144776
144807
|
createTreeId() {
|
|
144777
|
-
return { type: _itwin_core_common__WEBPACK_IMPORTED_MODULE_1__.BatchType.Primary, edges: false };
|
|
144808
|
+
return { type: _itwin_core_common__WEBPACK_IMPORTED_MODULE_1__.BatchType.Primary, edges: false, disablePolyfaceDecimation: _IModelApp__WEBPACK_IMPORTED_MODULE_3__.IModelApp.tileAdmin.disablePolyfaceDecimation };
|
|
144778
144809
|
}
|
|
144779
144810
|
get treeOwner() {
|
|
144780
144811
|
const newId = this.createTreeId();
|
|
@@ -150631,8 +150662,10 @@ class LocalUnitFormatProvider extends _BaseUnitFormattingSettingsProvider__WEBPA
|
|
|
150631
150662
|
__webpack_require__.r(__webpack_exports__);
|
|
150632
150663
|
/* harmony export */ __webpack_require__.d(__webpack_exports__, {
|
|
150633
150664
|
/* harmony export */ AlternateUnitLabelsRegistry: () => (/* binding */ AlternateUnitLabelsRegistry),
|
|
150665
|
+
/* harmony export */ FormatsProviderManager: () => (/* binding */ FormatsProviderManager),
|
|
150634
150666
|
/* harmony export */ QuantityFormatter: () => (/* binding */ QuantityFormatter),
|
|
150635
150667
|
/* harmony export */ QuantityType: () => (/* binding */ QuantityType),
|
|
150668
|
+
/* harmony export */ QuantityTypeFormatsProvider: () => (/* binding */ QuantityTypeFormatsProvider),
|
|
150636
150669
|
/* harmony export */ getQuantityTypeKey: () => (/* binding */ getQuantityTypeKey),
|
|
150637
150670
|
/* harmony export */ isCustomQuantityTypeDefinition: () => (/* binding */ isCustomQuantityTypeDefinition)
|
|
150638
150671
|
/* harmony export */ });
|
|
@@ -150778,12 +150811,66 @@ class StandardQuantityTypeDefinition {
|
|
|
150778
150811
|
return _itwin_core_quantity__WEBPACK_IMPORTED_MODULE_1__.ParserSpec.create(format, unitsProvider, this.persistenceUnit, alternateUnitLabelsProvider);
|
|
150779
150812
|
}
|
|
150780
150813
|
}
|
|
150814
|
+
/**
|
|
150815
|
+
* A default formatsProvider, that provides a limited set of [[FormatDefinition]], associated to a few [[KindOfQuantity]].
|
|
150816
|
+
* Maps each KindOfQuantity to a [[QuantityType]].
|
|
150817
|
+
* When retrieving a valid [[KindOfQuantity]], returns the [[FormatProps]] for the associated [[QuantityType]].
|
|
150818
|
+
* @internal
|
|
150819
|
+
*/
|
|
150820
|
+
class QuantityTypeFormatsProvider {
|
|
150821
|
+
onFormatsChanged = new _itwin_core_bentley__WEBPACK_IMPORTED_MODULE_0__.BeEvent();
|
|
150822
|
+
constructor() {
|
|
150823
|
+
_IModelApp__WEBPACK_IMPORTED_MODULE_3__.IModelApp.quantityFormatter.onActiveFormattingUnitSystemChanged.addListener(() => {
|
|
150824
|
+
this.onFormatsChanged.raiseEvent({ formatsChanged: "all" });
|
|
150825
|
+
});
|
|
150826
|
+
}
|
|
150827
|
+
_kindOfQuantityMap = new Map([
|
|
150828
|
+
["AecUnits.LENGTH", QuantityType.Length],
|
|
150829
|
+
["AecUnits.ANGLE", QuantityType.Angle],
|
|
150830
|
+
["AecUnits.AREA", QuantityType.Area],
|
|
150831
|
+
["AecUnits.VOLUME", QuantityType.Volume],
|
|
150832
|
+
["RoadRailUnits.STATION", QuantityType.Stationing],
|
|
150833
|
+
["RoadRailUnits.LENGTH", QuantityType.LengthSurvey],
|
|
150834
|
+
]);
|
|
150835
|
+
async getFormat(name) {
|
|
150836
|
+
const quantityType = this._kindOfQuantityMap.get(name);
|
|
150837
|
+
if (!quantityType)
|
|
150838
|
+
return undefined;
|
|
150839
|
+
return _IModelApp__WEBPACK_IMPORTED_MODULE_3__.IModelApp.quantityFormatter.getFormatPropsByQuantityType(quantityType);
|
|
150840
|
+
}
|
|
150841
|
+
}
|
|
150842
|
+
/**
|
|
150843
|
+
* An implementation of the [[FormatsProvider]] interface that forwards calls to getFormats to the underlying FormatsProvider.
|
|
150844
|
+
* Also fires the onFormatsChanged event when the underlying FormatsProvider fires its own onFormatsChanged event.
|
|
150845
|
+
* @internal
|
|
150846
|
+
*/
|
|
150847
|
+
class FormatsProviderManager {
|
|
150848
|
+
_formatsProvider;
|
|
150849
|
+
onFormatsChanged = new _itwin_core_bentley__WEBPACK_IMPORTED_MODULE_0__.BeEvent();
|
|
150850
|
+
constructor(_formatsProvider) {
|
|
150851
|
+
this._formatsProvider = _formatsProvider;
|
|
150852
|
+
this._formatsProvider.onFormatsChanged.addListener((args) => {
|
|
150853
|
+
this.onFormatsChanged.raiseEvent(args);
|
|
150854
|
+
});
|
|
150855
|
+
}
|
|
150856
|
+
async getFormat(name) {
|
|
150857
|
+
return this._formatsProvider.getFormat(name);
|
|
150858
|
+
}
|
|
150859
|
+
get formatsProvider() { return this; }
|
|
150860
|
+
set formatsProvider(formatsProvider) {
|
|
150861
|
+
this._formatsProvider = formatsProvider;
|
|
150862
|
+
this._formatsProvider.onFormatsChanged.addListener((args) => {
|
|
150863
|
+
this.onFormatsChanged.raiseEvent(args);
|
|
150864
|
+
});
|
|
150865
|
+
this.onFormatsChanged.raiseEvent({ formatsChanged: "all" });
|
|
150866
|
+
}
|
|
150867
|
+
}
|
|
150781
150868
|
/** Class that supports formatting quantity values into strings and parsing strings into quantity values. This class also maintains
|
|
150782
150869
|
* the "active" unit system and caches FormatterSpecs and ParserSpecs for the "active" unit system to allow synchronous access to
|
|
150783
150870
|
* parsing and formatting values. The support unit systems are defined by [[UnitSystemKey]] and is kept in synch with the unit systems
|
|
150784
150871
|
* provided by the Presentation Manager on the backend. The QuantityFormatter contains a registry of quantity type definitions. These definitions implement
|
|
150785
|
-
* the [[QuantityTypeDefinition]] interface, which among other things, provide default [FormatProps]
|
|
150786
|
-
* to generate both a [FormatterSpec]
|
|
150872
|
+
* the [[QuantityTypeDefinition]] interface, which among other things, provide default [[FormatProps]], and provide methods
|
|
150873
|
+
* to generate both a [[FormatterSpec]] and a [[ParserSpec]]. There are built-in quantity types that are
|
|
150787
150874
|
* identified by the [[QuantityType]] enum. [[CustomQuantityTypeDefinition]] can be registered to extend the available quantity types available
|
|
150788
150875
|
* by frontend tools. The QuantityFormatter also allows the default formats to be overriden.
|
|
150789
150876
|
*
|
|
@@ -151187,26 +151274,51 @@ class QuantityFormatter {
|
|
|
151187
151274
|
requestedSystem = isImperial ? "imperial" : "metric";
|
|
151188
151275
|
return this.getParserSpecByQuantityTypeAndSystem(type, requestedSystem);
|
|
151189
151276
|
}
|
|
151190
|
-
|
|
151191
|
-
|
|
151192
|
-
|
|
151193
|
-
|
|
151194
|
-
|
|
151195
|
-
|
|
151196
|
-
|
|
151197
|
-
|
|
151198
|
-
|
|
151199
|
-
return
|
|
151277
|
+
// eslint-disable-next-line @typescript-eslint/promise-function-async
|
|
151278
|
+
formatQuantity(args, spec) {
|
|
151279
|
+
if (typeof args === "number") {
|
|
151280
|
+
/** Format a quantity value. Default FormatterSpec implementation uses Formatter.formatQuantity. */
|
|
151281
|
+
const magnitude = args;
|
|
151282
|
+
if (spec)
|
|
151283
|
+
return spec.applyFormatting(magnitude);
|
|
151284
|
+
return magnitude.toString();
|
|
151285
|
+
}
|
|
151286
|
+
return this.formatQuantityAsync(args);
|
|
151287
|
+
}
|
|
151288
|
+
async formatQuantityAsync(args) {
|
|
151289
|
+
const { value, valueUnitName, kindOfQuantityName } = args;
|
|
151290
|
+
const formatProps = await _IModelApp__WEBPACK_IMPORTED_MODULE_3__.IModelApp.formatsProvider.getFormat(kindOfQuantityName);
|
|
151291
|
+
if (!formatProps)
|
|
151292
|
+
return value.toString();
|
|
151293
|
+
const formatSpec = await this.createFormatterSpec({
|
|
151294
|
+
persistenceUnitName: valueUnitName,
|
|
151295
|
+
formatProps,
|
|
151296
|
+
formatName: kindOfQuantityName,
|
|
151297
|
+
});
|
|
151298
|
+
return formatSpec.applyFormatting(value);
|
|
151200
151299
|
}
|
|
151201
|
-
|
|
151202
|
-
|
|
151203
|
-
|
|
151204
|
-
|
|
151205
|
-
|
|
151206
|
-
|
|
151207
|
-
|
|
151208
|
-
return
|
|
151209
|
-
|
|
151300
|
+
// eslint-disable-next-line @typescript-eslint/promise-function-async
|
|
151301
|
+
parseToQuantityValue(args, parserSpec) {
|
|
151302
|
+
if (typeof args === "string") {
|
|
151303
|
+
/** Parse a quantity value. Default ParserSpec implementation uses ParserSpec.parseToQuantityValue. */
|
|
151304
|
+
const inString = args;
|
|
151305
|
+
if (parserSpec)
|
|
151306
|
+
return parserSpec.parseToQuantityValue(inString);
|
|
151307
|
+
return { ok: false, error: _itwin_core_quantity__WEBPACK_IMPORTED_MODULE_1__.ParseError.InvalidParserSpec };
|
|
151308
|
+
}
|
|
151309
|
+
return this.parseToQuantityValueAsync(args);
|
|
151310
|
+
}
|
|
151311
|
+
async parseToQuantityValueAsync(args) {
|
|
151312
|
+
const { value, valueUnitName, kindOfQuantityName } = args;
|
|
151313
|
+
const formatProps = await _IModelApp__WEBPACK_IMPORTED_MODULE_3__.IModelApp.formatsProvider.getFormat(kindOfQuantityName);
|
|
151314
|
+
if (!formatProps)
|
|
151315
|
+
return { ok: false, error: _itwin_core_quantity__WEBPACK_IMPORTED_MODULE_1__.ParseError.InvalidParserSpec };
|
|
151316
|
+
const parserSpec = await this.createParserSpec({
|
|
151317
|
+
persistenceUnitName: valueUnitName,
|
|
151318
|
+
formatProps,
|
|
151319
|
+
formatName: kindOfQuantityName,
|
|
151320
|
+
});
|
|
151321
|
+
return parserSpec.parseToQuantityValue(value);
|
|
151210
151322
|
}
|
|
151211
151323
|
/**
|
|
151212
151324
|
* Get a UnitSystemKey from a string that may have been entered via a key-in. Supports different variation of
|
|
@@ -151276,6 +151388,28 @@ class QuantityFormatter {
|
|
|
151276
151388
|
async getConversion(fromUnit, toUnit) {
|
|
151277
151389
|
return this._unitsProvider.getConversion(fromUnit, toUnit);
|
|
151278
151390
|
}
|
|
151391
|
+
/**
|
|
151392
|
+
* Creates a [[FormatterSpec]] for a given persistence unit name and format properties, using the [[UnitsProvider]] to resolve the persistence unit.
|
|
151393
|
+
* @beta
|
|
151394
|
+
* @param props - A [[CreateFormattingSpecProps]] interface.
|
|
151395
|
+
*/
|
|
151396
|
+
async createFormatterSpec(props) {
|
|
151397
|
+
const { persistenceUnitName, formatProps, formatName } = props;
|
|
151398
|
+
const persistenceUnitProps = await this._unitsProvider.findUnitByName(persistenceUnitName);
|
|
151399
|
+
const format = await _itwin_core_quantity__WEBPACK_IMPORTED_MODULE_1__.Format.createFromJSON(formatName ?? "temp", this._unitsProvider, formatProps);
|
|
151400
|
+
return _itwin_core_quantity__WEBPACK_IMPORTED_MODULE_1__.FormatterSpec.create(`${format.name}_format_spec`, format, this._unitsProvider, persistenceUnitProps);
|
|
151401
|
+
}
|
|
151402
|
+
/**
|
|
151403
|
+
* Creates a [[ParserSpec]] for a given persistence unit name and format properties, using the [[UnitsProvider]] to resolve the persistence unit.
|
|
151404
|
+
* @beta
|
|
151405
|
+
* @param props - A [[CreateFormattingSpecProps]] object.
|
|
151406
|
+
*/
|
|
151407
|
+
async createParserSpec(props) {
|
|
151408
|
+
const { persistenceUnitName, formatProps, formatName } = props;
|
|
151409
|
+
const persistenceUnitProps = await this._unitsProvider.findUnitByName(persistenceUnitName);
|
|
151410
|
+
const format = await _itwin_core_quantity__WEBPACK_IMPORTED_MODULE_1__.Format.createFromJSON(formatName ?? "temp", this._unitsProvider, formatProps);
|
|
151411
|
+
return _itwin_core_quantity__WEBPACK_IMPORTED_MODULE_1__.ParserSpec.create(format, this._unitsProvider, persistenceUnitProps);
|
|
151412
|
+
}
|
|
151279
151413
|
}
|
|
151280
151414
|
// ========================================================================================================================================
|
|
151281
151415
|
// Default Data
|
|
@@ -158316,6 +158450,8 @@ class TileAdmin {
|
|
|
158316
158450
|
/** @internal */
|
|
158317
158451
|
optimizeBRepProcessing;
|
|
158318
158452
|
/** @internal */
|
|
158453
|
+
disablePolyfaceDecimation;
|
|
158454
|
+
/** @internal */
|
|
158319
158455
|
useLargerTiles;
|
|
158320
158456
|
/** @internal */
|
|
158321
158457
|
maximumLevelsToSkip;
|
|
@@ -158404,6 +158540,7 @@ class TileAdmin {
|
|
|
158404
158540
|
this.useProjectExtents = options.useProjectExtents ?? _itwin_core_common__WEBPACK_IMPORTED_MODULE_1__.defaultTileOptions.useProjectExtents;
|
|
158405
158541
|
this.expandProjectExtents = options.expandProjectExtents ?? _itwin_core_common__WEBPACK_IMPORTED_MODULE_1__.defaultTileOptions.expandProjectExtents;
|
|
158406
158542
|
this.optimizeBRepProcessing = options.optimizeBRepProcessing ?? _itwin_core_common__WEBPACK_IMPORTED_MODULE_1__.defaultTileOptions.optimizeBRepProcessing;
|
|
158543
|
+
this.disablePolyfaceDecimation = options.disablePolyfaceDecimation ?? _itwin_core_common__WEBPACK_IMPORTED_MODULE_1__.defaultTileOptions.disablePolyfaceDecimation;
|
|
158407
158544
|
this.useLargerTiles = options.useLargerTiles ?? _itwin_core_common__WEBPACK_IMPORTED_MODULE_1__.defaultTileOptions.useLargerTiles;
|
|
158408
158545
|
this.mobileRealityTileMinToleranceRatio = Math.max(options.mobileRealityTileMinToleranceRatio ?? 3.0, 1.0);
|
|
158409
158546
|
this.cesiumIonKey = options.cesiumIonKey;
|
|
@@ -171680,11 +171817,10 @@ __webpack_require__.r(__webpack_exports__);
|
|
|
171680
171817
|
/* harmony import */ var _IModelApp__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(/*! ../IModelApp */ "../../core/frontend/lib/esm/IModelApp.js");
|
|
171681
171818
|
/* harmony import */ var _Marker__WEBPACK_IMPORTED_MODULE_7__ = __webpack_require__(/*! ../Marker */ "../../core/frontend/lib/esm/Marker.js");
|
|
171682
171819
|
/* harmony import */ var _NotificationManager__WEBPACK_IMPORTED_MODULE_8__ = __webpack_require__(/*! ../NotificationManager */ "../../core/frontend/lib/esm/NotificationManager.js");
|
|
171683
|
-
/* harmony import */ var
|
|
171684
|
-
/* harmony import */ var
|
|
171685
|
-
/* harmony import */ var
|
|
171686
|
-
/* harmony import */ var
|
|
171687
|
-
/* harmony import */ var _common_render_GraphicType__WEBPACK_IMPORTED_MODULE_13__ = __webpack_require__(/*! ../common/render/GraphicType */ "../../core/frontend/lib/esm/common/render/GraphicType.js");
|
|
171820
|
+
/* harmony import */ var _PrimitiveTool__WEBPACK_IMPORTED_MODULE_9__ = __webpack_require__(/*! ./PrimitiveTool */ "../../core/frontend/lib/esm/tools/PrimitiveTool.js");
|
|
171821
|
+
/* harmony import */ var _Tool__WEBPACK_IMPORTED_MODULE_10__ = __webpack_require__(/*! ./Tool */ "../../core/frontend/lib/esm/tools/Tool.js");
|
|
171822
|
+
/* harmony import */ var _ToolAssistance__WEBPACK_IMPORTED_MODULE_11__ = __webpack_require__(/*! ./ToolAssistance */ "../../core/frontend/lib/esm/tools/ToolAssistance.js");
|
|
171823
|
+
/* harmony import */ var _common_render_GraphicType__WEBPACK_IMPORTED_MODULE_12__ = __webpack_require__(/*! ../common/render/GraphicType */ "../../core/frontend/lib/esm/common/render/GraphicType.js");
|
|
171688
171824
|
/*---------------------------------------------------------------------------------------------
|
|
171689
171825
|
* Copyright (c) Bentley Systems, Incorporated. All rights reserved.
|
|
171690
171826
|
* See LICENSE.md in the project root for license terms and full copyright notice.
|
|
@@ -171705,9 +171841,18 @@ __webpack_require__.r(__webpack_exports__);
|
|
|
171705
171841
|
|
|
171706
171842
|
|
|
171707
171843
|
|
|
171708
|
-
|
|
171709
171844
|
function translateBold(key) {
|
|
171710
|
-
return `<b>${
|
|
171845
|
+
return `<b>${_Tool__WEBPACK_IMPORTED_MODULE_10__.CoreTools.translate(`Measure.Labels.${key}`)}:</b> `;
|
|
171846
|
+
}
|
|
171847
|
+
async function getFormatterSpecByKoQAndPersistenceUnit(koq, persistenceUnitName) {
|
|
171848
|
+
const formatProps = await _IModelApp__WEBPACK_IMPORTED_MODULE_6__.IModelApp.formatsProvider.getFormat(koq);
|
|
171849
|
+
if (undefined === formatProps)
|
|
171850
|
+
return undefined;
|
|
171851
|
+
return _IModelApp__WEBPACK_IMPORTED_MODULE_6__.IModelApp.quantityFormatter.createFormatterSpec({
|
|
171852
|
+
persistenceUnitName,
|
|
171853
|
+
formatProps,
|
|
171854
|
+
formatName: koq
|
|
171855
|
+
});
|
|
171711
171856
|
}
|
|
171712
171857
|
/** @internal */
|
|
171713
171858
|
class MeasureLabel {
|
|
@@ -171771,7 +171916,7 @@ class MeasureMarker extends _Marker__WEBPACK_IMPORTED_MODULE_7__.Marker {
|
|
|
171771
171916
|
onMouseButton(_ev) { return true; } // Never forward event to active tool...
|
|
171772
171917
|
onMouseEnter(ev) {
|
|
171773
171918
|
super.onMouseEnter(ev);
|
|
171774
|
-
if (this.title &&
|
|
171919
|
+
if (this.title && _Tool__WEBPACK_IMPORTED_MODULE_10__.InputSource.Touch === ev.inputSource && ev.viewport)
|
|
171775
171920
|
ev.viewport.openToolTip(this.title, ev.viewPoint, this.tooltipOptions);
|
|
171776
171921
|
}
|
|
171777
171922
|
onMouseLeave() {
|
|
@@ -171808,7 +171953,7 @@ function adjustPoint(ev, segments, locations) {
|
|
|
171808
171953
|
/** Report distance between 2 points using current quantity formatter for length.
|
|
171809
171954
|
* @public
|
|
171810
171955
|
*/
|
|
171811
|
-
class MeasureDistanceTool extends
|
|
171956
|
+
class MeasureDistanceTool extends _PrimitiveTool__WEBPACK_IMPORTED_MODULE_9__.PrimitiveTool {
|
|
171812
171957
|
static toolId = "Measure.Distance";
|
|
171813
171958
|
static iconSpec = "icon-measure-distance";
|
|
171814
171959
|
/** @internal */
|
|
@@ -171826,6 +171971,12 @@ class MeasureDistanceTool extends _PrimitiveTool__WEBPACK_IMPORTED_MODULE_10__.P
|
|
|
171826
171971
|
/** @internal */
|
|
171827
171972
|
_lastMotionAdjustedPt;
|
|
171828
171973
|
/** @internal */
|
|
171974
|
+
_lengthFormatterSpec;
|
|
171975
|
+
/** @internal */
|
|
171976
|
+
_angleFormatterSpec;
|
|
171977
|
+
/** @internal */
|
|
171978
|
+
_removeFormatterListener;
|
|
171979
|
+
/** @internal */
|
|
171829
171980
|
allowView(vp) { return vp.view.isSpatialView() || vp.view.isDrawingView(); }
|
|
171830
171981
|
/** @internal */
|
|
171831
171982
|
isCompatibleViewport(vp, isSelectedViewChange) { return (super.isCompatibleViewport(vp, isSelectedViewChange) && undefined !== vp && this.allowView(vp)); }
|
|
@@ -171836,34 +171987,50 @@ class MeasureDistanceTool extends _PrimitiveTool__WEBPACK_IMPORTED_MODULE_10__.P
|
|
|
171836
171987
|
/** @internal */
|
|
171837
171988
|
async onPostInstall() {
|
|
171838
171989
|
await super.onPostInstall();
|
|
171990
|
+
this._lengthFormatterSpec = await getFormatterSpecByKoQAndPersistenceUnit("AecUnits.LENGTH", "Units.M");
|
|
171991
|
+
this._angleFormatterSpec = await getFormatterSpecByKoQAndPersistenceUnit("AecUnits.ANGLE", "Units.RAD");
|
|
171992
|
+
this._removeFormatterListener = _IModelApp__WEBPACK_IMPORTED_MODULE_6__.IModelApp.formatsProvider.onFormatsChanged.addListener(async (args) => {
|
|
171993
|
+
if (args.formatsChanged === "all" || args.formatsChanged.includes("AecUnits.LENGTH"))
|
|
171994
|
+
this._lengthFormatterSpec = await getFormatterSpecByKoQAndPersistenceUnit("AecUnits.LENGTH", "Units.M");
|
|
171995
|
+
if (args.formatsChanged === "all" || args.formatsChanged.includes("AecUnits.ANGLE"))
|
|
171996
|
+
this._angleFormatterSpec = await getFormatterSpecByKoQAndPersistenceUnit("AecUnits.ANGLE", "Units.RAD");
|
|
171997
|
+
});
|
|
171839
171998
|
this.setupAndPromptForNextAction();
|
|
171840
171999
|
}
|
|
171841
172000
|
/** @internal */
|
|
172001
|
+
async onCleanup() {
|
|
172002
|
+
if (this._removeFormatterListener) {
|
|
172003
|
+
this._removeFormatterListener();
|
|
172004
|
+
this._removeFormatterListener = undefined;
|
|
172005
|
+
}
|
|
172006
|
+
await super.onCleanup();
|
|
172007
|
+
}
|
|
172008
|
+
/** @internal */
|
|
171842
172009
|
async onUnsuspend() { this.showPrompt(); }
|
|
171843
172010
|
/** @internal */
|
|
171844
172011
|
showPrompt() {
|
|
171845
|
-
const mainInstruction =
|
|
172012
|
+
const mainInstruction = _ToolAssistance__WEBPACK_IMPORTED_MODULE_11__.ToolAssistance.createInstruction(this.iconSpec, _Tool__WEBPACK_IMPORTED_MODULE_10__.CoreTools.translate(0 === this._locationData.length ? "Measure.Distance.Prompts.FirstPoint" : "Measure.Distance.Prompts.NextPoint"));
|
|
171846
172013
|
const mouseInstructions = [];
|
|
171847
172014
|
const touchInstructions = [];
|
|
171848
|
-
if (!
|
|
171849
|
-
touchInstructions.push(
|
|
171850
|
-
mouseInstructions.push(
|
|
172015
|
+
if (!_ToolAssistance__WEBPACK_IMPORTED_MODULE_11__.ToolAssistance.createTouchCursorInstructions(touchInstructions))
|
|
172016
|
+
touchInstructions.push(_ToolAssistance__WEBPACK_IMPORTED_MODULE_11__.ToolAssistance.createInstruction(_ToolAssistance__WEBPACK_IMPORTED_MODULE_11__.ToolAssistanceImage.OneTouchTap, _Tool__WEBPACK_IMPORTED_MODULE_10__.CoreTools.translate("ElementSet.Inputs.AcceptPoint"), false, _ToolAssistance__WEBPACK_IMPORTED_MODULE_11__.ToolAssistanceInputMethod.Touch));
|
|
172017
|
+
mouseInstructions.push(_ToolAssistance__WEBPACK_IMPORTED_MODULE_11__.ToolAssistance.createInstruction(_ToolAssistance__WEBPACK_IMPORTED_MODULE_11__.ToolAssistanceImage.LeftClick, _Tool__WEBPACK_IMPORTED_MODULE_10__.CoreTools.translate("ElementSet.Inputs.AcceptPoint"), false, _ToolAssistance__WEBPACK_IMPORTED_MODULE_11__.ToolAssistanceInputMethod.Mouse));
|
|
171851
172018
|
if (0 === this._locationData.length) {
|
|
171852
172019
|
if (this._acceptedSegments.length > 0) {
|
|
171853
|
-
touchInstructions.push(
|
|
171854
|
-
mouseInstructions.push(
|
|
172020
|
+
touchInstructions.push(_ToolAssistance__WEBPACK_IMPORTED_MODULE_11__.ToolAssistance.createInstruction(_ToolAssistance__WEBPACK_IMPORTED_MODULE_11__.ToolAssistanceImage.TwoTouchTap, _Tool__WEBPACK_IMPORTED_MODULE_10__.CoreTools.translate("ElementSet.Inputs.Restart"), false, _ToolAssistance__WEBPACK_IMPORTED_MODULE_11__.ToolAssistanceInputMethod.Touch));
|
|
172021
|
+
mouseInstructions.push(_ToolAssistance__WEBPACK_IMPORTED_MODULE_11__.ToolAssistance.createInstruction(_ToolAssistance__WEBPACK_IMPORTED_MODULE_11__.ToolAssistanceImage.RightClick, _Tool__WEBPACK_IMPORTED_MODULE_10__.CoreTools.translate("ElementSet.Inputs.Restart"), false, _ToolAssistance__WEBPACK_IMPORTED_MODULE_11__.ToolAssistanceInputMethod.Mouse));
|
|
171855
172022
|
}
|
|
171856
172023
|
}
|
|
171857
172024
|
else {
|
|
171858
|
-
touchInstructions.push(
|
|
171859
|
-
mouseInstructions.push(
|
|
171860
|
-
mouseInstructions.push(
|
|
171861
|
-
mouseInstructions.push(
|
|
172025
|
+
touchInstructions.push(_ToolAssistance__WEBPACK_IMPORTED_MODULE_11__.ToolAssistance.createInstruction(_ToolAssistance__WEBPACK_IMPORTED_MODULE_11__.ToolAssistanceImage.TwoTouchTap, _Tool__WEBPACK_IMPORTED_MODULE_10__.CoreTools.translate("ElementSet.Inputs.Cancel"), false, _ToolAssistance__WEBPACK_IMPORTED_MODULE_11__.ToolAssistanceInputMethod.Touch));
|
|
172026
|
+
mouseInstructions.push(_ToolAssistance__WEBPACK_IMPORTED_MODULE_11__.ToolAssistance.createInstruction(_ToolAssistance__WEBPACK_IMPORTED_MODULE_11__.ToolAssistanceImage.RightClick, _Tool__WEBPACK_IMPORTED_MODULE_10__.CoreTools.translate("ElementSet.Inputs.Cancel"), false, _ToolAssistance__WEBPACK_IMPORTED_MODULE_11__.ToolAssistanceInputMethod.Mouse));
|
|
172027
|
+
mouseInstructions.push(_ToolAssistance__WEBPACK_IMPORTED_MODULE_11__.ToolAssistance.createModifierKeyInstruction(_ToolAssistance__WEBPACK_IMPORTED_MODULE_11__.ToolAssistance.ctrlKey, _ToolAssistance__WEBPACK_IMPORTED_MODULE_11__.ToolAssistanceImage.LeftClick, _Tool__WEBPACK_IMPORTED_MODULE_10__.CoreTools.translate("ElementSet.Inputs.AdditionalPoint"), false, _ToolAssistance__WEBPACK_IMPORTED_MODULE_11__.ToolAssistanceInputMethod.Mouse));
|
|
172028
|
+
mouseInstructions.push(_ToolAssistance__WEBPACK_IMPORTED_MODULE_11__.ToolAssistance.createKeyboardInstruction(_ToolAssistance__WEBPACK_IMPORTED_MODULE_11__.ToolAssistance.createKeyboardInfo([_ToolAssistance__WEBPACK_IMPORTED_MODULE_11__.ToolAssistance.ctrlKey, "Z"]), _Tool__WEBPACK_IMPORTED_MODULE_10__.CoreTools.translate("ElementSet.Inputs.UndoLastPoint"), false, _ToolAssistance__WEBPACK_IMPORTED_MODULE_11__.ToolAssistanceInputMethod.Mouse));
|
|
171862
172029
|
}
|
|
171863
172030
|
const sections = [];
|
|
171864
|
-
sections.push(
|
|
171865
|
-
sections.push(
|
|
171866
|
-
const instructions =
|
|
172031
|
+
sections.push(_ToolAssistance__WEBPACK_IMPORTED_MODULE_11__.ToolAssistance.createSection(mouseInstructions, _ToolAssistance__WEBPACK_IMPORTED_MODULE_11__.ToolAssistance.inputsLabel));
|
|
172032
|
+
sections.push(_ToolAssistance__WEBPACK_IMPORTED_MODULE_11__.ToolAssistance.createSection(touchInstructions, _ToolAssistance__WEBPACK_IMPORTED_MODULE_11__.ToolAssistance.inputsLabel));
|
|
172033
|
+
const instructions = _ToolAssistance__WEBPACK_IMPORTED_MODULE_11__.ToolAssistance.createInstructions(mainInstruction, sections);
|
|
171867
172034
|
_IModelApp__WEBPACK_IMPORTED_MODULE_6__.IModelApp.notifications.setToolAssistance(instructions);
|
|
171868
172035
|
}
|
|
171869
172036
|
/** @internal */
|
|
@@ -171909,8 +172076,8 @@ class MeasureDistanceTool extends _PrimitiveTool__WEBPACK_IMPORTED_MODULE_10__.P
|
|
|
171909
172076
|
totalDistance += adjustedPoints[i].distance(adjustedPoints[i + 1]);
|
|
171910
172077
|
if (0.0 === totalDistance)
|
|
171911
172078
|
return;
|
|
171912
|
-
const formatterSpec =
|
|
171913
|
-
if (
|
|
172079
|
+
const formatterSpec = this._lengthFormatterSpec;
|
|
172080
|
+
if (formatterSpec === undefined)
|
|
171914
172081
|
return;
|
|
171915
172082
|
const formattedTotalDistance = _IModelApp__WEBPACK_IMPORTED_MODULE_6__.IModelApp.quantityFormatter.formatQuantity(totalDistance, formatterSpec);
|
|
171916
172083
|
const distDyn = new MeasureLabel(points[points.length - 1], formattedTotalDistance);
|
|
@@ -171924,7 +172091,7 @@ class MeasureDistanceTool extends _PrimitiveTool__WEBPACK_IMPORTED_MODULE_10__.P
|
|
|
171924
172091
|
seg.refAxes.multiplyVectorInPlace(xVec);
|
|
171925
172092
|
seg.refAxes.multiplyVectorInPlace(yVec);
|
|
171926
172093
|
seg.refAxes.multiplyVectorInPlace(zVec);
|
|
171927
|
-
const builderAxes = context.createGraphicBuilder(
|
|
172094
|
+
const builderAxes = context.createGraphicBuilder(_common_render_GraphicType__WEBPACK_IMPORTED_MODULE_12__.GraphicType.WorldOverlay);
|
|
171928
172095
|
let basePt = seg.start.clone();
|
|
171929
172096
|
if (xVec.magnitude() > 1.0e-5) {
|
|
171930
172097
|
const segPoints = [];
|
|
@@ -171971,12 +172138,12 @@ class MeasureDistanceTool extends _PrimitiveTool__WEBPACK_IMPORTED_MODULE_10__.P
|
|
|
171971
172138
|
}
|
|
171972
172139
|
tmpPoints.push(this._lastMotionPt);
|
|
171973
172140
|
tmpAdjustedPoints.push(this._lastMotionAdjustedPt);
|
|
171974
|
-
const builderDynVis = context.createGraphicBuilder(
|
|
172141
|
+
const builderDynVis = context.createGraphicBuilder(_common_render_GraphicType__WEBPACK_IMPORTED_MODULE_12__.GraphicType.WorldDecoration);
|
|
171975
172142
|
const colorDynVis = context.viewport.hilite.color;
|
|
171976
172143
|
builderDynVis.setSymbology(colorDynVis, _itwin_core_common__WEBPACK_IMPORTED_MODULE_2__.ColorDef.black, 3);
|
|
171977
172144
|
builderDynVis.addLineString(tmpPoints);
|
|
171978
172145
|
context.addDecorationFromBuilder(builderDynVis);
|
|
171979
|
-
const builderDynHid = context.createGraphicBuilder(
|
|
172146
|
+
const builderDynHid = context.createGraphicBuilder(_common_render_GraphicType__WEBPACK_IMPORTED_MODULE_12__.GraphicType.WorldOverlay);
|
|
171980
172147
|
const colorDynHid = colorDynVis.withAlpha(100);
|
|
171981
172148
|
builderDynHid.setSymbology(colorDynHid, _itwin_core_common__WEBPACK_IMPORTED_MODULE_2__.ColorDef.black, 1, _itwin_core_common__WEBPACK_IMPORTED_MODULE_2__.LinePixels.Code2);
|
|
171982
172149
|
builderDynHid.addLineString(tmpPoints);
|
|
@@ -171984,8 +172151,8 @@ class MeasureDistanceTool extends _PrimitiveTool__WEBPACK_IMPORTED_MODULE_10__.P
|
|
|
171984
172151
|
this.displayDynamicDistance(context, tmpPoints, tmpAdjustedPoints);
|
|
171985
172152
|
}
|
|
171986
172153
|
if (this._acceptedSegments.length > 0) {
|
|
171987
|
-
const builderAccVis = context.createGraphicBuilder(
|
|
171988
|
-
const builderAccHid = context.createGraphicBuilder(
|
|
172154
|
+
const builderAccVis = context.createGraphicBuilder(_common_render_GraphicType__WEBPACK_IMPORTED_MODULE_12__.GraphicType.WorldDecoration);
|
|
172155
|
+
const builderAccHid = context.createGraphicBuilder(_common_render_GraphicType__WEBPACK_IMPORTED_MODULE_12__.GraphicType.WorldOverlay);
|
|
171989
172156
|
const colorAccVis = _itwin_core_common__WEBPACK_IMPORTED_MODULE_2__.ColorDef.white.adjustedForContrast(context.viewport.view.backgroundColor);
|
|
171990
172157
|
const colorAccHid = colorAccVis.withAlpha(100);
|
|
171991
172158
|
builderAccVis.setSymbology(colorAccVis, _itwin_core_common__WEBPACK_IMPORTED_MODULE_2__.ColorDef.black, 3);
|
|
@@ -172007,7 +172174,7 @@ class MeasureDistanceTool extends _PrimitiveTool__WEBPACK_IMPORTED_MODULE_10__.P
|
|
|
172007
172174
|
return;
|
|
172008
172175
|
if (undefined === this._snapGeomId)
|
|
172009
172176
|
this._snapGeomId = this.iModel.transientIds.getNext();
|
|
172010
|
-
const builderSnapPts = context.createGraphicBuilder(
|
|
172177
|
+
const builderSnapPts = context.createGraphicBuilder(_common_render_GraphicType__WEBPACK_IMPORTED_MODULE_12__.GraphicType.WorldOverlay, undefined, this._snapGeomId);
|
|
172011
172178
|
const colorAccPts = _itwin_core_common__WEBPACK_IMPORTED_MODULE_2__.ColorDef.white.adjustedForContrast(context.viewport.view.backgroundColor);
|
|
172012
172179
|
builderSnapPts.setSymbology(colorAccPts, _itwin_core_common__WEBPACK_IMPORTED_MODULE_2__.ColorDef.black, 7);
|
|
172013
172180
|
builderSnapPts.addPointString(snapPoints);
|
|
@@ -172036,7 +172203,7 @@ class MeasureDistanceTool extends _PrimitiveTool__WEBPACK_IMPORTED_MODULE_10__.P
|
|
|
172036
172203
|
reportMeasurements() {
|
|
172037
172204
|
if (undefined === this._totalDistanceMarker)
|
|
172038
172205
|
return;
|
|
172039
|
-
const briefMsg = `${
|
|
172206
|
+
const briefMsg = `${_Tool__WEBPACK_IMPORTED_MODULE_10__.CoreTools.translate(this._acceptedSegments.length > 1 ? "Measure.Labels.CumulativeDistance" : "Measure.Labels.Distance")}: ${this._totalDistanceMarker.label}`;
|
|
172040
172207
|
const msgDetail = new _NotificationManager__WEBPACK_IMPORTED_MODULE_8__.NotifyMessageDetails(_NotificationManager__WEBPACK_IMPORTED_MODULE_8__.OutputMessagePriority.Info, briefMsg, undefined, _NotificationManager__WEBPACK_IMPORTED_MODULE_8__.OutputMessageType.Sticky);
|
|
172041
172208
|
_IModelApp__WEBPACK_IMPORTED_MODULE_6__.IModelApp.notifications.outputMessage(msgDetail);
|
|
172042
172209
|
}
|
|
@@ -172047,7 +172214,7 @@ class MeasureDistanceTool extends _PrimitiveTool__WEBPACK_IMPORTED_MODULE_10__.P
|
|
|
172047
172214
|
this._totalDistance += seg.distance;
|
|
172048
172215
|
if (0.0 === this._totalDistance)
|
|
172049
172216
|
return;
|
|
172050
|
-
const formatterSpec =
|
|
172217
|
+
const formatterSpec = this._lengthFormatterSpec;
|
|
172051
172218
|
if (undefined === formatterSpec)
|
|
172052
172219
|
return;
|
|
172053
172220
|
const formattedTotalDistance = _IModelApp__WEBPACK_IMPORTED_MODULE_6__.IModelApp.quantityFormatter.formatQuantity(this._totalDistance, formatterSpec);
|
|
@@ -172058,20 +172225,20 @@ class MeasureDistanceTool extends _PrimitiveTool__WEBPACK_IMPORTED_MODULE_10__.P
|
|
|
172058
172225
|
const is3d = (undefined === this.targetView || this.targetView.view.is3d());
|
|
172059
172226
|
const isSpatial = (undefined !== this.targetView && this.targetView.view.isSpatialView());
|
|
172060
172227
|
const toolTip = document.createElement("div");
|
|
172061
|
-
const distanceFormatterSpec =
|
|
172228
|
+
const distanceFormatterSpec = this._lengthFormatterSpec;
|
|
172062
172229
|
if (undefined === distanceFormatterSpec)
|
|
172063
172230
|
return toolTip;
|
|
172064
172231
|
let toolTipHtml = "";
|
|
172065
172232
|
const formattedDistance = _IModelApp__WEBPACK_IMPORTED_MODULE_6__.IModelApp.quantityFormatter.formatQuantity(distance, distanceFormatterSpec);
|
|
172066
172233
|
toolTipHtml += `${translateBold("Distance") + formattedDistance}<br>`;
|
|
172067
172234
|
if (is3d) {
|
|
172068
|
-
const angleFormatterSpec =
|
|
172235
|
+
const angleFormatterSpec = this._angleFormatterSpec;
|
|
172069
172236
|
if (undefined !== angleFormatterSpec) {
|
|
172070
172237
|
const formattedSlope = _IModelApp__WEBPACK_IMPORTED_MODULE_6__.IModelApp.quantityFormatter.formatQuantity(slope, angleFormatterSpec);
|
|
172071
172238
|
toolTipHtml += `${translateBold("Slope") + formattedSlope}<br>`;
|
|
172072
172239
|
}
|
|
172073
172240
|
}
|
|
172074
|
-
const coordFormatterSpec =
|
|
172241
|
+
const coordFormatterSpec = this._lengthFormatterSpec;
|
|
172075
172242
|
if (undefined !== coordFormatterSpec) {
|
|
172076
172243
|
let startAdjusted = start;
|
|
172077
172244
|
let endAdjusted = end;
|
|
@@ -172216,19 +172383,19 @@ class MeasureDistanceTool extends _PrimitiveTool__WEBPACK_IMPORTED_MODULE_10__.P
|
|
|
172216
172383
|
this.setupAndPromptForNextAction();
|
|
172217
172384
|
if (undefined !== ev.viewport)
|
|
172218
172385
|
ev.viewport.invalidateDecorations();
|
|
172219
|
-
return
|
|
172386
|
+
return _Tool__WEBPACK_IMPORTED_MODULE_10__.EventHandled.No;
|
|
172220
172387
|
}
|
|
172221
172388
|
/** @internal */
|
|
172222
172389
|
async onResetButtonUp(ev) {
|
|
172223
172390
|
if (0 === this._locationData.length) {
|
|
172224
172391
|
await this.onReinitialize();
|
|
172225
|
-
return
|
|
172392
|
+
return _Tool__WEBPACK_IMPORTED_MODULE_10__.EventHandled.No;
|
|
172226
172393
|
}
|
|
172227
172394
|
await this.acceptNewSegments();
|
|
172228
172395
|
this.setupAndPromptForNextAction();
|
|
172229
172396
|
if (undefined !== ev.viewport)
|
|
172230
172397
|
ev.viewport.invalidateDecorations();
|
|
172231
|
-
return
|
|
172398
|
+
return _Tool__WEBPACK_IMPORTED_MODULE_10__.EventHandled.No;
|
|
172232
172399
|
}
|
|
172233
172400
|
/** @internal */
|
|
172234
172401
|
async onUndoPreviousStep() {
|
|
@@ -172259,7 +172426,7 @@ class MeasureDistanceTool extends _PrimitiveTool__WEBPACK_IMPORTED_MODULE_10__.P
|
|
|
172259
172426
|
/** Report spatial coordinate at a point as well as cartographic location for geolocated models using current quantity formatters.
|
|
172260
172427
|
* @public
|
|
172261
172428
|
*/
|
|
172262
|
-
class MeasureLocationTool extends
|
|
172429
|
+
class MeasureLocationTool extends _PrimitiveTool__WEBPACK_IMPORTED_MODULE_9__.PrimitiveTool {
|
|
172263
172430
|
static toolId = "Measure.Location";
|
|
172264
172431
|
static iconSpec = "icon-measure-location";
|
|
172265
172432
|
/** @internal */
|
|
@@ -172281,20 +172448,20 @@ class MeasureLocationTool extends _PrimitiveTool__WEBPACK_IMPORTED_MODULE_10__.P
|
|
|
172281
172448
|
async onUnsuspend() { this.showPrompt(); }
|
|
172282
172449
|
/** @internal */
|
|
172283
172450
|
showPrompt() {
|
|
172284
|
-
const mainInstruction =
|
|
172451
|
+
const mainInstruction = _ToolAssistance__WEBPACK_IMPORTED_MODULE_11__.ToolAssistance.createInstruction(this.iconSpec, _Tool__WEBPACK_IMPORTED_MODULE_10__.CoreTools.translate("Measure.Location.Prompts.EnterPoint"));
|
|
172285
172452
|
const mouseInstructions = [];
|
|
172286
172453
|
const touchInstructions = [];
|
|
172287
|
-
if (!
|
|
172288
|
-
touchInstructions.push(
|
|
172289
|
-
mouseInstructions.push(
|
|
172454
|
+
if (!_ToolAssistance__WEBPACK_IMPORTED_MODULE_11__.ToolAssistance.createTouchCursorInstructions(touchInstructions))
|
|
172455
|
+
touchInstructions.push(_ToolAssistance__WEBPACK_IMPORTED_MODULE_11__.ToolAssistance.createInstruction(_ToolAssistance__WEBPACK_IMPORTED_MODULE_11__.ToolAssistanceImage.OneTouchTap, _Tool__WEBPACK_IMPORTED_MODULE_10__.CoreTools.translate("ElementSet.Inputs.AcceptPoint"), false, _ToolAssistance__WEBPACK_IMPORTED_MODULE_11__.ToolAssistanceInputMethod.Touch));
|
|
172456
|
+
mouseInstructions.push(_ToolAssistance__WEBPACK_IMPORTED_MODULE_11__.ToolAssistance.createInstruction(_ToolAssistance__WEBPACK_IMPORTED_MODULE_11__.ToolAssistanceImage.LeftClick, _Tool__WEBPACK_IMPORTED_MODULE_10__.CoreTools.translate("ElementSet.Inputs.AcceptPoint"), false, _ToolAssistance__WEBPACK_IMPORTED_MODULE_11__.ToolAssistanceInputMethod.Mouse));
|
|
172290
172457
|
if (0 !== this._acceptedLocations.length) {
|
|
172291
|
-
touchInstructions.push(
|
|
172292
|
-
mouseInstructions.push(
|
|
172458
|
+
touchInstructions.push(_ToolAssistance__WEBPACK_IMPORTED_MODULE_11__.ToolAssistance.createInstruction(_ToolAssistance__WEBPACK_IMPORTED_MODULE_11__.ToolAssistanceImage.TwoTouchTap, _Tool__WEBPACK_IMPORTED_MODULE_10__.CoreTools.translate("ElementSet.Inputs.Restart"), false, _ToolAssistance__WEBPACK_IMPORTED_MODULE_11__.ToolAssistanceInputMethod.Touch));
|
|
172459
|
+
mouseInstructions.push(_ToolAssistance__WEBPACK_IMPORTED_MODULE_11__.ToolAssistance.createInstruction(_ToolAssistance__WEBPACK_IMPORTED_MODULE_11__.ToolAssistanceImage.RightClick, _Tool__WEBPACK_IMPORTED_MODULE_10__.CoreTools.translate("ElementSet.Inputs.Restart"), false, _ToolAssistance__WEBPACK_IMPORTED_MODULE_11__.ToolAssistanceInputMethod.Mouse));
|
|
172293
172460
|
}
|
|
172294
172461
|
const sections = [];
|
|
172295
|
-
sections.push(
|
|
172296
|
-
sections.push(
|
|
172297
|
-
const instructions =
|
|
172462
|
+
sections.push(_ToolAssistance__WEBPACK_IMPORTED_MODULE_11__.ToolAssistance.createSection(mouseInstructions, _ToolAssistance__WEBPACK_IMPORTED_MODULE_11__.ToolAssistance.inputsLabel));
|
|
172463
|
+
sections.push(_ToolAssistance__WEBPACK_IMPORTED_MODULE_11__.ToolAssistance.createSection(touchInstructions, _ToolAssistance__WEBPACK_IMPORTED_MODULE_11__.ToolAssistance.inputsLabel));
|
|
172464
|
+
const instructions = _ToolAssistance__WEBPACK_IMPORTED_MODULE_11__.ToolAssistance.createInstructions(mainInstruction, sections);
|
|
172298
172465
|
_IModelApp__WEBPACK_IMPORTED_MODULE_6__.IModelApp.notifications.setToolAssistance(instructions);
|
|
172299
172466
|
}
|
|
172300
172467
|
/** @internal */
|
|
@@ -172307,7 +172474,7 @@ class MeasureLocationTool extends _PrimitiveTool__WEBPACK_IMPORTED_MODULE_10__.P
|
|
|
172307
172474
|
const isSpatial = (undefined !== this.targetView && this.targetView.view.isSpatialView());
|
|
172308
172475
|
const toolTip = document.createElement("div");
|
|
172309
172476
|
let toolTipHtml = "";
|
|
172310
|
-
const coordFormatterSpec = await
|
|
172477
|
+
const coordFormatterSpec = await getFormatterSpecByKoQAndPersistenceUnit("AecUnits.LENGTH", "Units.M");
|
|
172311
172478
|
if (undefined !== coordFormatterSpec) {
|
|
172312
172479
|
let pointAdjusted = point;
|
|
172313
172480
|
if (isSpatial) {
|
|
@@ -172323,15 +172490,15 @@ class MeasureLocationTool extends _PrimitiveTool__WEBPACK_IMPORTED_MODULE_10__.P
|
|
|
172323
172490
|
toolTipHtml += "<br>";
|
|
172324
172491
|
}
|
|
172325
172492
|
if (isSpatial) {
|
|
172326
|
-
const latLongFormatterSpec = await
|
|
172493
|
+
const latLongFormatterSpec = await getFormatterSpecByKoQAndPersistenceUnit("AecUnits.ANGLE", "Units.RAD");
|
|
172327
172494
|
if (undefined !== latLongFormatterSpec && undefined !== coordFormatterSpec) {
|
|
172328
172495
|
try {
|
|
172329
172496
|
const cartographic = await this.iModel.spatialToCartographic(point);
|
|
172330
172497
|
const formattedLat = _IModelApp__WEBPACK_IMPORTED_MODULE_6__.IModelApp.quantityFormatter.formatQuantity(Math.abs(cartographic.latitude), latLongFormatterSpec);
|
|
172331
172498
|
const formattedLong = _IModelApp__WEBPACK_IMPORTED_MODULE_6__.IModelApp.quantityFormatter.formatQuantity(Math.abs(cartographic.longitude), latLongFormatterSpec);
|
|
172332
172499
|
const formattedHeight = _IModelApp__WEBPACK_IMPORTED_MODULE_6__.IModelApp.quantityFormatter.formatQuantity(cartographic.height, coordFormatterSpec);
|
|
172333
|
-
const latDir =
|
|
172334
|
-
const longDir =
|
|
172500
|
+
const latDir = _Tool__WEBPACK_IMPORTED_MODULE_10__.CoreTools.translate(cartographic.latitude < 0 ? "Measure.Labels.S" : "Measure.Labels.N");
|
|
172501
|
+
const longDir = _Tool__WEBPACK_IMPORTED_MODULE_10__.CoreTools.translate(cartographic.longitude < 0 ? "Measure.Labels.W" : "Measure.Labels.E");
|
|
172335
172502
|
toolTipHtml += `${translateBold("LatLong") + formattedLat + latDir}, ${formattedLong}${longDir}<br>`;
|
|
172336
172503
|
toolTipHtml += `${translateBold("Altitude") + formattedHeight}<br>`;
|
|
172337
172504
|
}
|
|
@@ -172369,12 +172536,12 @@ class MeasureLocationTool extends _PrimitiveTool__WEBPACK_IMPORTED_MODULE_10__.P
|
|
|
172369
172536
|
this.setupAndPromptForNextAction();
|
|
172370
172537
|
if (undefined !== ev.viewport)
|
|
172371
172538
|
ev.viewport.invalidateDecorations();
|
|
172372
|
-
return
|
|
172539
|
+
return _Tool__WEBPACK_IMPORTED_MODULE_10__.EventHandled.No;
|
|
172373
172540
|
}
|
|
172374
172541
|
/** @internal */
|
|
172375
172542
|
async onResetButtonUp(_ev) {
|
|
172376
172543
|
await this.onReinitialize();
|
|
172377
|
-
return
|
|
172544
|
+
return _Tool__WEBPACK_IMPORTED_MODULE_10__.EventHandled.No;
|
|
172378
172545
|
}
|
|
172379
172546
|
/** @internal */
|
|
172380
172547
|
async onUndoPreviousStep() {
|
|
@@ -172400,7 +172567,7 @@ class MeasureLocationTool extends _PrimitiveTool__WEBPACK_IMPORTED_MODULE_10__.P
|
|
|
172400
172567
|
/** Report area defined by points using current quantity formatter for area.
|
|
172401
172568
|
* @public
|
|
172402
172569
|
*/
|
|
172403
|
-
class MeasureAreaByPointsTool extends
|
|
172570
|
+
class MeasureAreaByPointsTool extends _PrimitiveTool__WEBPACK_IMPORTED_MODULE_9__.PrimitiveTool {
|
|
172404
172571
|
static toolId = "Measure.AreaByPoints";
|
|
172405
172572
|
static iconSpec = "icon-measure-2d";
|
|
172406
172573
|
/** @internal */
|
|
@@ -172429,12 +172596,12 @@ class MeasureAreaByPointsTool extends _PrimitiveTool__WEBPACK_IMPORTED_MODULE_10
|
|
|
172429
172596
|
/** @internal */
|
|
172430
172597
|
static _orientationName = "enumAsOrientation";
|
|
172431
172598
|
/** @internal */
|
|
172432
|
-
static enumAsOrientationMessage(str) { return
|
|
172599
|
+
static enumAsOrientationMessage(str) { return _Tool__WEBPACK_IMPORTED_MODULE_10__.CoreTools.translate(`Settings.Orientation.${str}`); }
|
|
172433
172600
|
/** @internal */
|
|
172434
172601
|
static _getEnumAsOrientationDescription = () => {
|
|
172435
172602
|
return {
|
|
172436
172603
|
name: MeasureAreaByPointsTool._orientationName,
|
|
172437
|
-
displayLabel:
|
|
172604
|
+
displayLabel: _Tool__WEBPACK_IMPORTED_MODULE_10__.CoreTools.translate("Settings.Orientation.Label"),
|
|
172438
172605
|
typename: "enum",
|
|
172439
172606
|
enum: {
|
|
172440
172607
|
choices: [
|
|
@@ -172502,24 +172669,24 @@ class MeasureAreaByPointsTool extends _PrimitiveTool__WEBPACK_IMPORTED_MODULE_10
|
|
|
172502
172669
|
mainMsg += this._isComplete ? "FirstPoint" : "NextPoint";
|
|
172503
172670
|
break;
|
|
172504
172671
|
}
|
|
172505
|
-
const mainInstruction =
|
|
172672
|
+
const mainInstruction = _ToolAssistance__WEBPACK_IMPORTED_MODULE_11__.ToolAssistance.createInstruction(this.iconSpec, _Tool__WEBPACK_IMPORTED_MODULE_10__.CoreTools.translate(mainMsg));
|
|
172506
172673
|
const mouseInstructions = [];
|
|
172507
172674
|
const touchInstructions = [];
|
|
172508
|
-
const acceptMsg =
|
|
172509
|
-
if (!
|
|
172510
|
-
touchInstructions.push(
|
|
172511
|
-
mouseInstructions.push(
|
|
172512
|
-
const resetMsg =
|
|
172513
|
-
touchInstructions.push(
|
|
172514
|
-
mouseInstructions.push(
|
|
172675
|
+
const acceptMsg = _Tool__WEBPACK_IMPORTED_MODULE_10__.CoreTools.translate(this._isComplete ? "ElementSet.Inputs.Restart" : "ElementSet.Inputs.AcceptPoint");
|
|
172676
|
+
if (!_ToolAssistance__WEBPACK_IMPORTED_MODULE_11__.ToolAssistance.createTouchCursorInstructions(touchInstructions))
|
|
172677
|
+
touchInstructions.push(_ToolAssistance__WEBPACK_IMPORTED_MODULE_11__.ToolAssistance.createInstruction(_ToolAssistance__WEBPACK_IMPORTED_MODULE_11__.ToolAssistanceImage.OneTouchTap, acceptMsg, false, _ToolAssistance__WEBPACK_IMPORTED_MODULE_11__.ToolAssistanceInputMethod.Touch));
|
|
172678
|
+
mouseInstructions.push(_ToolAssistance__WEBPACK_IMPORTED_MODULE_11__.ToolAssistance.createInstruction(_ToolAssistance__WEBPACK_IMPORTED_MODULE_11__.ToolAssistanceImage.LeftClick, acceptMsg, false, _ToolAssistance__WEBPACK_IMPORTED_MODULE_11__.ToolAssistanceInputMethod.Mouse));
|
|
172679
|
+
const resetMsg = _Tool__WEBPACK_IMPORTED_MODULE_10__.CoreTools.translate("ElementSet.Inputs.Restart");
|
|
172680
|
+
touchInstructions.push(_ToolAssistance__WEBPACK_IMPORTED_MODULE_11__.ToolAssistance.createInstruction(_ToolAssistance__WEBPACK_IMPORTED_MODULE_11__.ToolAssistanceImage.TwoTouchTap, resetMsg, false, _ToolAssistance__WEBPACK_IMPORTED_MODULE_11__.ToolAssistanceInputMethod.Touch));
|
|
172681
|
+
mouseInstructions.push(_ToolAssistance__WEBPACK_IMPORTED_MODULE_11__.ToolAssistance.createInstruction(_ToolAssistance__WEBPACK_IMPORTED_MODULE_11__.ToolAssistanceImage.RightClick, resetMsg, false, _ToolAssistance__WEBPACK_IMPORTED_MODULE_11__.ToolAssistanceInputMethod.Mouse));
|
|
172515
172682
|
if (this._points.length > 1)
|
|
172516
|
-
mouseInstructions.push(
|
|
172683
|
+
mouseInstructions.push(_ToolAssistance__WEBPACK_IMPORTED_MODULE_11__.ToolAssistance.createModifierKeyInstruction(_ToolAssistance__WEBPACK_IMPORTED_MODULE_11__.ToolAssistance.ctrlKey, _ToolAssistance__WEBPACK_IMPORTED_MODULE_11__.ToolAssistanceImage.LeftClick, _Tool__WEBPACK_IMPORTED_MODULE_10__.CoreTools.translate("ElementSet.Inputs.AdditionalPoint"), false, _ToolAssistance__WEBPACK_IMPORTED_MODULE_11__.ToolAssistanceInputMethod.Mouse));
|
|
172517
172684
|
if (0 !== this._points.length)
|
|
172518
|
-
mouseInstructions.push(
|
|
172685
|
+
mouseInstructions.push(_ToolAssistance__WEBPACK_IMPORTED_MODULE_11__.ToolAssistance.createKeyboardInstruction(_ToolAssistance__WEBPACK_IMPORTED_MODULE_11__.ToolAssistance.createKeyboardInfo([_ToolAssistance__WEBPACK_IMPORTED_MODULE_11__.ToolAssistance.ctrlKey, "Z"]), _Tool__WEBPACK_IMPORTED_MODULE_10__.CoreTools.translate("ElementSet.Inputs.UndoLastPoint"), false, _ToolAssistance__WEBPACK_IMPORTED_MODULE_11__.ToolAssistanceInputMethod.Mouse));
|
|
172519
172686
|
const sections = [];
|
|
172520
|
-
sections.push(
|
|
172521
|
-
sections.push(
|
|
172522
|
-
const instructions =
|
|
172687
|
+
sections.push(_ToolAssistance__WEBPACK_IMPORTED_MODULE_11__.ToolAssistance.createSection(mouseInstructions, _ToolAssistance__WEBPACK_IMPORTED_MODULE_11__.ToolAssistance.inputsLabel));
|
|
172688
|
+
sections.push(_ToolAssistance__WEBPACK_IMPORTED_MODULE_11__.ToolAssistance.createSection(touchInstructions, _ToolAssistance__WEBPACK_IMPORTED_MODULE_11__.ToolAssistance.inputsLabel));
|
|
172689
|
+
const instructions = _ToolAssistance__WEBPACK_IMPORTED_MODULE_11__.ToolAssistance.createInstructions(mainInstruction, sections);
|
|
172523
172690
|
_IModelApp__WEBPACK_IMPORTED_MODULE_6__.IModelApp.notifications.setToolAssistance(instructions);
|
|
172524
172691
|
}
|
|
172525
172692
|
/** @internal */
|
|
@@ -172563,7 +172730,7 @@ class MeasureAreaByPointsTool extends _PrimitiveTool__WEBPACK_IMPORTED_MODULE_10
|
|
|
172563
172730
|
let currentPt = _AccuDraw__WEBPACK_IMPORTED_MODULE_3__.AccuDrawHintBuilder.projectPointToPlaneInView(cursorPt, points[0], normal, this.targetView, true);
|
|
172564
172731
|
if (undefined === currentPt)
|
|
172565
172732
|
currentPt = cursorPt.clone();
|
|
172566
|
-
if (2 === points.length && 0 === (_IModelApp__WEBPACK_IMPORTED_MODULE_6__.IModelApp.toolAdmin.currentInputState.qualifiers &
|
|
172733
|
+
if (2 === points.length && 0 === (_IModelApp__WEBPACK_IMPORTED_MODULE_6__.IModelApp.toolAdmin.currentInputState.qualifiers & _Tool__WEBPACK_IMPORTED_MODULE_10__.BeModifierKeys.Control)) {
|
|
172567
172734
|
const xDir = _itwin_core_geometry__WEBPACK_IMPORTED_MODULE_1__.Vector3d.createStartEnd(points[0], points[1]);
|
|
172568
172735
|
const xLen = xDir.magnitude();
|
|
172569
172736
|
xDir.normalizeInPlace();
|
|
@@ -172589,8 +172756,8 @@ class MeasureAreaByPointsTool extends _PrimitiveTool__WEBPACK_IMPORTED_MODULE_10
|
|
|
172589
172756
|
const points = this.getShapePoints(this._lastMotionPt);
|
|
172590
172757
|
if (points.length < 2)
|
|
172591
172758
|
return;
|
|
172592
|
-
const builderAccVis = context.createGraphicBuilder(
|
|
172593
|
-
const builderAccHid = context.createGraphicBuilder(
|
|
172759
|
+
const builderAccVis = context.createGraphicBuilder(_common_render_GraphicType__WEBPACK_IMPORTED_MODULE_12__.GraphicType.WorldDecoration);
|
|
172760
|
+
const builderAccHid = context.createGraphicBuilder(_common_render_GraphicType__WEBPACK_IMPORTED_MODULE_12__.GraphicType.WorldOverlay);
|
|
172594
172761
|
const colorAccVis = _itwin_core_common__WEBPACK_IMPORTED_MODULE_2__.ColorDef.white.adjustedForContrast(context.viewport.view.backgroundColor);
|
|
172595
172762
|
const colorAccHid = colorAccVis.withAlpha(100);
|
|
172596
172763
|
const fillAccVis = context.viewport.hilite.color.withAlpha(50);
|
|
@@ -172627,17 +172794,17 @@ class MeasureAreaByPointsTool extends _PrimitiveTool__WEBPACK_IMPORTED_MODULE_10
|
|
|
172627
172794
|
const isSpatial = (undefined !== this.targetView && this.targetView.view.isSpatialView());
|
|
172628
172795
|
const toolTip = document.createElement("div");
|
|
172629
172796
|
let toolTipHtml = "";
|
|
172630
|
-
const areaFormatterSpec = await
|
|
172797
|
+
const areaFormatterSpec = await getFormatterSpecByKoQAndPersistenceUnit("AecUnits.AREA", "Units.SQ_M");
|
|
172631
172798
|
if (undefined !== areaFormatterSpec) {
|
|
172632
172799
|
const formattedArea = _IModelApp__WEBPACK_IMPORTED_MODULE_6__.IModelApp.quantityFormatter.formatQuantity(this._area, areaFormatterSpec);
|
|
172633
172800
|
toolTipHtml += `${translateBold("Area") + formattedArea}<br>`;
|
|
172634
172801
|
}
|
|
172635
|
-
const perimeterFormatterSpec = await
|
|
172802
|
+
const perimeterFormatterSpec = await getFormatterSpecByKoQAndPersistenceUnit("AecUnits.LENGTH", "Units.M");
|
|
172636
172803
|
if (undefined !== perimeterFormatterSpec) {
|
|
172637
172804
|
const formattedPerimeter = _IModelApp__WEBPACK_IMPORTED_MODULE_6__.IModelApp.quantityFormatter.formatQuantity(this._perimeter, perimeterFormatterSpec);
|
|
172638
172805
|
toolTipHtml += `${translateBold("Perimeter") + formattedPerimeter}<br>`;
|
|
172639
172806
|
}
|
|
172640
|
-
const coordFormatterSpec = await
|
|
172807
|
+
const coordFormatterSpec = await getFormatterSpecByKoQAndPersistenceUnit("AecUnits.LENGTH", "Units.M");
|
|
172641
172808
|
if (undefined !== coordFormatterSpec) {
|
|
172642
172809
|
let pointAdjusted = this._centroid.clone();
|
|
172643
172810
|
if (isSpatial) {
|
|
@@ -172658,7 +172825,7 @@ class MeasureAreaByPointsTool extends _PrimitiveTool__WEBPACK_IMPORTED_MODULE_10
|
|
|
172658
172825
|
reportMeasurements() {
|
|
172659
172826
|
if (undefined === this._marker)
|
|
172660
172827
|
return;
|
|
172661
|
-
const briefMsg = `${
|
|
172828
|
+
const briefMsg = `${_Tool__WEBPACK_IMPORTED_MODULE_10__.CoreTools.translate("Measure.Labels.Area")}: ${this._marker.label}`;
|
|
172662
172829
|
const msgDetail = new _NotificationManager__WEBPACK_IMPORTED_MODULE_8__.NotifyMessageDetails(_NotificationManager__WEBPACK_IMPORTED_MODULE_8__.OutputMessagePriority.Info, briefMsg, undefined, _NotificationManager__WEBPACK_IMPORTED_MODULE_8__.OutputMessageType.Sticky);
|
|
172663
172830
|
_IModelApp__WEBPACK_IMPORTED_MODULE_6__.IModelApp.notifications.outputMessage(msgDetail);
|
|
172664
172831
|
}
|
|
@@ -172676,7 +172843,7 @@ class MeasureAreaByPointsTool extends _PrimitiveTool__WEBPACK_IMPORTED_MODULE_10
|
|
|
172676
172843
|
const toolTip = await this.getMarkerToolTip();
|
|
172677
172844
|
this._acceptedMeasurement = new MeasureMarker("1", toolTip, this._centroid, _itwin_core_geometry__WEBPACK_IMPORTED_MODULE_1__.Point2d.create(25, 25));
|
|
172678
172845
|
this._marker = undefined;
|
|
172679
|
-
const areaFormatterSpec = await
|
|
172846
|
+
const areaFormatterSpec = await getFormatterSpecByKoQAndPersistenceUnit("AecUnits.AREA", "Units.SQ_M");
|
|
172680
172847
|
if (undefined === areaFormatterSpec)
|
|
172681
172848
|
return;
|
|
172682
172849
|
const formattedTotalArea = _IModelApp__WEBPACK_IMPORTED_MODULE_6__.IModelApp.quantityFormatter.formatQuantity(this._area, areaFormatterSpec);
|
|
@@ -172686,23 +172853,23 @@ class MeasureAreaByPointsTool extends _PrimitiveTool__WEBPACK_IMPORTED_MODULE_10
|
|
|
172686
172853
|
/** @internal */
|
|
172687
172854
|
async onDataButtonDown(ev) {
|
|
172688
172855
|
if (undefined === this.targetView)
|
|
172689
|
-
return
|
|
172856
|
+
return _Tool__WEBPACK_IMPORTED_MODULE_10__.EventHandled.No;
|
|
172690
172857
|
if (this._isComplete)
|
|
172691
172858
|
await this.onReinitialize();
|
|
172692
172859
|
if (this._points.length > 1 && !ev.isControlKey) {
|
|
172693
172860
|
const points = this.getShapePoints(ev.point);
|
|
172694
172861
|
if (points.length < 3)
|
|
172695
|
-
return
|
|
172862
|
+
return _Tool__WEBPACK_IMPORTED_MODULE_10__.EventHandled.No;
|
|
172696
172863
|
this._isComplete = true;
|
|
172697
172864
|
this._points.length = 0;
|
|
172698
172865
|
for (const pt of points)
|
|
172699
172866
|
this._points.push(pt);
|
|
172700
172867
|
await this.updateTotals();
|
|
172701
172868
|
this.setupAndPromptForNextAction();
|
|
172702
|
-
return
|
|
172869
|
+
return _Tool__WEBPACK_IMPORTED_MODULE_10__.EventHandled.No;
|
|
172703
172870
|
}
|
|
172704
172871
|
if (undefined === this._matrix && undefined === (this._matrix = _AccuDraw__WEBPACK_IMPORTED_MODULE_3__.AccuDrawHintBuilder.getContextRotation(this.orientation, this.targetView)))
|
|
172705
|
-
return
|
|
172872
|
+
return _Tool__WEBPACK_IMPORTED_MODULE_10__.EventHandled.No;
|
|
172706
172873
|
const currPt = ev.point.clone();
|
|
172707
172874
|
if (this._points.length > 0) {
|
|
172708
172875
|
const planePt = _AccuDraw__WEBPACK_IMPORTED_MODULE_3__.AccuDrawHintBuilder.projectPointToPlaneInView(currPt, this._points[0], this._matrix.getColumn(2), ev.viewport, true);
|
|
@@ -172711,14 +172878,14 @@ class MeasureAreaByPointsTool extends _PrimitiveTool__WEBPACK_IMPORTED_MODULE_10
|
|
|
172711
172878
|
}
|
|
172712
172879
|
this._points.push(currPt);
|
|
172713
172880
|
this.setupAndPromptForNextAction();
|
|
172714
|
-
return
|
|
172881
|
+
return _Tool__WEBPACK_IMPORTED_MODULE_10__.EventHandled.No;
|
|
172715
172882
|
}
|
|
172716
172883
|
/** @internal */
|
|
172717
172884
|
async onResetButtonUp(ev) {
|
|
172718
172885
|
if (undefined !== ev.viewport)
|
|
172719
172886
|
ev.viewport.invalidateDecorations();
|
|
172720
172887
|
await this.onReinitialize();
|
|
172721
|
-
return
|
|
172888
|
+
return _Tool__WEBPACK_IMPORTED_MODULE_10__.EventHandled.No;
|
|
172722
172889
|
}
|
|
172723
172890
|
/** @internal */
|
|
172724
172891
|
async onReinitialize() {
|
|
@@ -172748,7 +172915,7 @@ class MeasureAreaByPointsTool extends _PrimitiveTool__WEBPACK_IMPORTED_MODULE_10
|
|
|
172748
172915
|
/** Base class for mass properties tools.
|
|
172749
172916
|
* @public
|
|
172750
172917
|
*/
|
|
172751
|
-
class MeasureElementTool extends
|
|
172918
|
+
class MeasureElementTool extends _PrimitiveTool__WEBPACK_IMPORTED_MODULE_9__.PrimitiveTool {
|
|
172752
172919
|
/** @internal */
|
|
172753
172920
|
_checkedIds = new Map();
|
|
172754
172921
|
/** @internal */
|
|
@@ -172784,33 +172951,33 @@ class MeasureElementTool extends _PrimitiveTool__WEBPACK_IMPORTED_MODULE_10__.Pr
|
|
|
172784
172951
|
/** @internal */
|
|
172785
172952
|
showPrompt() {
|
|
172786
172953
|
const mainMsg = (this._useSelection ? (0 === this._acceptedMeasurements.length ? "ElementSet.Prompts.ConfirmSelection" : "ElementSet.Prompts.InspectResult") : "ElementSet.Prompts.IdentifyElement");
|
|
172787
|
-
const mainInstruction =
|
|
172954
|
+
const mainInstruction = _ToolAssistance__WEBPACK_IMPORTED_MODULE_11__.ToolAssistance.createInstruction(this.iconSpec, _Tool__WEBPACK_IMPORTED_MODULE_10__.CoreTools.translate(mainMsg));
|
|
172788
172955
|
const mouseInstructions = [];
|
|
172789
172956
|
const touchInstructions = [];
|
|
172790
172957
|
if (this._useSelection) {
|
|
172791
172958
|
if (0 === this._acceptedMeasurements.length) {
|
|
172792
|
-
touchInstructions.push(
|
|
172793
|
-
mouseInstructions.push(
|
|
172794
|
-
touchInstructions.push(
|
|
172795
|
-
mouseInstructions.push(
|
|
172959
|
+
touchInstructions.push(_ToolAssistance__WEBPACK_IMPORTED_MODULE_11__.ToolAssistance.createInstruction(_ToolAssistance__WEBPACK_IMPORTED_MODULE_11__.ToolAssistanceImage.OneTouchTap, _Tool__WEBPACK_IMPORTED_MODULE_10__.CoreTools.translate("ElementSet.Inputs.AcceptSelection"), false, _ToolAssistance__WEBPACK_IMPORTED_MODULE_11__.ToolAssistanceInputMethod.Touch));
|
|
172960
|
+
mouseInstructions.push(_ToolAssistance__WEBPACK_IMPORTED_MODULE_11__.ToolAssistance.createInstruction(_ToolAssistance__WEBPACK_IMPORTED_MODULE_11__.ToolAssistanceImage.LeftClick, _Tool__WEBPACK_IMPORTED_MODULE_10__.CoreTools.translate("ElementSet.Inputs.AcceptSelection"), false, _ToolAssistance__WEBPACK_IMPORTED_MODULE_11__.ToolAssistanceInputMethod.Mouse));
|
|
172961
|
+
touchInstructions.push(_ToolAssistance__WEBPACK_IMPORTED_MODULE_11__.ToolAssistance.createInstruction(_ToolAssistance__WEBPACK_IMPORTED_MODULE_11__.ToolAssistanceImage.TwoTouchTap, _Tool__WEBPACK_IMPORTED_MODULE_10__.CoreTools.translate("ElementSet.Inputs.RejectSelection"), false, _ToolAssistance__WEBPACK_IMPORTED_MODULE_11__.ToolAssistanceInputMethod.Touch));
|
|
172962
|
+
mouseInstructions.push(_ToolAssistance__WEBPACK_IMPORTED_MODULE_11__.ToolAssistance.createInstruction(_ToolAssistance__WEBPACK_IMPORTED_MODULE_11__.ToolAssistanceImage.RightClick, _Tool__WEBPACK_IMPORTED_MODULE_10__.CoreTools.translate("ElementSet.Inputs.RejectSelection"), false, _ToolAssistance__WEBPACK_IMPORTED_MODULE_11__.ToolAssistanceInputMethod.Mouse));
|
|
172796
172963
|
}
|
|
172797
172964
|
else {
|
|
172798
|
-
touchInstructions.push(
|
|
172799
|
-
mouseInstructions.push(
|
|
172965
|
+
touchInstructions.push(_ToolAssistance__WEBPACK_IMPORTED_MODULE_11__.ToolAssistance.createInstruction(_ToolAssistance__WEBPACK_IMPORTED_MODULE_11__.ToolAssistanceImage.TwoTouchTap, _Tool__WEBPACK_IMPORTED_MODULE_10__.CoreTools.translate("ElementSet.Inputs.Exit"), false, _ToolAssistance__WEBPACK_IMPORTED_MODULE_11__.ToolAssistanceInputMethod.Touch));
|
|
172966
|
+
mouseInstructions.push(_ToolAssistance__WEBPACK_IMPORTED_MODULE_11__.ToolAssistance.createInstruction(_ToolAssistance__WEBPACK_IMPORTED_MODULE_11__.ToolAssistanceImage.RightClick, _Tool__WEBPACK_IMPORTED_MODULE_10__.CoreTools.translate("ElementSet.Inputs.Exit"), false, _ToolAssistance__WEBPACK_IMPORTED_MODULE_11__.ToolAssistanceInputMethod.Mouse));
|
|
172800
172967
|
}
|
|
172801
172968
|
}
|
|
172802
172969
|
else {
|
|
172803
|
-
touchInstructions.push(
|
|
172804
|
-
mouseInstructions.push(
|
|
172970
|
+
touchInstructions.push(_ToolAssistance__WEBPACK_IMPORTED_MODULE_11__.ToolAssistance.createInstruction(_ToolAssistance__WEBPACK_IMPORTED_MODULE_11__.ToolAssistanceImage.OneTouchTap, _Tool__WEBPACK_IMPORTED_MODULE_10__.CoreTools.translate("ElementSet.Inputs.AcceptElement"), false, _ToolAssistance__WEBPACK_IMPORTED_MODULE_11__.ToolAssistanceInputMethod.Touch));
|
|
172971
|
+
mouseInstructions.push(_ToolAssistance__WEBPACK_IMPORTED_MODULE_11__.ToolAssistance.createInstruction(_ToolAssistance__WEBPACK_IMPORTED_MODULE_11__.ToolAssistanceImage.LeftClick, _Tool__WEBPACK_IMPORTED_MODULE_10__.CoreTools.translate("ElementSet.Inputs.AcceptElement"), false, _ToolAssistance__WEBPACK_IMPORTED_MODULE_11__.ToolAssistanceInputMethod.Mouse));
|
|
172805
172972
|
if (0 !== this._acceptedMeasurements.length) {
|
|
172806
|
-
touchInstructions.push(
|
|
172807
|
-
mouseInstructions.push(
|
|
172973
|
+
touchInstructions.push(_ToolAssistance__WEBPACK_IMPORTED_MODULE_11__.ToolAssistance.createInstruction(_ToolAssistance__WEBPACK_IMPORTED_MODULE_11__.ToolAssistanceImage.TwoTouchTap, _Tool__WEBPACK_IMPORTED_MODULE_10__.CoreTools.translate("ElementSet.Inputs.Restart"), false, _ToolAssistance__WEBPACK_IMPORTED_MODULE_11__.ToolAssistanceInputMethod.Touch));
|
|
172974
|
+
mouseInstructions.push(_ToolAssistance__WEBPACK_IMPORTED_MODULE_11__.ToolAssistance.createInstruction(_ToolAssistance__WEBPACK_IMPORTED_MODULE_11__.ToolAssistanceImage.RightClick, _Tool__WEBPACK_IMPORTED_MODULE_10__.CoreTools.translate("ElementSet.Inputs.Restart"), false, _ToolAssistance__WEBPACK_IMPORTED_MODULE_11__.ToolAssistanceInputMethod.Mouse));
|
|
172808
172975
|
}
|
|
172809
172976
|
}
|
|
172810
172977
|
const sections = [];
|
|
172811
|
-
sections.push(
|
|
172812
|
-
sections.push(
|
|
172813
|
-
const instructions =
|
|
172978
|
+
sections.push(_ToolAssistance__WEBPACK_IMPORTED_MODULE_11__.ToolAssistance.createSection(mouseInstructions, _ToolAssistance__WEBPACK_IMPORTED_MODULE_11__.ToolAssistance.inputsLabel));
|
|
172979
|
+
sections.push(_ToolAssistance__WEBPACK_IMPORTED_MODULE_11__.ToolAssistance.createSection(touchInstructions, _ToolAssistance__WEBPACK_IMPORTED_MODULE_11__.ToolAssistance.inputsLabel));
|
|
172980
|
+
const instructions = _ToolAssistance__WEBPACK_IMPORTED_MODULE_11__.ToolAssistance.createInstructions(mainInstruction, sections);
|
|
172814
172981
|
_IModelApp__WEBPACK_IMPORTED_MODULE_6__.IModelApp.notifications.setToolAssistance(instructions);
|
|
172815
172982
|
}
|
|
172816
172983
|
/** @internal */
|
|
@@ -172847,7 +173014,7 @@ class MeasureElementTool extends _PrimitiveTool__WEBPACK_IMPORTED_MODULE_10__.Pr
|
|
|
172847
173014
|
default:
|
|
172848
173015
|
return;
|
|
172849
173016
|
}
|
|
172850
|
-
const briefMsg = `${
|
|
173017
|
+
const briefMsg = `${_Tool__WEBPACK_IMPORTED_MODULE_10__.CoreTools.translate(label)}: ${this._totalMarker.label}`;
|
|
172851
173018
|
const msgDetail = new _NotificationManager__WEBPACK_IMPORTED_MODULE_8__.NotifyMessageDetails(_NotificationManager__WEBPACK_IMPORTED_MODULE_8__.OutputMessagePriority.Info, briefMsg, undefined, _NotificationManager__WEBPACK_IMPORTED_MODULE_8__.OutputMessageType.Sticky);
|
|
172852
173019
|
_IModelApp__WEBPACK_IMPORTED_MODULE_6__.IModelApp.notifications.outputMessage(msgDetail);
|
|
172853
173020
|
}
|
|
@@ -172858,7 +173025,7 @@ class MeasureElementTool extends _PrimitiveTool__WEBPACK_IMPORTED_MODULE_10__.Pr
|
|
|
172858
173025
|
let toolTipHtml = "";
|
|
172859
173026
|
switch (this.getOperation()) {
|
|
172860
173027
|
case _itwin_core_common__WEBPACK_IMPORTED_MODULE_2__.MassPropertiesOperation.AccumulateLengths: {
|
|
172861
|
-
const distanceFormatterSpec = await
|
|
173028
|
+
const distanceFormatterSpec = await getFormatterSpecByKoQAndPersistenceUnit("AecUnits.LENGTH", "Units.M");
|
|
172862
173029
|
if (undefined !== distanceFormatterSpec) {
|
|
172863
173030
|
const formattedLength = _IModelApp__WEBPACK_IMPORTED_MODULE_6__.IModelApp.quantityFormatter.formatQuantity(responseProps.length ? responseProps.length : 0, distanceFormatterSpec);
|
|
172864
173031
|
toolTipHtml += `${translateBold("Length") + formattedLength}<br>`;
|
|
@@ -172866,13 +173033,13 @@ class MeasureElementTool extends _PrimitiveTool__WEBPACK_IMPORTED_MODULE_10__.Pr
|
|
|
172866
173033
|
break;
|
|
172867
173034
|
}
|
|
172868
173035
|
case _itwin_core_common__WEBPACK_IMPORTED_MODULE_2__.MassPropertiesOperation.AccumulateAreas: {
|
|
172869
|
-
const areaFormatterSpec = await
|
|
173036
|
+
const areaFormatterSpec = await getFormatterSpecByKoQAndPersistenceUnit("AecUnits.AREA", "Units.SQ_M");
|
|
172870
173037
|
if (undefined !== areaFormatterSpec) {
|
|
172871
173038
|
const formattedArea = _IModelApp__WEBPACK_IMPORTED_MODULE_6__.IModelApp.quantityFormatter.formatQuantity(responseProps.area ? responseProps.area : 0, areaFormatterSpec);
|
|
172872
173039
|
toolTipHtml += `${translateBold("Area") + formattedArea}<br>`;
|
|
172873
173040
|
}
|
|
172874
173041
|
if (responseProps.perimeter) {
|
|
172875
|
-
const perimeterFormatterSpec = await
|
|
173042
|
+
const perimeterFormatterSpec = await getFormatterSpecByKoQAndPersistenceUnit("AecUnits.LENGTH", "Units.M");
|
|
172876
173043
|
if (undefined !== perimeterFormatterSpec) {
|
|
172877
173044
|
const formattedPerimeter = _IModelApp__WEBPACK_IMPORTED_MODULE_6__.IModelApp.quantityFormatter.formatQuantity(responseProps.perimeter, perimeterFormatterSpec);
|
|
172878
173045
|
toolTipHtml += `${translateBold("Perimeter") + formattedPerimeter}<br>`;
|
|
@@ -172881,13 +173048,13 @@ class MeasureElementTool extends _PrimitiveTool__WEBPACK_IMPORTED_MODULE_10__.Pr
|
|
|
172881
173048
|
break;
|
|
172882
173049
|
}
|
|
172883
173050
|
case _itwin_core_common__WEBPACK_IMPORTED_MODULE_2__.MassPropertiesOperation.AccumulateVolumes: {
|
|
172884
|
-
const volumeFormatterSpec = await
|
|
173051
|
+
const volumeFormatterSpec = await getFormatterSpecByKoQAndPersistenceUnit("AecUnits.VOLUME", "Units.CUB_M");
|
|
172885
173052
|
if (undefined !== volumeFormatterSpec) {
|
|
172886
173053
|
const formattedVolume = _IModelApp__WEBPACK_IMPORTED_MODULE_6__.IModelApp.quantityFormatter.formatQuantity(responseProps.volume ? responseProps.volume : 0, volumeFormatterSpec);
|
|
172887
173054
|
toolTipHtml += `${translateBold("Volume") + formattedVolume}<br>`;
|
|
172888
173055
|
}
|
|
172889
173056
|
if (responseProps.area) {
|
|
172890
|
-
const areaFormatterSpec = await
|
|
173057
|
+
const areaFormatterSpec = await getFormatterSpecByKoQAndPersistenceUnit("AecUnits.AREA", "Units.SQ_M");
|
|
172891
173058
|
if (undefined !== areaFormatterSpec) {
|
|
172892
173059
|
const formattedArea = _IModelApp__WEBPACK_IMPORTED_MODULE_6__.IModelApp.quantityFormatter.formatQuantity(responseProps.area, areaFormatterSpec);
|
|
172893
173060
|
toolTipHtml += `${translateBold("Area") + formattedArea}<br>`;
|
|
@@ -172897,7 +173064,7 @@ class MeasureElementTool extends _PrimitiveTool__WEBPACK_IMPORTED_MODULE_10__.Pr
|
|
|
172897
173064
|
}
|
|
172898
173065
|
}
|
|
172899
173066
|
if (responseProps.centroid) {
|
|
172900
|
-
const coordFormatterSpec = await
|
|
173067
|
+
const coordFormatterSpec = await getFormatterSpecByKoQAndPersistenceUnit("AecUnits.LENGTH", "Units.M");
|
|
172901
173068
|
if (undefined !== coordFormatterSpec) {
|
|
172902
173069
|
let pointAdjusted = _itwin_core_geometry__WEBPACK_IMPORTED_MODULE_1__.Point3d.fromJSON(responseProps.centroid);
|
|
172903
173070
|
if (isSpatial) {
|
|
@@ -172948,21 +173115,21 @@ class MeasureElementTool extends _PrimitiveTool__WEBPACK_IMPORTED_MODULE_10__.Pr
|
|
|
172948
173115
|
return;
|
|
172949
173116
|
switch (operation) {
|
|
172950
173117
|
case _itwin_core_common__WEBPACK_IMPORTED_MODULE_2__.MassPropertiesOperation.AccumulateLengths:
|
|
172951
|
-
const distanceFormatterSpec = await
|
|
173118
|
+
const distanceFormatterSpec = await getFormatterSpecByKoQAndPersistenceUnit("AecUnits.LENGTH", "Units.M");
|
|
172952
173119
|
if (undefined === distanceFormatterSpec)
|
|
172953
173120
|
return;
|
|
172954
173121
|
const formattedTotalDistance = _IModelApp__WEBPACK_IMPORTED_MODULE_6__.IModelApp.quantityFormatter.formatQuantity(this._totalValue, distanceFormatterSpec);
|
|
172955
173122
|
this._totalMarker = new MeasureLabel(labelPt, formattedTotalDistance);
|
|
172956
173123
|
break;
|
|
172957
173124
|
case _itwin_core_common__WEBPACK_IMPORTED_MODULE_2__.MassPropertiesOperation.AccumulateAreas:
|
|
172958
|
-
const areaFormatterSpec = await
|
|
173125
|
+
const areaFormatterSpec = await getFormatterSpecByKoQAndPersistenceUnit("AecUnits.AREA", "Units.SQ_M");
|
|
172959
173126
|
if (undefined === areaFormatterSpec)
|
|
172960
173127
|
return;
|
|
172961
173128
|
const formattedTotalArea = _IModelApp__WEBPACK_IMPORTED_MODULE_6__.IModelApp.quantityFormatter.formatQuantity(this._totalValue, areaFormatterSpec);
|
|
172962
173129
|
this._totalMarker = new MeasureLabel(labelPt, formattedTotalArea);
|
|
172963
173130
|
break;
|
|
172964
173131
|
case _itwin_core_common__WEBPACK_IMPORTED_MODULE_2__.MassPropertiesOperation.AccumulateVolumes:
|
|
172965
|
-
const volumeFormatterSpec = await
|
|
173132
|
+
const volumeFormatterSpec = await getFormatterSpecByKoQAndPersistenceUnit("AecUnits.VOLUME", "Units.CUB_M");
|
|
172966
173133
|
if (undefined === volumeFormatterSpec)
|
|
172967
173134
|
return;
|
|
172968
173135
|
const formattedTotalVolume = _IModelApp__WEBPACK_IMPORTED_MODULE_6__.IModelApp.quantityFormatter.formatQuantity(this._totalValue, volumeFormatterSpec);
|
|
@@ -173020,7 +173187,7 @@ class MeasureElementTool extends _PrimitiveTool__WEBPACK_IMPORTED_MODULE_10__.Pr
|
|
|
173020
173187
|
/** @internal */
|
|
173021
173188
|
async onResetButtonUp(_ev) {
|
|
173022
173189
|
await this.onReinitialize();
|
|
173023
|
-
return
|
|
173190
|
+
return _Tool__WEBPACK_IMPORTED_MODULE_10__.EventHandled.No;
|
|
173024
173191
|
}
|
|
173025
173192
|
/** @internal */
|
|
173026
173193
|
async onDataButtonDown(ev) {
|
|
@@ -173028,20 +173195,20 @@ class MeasureElementTool extends _PrimitiveTool__WEBPACK_IMPORTED_MODULE_10__.Pr
|
|
|
173028
173195
|
if (0 === this._acceptedMeasurements.length && undefined !== ev.viewport) {
|
|
173029
173196
|
await this.doMeasureSelectedElements(ev.viewport);
|
|
173030
173197
|
if (0 !== this._acceptedMeasurements.length)
|
|
173031
|
-
return
|
|
173032
|
-
_IModelApp__WEBPACK_IMPORTED_MODULE_6__.IModelApp.notifications.outputMessage(new _NotificationManager__WEBPACK_IMPORTED_MODULE_8__.NotifyMessageDetails(_NotificationManager__WEBPACK_IMPORTED_MODULE_8__.OutputMessagePriority.Error,
|
|
173198
|
+
return _Tool__WEBPACK_IMPORTED_MODULE_10__.EventHandled.Yes;
|
|
173199
|
+
_IModelApp__WEBPACK_IMPORTED_MODULE_6__.IModelApp.notifications.outputMessage(new _NotificationManager__WEBPACK_IMPORTED_MODULE_8__.NotifyMessageDetails(_NotificationManager__WEBPACK_IMPORTED_MODULE_8__.OutputMessagePriority.Error, _Tool__WEBPACK_IMPORTED_MODULE_10__.CoreTools.translate("ElementSet.Error.NotSupportedElmType")));
|
|
173033
173200
|
await this.onReinitialize();
|
|
173034
173201
|
}
|
|
173035
|
-
return
|
|
173202
|
+
return _Tool__WEBPACK_IMPORTED_MODULE_10__.EventHandled.Yes;
|
|
173036
173203
|
}
|
|
173037
173204
|
const hit = await _IModelApp__WEBPACK_IMPORTED_MODULE_6__.IModelApp.locateManager.doLocate(new _ElementLocateManager__WEBPACK_IMPORTED_MODULE_4__.LocateResponse(), true, ev.point, ev.viewport, ev.inputSource);
|
|
173038
173205
|
if (undefined === hit || !hit.isElementHit)
|
|
173039
|
-
return
|
|
173206
|
+
return _Tool__WEBPACK_IMPORTED_MODULE_10__.EventHandled.No;
|
|
173040
173207
|
const result = this._checkedIds.get(hit.sourceId);
|
|
173041
173208
|
if (undefined === result)
|
|
173042
|
-
return
|
|
173209
|
+
return _Tool__WEBPACK_IMPORTED_MODULE_10__.EventHandled.No;
|
|
173043
173210
|
if (-1 !== this._acceptedIds.indexOf(hit.sourceId))
|
|
173044
|
-
return
|
|
173211
|
+
return _Tool__WEBPACK_IMPORTED_MODULE_10__.EventHandled.Yes; // Already accepted, not rejected in filterHit to avoid showing "not" cursor...
|
|
173045
173212
|
const toolTip = await this.getMarkerToolTip(result);
|
|
173046
173213
|
const point = result.centroid ? _itwin_core_geometry__WEBPACK_IMPORTED_MODULE_1__.Point3d.fromJSON(result.centroid) : ev.point.clone();
|
|
173047
173214
|
const marker = new MeasureMarker((this._acceptedMeasurements.length + 1).toString(), toolTip, point, _itwin_core_geometry__WEBPACK_IMPORTED_MODULE_1__.Point2d.create(25, 25));
|
|
@@ -173052,7 +173219,7 @@ class MeasureElementTool extends _PrimitiveTool__WEBPACK_IMPORTED_MODULE_10__.Pr
|
|
|
173052
173219
|
this.setupAndPromptForNextAction();
|
|
173053
173220
|
if (undefined !== ev.viewport)
|
|
173054
173221
|
ev.viewport.invalidateDecorations();
|
|
173055
|
-
return
|
|
173222
|
+
return _Tool__WEBPACK_IMPORTED_MODULE_10__.EventHandled.No;
|
|
173056
173223
|
}
|
|
173057
173224
|
/** @internal */
|
|
173058
173225
|
async onUndoPreviousStep() {
|
|
@@ -302455,28 +302622,6 @@ const getClassName = (obj) => {
|
|
|
302455
302622
|
};
|
|
302456
302623
|
|
|
302457
302624
|
|
|
302458
|
-
/***/ }),
|
|
302459
|
-
|
|
302460
|
-
/***/ "../../core/frontend/lib/esm/extension/providers lazy recursive":
|
|
302461
|
-
/*!******************************************************************************!*\
|
|
302462
|
-
!*** ../../core/frontend/lib/esm/extension/providers/ lazy namespace object ***!
|
|
302463
|
-
\******************************************************************************/
|
|
302464
|
-
/***/ ((module) => {
|
|
302465
|
-
|
|
302466
|
-
function webpackEmptyAsyncContext(req) {
|
|
302467
|
-
// Here Promise.resolve().then() is used instead of new Promise() to prevent
|
|
302468
|
-
// uncaught exception popping up in devtools
|
|
302469
|
-
return Promise.resolve().then(() => {
|
|
302470
|
-
var e = new Error("Cannot find module '" + req + "'");
|
|
302471
|
-
e.code = 'MODULE_NOT_FOUND';
|
|
302472
|
-
throw e;
|
|
302473
|
-
});
|
|
302474
|
-
}
|
|
302475
|
-
webpackEmptyAsyncContext.keys = () => ([]);
|
|
302476
|
-
webpackEmptyAsyncContext.resolve = webpackEmptyAsyncContext;
|
|
302477
|
-
webpackEmptyAsyncContext.id = "../../core/frontend/lib/esm/extension/providers lazy recursive";
|
|
302478
|
-
module.exports = webpackEmptyAsyncContext;
|
|
302479
|
-
|
|
302480
302625
|
/***/ }),
|
|
302481
302626
|
|
|
302482
302627
|
/***/ "?088e":
|
|
@@ -312549,7 +312694,7 @@ var loadLanguages = instance.loadLanguages;
|
|
|
312549
312694
|
/***/ ((module) => {
|
|
312550
312695
|
|
|
312551
312696
|
"use strict";
|
|
312552
|
-
module.exports = /*#__PURE__*/JSON.parse('{"name":"@itwin/core-frontend","version":"5.1.0-dev.
|
|
312697
|
+
module.exports = /*#__PURE__*/JSON.parse('{"name":"@itwin/core-frontend","version":"5.1.0-dev.15","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","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","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","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/eslint-plugin":"5.0.0-dev.1","@types/chai-as-promised":"^7","@vitest/browser":"^3.0.6","@vitest/coverage-v8":"^3.0.6","cpx2":"^8.0.0","eslint":"^9.13.0","glob":"^10.3.12","playwright":"~1.47.1","rimraf":"^6.0.1","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/cloud-agnostic-core":"^2.2.4","@itwin/object-storage-core":"^2.3.0","@itwin/core-i18n":"workspace:*","@itwin/webgl-compatibility":"workspace:*","@loaders.gl/core":"^3.1.6","@loaders.gl/draco":"^3.1.6","fuse.js":"^3.3.0","wms-capabilities":"0.4.0"}}');
|
|
312553
312698
|
|
|
312554
312699
|
/***/ })
|
|
312555
312700
|
|