fix area text label for Polygon

Author: hl662

packages/itwin/measure-tools/src/api/Polygon.ts

@@ -6,10 +6,11 @@
 import type { Ray3d } from "@itwin/core-geometry";
 import { Point3d, PolygonOps } from "@itwin/core-geometry";
 import type { DecorateContext, GraphicBuilder} from "@itwin/core-frontend";
-import { IModelApp, QuantityType } from "@itwin/core-frontend";
+import { IModelApp } from "@itwin/core-frontend";
 import { StyleSet, WellKnownGraphicStyleType, WellKnownTextStyleType } from "./GraphicStyle.js";
 import type { TextEntry} from "./TextMarker.js";
 import { TextMarker } from "./TextMarker.js";
+import type { MeasurementFormattingProps } from "./MeasurementProps.js";
 
 export class Polygon {
   public isSelected: boolean;
@@ -25,6 +26,8 @@ export class Polygon {
   private _overrideText?: string[] | TextEntry[];
   private _textMarker: TextMarker;
   private _styleSet: StyleSet;
+  private _areaKoQ: string;
+  private _areaPersistenceUnitName: string;
 
   public get points(): Point3d[] {
     return this._points;
@@ -76,7 +79,27 @@ export class Polygon {
     return this._worldScale ?? 1.0;
   }
 
-  constructor(points: Point3d[], copyPoints: boolean = true, styleSet?: StyleSet, worldScale?: number) {
+  public get areaKoQ(): string {
+    return this._areaKoQ;
+  }
+
+  public set areaKoQ(value: string) {
+    this._areaKoQ = value;
+    this.recomputeFromPoints();
+  }
+
+  public get areaPersistenceUnitName(): string {
+    return this._areaPersistenceUnitName;
+  }
+
+  public set areaPersistenceUnitName(value: string) {
+    this._areaPersistenceUnitName = value;
+    this.recomputeFromPoints();
+  }
+
+  constructor(points: Point3d[], copyPoints: boolean = true, styleSet?: StyleSet, worldScale?: number, formatting?: MeasurementFormattingProps) {
+    this._areaKoQ = formatting?.koqName ?? "AecUnits.AREA";
+    this._areaPersistenceUnitName = formatting?.persistenceUnitName ?? "Units.SQ_M";
     this._styleSet = (styleSet !== undefined) ? styleSet : StyleSet.default;
     this.drawMarker = true;
     this.drawFillArea = true;
@@ -117,12 +140,12 @@ export class Polygon {
       this.recomputeFromPoints();
   }
 
-  private setTextToMarker() {
+  private async setTextToMarker() {
     if (this._overrideText) {
       this._textMarker.textLines = this._overrideText;
     } else {
       const lines: string[] = [];
-      const areaFormatter = IModelApp.quantityFormatter.findFormatterSpecByQuantityType(QuantityType.Area);
+      const areaFormatter = IModelApp.quantityFormatter.getSpecsByName(this._areaKoQ)?.formatterSpec;
       if (undefined !== areaFormatter)
         lines.push(IModelApp.quantityFormatter.formatQuantity(this.worldScale * this.worldScale * this.area, areaFormatter));
 

packages/itwin/measure-tools/src/measurements/AreaMeasurement.ts

@@ -167,7 +167,7 @@ export class AreaMeasurement extends Measurement {
   constructor(props?: AreaMeasurementProps) {
     super(props);
 
-    this._polygon = new Polygon([], false);
+    this._polygon = new Polygon([], false, undefined, undefined, props?.formatting?.area);
     this._polygon.textMarker.setMouseButtonHandler(
       this.handleTextMarkerButtonEvent.bind(this)
     );
@@ -245,7 +245,7 @@ export class AreaMeasurement extends Measurement {
     if (length === 0) return;
 
     const start = this.polygonPoints[length - 1];
-    this._dynamicEdge = DistanceMeasurement.create(start, point);
+    this._dynamicEdge = DistanceMeasurement.create(start, point, undefined, { length: { koqName: this._lengthKoQ, persistenceUnitName: this._lengthPersistenceUnitName }});
     if (this.drawingMetadata?.origin)
       this._dynamicEdge.drawingMetadata = { origin: this.drawingMetadata.origin, worldScale: this.worldScale };
     this._dynamicEdge.sheetViewId = this.sheetViewId;
@@ -631,6 +631,16 @@ export class AreaMeasurement extends Measurement {
     super.readFromJSON(json);
 
     const jsonArea = json as AreaMeasurementProps;
+    if (jsonArea.formatting?.area?.koqName) {
+      this._areaKoQ = jsonArea.formatting.area.koqName;
+      this._polygon.areaKoQ = this._areaKoQ;
+    }
+    if (jsonArea.formatting?.area?.persistenceUnitName) {
+      this._areaPersistenceUnitName = jsonArea.formatting.area.persistenceUnitName;
+      this._polygon.areaPersistenceUnitName = this._areaPersistenceUnitName;
+    }
+    if (jsonArea.formatting?.length?.koqName) this._lengthKoQ = jsonArea.formatting.length.koqName;
+    if (jsonArea.formatting?.length?.persistenceUnitName) this._lengthPersistenceUnitName = jsonArea.formatting.length.persistenceUnitName;
     if (jsonArea.polygonPoints !== undefined) {
       const pts = new Array<Point3d>();
       for (const pt of jsonArea.polygonPoints) pts.push(Point3d.fromJSON(pt));
@@ -641,10 +651,7 @@ export class AreaMeasurement extends Measurement {
         this.updateDynamicPolygon(this._dynamicEdge.endPointRef);
     }
 
-    if (jsonArea.formatting?.area?.koqName) this._areaKoQ = jsonArea.formatting.area.koqName;
-    if (jsonArea.formatting?.area?.persistenceUnitName) this._areaPersistenceUnitName = jsonArea.formatting.area.persistenceUnitName;
-    if (jsonArea.formatting?.length?.koqName) this._lengthKoQ = jsonArea.formatting.length.koqName;
-    if (jsonArea.formatting?.length?.persistenceUnitName) this._lengthPersistenceUnitName = jsonArea.formatting.length.persistenceUnitName;
+
   }
 
   /**