@itwin/map-layers-formats 4.1.0-dev.54 → 4.1.0-dev.56

package/lib/cjs/ArcGisFeature/ArcGisFeatureReader.d.ts

@@ -1,17 +1,26 @@
 import { Primitives, StandardTypeNames } from "@itwin/appui-abstract";
 import { ImageMapLayerSettings } from "@itwin/core-common";
-import { MapLayerFeatureInfo } from "@itwin/core-frontend";
-import { ArcGisFeatureRenderer } from "./ArcGisFeatureRenderer";
+import { ArcGisGeometryRenderer, ArcGisGraphicsRenderer, MapLayerFeatureInfo } from "@itwin/core-frontend";
 import { ArcGisResponseData } from "./ArcGisFeatureResponse";
-/** @internal */
-export declare abstract class ArcGisFeatureReader {
+/** Interface defining minimal implementation needed to create an ArcGIS geometry reader,
+ * needed by the [[ArcGisFeatureProvider]].
+ * @internal
+ */
+export interface ArcGisFeatureReader {
+    readAndRender: (response: ArcGisResponseData, renderer: ArcGisGeometryRenderer) => Promise<void>;
+    readFeatureInfo: (response: ArcGisResponseData, featureInfos: MapLayerFeatureInfo[], renderer: ArcGisGraphicsRenderer) => Promise<void>;
+}
+/** Internal implementation of [[ArcGisFeatureReader]]
+ * @internal
+ */
+export declare abstract class ArcGisBaseFeatureReader implements ArcGisFeatureReader {
     floatPrecision: number | undefined;
     forceDateDisplayValueToIso: boolean;
     protected _settings: ImageMapLayerSettings;
     protected _layerMetadata: any;
     constructor(settings: ImageMapLayerSettings, layerMetadata: any);
-    abstract readAndRender(response: ArcGisResponseData, _renderer: ArcGisFeatureRenderer): void;
-    abstract readFeatureInfo(response: ArcGisResponseData, featureInfos: MapLayerFeatureInfo[]): void;
+    abstract readAndRender(response: ArcGisResponseData, renderer: ArcGisGeometryRenderer): Promise<void>;
+    abstract readFeatureInfo(response: ArcGisResponseData, featureInfos: MapLayerFeatureInfo[], renderer: ArcGisGraphicsRenderer): Promise<void>;
     protected toFixedWithoutPadding: (value: number) => number;
     protected getDisplayValue: (typename: StandardTypeNames, value: Primitives.Value | undefined) => string;
 }

package/lib/cjs/ArcGisFeature/ArcGisFeatureReader.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ArcGisFeatureReader.d.ts","sourceRoot":"","sources":["../../../src/ArcGisFeature/ArcGisFeatureReader.ts"],"names":[],"mappings":"AAKA,OAAO,EAAE,UAAU,EAAE,iBAAiB,EAAE,MAAM,uBAAuB,CAAC;AACtE,OAAO,EAAE,qBAAqB,EAAE,MAAM,oBAAoB,CAAC;AAC3D,OAAO,EAAE,mBAAmB,EAAE,MAAM,sBAAsB,CAAC;AAC3D,OAAO,EAAE,qBAAqB,EAAE,MAAM,yBAAyB,CAAC;AAChE,OAAO,EAAE,kBAAkB,EAAE,MAAM,yBAAyB,CAAC;AAE7D,gBAAgB;AAChB,8BAAsB,mBAAmB;IAEhC,cAAc,EAAE,MAAM,GAAC,SAAS,CAAC;IAIjC,0BAA0B,UAAS;IAE1C,SAAS,CAAC,SAAS,EAAE,qBAAqB,CAAC;IAC3C,SAAS,CAAC,cAAc,EAAE,GAAG,CAAC;gBAEX,QAAQ,EAAE,qBAAqB,EAAE,aAAa,EAAE,GAAG;aAKtD,aAAa,CAAC,QAAQ,EAAE,kBAAkB,EAAE,SAAS,EAAE,qBAAqB,GAAG,IAAI;aAEnF,eAAe,CAAC,QAAQ,EAAE,kBAAkB,EAAE,YAAY,EAAE,mBAAmB,EAAE,GAAG,IAAI;IAExG,SAAS,CAAE,qBAAqB,UAAW,MAAM,YAE/C;IAEF,SAAS,CAAC,eAAe,aAAc,iBAAiB,SAAS,WAAW,KAAK,GAAC,SAAS,YAQzF;CACH"}
+{"version":3,"file":"ArcGisFeatureReader.d.ts","sourceRoot":"","sources":["../../../src/ArcGisFeature/ArcGisFeatureReader.ts"],"names":[],"mappings":"AAKA,OAAO,EAAE,UAAU,EAAE,iBAAiB,EAAE,MAAM,uBAAuB,CAAC;AACtE,OAAO,EAAE,qBAAqB,EAAE,MAAM,oBAAoB,CAAC;AAC3D,OAAO,EAAE,sBAAsB,EAAE,sBAAsB,EAAE,mBAAmB,EAAE,MAAM,sBAAsB,CAAC;AAC3G,OAAO,EAAE,kBAAkB,EAAE,MAAM,yBAAyB,CAAC;AAE7D;;;GAGG;AACH,MAAM,WAAW,mBAAmB;IAClC,aAAa,EAAE,CAAC,QAAQ,EAAE,kBAAkB,EAAE,QAAQ,EAAE,sBAAsB,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;IACjG,eAAe,EAAE,CAAC,QAAQ,EAAE,kBAAkB,EAAE,YAAY,EAAE,mBAAmB,EAAE,EAAE,QAAQ,EAAE,sBAAsB,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;CACzI;AAED;;GAEG;AACH,8BAAsB,uBAAwB,YAAW,mBAAmB;IAEnE,cAAc,EAAE,MAAM,GAAC,SAAS,CAAC;IAIjC,0BAA0B,UAAS;IAE1C,SAAS,CAAC,SAAS,EAAE,qBAAqB,CAAC;IAC3C,SAAS,CAAC,cAAc,EAAE,GAAG,CAAC;gBAEX,QAAQ,EAAE,qBAAqB,EAAE,aAAa,EAAE,GAAG;aAKtD,aAAa,CAAC,QAAQ,EAAE,kBAAkB,EAAE,QAAQ,EAAE,sBAAsB,GAAG,OAAO,CAAC,IAAI,CAAC;aAC5F,eAAe,CAAC,QAAQ,EAAE,kBAAkB,EAAE,YAAY,EAAE,mBAAmB,EAAE,EAAE,QAAQ,EAAE,sBAAsB,GAAG,OAAO,CAAC,IAAI,CAAC;IAEnJ,SAAS,CAAE,qBAAqB,UAAW,MAAM,YAE/C;IAEF,SAAS,CAAC,eAAe,aAAc,iBAAiB,SAAS,WAAW,KAAK,GAAC,SAAS,YAQzF;CACH"}

package/lib/cjs/ArcGisFeature/ArcGisFeatureReader.js

@@ -4,10 +4,12 @@
 * See LICENSE.md in the project root for license terms and full copyright notice.
 *--------------------------------------------------------------------------------------------*/
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.ArcGisFeatureReader = void 0;
+exports.ArcGisBaseFeatureReader = void 0;
 const appui_abstract_1 = require("@itwin/appui-abstract");
-/** @internal */
-class ArcGisFeatureReader {
+/** Internal implementation of [[ArcGisFeatureReader]]
+ * @internal
+ */
+class ArcGisBaseFeatureReader {
     constructor(settings, layerMetadata) {
         // Force display value of date to ISO 8601 format.
         // Turning this ON, will disable display value in end-user's locale
@@ -30,5 +32,5 @@ class ArcGisFeatureReader {
         this._layerMetadata = layerMetadata;
     }
 }
-exports.ArcGisFeatureReader = ArcGisFeatureReader;
+exports.ArcGisBaseFeatureReader = ArcGisBaseFeatureReader;
 //# sourceMappingURL=ArcGisFeatureReader.js.map

package/lib/cjs/ArcGisFeature/ArcGisFeatureReader.js.map

@@ -1 +1 @@
-{"version":3,"file":"ArcGisFeatureReader.js","sourceRoot":"","sources":["../../../src/ArcGisFeature/ArcGisFeatureReader.ts"],"names":[],"mappings":";AAAA;;;+FAG+F;;;AAE/F,0DAAsE;AAMtE,gBAAgB;AAChB,MAAsB,mBAAmB;IAWvC,YAAmB,QAA+B,EAAE,aAAkB;QAPtE,kDAAkD;QAClD,mEAAmE;QAC5D,+BAA0B,GAAG,KAAK,CAAC;QAc/B,0BAAqB,GAAG,CAAC,KAAa,EAAE,EAAE;YACnD,OAAO,CAAC,IAAI,CAAC,cAAc,KAAK,SAAS,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,UAAU,CAAC,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,cAAc,CAAC,CAAC,CAAC,CAAC;QACtG,CAAC,CAAC;QAEQ,oBAAe,GAAG,CAAC,QAA2B,EAAE,KAAiC,EAAE,EAAE;YAC7F,IAAI,KAAK,KAAK,SAAS,EAAE;gBACvB,OAAQ,EAAE,CAAC;aACZ;iBAAM,IAAK,QAAQ,KAAK,kCAAiB,CAAC,QAAQ,IAAI,IAAI,CAAC,0BAA0B,EAAE;gBACtF,OAAQ,KAAc,CAAC,WAAW,EAAE,CAAC;aACtC;iBAAM;gBACL,OAAO,GAAG,KAAK,EAAE,CAAC;aACnB;QACH,CAAC,CAAC;QApBA,IAAI,CAAC,SAAS,GAAG,QAAQ,CAAC;QAC1B,IAAI,CAAC,cAAc,GAAG,aAAa,CAAC;IACtC,CAAC;CAmBF;AAjCD,kDAiCC","sourcesContent":["/*---------------------------------------------------------------------------------------------\r\n* Copyright (c) Bentley Systems, Incorporated. All rights reserved.\r\n* See LICENSE.md in the project root for license terms and full copyright notice.\r\n*--------------------------------------------------------------------------------------------*/\r\n\r\nimport { Primitives, StandardTypeNames } from \"@itwin/appui-abstract\";\r\nimport { ImageMapLayerSettings } from \"@itwin/core-common\";\r\nimport { MapLayerFeatureInfo } from \"@itwin/core-frontend\";\r\nimport { ArcGisFeatureRenderer } from \"./ArcGisFeatureRenderer\";\r\nimport { ArcGisResponseData } from \"./ArcGisFeatureResponse\";\r\n\r\n/** @internal */\r\nexport abstract class ArcGisFeatureReader  {\r\n  // Optionally you can set the floating precision\r\n  public floatPrecision: number|undefined;\r\n\r\n  // Force display value of date to ISO 8601 format.\r\n  // Turning this ON, will disable display value in end-user's locale\r\n  public forceDateDisplayValueToIso = false;\r\n\r\n  protected _settings: ImageMapLayerSettings;\r\n  protected _layerMetadata: any;\r\n\r\n  public constructor(settings: ImageMapLayerSettings, layerMetadata: any) {\r\n    this._settings = settings;\r\n    this._layerMetadata = layerMetadata;\r\n  }\r\n\r\n  public abstract readAndRender(response: ArcGisResponseData, _renderer: ArcGisFeatureRenderer): void;\r\n\r\n  public abstract readFeatureInfo(response: ArcGisResponseData, featureInfos: MapLayerFeatureInfo[]): void;\r\n\r\n  protected  toFixedWithoutPadding = (value: number) => {\r\n    return (this.floatPrecision === undefined ? value : parseFloat(value.toFixed(this.floatPrecision)));\r\n  };\r\n\r\n  protected getDisplayValue = (typename: StandardTypeNames, value: Primitives.Value|undefined) => {\r\n    if (value === undefined) {\r\n      return  \"\";\r\n    } else if ( typename === StandardTypeNames.DateTime && this.forceDateDisplayValueToIso) {\r\n      return (value as Date).toISOString();\r\n    } else {\r\n      return `${value}`;\r\n    }\r\n  };\r\n}\r\n"]}
+{"version":3,"file":"ArcGisFeatureReader.js","sourceRoot":"","sources":["../../../src/ArcGisFeature/ArcGisFeatureReader.ts"],"names":[],"mappings":";AAAA;;;+FAG+F;;;AAE/F,0DAAsE;AActE;;GAEG;AACH,MAAsB,uBAAuB;IAW3C,YAAmB,QAA+B,EAAE,aAAkB;QAPtE,kDAAkD;QAClD,mEAAmE;QAC5D,+BAA0B,GAAG,KAAK,CAAC;QAa/B,0BAAqB,GAAG,CAAC,KAAa,EAAE,EAAE;YACnD,OAAO,CAAC,IAAI,CAAC,cAAc,KAAK,SAAS,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,UAAU,CAAC,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,cAAc,CAAC,CAAC,CAAC,CAAC;QACtG,CAAC,CAAC;QAEQ,oBAAe,GAAG,CAAC,QAA2B,EAAE,KAAiC,EAAE,EAAE;YAC7F,IAAI,KAAK,KAAK,SAAS,EAAE;gBACvB,OAAQ,EAAE,CAAC;aACZ;iBAAM,IAAK,QAAQ,KAAK,kCAAiB,CAAC,QAAQ,IAAI,IAAI,CAAC,0BAA0B,EAAE;gBACtF,OAAQ,KAAc,CAAC,WAAW,EAAE,CAAC;aACtC;iBAAM;gBACL,OAAO,GAAG,KAAK,EAAE,CAAC;aACnB;QACH,CAAC,CAAC;QAnBA,IAAI,CAAC,SAAS,GAAG,QAAQ,CAAC;QAC1B,IAAI,CAAC,cAAc,GAAG,aAAa,CAAC;IACtC,CAAC;CAkBF;AAhCD,0DAgCC","sourcesContent":["/*---------------------------------------------------------------------------------------------\n* Copyright (c) Bentley Systems, Incorporated. All rights reserved.\n* See LICENSE.md in the project root for license terms and full copyright notice.\n*--------------------------------------------------------------------------------------------*/\n\nimport { Primitives, StandardTypeNames } from \"@itwin/appui-abstract\";\nimport { ImageMapLayerSettings } from \"@itwin/core-common\";\nimport { ArcGisGeometryRenderer, ArcGisGraphicsRenderer, MapLayerFeatureInfo } from \"@itwin/core-frontend\";\nimport { ArcGisResponseData } from \"./ArcGisFeatureResponse\";\n\n/** Interface defining minimal implementation needed to create an ArcGIS geometry reader,\n * needed by the [[ArcGisFeatureProvider]].\n * @internal\n */\nexport interface ArcGisFeatureReader {\n  readAndRender: (response: ArcGisResponseData, renderer: ArcGisGeometryRenderer) => Promise<void>;\n  readFeatureInfo: (response: ArcGisResponseData, featureInfos: MapLayerFeatureInfo[], renderer: ArcGisGraphicsRenderer) => Promise<void>;\n}\n\n/** Internal implementation of [[ArcGisFeatureReader]]\n * @internal\n */\nexport abstract class ArcGisBaseFeatureReader implements ArcGisFeatureReader {\n  // Optionally you can set the floating precision\n  public floatPrecision: number|undefined;\n\n  // Force display value of date to ISO 8601 format.\n  // Turning this ON, will disable display value in end-user's locale\n  public forceDateDisplayValueToIso = false;\n\n  protected _settings: ImageMapLayerSettings;\n  protected _layerMetadata: any;\n\n  public constructor(settings: ImageMapLayerSettings, layerMetadata: any) {\n    this._settings = settings;\n    this._layerMetadata = layerMetadata;\n  }\n\n  public abstract readAndRender(response: ArcGisResponseData, renderer: ArcGisGeometryRenderer): Promise<void>;\n  public abstract readFeatureInfo(response: ArcGisResponseData, featureInfos: MapLayerFeatureInfo[], renderer: ArcGisGraphicsRenderer): Promise<void>;\n\n  protected  toFixedWithoutPadding = (value: number) => {\n    return (this.floatPrecision === undefined ? value : parseFloat(value.toFixed(this.floatPrecision)));\n  };\n\n  protected getDisplayValue = (typename: StandardTypeNames, value: Primitives.Value|undefined) => {\n    if (value === undefined) {\n      return  \"\";\n    } else if ( typename === StandardTypeNames.DateTime && this.forceDateDisplayValueToIso) {\n      return (value as Date).toISOString();\n    } else {\n      return `${value}`;\n    }\n  };\n}\n"]}

package/lib/cjs/ArcGisFeature/ArcGisFeatureResponse.js.map

@@ -1 +1 @@
-{"version":3,"file":"ArcGisFeatureResponse.js","sourceRoot":"","sources":["../../../src/ArcGisFeature/ArcGisFeatureResponse.ts"],"names":[],"mappings":";AAAA;;;+FAG+F;;;AAG/F,uDAAgD;AAwBhD,gBAAgB;AAChB,MAAa,qBAAqB;IAMhC,YAAY,MAA2B,EAAG,QAA2B,EAAE,QAAuB;QAC5F,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC;QACrB,IAAI,CAAC,SAAS,GAAG,QAAQ,CAAC;QAC1B,IAAI,CAAC,QAAQ,GAAG,QAAQ,CAAC;IAC3B,CAAC;IAEM,KAAK,CAAC,eAAe;QAC1B,IAAI,IAAmB,CAAC;QACxB,IAAI;YACF,MAAM,YAAY,GAAG,MAAM,IAAI,CAAC,SAAS,CAAC;YAC1C,IAAI,YAAY,KAAK,SAAS,IAAI,YAAY,CAAC,MAAM,KAAK,GAAG;gBAC3D,OAAO,SAAS,CAAC;YAEnB,IAAI,IAAI,CAAC,MAAM,KAAK,KAAK,EAAE;gBACzB,MAAM,SAAS,GAAe,IAAI,UAAU,CAAC,MAAM,YAAY,CAAC,WAAW,EAAE,CAAC,CAAC;gBAC/E,IAAI,CAAC,SAAS,IAAI,CAAC,SAAS,CAAC,MAAM,KAAK,CAAC,CAAC;oBACxC,OAAO,SAAS,CAAC;gBAEnB,IAAI,GAAG,6BAAW,CAAC,wBAAwB,CAAC,WAAW,CAAC,SAAS,CAAC,CAAC;gBACnE,MAAM,UAAU,GAAG,IAA4C,CAAC;gBAChE,OAAO,EAAC,IAAI,EAAE,mBAAmB,EAAE,UAAU,EAAE,WAAW,EAAE,aAAa,EAAE,qBAAqB,EAAC,CAAC;aAEnG;iBAAM;gBACL,IAAI,GAAG,MAAM,YAAY,CAAC,IAAI,EAAE,CAAC;gBACjC,IAAI,IAAI,KAAK,SAAS,IAAI,IAAI,IAAI,IAAI;oBACpC,OAAO,SAAS,CAAC;gBAEnB,OAAO,EAAC,IAAI,EAAE,mBAAmB,EAAE,IAAI,CAAC,qBAAqB,EAAC,CAAC;aAChE;SAEF;QAAC,OAAM,EAAE,EAAE;YACV,OAAO,SAAS,CAAC;SAClB;IACH,CAAC;CACF;AAxCD,sDAwCC","sourcesContent":["/*---------------------------------------------------------------------------------------------\r\n* Copyright (c) Bentley Systems, Incorporated. All rights reserved.\r\n* See LICENSE.md in the project root for license terms and full copyright notice.\r\n*--------------------------------------------------------------------------------------------*/\r\n\r\nimport { ArcGisExtent, ArcGisFeatureFormat } from \"./ArcGisFeatureQuery\";\r\nimport { esriPBuffer } from \"./esriPBuffer.gen\";\r\n\r\n/** @internal */\r\nexport interface ArcGisResponseData {\r\n  data: any;\r\n  exceedTransferLimit: boolean;\r\n}\r\n\r\n/** @internal */\r\nexport type ArcGisFieldType =\r\n  \"esriFieldTypeInteger\"\r\n  | \"esriFieldTypeSmallInteger\"\r\n  | \"esriFieldTypeDouble\"\r\n  | \"esriFieldTypeSingle\"\r\n  | \"esriFieldTypeString\"\r\n  | \"esriFieldTypeDate\"\r\n  | \"esriFieldTypeGeometry\"\r\n  | \"esriFieldTypeOID\"\r\n  | \"esriFieldTypeBlob\"\r\n  | \"esriFieldTypeGlobalID\"\r\n  | \"esriFieldTypeRaster\"\r\n  | \"esriFieldTypeGUID\"\r\n  | \"esriFieldTypeXML\";\r\n\r\n/** @internal */\r\nexport class ArcGisFeatureResponse {\r\n  public readonly format: ArcGisFeatureFormat;\r\n  public readonly envelope: ArcGisExtent | undefined;\r\n\r\n  private _response: Promise<Response>;\r\n\r\n  constructor(format: ArcGisFeatureFormat,  response: Promise<Response>, envelope?: ArcGisExtent) {\r\n    this.format = format;\r\n    this._response = response;\r\n    this.envelope = envelope;\r\n  }\r\n\r\n  public async getResponseData(): Promise<ArcGisResponseData|undefined> {\r\n    let data: any|undefined;\r\n    try {\r\n      const tileResponse = await this._response;\r\n      if (tileResponse === undefined || tileResponse.status !== 200  )\r\n        return undefined;\r\n\r\n      if (this.format === \"PBF\") {\r\n        const byteArray: Uint8Array = new Uint8Array(await tileResponse.arrayBuffer());\r\n        if (!byteArray || (byteArray.length === 0))\r\n          return undefined;\r\n\r\n        data = esriPBuffer.FeatureCollectionPBuffer.deserialize(byteArray);\r\n        const collection = data as esriPBuffer.FeatureCollectionPBuffer;\r\n        return {data, exceedTransferLimit: collection?.queryResult?.featureResult?.exceededTransferLimit};\r\n\r\n      } else {\r\n        data = await tileResponse.json();\r\n        if (data === undefined || data == null)\r\n          return undefined;\r\n\r\n        return {data, exceedTransferLimit: data.exceededTransferLimit};\r\n      }\r\n\r\n    } catch(_e) {\r\n      return undefined;\r\n    }\r\n  }\r\n}\r\n"]}
+{"version":3,"file":"ArcGisFeatureResponse.js","sourceRoot":"","sources":["../../../src/ArcGisFeature/ArcGisFeatureResponse.ts"],"names":[],"mappings":";AAAA;;;+FAG+F;;;AAG/F,uDAAgD;AAwBhD,gBAAgB;AAChB,MAAa,qBAAqB;IAMhC,YAAY,MAA2B,EAAG,QAA2B,EAAE,QAAuB;QAC5F,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC;QACrB,IAAI,CAAC,SAAS,GAAG,QAAQ,CAAC;QAC1B,IAAI,CAAC,QAAQ,GAAG,QAAQ,CAAC;IAC3B,CAAC;IAEM,KAAK,CAAC,eAAe;QAC1B,IAAI,IAAmB,CAAC;QACxB,IAAI;YACF,MAAM,YAAY,GAAG,MAAM,IAAI,CAAC,SAAS,CAAC;YAC1C,IAAI,YAAY,KAAK,SAAS,IAAI,YAAY,CAAC,MAAM,KAAK,GAAG;gBAC3D,OAAO,SAAS,CAAC;YAEnB,IAAI,IAAI,CAAC,MAAM,KAAK,KAAK,EAAE;gBACzB,MAAM,SAAS,GAAe,IAAI,UAAU,CAAC,MAAM,YAAY,CAAC,WAAW,EAAE,CAAC,CAAC;gBAC/E,IAAI,CAAC,SAAS,IAAI,CAAC,SAAS,CAAC,MAAM,KAAK,CAAC,CAAC;oBACxC,OAAO,SAAS,CAAC;gBAEnB,IAAI,GAAG,6BAAW,CAAC,wBAAwB,CAAC,WAAW,CAAC,SAAS,CAAC,CAAC;gBACnE,MAAM,UAAU,GAAG,IAA4C,CAAC;gBAChE,OAAO,EAAC,IAAI,EAAE,mBAAmB,EAAE,UAAU,EAAE,WAAW,EAAE,aAAa,EAAE,qBAAqB,EAAC,CAAC;aAEnG;iBAAM;gBACL,IAAI,GAAG,MAAM,YAAY,CAAC,IAAI,EAAE,CAAC;gBACjC,IAAI,IAAI,KAAK,SAAS,IAAI,IAAI,IAAI,IAAI;oBACpC,OAAO,SAAS,CAAC;gBAEnB,OAAO,EAAC,IAAI,EAAE,mBAAmB,EAAE,IAAI,CAAC,qBAAqB,EAAC,CAAC;aAChE;SAEF;QAAC,OAAM,EAAE,EAAE;YACV,OAAO,SAAS,CAAC;SAClB;IACH,CAAC;CACF;AAxCD,sDAwCC","sourcesContent":["/*---------------------------------------------------------------------------------------------\n* Copyright (c) Bentley Systems, Incorporated. All rights reserved.\n* See LICENSE.md in the project root for license terms and full copyright notice.\n*--------------------------------------------------------------------------------------------*/\n\nimport { ArcGisExtent, ArcGisFeatureFormat } from \"./ArcGisFeatureQuery\";\nimport { esriPBuffer } from \"./esriPBuffer.gen\";\n\n/** @internal */\nexport interface ArcGisResponseData {\n  data: any;\n  exceedTransferLimit: boolean;\n}\n\n/** @internal */\nexport type ArcGisFieldType =\n  \"esriFieldTypeInteger\"\n  | \"esriFieldTypeSmallInteger\"\n  | \"esriFieldTypeDouble\"\n  | \"esriFieldTypeSingle\"\n  | \"esriFieldTypeString\"\n  | \"esriFieldTypeDate\"\n  | \"esriFieldTypeGeometry\"\n  | \"esriFieldTypeOID\"\n  | \"esriFieldTypeBlob\"\n  | \"esriFieldTypeGlobalID\"\n  | \"esriFieldTypeRaster\"\n  | \"esriFieldTypeGUID\"\n  | \"esriFieldTypeXML\";\n\n/** @internal */\nexport class ArcGisFeatureResponse {\n  public readonly format: ArcGisFeatureFormat;\n  public readonly envelope: ArcGisExtent | undefined;\n\n  private _response: Promise<Response>;\n\n  constructor(format: ArcGisFeatureFormat,  response: Promise<Response>, envelope?: ArcGisExtent) {\n    this.format = format;\n    this._response = response;\n    this.envelope = envelope;\n  }\n\n  public async getResponseData(): Promise<ArcGisResponseData|undefined> {\n    let data: any|undefined;\n    try {\n      const tileResponse = await this._response;\n      if (tileResponse === undefined || tileResponse.status !== 200  )\n        return undefined;\n\n      if (this.format === \"PBF\") {\n        const byteArray: Uint8Array = new Uint8Array(await tileResponse.arrayBuffer());\n        if (!byteArray || (byteArray.length === 0))\n          return undefined;\n\n        data = esriPBuffer.FeatureCollectionPBuffer.deserialize(byteArray);\n        const collection = data as esriPBuffer.FeatureCollectionPBuffer;\n        return {data, exceedTransferLimit: collection?.queryResult?.featureResult?.exceededTransferLimit};\n\n      } else {\n        data = await tileResponse.json();\n        if (data === undefined || data == null)\n          return undefined;\n\n        return {data, exceedTransferLimit: data.exceededTransferLimit};\n      }\n\n    } catch(_e) {\n      return undefined;\n    }\n  }\n}\n"]}

package/lib/cjs/ArcGisFeature/ArcGisJsonFeatureReader.d.ts

@@ -0,0 +1,13 @@
+import { ImageMapLayerSettings } from "@itwin/core-common";
+import { ArcGisGeometryRenderer, ArcGisGraphicsRenderer, MapLayerFeatureInfo } from "@itwin/core-frontend";
+import { Transform } from "@itwin/core-geometry";
+import { ArcGisBaseFeatureReader } from "./ArcGisFeatureReader";
+import { ArcGisResponseData } from "./ArcGisFeatureResponse";
+/** @internal */
+export declare class ArcGisJsonFeatureReader extends ArcGisBaseFeatureReader {
+    transform: Transform | undefined;
+    constructor(settings: ImageMapLayerSettings, layerMetadata: any);
+    readAndRender(response: ArcGisResponseData, renderer: ArcGisGeometryRenderer): Promise<void>;
+    readFeatureInfo(response: ArcGisResponseData, featureInfos: MapLayerFeatureInfo[], renderer?: ArcGisGraphicsRenderer): Promise<void>;
+}
+//# sourceMappingURL=ArcGisJsonFeatureReader.d.ts.map

package/lib/cjs/ArcGisFeature/ArcGisJsonFeatureReader.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"ArcGisJsonFeatureReader.d.ts","sourceRoot":"","sources":["../../../src/ArcGisFeature/ArcGisJsonFeatureReader.ts"],"names":[],"mappings":"AAMA,OAAO,EAAE,qBAAqB,EAAE,MAAM,oBAAoB,CAAC;AAC3D,OAAO,EAA4B,sBAAsB,EAAE,sBAAsB,EAA6C,mBAAmB,EAAyB,MAAM,sBAAsB,CAAC;AACvM,OAAO,EAAE,SAAS,EAAE,MAAM,sBAAsB,CAAC;AACjD,OAAO,EAAE,uBAAuB,EAAE,MAAM,uBAAuB,CAAC;AAChE,OAAO,EAAmB,kBAAkB,EAAE,MAAM,yBAAyB,CAAC;AAE9E,gBAAgB;AAChB,qBAAa,uBAAwB,SAAQ,uBAAuB;IAC3D,SAAS,EAAE,SAAS,GAAG,SAAS,CAAC;gBAErB,QAAQ,EAAE,qBAAqB,EAAE,aAAa,EAAE,GAAG;IAKzD,aAAa,CAAC,QAAQ,EAAE,kBAAkB,EAAE,QAAQ,EAAE,sBAAsB;IAW5E,eAAe,CAAC,QAAQ,EAAE,kBAAkB,EAAE,YAAY,EAAE,mBAAmB,EAAE,EAAE,QAAQ,CAAC,EAAE,sBAAsB;CAoGlI"}

package/lib/cjs/ArcGisFeature/{ArcGisFeatureJSON.js → ArcGisJsonFeatureReader.js}

@@ -4,61 +4,25 @@
 * See LICENSE.md in the project root for license terms and full copyright notice.
 *--------------------------------------------------------------------------------------------*/
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.ArcGisFeatureJSON = void 0;
+exports.ArcGisJsonFeatureReader = void 0;
 const appui_abstract_1 = require("@itwin/appui-abstract");
 const core_frontend_1 = require("@itwin/core-frontend");
 const ArcGisFeatureReader_1 = require("./ArcGisFeatureReader");
 /** @internal */
-class ArcGisFeatureJSON extends ArcGisFeatureReader_1.ArcGisFeatureReader {
+class ArcGisJsonFeatureReader extends ArcGisFeatureReader_1.ArcGisBaseFeatureReader {
     constructor(settings, layerMetadata) {
         super(settings, layerMetadata);
     }
-    readAndRender(response, renderer) {
+    async readAndRender(response, renderer) {
         const responseObj = response.data;
-        if (responseObj?.geometryType === "esriGeometryPolyline" || responseObj?.geometryType === "esriGeometryPolygon") {
-            const fill = (responseObj.geometryType === "esriGeometryPolygon");
+        if (responseObj.geometryType) {
+            const geomReader = new core_frontend_1.ArcGisGeometryReaderJSON(responseObj.geometryType, renderer, renderer.transform === undefined);
             for (const feature of responseObj.features) {
-                let offset = 0;
-                const lengths = [];
-                const coords = [];
-                if (feature?.geometry?.rings) {
-                    for (const ring of feature?.geometry?.rings) {
-                        offset = ArcGisFeatureJSON.deflateCoordinates(ring, coords, 2, offset);
-                        lengths.push(ring.length);
-                    }
-                }
-                else if (feature?.geometry?.paths) {
-                    for (const path of feature?.geometry?.paths) {
-                        offset = ArcGisFeatureJSON.deflateCoordinates(path, coords, 2, offset);
-                        lengths.push(path.length);
-                    }
-                }
-                renderer.renderPath(lengths, coords, fill, 2, renderer.transform === undefined);
+                await geomReader.readGeometry(feature.geometry);
             }
         }
-        else if (responseObj?.geometryType === "esriGeometryPoint" || responseObj?.geometryType === "esriGeometryMultiPoint") {
-            for (const feature of responseObj.features) {
-                // TODO: Add support for multipoint
-                if (feature.geometry) {
-                    const lengths = [];
-                    const coords = [feature.geometry.x, feature.geometry.y];
-                    renderer.renderPoint(lengths, coords, 2, renderer.transform === undefined);
-                }
-            }
-        }
-    }
-    // Converts an [[x1,y1], [x2,y2], ...] to [x1,y1,x2,y2, ...]
-    // stride is the number of dimensions
-    // https://github.com/openlayers/openlayers/blob/7a2f87caca9ddc1912d910f56eb5637445fc11f6/src/ol/geom/flat/deflate.js#L26
-    static deflateCoordinates(coordinates, flatCoordinates, stride, offset) {
-        for (let i = 0, ii = coordinates.length; i < ii; ++i) {
-            const coordinate = coordinates[i];
-            for (let j = 0; j < stride; ++j)
-                flatCoordinates[offset++] = coordinate[j];
-        }
-        return offset;
     }
-    readFeatureInfo(response, featureInfos) {
+    async readFeatureInfo(response, featureInfos, renderer) {
         const responseObj = response.data;
         if (responseObj === undefined || !Array.isArray(responseObj.features))
             return;
@@ -111,23 +75,37 @@ class ArcGisFeatureJSON extends ArcGisFeatureReader_1.ArcGisFeatureReader {
             }
             const typename = getStandardTypeName(fieldType);
             propertyValue.displayValue = this.getDisplayValue(typename, propertyValue.value);
-            return new core_frontend_1.MapFeatureInfoRecord(propertyValue, { name: fieldName, displayLabel: fieldName, typename });
+            return { value: propertyValue, property: { name: fieldName, displayLabel: fieldName, typename } };
+        };
+        let geomReader;
+        if (renderer && responseObj?.geometryType) {
+            geomReader = new core_frontend_1.ArcGisGeometryReaderJSON(responseObj.geometryType, renderer);
+        }
+        // Each feature response represent a single sub-layer, no need to check for existing entry.
+        const subLayerInfo = {
+            subLayerName: this._layerMetadata.name,
+            displayFieldName: this._layerMetadata.name,
+            features: [],
         };
-        for (const feature of responseObj.features) {
-            const subLayerInfo = {
-                subLayerName: this._layerMetadata.name,
-                displayFieldName: this._layerMetadata.name,
-                records: [],
-            };
-            for (const [key, value] of Object.entries(feature.attributes))
-                subLayerInfo.records?.push(getRecordInfo(key, value));
-            if (layerInfo.info === undefined)
-                layerInfo.info = [];
-            if (!(layerInfo.info instanceof HTMLElement))
-                layerInfo.info.push(subLayerInfo);
+        // Read all features attributes / geometries
+        for (const responseFeature of responseObj.features) {
+            const feature = { attributes: [] };
+            for (const [key, value] of Object.entries(responseFeature.attributes))
+                feature.attributes?.push(getRecordInfo(key, value));
+            if (geomReader) {
+                await geomReader.readGeometry(responseFeature.geometry);
+                const graphics = renderer.moveGraphics();
+                feature.geometries = graphics.map((graphic) => {
+                    return { graphic };
+                });
+            }
+            subLayerInfo.features.push(feature);
         }
+        if (layerInfo.subLayerInfos === undefined)
+            layerInfo.subLayerInfos = [];
+        layerInfo.subLayerInfos.push(subLayerInfo);
         featureInfos.push(layerInfo);
     }
 }
-exports.ArcGisFeatureJSON = ArcGisFeatureJSON;
-//# sourceMappingURL=ArcGisFeatureJSON.js.map
+exports.ArcGisJsonFeatureReader = ArcGisJsonFeatureReader;
+//# sourceMappingURL=ArcGisJsonFeatureReader.js.map

package/lib/cjs/ArcGisFeature/ArcGisJsonFeatureReader.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"ArcGisJsonFeatureReader.js","sourceRoot":"","sources":["../../../src/ArcGisFeature/ArcGisJsonFeatureReader.ts"],"names":[],"mappings":"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","sourcesContent":["/*---------------------------------------------------------------------------------------------\n* Copyright (c) Bentley Systems, Incorporated. All rights reserved.\n* See LICENSE.md in the project root for license terms and full copyright notice.\n*--------------------------------------------------------------------------------------------*/\n\nimport { PrimitiveValue, PropertyValueFormat, StandardTypeNames } from \"@itwin/appui-abstract\";\nimport { ImageMapLayerSettings } from \"@itwin/core-common\";\nimport { ArcGisGeometryReaderJSON, ArcGisGeometryRenderer, ArcGisGraphicsRenderer, MapLayerFeature, MapLayerFeatureAttribute, MapLayerFeatureInfo, MapSubLayerFeatureInfo} from \"@itwin/core-frontend\";\nimport { Transform } from \"@itwin/core-geometry\";\nimport { ArcGisBaseFeatureReader } from \"./ArcGisFeatureReader\";\nimport { ArcGisFieldType, ArcGisResponseData } from \"./ArcGisFeatureResponse\";\n\n/** @internal */\nexport class ArcGisJsonFeatureReader extends ArcGisBaseFeatureReader {\n  public transform: Transform | undefined;\n\n  public constructor(settings: ImageMapLayerSettings, layerMetadata: any) {\n    super(settings, layerMetadata);\n\n  }\n\n  public async readAndRender(response: ArcGisResponseData, renderer: ArcGisGeometryRenderer) {\n    const responseObj = response.data;\n    if (responseObj.geometryType) {\n      const geomReader = new ArcGisGeometryReaderJSON(responseObj.geometryType, renderer, renderer.transform === undefined);\n\n      for (const feature of responseObj.features) {\n        await geomReader.readGeometry(feature.geometry);\n      }\n    }\n  }\n\n  public async readFeatureInfo(response: ArcGisResponseData, featureInfos: MapLayerFeatureInfo[], renderer?: ArcGisGraphicsRenderer) {\n    const responseObj = response.data;\n    if (responseObj === undefined || !Array.isArray(responseObj.features))\n      return;\n\n    const layerInfo: MapLayerFeatureInfo = { layerName: this._settings.name };\n\n    // Create a signature index for every field name / type.\n    const fieldsType: { [key: string]: ArcGisFieldType } = {};\n    for (const fieldInfo of responseObj.fields) {\n      fieldsType[fieldInfo.name] = fieldInfo.type;\n    }\n\n    const getStandardTypeName = (fieldType: ArcGisFieldType) => {\n      switch (fieldType) {\n        case \"esriFieldTypeInteger\":\n        case \"esriFieldTypeSmallInteger\":\n        case \"esriFieldTypeOID\":\n          return StandardTypeNames.Integer;\n        case \"esriFieldTypeDouble\":\n          return StandardTypeNames.Double;\n        case \"esriFieldTypeSingle\":\n          return StandardTypeNames.Float;\n        case \"esriFieldTypeDate\":\n          return StandardTypeNames.DateTime;\n        default:\n          return StandardTypeNames.String;\n      }\n    };\n\n    const getRecordInfo = (fieldName: string, value: any): MapLayerFeatureAttribute => {\n      const propertyValue: PrimitiveValue = {valueFormat: PropertyValueFormat.Primitive};\n\n      if (value === null) {\n        value = undefined;\n      }\n\n      const strValue = `${value}`;\n      const fieldType = fieldsType[fieldName];\n      switch (fieldType) {\n        case \"esriFieldTypeInteger\":\n        case \"esriFieldTypeSmallInteger\":\n        case \"esriFieldTypeOID\":\n          propertyValue.value = value as number;\n          break;\n        case \"esriFieldTypeDouble\":\n        case \"esriFieldTypeSingle\":\n          propertyValue.value = this.toFixedWithoutPadding(value);\n          break;\n        case \"esriFieldTypeDate\":\n          propertyValue.value = new Date(value);\n          break;\n        default:\n          if (value !== undefined)\n            propertyValue.value = strValue;\n\n          break;\n      }\n\n      const typename = getStandardTypeName(fieldType);\n      propertyValue.displayValue = this.getDisplayValue(typename, propertyValue.value);\n\n      return {value: propertyValue, property: { name: fieldName, displayLabel: fieldName, typename }};\n    };\n\n    let geomReader: ArcGisGeometryReaderJSON|undefined;\n    if (renderer && responseObj?.geometryType) {\n      geomReader = new ArcGisGeometryReaderJSON(responseObj.geometryType, renderer);\n    }\n\n    // Each feature response represent a single sub-layer, no need to check for existing entry.\n    const subLayerInfo: MapSubLayerFeatureInfo = {\n      subLayerName: this._layerMetadata.name,\n      displayFieldName: this._layerMetadata.name,\n      features: [],\n    };\n\n    // Read all features attributes / geometries\n    for (const responseFeature of responseObj.features) {\n      const feature: MapLayerFeature = {attributes: []};\n\n      for (const [key, value] of Object.entries(responseFeature.attributes))\n        feature.attributes?.push(getRecordInfo(key, value));\n\n      if (geomReader) {\n        await geomReader.readGeometry(responseFeature.geometry);\n        const graphics = renderer!.moveGraphics();\n        feature.geometries = graphics.map((graphic) => {\n          return {graphic};\n        });\n      }\n      subLayerInfo.features.push(feature);\n    }\n\n    if (layerInfo.subLayerInfos === undefined)\n      layerInfo.subLayerInfos = [];\n    layerInfo.subLayerInfos.push(subLayerInfo);\n\n    featureInfos.push(layerInfo);\n  }\n}\n"]}

package/lib/cjs/ArcGisFeature/{ArcGisFeaturePBF.d.ts → ArcGisPbfFeatureReader.d.ts}

@@ -1,15 +1,14 @@
-import { ArcGisFeatureRenderer } from "./ArcGisFeatureRenderer";
 import { esriPBuffer } from "../ArcGisFeature/esriPBuffer.gen";
-import { MapLayerFeatureInfo } from "@itwin/core-frontend";
+import { ArcGisGeometryRenderer, ArcGisGraphicsRenderer, MapLayerFeatureInfo } from "@itwin/core-frontend";
 import { ImageMapLayerSettings } from "@itwin/core-common";
-import { ArcGisFeatureReader } from "./ArcGisFeatureReader";
+import { ArcGisBaseFeatureReader } from "./ArcGisFeatureReader";
 import { ArcGisResponseData } from "./ArcGisFeatureResponse";
 import { ArcGisFeatureGeometryType } from "./ArcGisFeatureQuery";
 /** @internal */
-export declare class ArcGisFeaturePBF extends ArcGisFeatureReader {
+export declare class ArcGisPbfFeatureReader extends ArcGisBaseFeatureReader {
     constructor(settings: ImageMapLayerSettings, layerMetadata: any);
     static getArcGisFeatureGeometryType(geomType: esriPBuffer.FeatureCollectionPBuffer.GeometryType): ArcGisFeatureGeometryType;
-    readAndRender(response: ArcGisResponseData, renderer: ArcGisFeatureRenderer): void;
-    readFeatureInfo(response: ArcGisResponseData, featureInfos: MapLayerFeatureInfo[]): void;
+    readAndRender(response: ArcGisResponseData, renderer: ArcGisGeometryRenderer): Promise<void>;
+    readFeatureInfo(response: ArcGisResponseData, featureInfos: MapLayerFeatureInfo[], renderer?: ArcGisGraphicsRenderer): Promise<void>;
 }
-//# sourceMappingURL=ArcGisFeaturePBF.d.ts.map
+//# sourceMappingURL=ArcGisPbfFeatureReader.d.ts.map

package/lib/cjs/ArcGisFeature/ArcGisPbfFeatureReader.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"ArcGisPbfFeatureReader.d.ts","sourceRoot":"","sources":["../../../src/ArcGisFeature/ArcGisPbfFeatureReader.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,WAAW,EAAE,MAAM,kCAAkC,CAAC;AAC/D,OAAO,EAAE,sBAAsB,EAAE,sBAAsB,EAA6C,mBAAmB,EAAyB,MAAM,sBAAsB,CAAC;AAE7K,OAAO,EAAE,qBAAqB,EAAE,MAAM,oBAAoB,CAAC;AAC3D,OAAO,EAAE,uBAAuB,EAAE,MAAM,uBAAuB,CAAC;AAChE,OAAO,EAAE,kBAAkB,EAAE,MAAM,yBAAyB,CAAC;AAE7D,OAAO,EAAE,yBAAyB,EAAE,MAAM,sBAAsB,CAAC;AAUjE,gBAAgB;AAChB,qBAAa,sBAAuB,SAAQ,uBAAuB;gBAC9C,QAAQ,EAAE,qBAAqB,EAAE,aAAa,EAAE,GAAG;WAIxD,4BAA4B,CAAC,QAAQ,EAAE,WAAW,CAAC,wBAAwB,CAAC,YAAY,GAAG,yBAAyB;IAiBrH,aAAa,CAAC,QAAQ,EAAE,kBAAkB,EAAE,QAAQ,EAAE,sBAAsB;IA2B5E,eAAe,CAAC,QAAQ,EAAE,kBAAkB,EAAE,YAAY,EAAE,mBAAmB,EAAE,EAAE,QAAQ,CAAC,EAAE,sBAAsB;CA8JlI"}

package/lib/cjs/ArcGisFeature/{ArcGisFeaturePBF.js → ArcGisPbfFeatureReader.js}

@@ -1,19 +1,18 @@
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.ArcGisPbfFeatureReader = void 0;
 /*---------------------------------------------------------------------------------------------
 * Copyright (c) Bentley Systems, Incorporated. All rights reserved.
 * See LICENSE.md in the project root for license terms and full copyright notice.
 *--------------------------------------------------------------------------------------------*/
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.ArcGisFeaturePBF = void 0;
 const esriPBuffer_gen_1 = require("../ArcGisFeature/esriPBuffer.gen");
-const core_frontend_1 = require("@itwin/core-frontend");
 const appui_abstract_1 = require("@itwin/appui-abstract");
 const ArcGisFeatureReader_1 = require("./ArcGisFeatureReader");
 const core_bentley_1 = require("@itwin/core-bentley");
 const esriGeometryType = esriPBuffer_gen_1.esriPBuffer.FeatureCollectionPBuffer.GeometryType;
 const loggerCategory = "MapLayersFormats.ArcGISFeature";
 /** @internal */
-class ArcGisFeaturePBF extends ArcGisFeatureReader_1.ArcGisFeatureReader {
+class ArcGisPbfFeatureReader extends ArcGisFeatureReader_1.ArcGisBaseFeatureReader {
     constructor(settings, layerMetadata) {
         super(settings, layerMetadata);
     }
@@ -33,7 +32,7 @@ class ArcGisFeaturePBF extends ArcGisFeatureReader_1.ArcGisFeatureReader {
                 return "esriGeometryNull";
         }
     }
-    readAndRender(response, renderer) {
+    async readAndRender(response, renderer) {
         if (!(response.data instanceof esriPBuffer_gen_1.esriPBuffer.FeatureCollectionPBuffer)) {
             const msg = "Response was not in PBF format";
             core_bentley_1.Logger.logError(loggerCategory, msg);
@@ -48,23 +47,23 @@ class ArcGisFeaturePBF extends ArcGisFeatureReader_1.ArcGisFeatureReader {
         if (geomType === esriGeometryType.esriGeometryTypePoint ||
             geomType === esriGeometryType.esriGeometryTypeMultipoint) {
             for (const feature of collection.queryResult.featureResult.features)
-                renderer.renderPoint(feature.geometry.lengths, feature.geometry.coords, stride, renderer.transform === undefined);
+                await renderer.renderPoint(feature.geometry.lengths, feature.geometry.coords, stride, renderer.transform === undefined);
         }
         else if (geomType === esriGeometryType.esriGeometryTypePolyline || geomType === esriGeometryType.esriGeometryTypePolygon) {
             const fill = (geomType === esriGeometryType.esriGeometryTypePolygon);
             for (const feature of collection.queryResult.featureResult.features)
                 if (feature?.has_geometry)
-                    renderer.renderPath(feature.geometry.lengths, feature.geometry.coords, fill, stride, renderer.transform === undefined);
+                    await renderer.renderPath(feature.geometry.lengths, feature.geometry.coords, fill, stride, renderer.transform === undefined);
         }
     }
-    readFeatureInfo(response, featureInfos) {
+    async readFeatureInfo(response, featureInfos, renderer) {
         if (!(response.data instanceof esriPBuffer_gen_1.esriPBuffer.FeatureCollectionPBuffer)) {
             core_bentley_1.Logger.logError(loggerCategory, "Response was not in PBF format");
         }
         const collection = response.data;
         if (!collection.has_queryResult || !collection.queryResult.has_featureResult || collection?.queryResult?.featureResult?.features === undefined)
             return;
-        const layerInfo = { layerName: this._settings.name, info: [] };
+        const layerInfo = { layerName: this._settings.name, subLayerInfos: [] };
         // Fields metadata is stored outside feature results, create dedicated array first
         const fields = [];
         for (const field of collection.queryResult.featureResult.fields)
@@ -107,7 +106,7 @@ class ArcGisFeaturePBF extends ArcGisFeatureReader_1.ArcGisFeatureReader {
             }
             return { propertyValue, typename };
         };
-        const getRecordInfo = (fieldInfo, attrValue) => {
+        const getFeatureAttribute = (fieldInfo, attrValue) => {
             let propertyValue = { valueFormat: appui_abstract_1.PropertyValueFormat.Primitive };
             let typename = appui_abstract_1.StandardTypeNames.String;
             if (fieldInfo.type === esriPBuffer_gen_1.esriPBuffer.FeatureCollectionPBuffer.FieldType.esriFieldTypeDouble
@@ -165,37 +164,52 @@ class ArcGisFeaturePBF extends ArcGisFeatureReader_1.ArcGisFeatureReader {
                 return undefined;
             }
             propertyValue.displayValue = this.getDisplayValue(typename, propertyValue.value);
-            return new core_frontend_1.MapFeatureInfoRecord(propertyValue, { name: fieldInfo.name, displayLabel: fieldInfo.name, typename });
+            return { value: propertyValue, property: { name: fieldInfo.name, displayLabel: fieldInfo.name, typename } };
+        };
+        const geomType = collection.queryResult.featureResult.geometryType;
+        const stride = (collection.queryResult.featureResult.hasM || collection.queryResult.featureResult.hasZ) ? 3 : 2;
+        const subLayerInfo = {
+            subLayerName: this._layerMetadata.name,
+            displayFieldName: this._layerMetadata.name,
+            features: [],
         };
         // Read feature values
-        for (const feature of collection.queryResult.featureResult.features) {
-            const subLayerInfo = {
-                subLayerName: this._layerMetadata.name,
-                displayFieldName: this._layerMetadata.name,
-                records: [],
-            };
-            let i = 0;
-            for (const attrValue of feature.attributes) {
-                if (i > fields.length) {
+        for (const featureResponse of collection.queryResult.featureResult.features) {
+            const feature = { attributes: [] };
+            if (renderer && featureResponse?.has_geometry) {
+                if (geomType === esriGeometryType.esriGeometryTypePoint || geomType === esriGeometryType.esriGeometryTypeMultipoint) {
+                    await renderer.renderPoint(featureResponse.geometry.lengths, featureResponse.geometry.coords, stride, true);
+                }
+                else if (geomType === esriGeometryType.esriGeometryTypePolyline || geomType === esriGeometryType.esriGeometryTypePolygon) {
+                    const fill = (geomType === esriGeometryType.esriGeometryTypePolygon);
+                    await renderer.renderPath(featureResponse.geometry.lengths, featureResponse.geometry.coords, fill, stride, true);
+                }
+                const graphics = renderer.moveGraphics();
+                feature.geometries = graphics.map((graphic) => {
+                    return { graphic };
+                });
+            }
+            let fieldIdx = 0;
+            for (const attrValue of featureResponse.attributes) {
+                if (fieldIdx > fields.length) {
                     core_bentley_1.Logger.logError(loggerCategory, "Error while read feature info data: fields metadata missing");
                     break;
                 }
                 // Convert everything to string for now
-                const info = getRecordInfo(fields[i], attrValue);
-                if (info) {
-                    subLayerInfo.records?.push(info);
+                const attr = getFeatureAttribute(fields[fieldIdx], attrValue);
+                if (attr) {
+                    feature.attributes?.push(attr);
                 }
-                i++;
-            }
-            if (layerInfo.info === undefined) {
-                layerInfo.info = [];
-            }
-            if (!(layerInfo.info instanceof HTMLElement)) {
-                layerInfo.info.push(subLayerInfo);
+                fieldIdx++;
             }
+            subLayerInfo.features.push(feature);
+        }
+        if (layerInfo.subLayerInfos === undefined) {
+            layerInfo.subLayerInfos = [];
         }
+        layerInfo.subLayerInfos.push(subLayerInfo);
         featureInfos.push(layerInfo);
     }
 }
-exports.ArcGisFeaturePBF = ArcGisFeaturePBF;
-//# sourceMappingURL=ArcGisFeaturePBF.js.map
+exports.ArcGisPbfFeatureReader = ArcGisPbfFeatureReader;
+//# sourceMappingURL=ArcGisPbfFeatureReader.js.map

package/lib/cjs/ArcGisFeature/ArcGisPbfFeatureReader.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"ArcGisPbfFeatureReader.js","sourceRoot":"","sources":["../../../src/ArcGisFeature/ArcGisPbfFeatureReader.ts"],"names":[],"mappings":"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","sourcesContent":["/*---------------------------------------------------------------------------------------------\n* Copyright (c) Bentley Systems, Incorporated. All rights reserved.\n* See LICENSE.md in the project root for license terms and full copyright notice.\n*--------------------------------------------------------------------------------------------*/\nimport { esriPBuffer } from \"../ArcGisFeature/esriPBuffer.gen\";\nimport { ArcGisGeometryRenderer, ArcGisGraphicsRenderer, MapLayerFeature, MapLayerFeatureAttribute, MapLayerFeatureInfo, MapSubLayerFeatureInfo} from \"@itwin/core-frontend\";\nimport { PrimitiveValue, PropertyValueFormat, StandardTypeNames } from \"@itwin/appui-abstract\";\nimport { ImageMapLayerSettings } from \"@itwin/core-common\";\nimport { ArcGisBaseFeatureReader } from \"./ArcGisFeatureReader\";\nimport { ArcGisResponseData } from \"./ArcGisFeatureResponse\";\nimport { Logger } from \"@itwin/core-bentley\";\nimport { ArcGisFeatureGeometryType } from \"./ArcGisFeatureQuery\";\n\nconst esriGeometryType = esriPBuffer.FeatureCollectionPBuffer.GeometryType;\nconst loggerCategory = \"MapLayersFormats.ArcGISFeature\";\n\ninterface PbfFieldInfo {\n  name: string;\n  type: esriPBuffer.FeatureCollectionPBuffer.FieldType;\n}\n\n/** @internal */\nexport class ArcGisPbfFeatureReader extends ArcGisBaseFeatureReader {\n  public constructor(settings: ImageMapLayerSettings, layerMetadata: any) {\n    super(settings, layerMetadata);\n  }\n\n  public static getArcGisFeatureGeometryType(geomType: esriPBuffer.FeatureCollectionPBuffer.GeometryType): ArcGisFeatureGeometryType {\n    switch (geomType) {\n      case esriPBuffer.FeatureCollectionPBuffer.GeometryType.esriGeometryTypeMultipatch:\n        return \"esriGeometryMultiPatch\";\n      case esriPBuffer.FeatureCollectionPBuffer.GeometryType.esriGeometryTypeMultipoint:\n        return \"esriGeometryMultipoint\";\n      case esriPBuffer.FeatureCollectionPBuffer.GeometryType.esriGeometryTypePoint:\n        return \"esriGeometryPoint\";\n      case esriPBuffer.FeatureCollectionPBuffer.GeometryType.esriGeometryTypePolygon:\n        return \"esriGeometryPolygon\";\n      case esriPBuffer.FeatureCollectionPBuffer.GeometryType.esriGeometryTypePolyline:\n        return \"esriGeometryPolyline\";\n      default:\n        return \"esriGeometryNull\";\n    }\n  }\n\n  public async readAndRender(response: ArcGisResponseData, renderer: ArcGisGeometryRenderer) {\n    if (!(response.data instanceof esriPBuffer.FeatureCollectionPBuffer)) {\n      const msg = \"Response was not in PBF format\";\n      Logger.logError(loggerCategory, msg);\n      return;\n    }\n\n    const collection = response.data;\n    if (!collection.has_queryResult || !collection.queryResult.has_featureResult || collection?.queryResult?.featureResult?.features === undefined)\n      return;\n\n    const geomType = collection.queryResult.featureResult.geometryType;\n    const stride = (collection.queryResult.featureResult.hasM || collection.queryResult.featureResult.hasZ) ? 3 : 2;\n\n    // console.log(`Nb Feature: ${collection.queryResult.featureResult.features.length}`);\n    if (geomType === esriGeometryType.esriGeometryTypePoint ||\n      geomType === esriGeometryType.esriGeometryTypeMultipoint) {\n      for (const feature of collection.queryResult.featureResult.features)\n        await renderer.renderPoint(feature.geometry.lengths, feature.geometry.coords, stride, renderer.transform === undefined);\n    } else if (geomType === esriGeometryType.esriGeometryTypePolyline || geomType === esriGeometryType.esriGeometryTypePolygon) {\n      const fill = (geomType === esriGeometryType.esriGeometryTypePolygon);\n      for (const feature of collection.queryResult.featureResult.features)\n        if (feature?.has_geometry)\n          await renderer.renderPath(feature.geometry.lengths, feature.geometry.coords, fill, stride, renderer.transform === undefined);\n    }\n  }\n\n  public async readFeatureInfo(response: ArcGisResponseData, featureInfos: MapLayerFeatureInfo[], renderer?: ArcGisGraphicsRenderer) {\n    if (!(response.data instanceof esriPBuffer.FeatureCollectionPBuffer)) {\n\n      Logger.logError(loggerCategory, \"Response was not in PBF format\");\n    }\n\n    const collection = response.data as esriPBuffer.FeatureCollectionPBuffer;\n    if (!collection.has_queryResult || !collection.queryResult.has_featureResult || collection?.queryResult?.featureResult?.features === undefined)\n      return;\n\n    const layerInfo: MapLayerFeatureInfo = { layerName: this._settings.name, subLayerInfos: [] };\n\n    // Fields metadata is stored outside feature results, create dedicated array first\n    const fields: PbfFieldInfo[] = [];\n    for (const field of collection.queryResult.featureResult.fields)\n      fields.push({name: field.name, type:field.fieldType});\n\n    const getNumericValue = (attrValue: esriPBuffer.FeatureCollectionPBuffer.Value) => {\n      const propertyValue: PrimitiveValue = { valueFormat: PropertyValueFormat.Primitive };\n      let typename = StandardTypeNames.Number;\n      if (attrValue.has_double_value) {\n        const value = this.toFixedWithoutPadding(attrValue.double_value);\n        propertyValue.value = value;\n        typename = StandardTypeNames.Double;\n      } else if (attrValue.has_float_value) {\n        const value = this.toFixedWithoutPadding(attrValue.float_value);\n        propertyValue.value = value;\n        typename = StandardTypeNames.Float;\n      } else if (attrValue.has_int64_value) {\n        propertyValue.value = attrValue.int64_value;\n        typename = StandardTypeNames.Integer;\n      } else if (attrValue.has_sint64_value) {\n        propertyValue.value = attrValue.sint64_value;\n        typename = StandardTypeNames.Integer;\n      } else if (attrValue.has_sint_value) {\n        propertyValue.value = attrValue.sint_value;\n        typename = StandardTypeNames.Integer;\n      } else if (attrValue.has_uint64_value) {\n        propertyValue.value = attrValue.uint64_value;\n        typename = StandardTypeNames.Integer;\n      } else if (attrValue.has_uint_value) {\n        propertyValue.value = attrValue.uint_value;\n        typename = StandardTypeNames.Integer;\n      } else {\n        propertyValue.value = undefined;\n      }\n\n      return { propertyValue,  typename };\n    };\n\n    const getFeatureAttribute = (fieldInfo: PbfFieldInfo, attrValue: esriPBuffer.FeatureCollectionPBuffer.Value): MapLayerFeatureAttribute|undefined => {\n      let propertyValue: PrimitiveValue = { valueFormat: PropertyValueFormat.Primitive };\n\n      let typename = StandardTypeNames.String;\n      if (fieldInfo.type === esriPBuffer.FeatureCollectionPBuffer.FieldType.esriFieldTypeDouble\n        || fieldInfo.type === esriPBuffer.FeatureCollectionPBuffer.FieldType.esriFieldTypeInteger\n        || fieldInfo.type === esriPBuffer.FeatureCollectionPBuffer.FieldType.esriFieldTypeSmallInteger\n        || fieldInfo.type === esriPBuffer.FeatureCollectionPBuffer.FieldType.esriFieldTypeOID\n        || fieldInfo.type === esriPBuffer.FeatureCollectionPBuffer.FieldType.esriFieldTypeSingle\n        || fieldInfo.type === esriPBuffer.FeatureCollectionPBuffer.FieldType.esriFieldTypeDate\n      ) {\n        const value = getNumericValue(attrValue);\n        if (value.propertyValue === undefined) {\n          Logger.logError(loggerCategory, `Could not read numeric value for field ${fieldInfo.name}`);\n          return undefined;\n        }\n\n        if (fieldInfo.type === esriPBuffer.FeatureCollectionPBuffer.FieldType.esriFieldTypeDate) {\n          const test = (value.propertyValue.value as unknown) as number;\n          propertyValue.value = new Date(test);\n          typename = StandardTypeNames.DateTime;\n        } else {\n          typename = value.typename;\n          propertyValue = value.propertyValue;\n        }\n      } else if (fieldInfo.type === esriPBuffer.FeatureCollectionPBuffer.FieldType.esriFieldTypeString) {\n        if (attrValue.has_string_value) {\n          propertyValue.value = attrValue.string_value;\n          typename = StandardTypeNames.String;\n        }\n      } else if (fieldInfo.type === esriPBuffer.FeatureCollectionPBuffer.FieldType.esriFieldTypeGlobalID) {\n        if (attrValue.has_string_value) {\n          propertyValue.value = attrValue.string_value;\n          typename = StandardTypeNames.String;\n        } else {\n          const value = getNumericValue(attrValue);\n          if (value.propertyValue === undefined) {\n            Logger.logError(loggerCategory, `Could not read GlobalId value for field ${fieldInfo.name}`);\n            return undefined;\n          }\n        }\n      } else if (attrValue.has_string_value) {\n        // If we reach this case that probably mean we don't support the field type, simply try to output string value\n        typename = StandardTypeNames.String;\n        propertyValue.value = attrValue.string_value;\n      } else if (attrValue.value_type === \"none\") {\n        // Sometimes fields are just empty, use an empty string\n        typename = StandardTypeNames.String;\n        propertyValue.value = undefined;\n      } else {\n        Logger.logError(loggerCategory, `Could not read value for field ${fieldInfo.name}`);\n        return undefined;\n      }\n\n      propertyValue.displayValue = this.getDisplayValue(typename, propertyValue.value);\n\n      return {value: propertyValue, property: { name: fieldInfo.name, displayLabel: fieldInfo.name, typename } };\n    };\n\n    const geomType = collection.queryResult.featureResult.geometryType;\n    const stride = (collection.queryResult.featureResult.hasM || collection.queryResult.featureResult.hasZ) ? 3 : 2;\n\n    const subLayerInfo: MapSubLayerFeatureInfo = {\n      subLayerName: this._layerMetadata.name,\n      displayFieldName: this._layerMetadata.name,\n      features: [],\n    };\n\n    // Read feature values\n    for (const featureResponse of collection.queryResult.featureResult.features) {\n      const feature: MapLayerFeature = { attributes: []};\n\n      if (renderer && featureResponse?.has_geometry) {\n        if (geomType === esriGeometryType.esriGeometryTypePoint || geomType === esriGeometryType.esriGeometryTypeMultipoint) {\n          await renderer.renderPoint(featureResponse.geometry.lengths, featureResponse.geometry.coords, stride, true);\n        } else if (geomType === esriGeometryType.esriGeometryTypePolyline || geomType === esriGeometryType.esriGeometryTypePolygon) {\n          const fill = (geomType === esriGeometryType.esriGeometryTypePolygon);\n          await renderer.renderPath(featureResponse.geometry.lengths, featureResponse.geometry.coords, fill, stride, true);\n        }\n        const graphics = renderer.moveGraphics();\n        feature.geometries = graphics.map((graphic) => {\n          return {graphic};\n        });\n      }\n\n      let fieldIdx = 0;\n      for (const attrValue of featureResponse.attributes) {\n        if (fieldIdx > fields.length) {\n          Logger.logError(loggerCategory, \"Error while read feature info data: fields metadata missing\");\n          break;\n        }\n        // Convert everything to string for now\n        const attr = getFeatureAttribute(fields[fieldIdx], attrValue);\n        if (attr) {\n          feature.attributes?.push(attr);\n        }\n\n        fieldIdx++;\n      }\n      subLayerInfo.features.push(feature);\n    }\n\n    if (layerInfo.subLayerInfos === undefined) {\n      layerInfo.subLayerInfos = [];\n    }\n    layerInfo.subLayerInfos.push(subLayerInfo);\n    featureInfos.push(layerInfo);\n  }\n}\n"]}

package/lib/cjs/ArcGisFeature/ArcGisSymbologyRenderer.js

@@ -138,7 +138,7 @@ class ArcGisSymbologyRenderer {
         if (sls) {
             if (sls.color)
                 context.strokeStyle = sls.color.toRgbaString();
-            context.lineWidth = sls.width; // TODO: Should we scale this value here?
+            context.lineWidth = sls.width * 2; // TODO: Should we scale this value here?
         }
     }
     drawPoint(context, ptX, ptY) {

package/lib/cjs/ArcGisFeature/ArcGisSymbologyRenderer.js.map

@@ -1 +1 @@
-{"version":3,"file":"ArcGisSymbologyRenderer.js","sourceRoot":"","sources":["../../../src/ArcGisFeature/ArcGisSymbologyRenderer.ts"],"names":[],"mappings":"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","sourcesContent":["/*---------------------------------------------------------------------------------------------\r\n* Copyright (c) Bentley Systems, Incorporated. All rights reserved.\r\n* See LICENSE.md in the project root for license terms and full copyright notice.\r\n*--------------------------------------------------------------------------------------------*/\r\n\r\nimport { Logger } from \"@itwin/core-bentley\";\r\nimport { ColorDef } from \"@itwin/core-common\";\r\nimport { ArcGisFeatureGeometryType } from \"./ArcGisFeatureQuery\";\r\n\r\n// Convert a channel array [r, g, b, a] to ColorDef\r\nfunction colorFromArray(channels?: number[]) {\r\n  if (channels && channels.length === 4) {\r\n    // Alpha channel is reversed, 255 = opaque\r\n    return ColorDef.from(channels[0], channels[1], channels[2], 255 - channels[3]);\r\n  }\r\n  return undefined;\r\n}\r\n\r\nconst loggerCategory =  \"MapLayersFormats.ArcGISFeature\";\r\n\r\n/** @internal */\r\nexport type EsriSymbolType = \"esriSFS\" | \"esriPMS\" | \"esriSLS\" | \"esriSMS\" | \"esriTS\" | \"CIMSymbolReference\";\r\ninterface EsriSymbol {\r\n  type: EsriSymbolType;\r\n}\r\n\r\n/** @internal */\r\nexport type EsriSLSStyle = \"esriSLSDash\" | \"esriSLSDashDot\" | \"esriSLSDashDotDot\" | \"esriSLSDot\" | \"esriSLSLongDash\" | \"esriSLSLongDashDot\" |\r\n\"esriSLSNull\" | \"esriSLSShortDash\" | \"esriSLSShortDashDot\" | \"esriSLSShortDashDotDot\" | \"esriSLSShortDot\" | \"esriSLSSolid\";\r\n\r\ninterface EsriSLSProps {\r\n  color: number[];\r\n  type: EsriSymbolType;\r\n  width: number;\r\n  style: EsriSLSStyle;\r\n}\r\n\r\n/** @internal */\r\nexport class EsriSLS implements EsriSymbol {\r\n  public readonly props: EsriSLSProps;\r\n\r\n  public get color() { return colorFromArray(this.props.color); }\r\n  public get type() { return this.props.type; }\r\n  public get width() { return this.props.width; }\r\n  public get style() { return this.props.style; }\r\n\r\n  constructor(json: EsriSLSProps) {\r\n    this.props = json;\r\n  }\r\n\r\n  public static fromJSON(json: EsriSLSProps) {\r\n    return new EsriSLS(json);\r\n  }\r\n}\r\n\r\ninterface EsriPMSProps {\r\n  type: EsriSymbolType;\r\n  url: string;\r\n  imageData: string;\r\n  contentType: string;\r\n  width?: number;\r\n  height?: number;\r\n  xoffset?: number;\r\n  yoffset?: number;\r\n  angle?: number;\r\n}\r\n\r\n/** @internal */\r\nexport class EsriPMS implements EsriSymbol {\r\n  public readonly props: EsriPMSProps;\r\n  private _image: HTMLImageElement;\r\n\r\n  public get type() { return this.props.type; }\r\n  public get url() { return this.props.url; }\r\n  public get imageData() { return this.props.imageData; }\r\n  public get imageUrl() { return `data:${this.contentType};base64,${this.imageData}`; }\r\n  public get image() { return this._image; }\r\n  public get contentType() { return this.props.contentType; }\r\n  public get width() { return this.props.width; }\r\n  public get height() { return this.props.height; }\r\n  public get xoffset() { return this.props.xoffset; }\r\n  public get yoffset() { return this.props.yoffset; }\r\n  public get angle() { return this.props.angle; }\r\n\r\n  constructor(json: EsriPMSProps) {\r\n    this.props = json;\r\n    this._image = new Image();\r\n    this._image.src = this.imageUrl;\r\n  }\r\n\r\n  public static fromJSON(json: EsriPMSProps) {\r\n    return new EsriPMS(json);\r\n  }\r\n}\r\n\r\n/** @internal */\r\nexport type EsriSFSStyleProps = \"esriSFSBackwardDiagonal\" | \"esriSFSCross\" | \"esriSFSDiagonalCross\" | \"esriSFSForwardDiagonal\" | \"esriSFSHorizontal\" | \"esriSFSNull\" | \"esriSFSSolid\" | \"esriSFSVertical\";\r\ninterface EsriSFSProps {\r\n  color?: number[];\r\n  type: EsriSymbolType;\r\n  style: EsriSFSStyleProps;\r\n  outline?: EsriSLSProps;\r\n}\r\n\r\n/** @internal */\r\nexport class EsriSFS implements EsriSymbol {\r\n  public readonly props: EsriSFSProps;\r\n  private _outline: EsriSLS | undefined;\r\n\r\n  public get color() { return colorFromArray(this.props.color); }\r\n  public get type() { return this.props.type; }\r\n  public get style() { return this.props.style; }\r\n  public get outline() { return this._outline; }\r\n  constructor(json: EsriSFSProps) {\r\n    this.props = json;\r\n    if (json.outline)\r\n      this._outline = EsriSLS.fromJSON(json.outline);\r\n  }\r\n\r\n  public static fromJSON(json: EsriSFSProps): EsriSFS {\r\n    return new EsriSFS(json);\r\n  }\r\n}\r\n\r\n/** @internal */\r\nexport class ArcGisSymbologyRenderer {\r\n  private _symbol: EsriSymbol | undefined;\r\n\r\n  private static readonly defaultPMS: EsriPMSProps = {\r\n    type: \"esriPMS\",\r\n    url: \"\",\r\n    contentType: \"image/png\",\r\n    imageData: \"iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAmBJREFUOE+Nk01IVFEUx//n3jfvOZOaJkMtiiJ7o9RG3LgoqKhFSFJBTS1ahFBBi0ijfJXCIyQr+hBbSIsoW7iQoKKFCw2CkAI3tZAgy8Ei+xhoTCbnje/NPfHGnA816KzuPR+/c8/HJRQJE7o+VUhym0DcCOYGgBQEXjOLlyqo+nHanCkMoaL4rslKjZwOQLT4ek3Mmz3FACFNLB67ut6M1nWphbg8wI6VyJK5KEH0EQFVJRKbwzokAW++p/ErraAYSQK3u47bC3vLnA+ZB9i2gHF0oyQMCfCGNaUa+vauxs71wWz2V18cnBj8gQ8J1/eeBnHUa4sMFQDGdGno+4gwEAoQzjVUon3rqlx1KY9x7+0MWobjAPg3QJ2eZV4tAEyFNCN5FkSXyw2B3j1hRGvLcgBXMV5MptA4MOXr0gT0u5bZnAf0jBsyiSgJPAxqhON1K3FlRxUMvwFAtv7u0Wl0jvwEmJNEuOhakTt5wKEBifr6Oo14BIBRpgt07w6jcVMIngKGY7NofR5HwlF+zDcpsC193vyYB/innvHywCzdZfAR/+onX1segBTAxHzzfPE7/8yzzIPLjJE1LTixHZx5CtCK4gXLzovBiDPUsYxVM7gUkB3nWKlm6DYEnQGzXARxCOK+a1WfKtQXb6LNAvr7iCboCUA1Ocdsdv5KLPe7F6pH/w3wLbc+BwOuc5IZ1wEE/jonQbjptZn24tKKX7BgvR2r0NKZRwDvAqCI+Z30VJPTURv7P4A9psuQcYAUPwAoReBLrmX2Lmls7i8sZ7kWLwuoxA1FVJGxzMPLufi6P2r+2xFbOUjGAAAAAElFTkSuQmCC\",\r\n    width: 16,\r\n    height: 16,\r\n    xoffset: -8,\r\n    yoffset: -16,\r\n  };\r\n\r\n  private static readonly defaultSLS: EsriSLSProps = {\r\n    type: \"esriSLS\",\r\n    color: [0, 0, 0, 255],\r\n    width: 1,\r\n    style: \"esriSLSSolid\",\r\n  };\r\n\r\n  private static readonly defaultSFS: EsriSFSProps = {\r\n    type: \"esriSFS\",\r\n    color:  [0, 0, 0, 255],\r\n    style: \"esriSFSSolid\",\r\n  };\r\n\r\n  constructor(geometryType: ArcGisFeatureGeometryType, rendererDefinition: any) {\r\n    let symbol;\r\n    if (rendererDefinition?.symbol) {\r\n      symbol = rendererDefinition.symbol;\r\n    } else if (rendererDefinition?.defaultSymbol) {\r\n      symbol = rendererDefinition?.defaultSymbol;\r\n    }\r\n\r\n    if (symbol) {\r\n      if (symbol.type === \"esriSFS\") {\r\n        this._symbol = EsriSFS.fromJSON(symbol);\r\n      } else if (symbol.type === \"esriSLS\") {\r\n        this._symbol = EsriSLS.fromJSON(symbol);\r\n      } else if (symbol.type === \"esriPMS\") {\r\n        this._symbol = EsriPMS.fromJSON(symbol);\r\n      }\r\n    }\r\n\r\n    // If '_symbol' is still undefined at this point, that means we could not find\r\n    // any symbology definition from the metadata, let's use some default symbology\r\n    // so that we display at least something.\r\n    if (this._symbol === undefined) {\r\n      Logger.logWarning(loggerCategory, \"Symbology definition not supported, using default symbology\");\r\n      if (geometryType === \"esriGeometryPoint\" || geometryType === \"esriGeometryMultipoint\") {\r\n        this._symbol = EsriPMS.fromJSON(ArcGisSymbologyRenderer.defaultPMS);\r\n      } else if (geometryType === \"esriGeometryLine\" || geometryType === \"esriGeometryPolyline\") {\r\n        this._symbol = EsriSLS.fromJSON(ArcGisSymbologyRenderer.defaultSLS);\r\n      } else if (geometryType === \"esriGeometryPolygon\") {\r\n        this._symbol = EsriSFS.fromJSON(ArcGisSymbologyRenderer.defaultSFS);\r\n      } else {\r\n        Logger.logError(loggerCategory, \"Could not determine default symbology: geometry type not supported\");\r\n      }\r\n    }\r\n  }\r\n\r\n  public applyFillStyle(context: CanvasRenderingContext2D) {\r\n    if (!context)\r\n      return;\r\n\r\n    if (this._symbol?.type === \"esriSFS\") {\r\n      const sfs = this._symbol as EsriSFS;\r\n      if (sfs.style === \"esriSFSSolid\" && sfs.color) {\r\n        context.fillStyle = sfs.color.toRgbaString();\r\n      } else {\r\n        context.fillStyle = ColorDef.from(200, 0, 0, 100).toRgbaString();  // default color is red?\r\n      }\r\n    }\r\n  }\r\n\r\n  public applyStrokeStyle(context: CanvasRenderingContext2D) {\r\n    if (!context)\r\n      return;\r\n\r\n    let sls: EsriSLS | undefined;\r\n    if (this._symbol?.type === \"esriSFS\") {\r\n      const sfs = this._symbol as EsriSFS;\r\n      if (sfs.outline && sfs.outline.style === \"esriSLSSolid\") {\r\n        sls = sfs.outline;\r\n      }\r\n    } else if (this._symbol?.type === \"esriSLS\") {\r\n      sls = this._symbol as EsriSLS;\r\n    }\r\n\r\n    if (sls) {\r\n      if (sls.color)\r\n        context.strokeStyle = sls.color.toRgbaString();\r\n      context.lineWidth = sls.width;     // TODO: Should we scale this value here?\r\n    }\r\n  }\r\n\r\n  public drawPoint(context: CanvasRenderingContext2D, ptX: number, ptY: number) {\r\n    if (!context)\r\n      return;\r\n\r\n    if (this._symbol?.type === \"esriPMS\") {\r\n      const pms = this._symbol as EsriPMS;\r\n      let xOffset = 0, yOffset = 0;\r\n      if (pms.xoffset)\r\n        xOffset = pms.xoffset;\r\n      else if (pms.width)\r\n        xOffset = pms.width * -0.5;  // if no offset center in the middle\r\n\r\n      if (pms.yoffset)\r\n        yOffset = pms.yoffset;\r\n      else if (pms.height)\r\n        yOffset = pms.height * -0.5; // if no offset center in the middle\r\n\r\n      if (pms.width && pms.height) {\r\n        context.drawImage(pms.image, ptX + xOffset, ptY + yOffset, pms.width, pms.height);\r\n      } else {\r\n        context.drawImage(pms.image, ptX + xOffset, ptY + yOffset);\r\n      }\r\n\r\n      // TODO: marker rotation angle\r\n    }\r\n  }\r\n}\r\n"]}
+{"version":3,"file":"ArcGisSymbologyRenderer.js","sourceRoot":"","sources":["../../../src/ArcGisFeature/ArcGisSymbologyRenderer.ts"],"names":[],"mappings":"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","sourcesContent":["/*---------------------------------------------------------------------------------------------\n* Copyright (c) Bentley Systems, Incorporated. All rights reserved.\n* See LICENSE.md in the project root for license terms and full copyright notice.\n*--------------------------------------------------------------------------------------------*/\n\nimport { Logger } from \"@itwin/core-bentley\";\nimport { ColorDef } from \"@itwin/core-common\";\nimport { ArcGisFeatureGeometryType } from \"./ArcGisFeatureQuery\";\n\n// Convert a channel array [r, g, b, a] to ColorDef\nfunction colorFromArray(channels?: number[]) {\n  if (channels && channels.length === 4) {\n    // Alpha channel is reversed, 255 = opaque\n    return ColorDef.from(channels[0], channels[1], channels[2], 255 - channels[3]);\n  }\n  return undefined;\n}\n\nconst loggerCategory =  \"MapLayersFormats.ArcGISFeature\";\n\n/** @internal */\nexport type EsriSymbolType = \"esriSFS\" | \"esriPMS\" | \"esriSLS\" | \"esriSMS\" | \"esriTS\" | \"CIMSymbolReference\";\ninterface EsriSymbol {\n  type: EsriSymbolType;\n}\n\n/** @internal */\nexport type EsriSLSStyle = \"esriSLSDash\" | \"esriSLSDashDot\" | \"esriSLSDashDotDot\" | \"esriSLSDot\" | \"esriSLSLongDash\" | \"esriSLSLongDashDot\" |\n\"esriSLSNull\" | \"esriSLSShortDash\" | \"esriSLSShortDashDot\" | \"esriSLSShortDashDotDot\" | \"esriSLSShortDot\" | \"esriSLSSolid\";\n\ninterface EsriSLSProps {\n  color: number[];\n  type: EsriSymbolType;\n  width: number;\n  style: EsriSLSStyle;\n}\n\n/** @internal */\nexport class EsriSLS implements EsriSymbol {\n  public readonly props: EsriSLSProps;\n\n  public get color() { return colorFromArray(this.props.color); }\n  public get type() { return this.props.type; }\n  public get width() { return this.props.width; }\n  public get style() { return this.props.style; }\n\n  constructor(json: EsriSLSProps) {\n    this.props = json;\n  }\n\n  public static fromJSON(json: EsriSLSProps) {\n    return new EsriSLS(json);\n  }\n}\n\ninterface EsriPMSProps {\n  type: EsriSymbolType;\n  url: string;\n  imageData: string;\n  contentType: string;\n  width?: number;\n  height?: number;\n  xoffset?: number;\n  yoffset?: number;\n  angle?: number;\n}\n\n/** @internal */\nexport class EsriPMS implements EsriSymbol {\n  public readonly props: EsriPMSProps;\n  private _image: HTMLImageElement;\n\n  public get type() { return this.props.type; }\n  public get url() { return this.props.url; }\n  public get imageData() { return this.props.imageData; }\n  public get imageUrl() { return `data:${this.contentType};base64,${this.imageData}`; }\n  public get image() { return this._image; }\n  public get contentType() { return this.props.contentType; }\n  public get width() { return this.props.width; }\n  public get height() { return this.props.height; }\n  public get xoffset() { return this.props.xoffset; }\n  public get yoffset() { return this.props.yoffset; }\n  public get angle() { return this.props.angle; }\n\n  constructor(json: EsriPMSProps) {\n    this.props = json;\n    this._image = new Image();\n    this._image.src = this.imageUrl;\n  }\n\n  public static fromJSON(json: EsriPMSProps) {\n    return new EsriPMS(json);\n  }\n}\n\n/** @internal */\nexport type EsriSFSStyleProps = \"esriSFSBackwardDiagonal\" | \"esriSFSCross\" | \"esriSFSDiagonalCross\" | \"esriSFSForwardDiagonal\" | \"esriSFSHorizontal\" | \"esriSFSNull\" | \"esriSFSSolid\" | \"esriSFSVertical\";\ninterface EsriSFSProps {\n  color?: number[];\n  type: EsriSymbolType;\n  style: EsriSFSStyleProps;\n  outline?: EsriSLSProps;\n}\n\n/** @internal */\nexport class EsriSFS implements EsriSymbol {\n  public readonly props: EsriSFSProps;\n  private _outline: EsriSLS | undefined;\n\n  public get color() { return colorFromArray(this.props.color); }\n  public get type() { return this.props.type; }\n  public get style() { return this.props.style; }\n  public get outline() { return this._outline; }\n  constructor(json: EsriSFSProps) {\n    this.props = json;\n    if (json.outline)\n      this._outline = EsriSLS.fromJSON(json.outline);\n  }\n\n  public static fromJSON(json: EsriSFSProps): EsriSFS {\n    return new EsriSFS(json);\n  }\n}\n\n/** @internal */\nexport class ArcGisSymbologyRenderer {\n  private _symbol: EsriSymbol | undefined;\n\n  private static readonly defaultPMS: EsriPMSProps = {\n    type: \"esriPMS\",\n    url: \"\",\n    contentType: \"image/png\",\n    imageData: \"iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAmBJREFUOE+Nk01IVFEUx//n3jfvOZOaJkMtiiJ7o9RG3LgoqKhFSFJBTS1ahFBBi0ijfJXCIyQr+hBbSIsoW7iQoKKFCw2CkAI3tZAgy8Ei+xhoTCbnje/NPfHGnA816KzuPR+/c8/HJRQJE7o+VUhym0DcCOYGgBQEXjOLlyqo+nHanCkMoaL4rslKjZwOQLT4ek3Mmz3FACFNLB67ut6M1nWphbg8wI6VyJK5KEH0EQFVJRKbwzokAW++p/ErraAYSQK3u47bC3vLnA+ZB9i2gHF0oyQMCfCGNaUa+vauxs71wWz2V18cnBj8gQ8J1/eeBnHUa4sMFQDGdGno+4gwEAoQzjVUon3rqlx1KY9x7+0MWobjAPg3QJ2eZV4tAEyFNCN5FkSXyw2B3j1hRGvLcgBXMV5MptA4MOXr0gT0u5bZnAf0jBsyiSgJPAxqhON1K3FlRxUMvwFAtv7u0Wl0jvwEmJNEuOhakTt5wKEBifr6Oo14BIBRpgt07w6jcVMIngKGY7NofR5HwlF+zDcpsC193vyYB/innvHywCzdZfAR/+onX1segBTAxHzzfPE7/8yzzIPLjJE1LTixHZx5CtCK4gXLzovBiDPUsYxVM7gUkB3nWKlm6DYEnQGzXARxCOK+a1WfKtQXb6LNAvr7iCboCUA1Ocdsdv5KLPe7F6pH/w3wLbc+BwOuc5IZ1wEE/jonQbjptZn24tKKX7BgvR2r0NKZRwDvAqCI+Z30VJPTURv7P4A9psuQcYAUPwAoReBLrmX2Lmls7i8sZ7kWLwuoxA1FVJGxzMPLufi6P2r+2xFbOUjGAAAAAElFTkSuQmCC\",\n    width: 16,\n    height: 16,\n    xoffset: -8,\n    yoffset: -16,\n  };\n\n  private static readonly defaultSLS: EsriSLSProps = {\n    type: \"esriSLS\",\n    color: [0, 0, 0, 255],\n    width: 1,\n    style: \"esriSLSSolid\",\n  };\n\n  private static readonly defaultSFS: EsriSFSProps = {\n    type: \"esriSFS\",\n    color:  [0, 0, 0, 255],\n    style: \"esriSFSSolid\",\n  };\n\n  constructor(geometryType: ArcGisFeatureGeometryType, rendererDefinition: any) {\n    let symbol;\n    if (rendererDefinition?.symbol) {\n      symbol = rendererDefinition.symbol;\n    } else if (rendererDefinition?.defaultSymbol) {\n      symbol = rendererDefinition?.defaultSymbol;\n    }\n\n    if (symbol) {\n      if (symbol.type === \"esriSFS\") {\n        this._symbol = EsriSFS.fromJSON(symbol);\n      } else if (symbol.type === \"esriSLS\") {\n        this._symbol = EsriSLS.fromJSON(symbol);\n      } else if (symbol.type === \"esriPMS\") {\n        this._symbol = EsriPMS.fromJSON(symbol);\n      }\n    }\n\n    // If '_symbol' is still undefined at this point, that means we could not find\n    // any symbology definition from the metadata, let's use some default symbology\n    // so that we display at least something.\n    if (this._symbol === undefined) {\n      Logger.logWarning(loggerCategory, \"Symbology definition not supported, using default symbology\");\n      if (geometryType === \"esriGeometryPoint\" || geometryType === \"esriGeometryMultipoint\") {\n        this._symbol = EsriPMS.fromJSON(ArcGisSymbologyRenderer.defaultPMS);\n      } else if (geometryType === \"esriGeometryLine\" || geometryType === \"esriGeometryPolyline\") {\n        this._symbol = EsriSLS.fromJSON(ArcGisSymbologyRenderer.defaultSLS);\n      } else if (geometryType === \"esriGeometryPolygon\") {\n        this._symbol = EsriSFS.fromJSON(ArcGisSymbologyRenderer.defaultSFS);\n      } else {\n        Logger.logError(loggerCategory, \"Could not determine default symbology: geometry type not supported\");\n      }\n    }\n  }\n\n  public applyFillStyle(context: CanvasRenderingContext2D) {\n    if (!context)\n      return;\n\n    if (this._symbol?.type === \"esriSFS\") {\n      const sfs = this._symbol as EsriSFS;\n      if (sfs.style === \"esriSFSSolid\" && sfs.color) {\n        context.fillStyle = sfs.color.toRgbaString();\n      } else {\n        context.fillStyle = ColorDef.from(200, 0, 0, 100).toRgbaString();  // default color is red?\n      }\n    }\n  }\n\n  public applyStrokeStyle(context: CanvasRenderingContext2D) {\n    if (!context)\n      return;\n\n    let sls: EsriSLS | undefined;\n    if (this._symbol?.type === \"esriSFS\") {\n      const sfs = this._symbol as EsriSFS;\n      if (sfs.outline && sfs.outline.style === \"esriSLSSolid\") {\n        sls = sfs.outline;\n      }\n    } else if (this._symbol?.type === \"esriSLS\") {\n      sls = this._symbol as EsriSLS;\n    }\n\n    if (sls) {\n      if (sls.color)\n        context.strokeStyle = sls.color.toRgbaString();\n      context.lineWidth = sls.width * 2;     // TODO: Should we scale this value here?\n    }\n  }\n\n  public drawPoint(context: CanvasRenderingContext2D, ptX: number, ptY: number) {\n    if (!context)\n      return;\n\n    if (this._symbol?.type === \"esriPMS\") {\n      const pms = this._symbol as EsriPMS;\n      let xOffset = 0, yOffset = 0;\n      if (pms.xoffset)\n        xOffset = pms.xoffset;\n      else if (pms.width)\n        xOffset = pms.width * -0.5;  // if no offset center in the middle\n\n      if (pms.yoffset)\n        yOffset = pms.yoffset;\n      else if (pms.height)\n        yOffset = pms.height * -0.5; // if no offset center in the middle\n\n      if (pms.width && pms.height) {\n        context.drawImage(pms.image, ptX + xOffset, ptY + yOffset, pms.width, pms.height);\n      } else {\n        context.drawImage(pms.image, ptX + xOffset, ptY + yOffset);\n      }\n\n      // TODO: marker rotation angle\n    }\n  }\n}\n"]}