@itwin/map-layers-formats 4.1.0-dev.7 → 4.1.0-dev.71

package/lib/esm/ArcGisFeature/ArcGisFeatureQuery.js.map

@@ -1 +1 @@
-{"version":3,"file":"ArcGisFeatureQuery.js","sourceRoot":"","sources":["../../../src/ArcGisFeature/ArcGisFeatureQuery.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\n/** @internal */\r\nexport type ArcGisFeatureResultType = \"none\" | \"standard\" | \"tile\";\r\n\r\n/** @internal */\r\nexport type ArcGisFeatureGeometryType =\r\n \"esriGeometryNull\"\r\n | \"esriGeometryPoint\"\r\n | \"esriGeometryMultipoint\"\r\n | \"esriGeometryLine\"\r\n | \"esriGeometryCircularArc\"\r\n | \"esriGeometryEllipticArc\"\r\n | \"esriGeometryBezier3Curve\"\r\n | \"esriGeometryPath\"\r\n | \"esriGeometryPolyline\"\r\n | \"esriGeometryRing\"\r\n | \"esriGeometryPolygon\"\r\n | \"esriGeometryEnvelope\"\r\n | \"esriGeometryAny\"\r\n | \"esriGeometryBag\"\r\n | \"esriGeometryMultiPatch\"\r\n | \"esriGeometryTriangleStrip\"\r\n | \"esriGeometryTriangeFan\"\r\n | \"esriGeometryRay\"\r\n | \"esriGeometrySphere\"\r\n | \"esriGeometryTriangles\";\r\n\r\n/** @internal */\r\nexport type ArcGisFeatureSpatialRel =  \"esriSpatialRelIntersects\" | \"esriSpatialRelContains\" | \"esriSpatialRelCrosses\" | \"esriSpatialRelEnvelopeIntersects\" | \"esriSpatialRelIndexIntersects\" | \"esriSpatialRelOverlaps\" | \"esriSpatialRelTouches\" | \"esriSpatialRelWithin\";\r\n\r\n/** @internal */\r\nexport interface ArcGisGeometry {\r\n  type: ArcGisFeatureGeometryType;\r\n  geom: ArcGisExtent | ArcGisPointGeometry;\r\n}\r\n\r\n/** @internal */\r\nexport interface ArcGisSpatialReference {\r\n  wkid: number;\r\n  latestWkid: number;\r\n}\r\n\r\n/** @internal */\r\nexport interface ArcGisExtent {\r\n  xmin: number;\r\n  xmax: number;\r\n  ymin: number;\r\n  ymax: number;\r\n  spatialReference: ArcGisSpatialReference;\r\n}\r\n\r\n/** @internal */\r\nexport interface ArcGisPointGeometry {\r\n  x: number;\r\n  y: number;\r\n  spatialReference: ArcGisSpatialReference;\r\n}\r\n\r\n/** @internal */\r\nexport interface FeatureQueryQuantizationParams {\r\n  extent: ArcGisExtent;\r\n  mode: \"view\" | \"edit\";\r\n  originPosition: \"upperLeft\" | \"lowerLeft\";\r\n  tolerance: number;\r\n}\r\n\r\n/** @internal */\r\nexport type ArcGisFeatureFormat = \"JSON\" | \"PBF\";\r\n\r\n// Based on official documentation:\r\n// https://developers.arcgis.com/rest/services-reference/query-feature-service-layer-.htm\r\n/** @internal */\r\nexport interface ArcGisFeatureQueryParams {\r\n\r\n  /** This option can be used for fetching query results up to the resultRecordCount specified.\r\n   * When resultOffset is specified but this parameter is not, the map service defaults it to maxRecordCount.\r\n   * The maximum value for this parameter is the value of the layer's maxRecordCount property.\r\n   * The minimum value entered for this parameter cannot be below 1.\r\n   * This parameter only applies if supportsPagination is true.\r\n   * */\r\n  resultRecordCount?: number;\r\n\r\n  /** This option can be used for fetching query results up to the resultRecordCount specified.\r\n   * When resultOffset is specified but this parameter is not, the map service defaults it to maxRecordCount.\r\n   * The maximum value for this parameter is the value of the layer's maxRecordCount property.\r\n   * The minimum value entered for this parameter cannot be below 1.\r\n   * This parameter only applies if supportsPagination is true.\r\n   * */\r\n  resultOffset?: number;\r\n\r\n  /** If true, the result includes the geometry associated with each feature returned. */\r\n  returnGeometry?: boolean;\r\n  geometry?: ArcGisGeometry;\r\n  geometryType?: ArcGisFeatureGeometryType;\r\n  spatialRel?: ArcGisFeatureSpatialRel;\r\n  resultType?: ArcGisFeatureResultType;\r\n  maxRecordCountFactor?: number;\r\n  returnExceededLimitFeatures?: boolean;\r\n  quantizationParameters?: FeatureQueryQuantizationParams;\r\n\r\n  /** The list of fields to be included in the returned result set. This list is a comma-delimited list of field names.\r\n   * You can also specify the wildcard \"*\" as the value of this parameter.\r\n   *  */\r\n  outFields?: string;\r\n\r\n  /** The buffer distance for the input geometries.\r\n   *  */\r\n  distance?: number;\r\n}\r\n\r\n/** @internal */\r\nexport class ArcGisFeatureQuery {\r\n  public baseUrl: string;\r\n  public layerIdx: number;\r\n  public format: ArcGisFeatureFormat;\r\n  public resultRecordCount?: number;\r\n  public resultOffset?: number;\r\n  public returnGeometry?: boolean;\r\n  public geometry?: ArcGisGeometry;\r\n  public spatialRel?: ArcGisFeatureSpatialRel;\r\n  public resultType?: ArcGisFeatureResultType;\r\n  public maxRecordCountFactor?: number;\r\n  public returnExceededLimitFeatures?: boolean;\r\n  public outSR: number;\r\n  public outFields?: string;\r\n  public distance?: number;\r\n\r\n  // public envelopeFilter?: CartographicRange;\r\n  public quantizationParams?: FeatureQueryQuantizationParams;\r\n\r\n  // base url is expected ito be in the format of:\r\n  // https://<hostname>/arcgis/rest/services/<ServiceName>/FeatureServer\r\n  public constructor(baseUrl: string, layerIdx: number, format: ArcGisFeatureFormat, outSR: number, params?: ArcGisFeatureQueryParams) {\r\n    this.baseUrl = baseUrl;\r\n    this.layerIdx = layerIdx;\r\n    this.format = format;\r\n    this.outSR = outSR;\r\n\r\n    if (params !== undefined) {\r\n      this.resultRecordCount = params.resultRecordCount;\r\n      this.resultOffset = params.resultOffset;\r\n      this.returnGeometry = params.returnGeometry;\r\n      this.geometry = params.geometry;\r\n      this.spatialRel = params.spatialRel;\r\n      this.resultType = params.resultType;\r\n      this.maxRecordCountFactor = params.maxRecordCountFactor;\r\n      this.returnExceededLimitFeatures = params.returnExceededLimitFeatures;\r\n      this.quantizationParams = params.quantizationParameters;\r\n      this.outFields = params.outFields;\r\n      this.distance = params.distance;\r\n    }\r\n\r\n  }\r\n\r\n  public toString() {\r\n    const url = new URL(`${this.baseUrl}/${this.layerIdx}/query`);\r\n\r\n    url.searchParams.append(\"f\", this.format);\r\n\r\n    if ( this.resultRecordCount !== undefined) {\r\n      url.searchParams.append(\"resultRecordCount\", `${this.resultRecordCount}`);\r\n    }\r\n\r\n    if ( this.resultOffset !== undefined) {\r\n      url.searchParams.append( \"resultOffset\", `${this.resultOffset}`);\r\n    }\r\n\r\n    if ( this.returnGeometry !== undefined) {\r\n      url.searchParams.append(\"returnGeometry\", this.returnGeometry?\"true\":\"false\");\r\n    }\r\n\r\n    if ( this.resultType !== undefined) {\r\n      url.searchParams.append(\"resultType\", this.resultType);\r\n    }\r\n\r\n    if ( this.maxRecordCountFactor !== undefined) {\r\n      url.searchParams.append( \"maxRecordCountFactor\", `${this.maxRecordCountFactor}`);\r\n    }\r\n\r\n    if ( this.returnExceededLimitFeatures !== undefined) {\r\n      url.searchParams.append( \"returnExceededLimitFeatures\", this.returnExceededLimitFeatures?\"true\":\"false\");\r\n    }\r\n\r\n    url.searchParams.append( \"outSR\", `${this.outSR}`);\r\n\r\n    if (this.geometry || this.spatialRel) {\r\n\r\n      if (this.spatialRel) {\r\n        url.searchParams.append( \"spatialRel\", this.spatialRel);\r\n      }\r\n\r\n      if (this.geometry) {\r\n        url.searchParams.append( \"geometryType\", this.geometry.type);\r\n\r\n        const geomStr = JSON.stringify(this.geometry.geom);\r\n        url.searchParams.append( \"geometry\", geomStr);\r\n        url.searchParams.append( \"units\", \"esriSRUnit_Meter\");    // required on older server for get feature info\r\n\r\n        url.searchParams.append( \"inSR\", `${this.geometry.geom.spatialReference.wkid}`);\r\n      }\r\n    } else {\r\n      // No custom params, fetch all geometries\r\n      url.searchParams.append(\"where\", \"1=1\");\r\n    }\r\n\r\n    if (this.quantizationParams) {\r\n      const quantizationParamsStr = JSON.stringify(this.quantizationParams);\r\n      url.searchParams.append(\"quantizationParameters\", quantizationParamsStr);\r\n    }\r\n\r\n    if (this.outFields) {\r\n      url.searchParams.append( \"outFields\", this.outFields);\r\n    }\r\n\r\n    if (this.distance) {\r\n      url.searchParams.append(\"distance\", `${this.distance}`);\r\n    }\r\n\r\n    return url.toString();\r\n  }\r\n\r\n}\r\n"]}
+{"version":3,"file":"ArcGisFeatureQuery.js","sourceRoot":"","sources":["../../../src/ArcGisFeature/ArcGisFeatureQuery.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\n/** @internal */\r\nexport type ArcGisFeatureResultType = \"none\" | \"standard\" | \"tile\";\r\n\r\n/** @internal */\r\nexport type ArcGisFeatureGeometryType =\r\n \"esriGeometryNull\"\r\n | \"esriGeometryPoint\"\r\n | \"esriGeometryMultipoint\"\r\n | \"esriGeometryLine\"\r\n | \"esriGeometryCircularArc\"\r\n | \"esriGeometryEllipticArc\"\r\n | \"esriGeometryBezier3Curve\"\r\n | \"esriGeometryPath\"\r\n | \"esriGeometryPolyline\"\r\n | \"esriGeometryRing\"\r\n | \"esriGeometryPolygon\"\r\n | \"esriGeometryEnvelope\"\r\n | \"esriGeometryAny\"\r\n | \"esriGeometryBag\"\r\n | \"esriGeometryMultiPatch\"\r\n | \"esriGeometryTriangleStrip\"\r\n | \"esriGeometryTriangeFan\"\r\n | \"esriGeometryRay\"\r\n | \"esriGeometrySphere\"\r\n | \"esriGeometryTriangles\";\r\n\r\n/** @internal */\r\nexport type ArcGisFeatureSpatialRel =  \"esriSpatialRelIntersects\" | \"esriSpatialRelContains\" | \"esriSpatialRelCrosses\" | \"esriSpatialRelEnvelopeIntersects\" | \"esriSpatialRelIndexIntersects\" | \"esriSpatialRelOverlaps\" | \"esriSpatialRelTouches\" | \"esriSpatialRelWithin\";\r\n\r\n/** @internal */\r\nexport interface ArcGisGeometry {\r\n  type: ArcGisFeatureGeometryType;\r\n  geom: ArcGisExtent | ArcGisPointGeometry;\r\n}\r\n\r\n/** @internal */\r\nexport interface ArcGisSpatialReference {\r\n  wkid: number;\r\n  latestWkid: number;\r\n}\r\n\r\n/** @internal */\r\nexport interface ArcGisExtent {\r\n  xmin: number;\r\n  xmax: number;\r\n  ymin: number;\r\n  ymax: number;\r\n  spatialReference: ArcGisSpatialReference;\r\n}\r\n\r\n/** @internal */\r\nexport interface ArcGisPointGeometry {\r\n  x: number;\r\n  y: number;\r\n  spatialReference: ArcGisSpatialReference;\r\n}\r\n\r\n/** @internal */\r\nexport interface FeatureQueryQuantizationParams {\r\n  extent: ArcGisExtent;\r\n  mode: \"view\" | \"edit\";\r\n  originPosition: \"upperLeft\" | \"lowerLeft\";\r\n  tolerance: number;\r\n}\r\n\r\n/** @internal */\r\nexport type ArcGisFeatureFormat = \"JSON\" | \"PBF\";\r\n\r\n// Based on official documentation:\r\n// https://developers.arcgis.com/rest/services-reference/query-feature-service-layer-.htm\r\n/** @internal */\r\nexport interface ArcGisFeatureQueryParams {\r\n\r\n  /** This option can be used for fetching query results up to the resultRecordCount specified.\r\n   * When resultOffset is specified but this parameter is not, the map service defaults it to maxRecordCount.\r\n   * The maximum value for this parameter is the value of the layer's maxRecordCount property.\r\n   * The minimum value entered for this parameter cannot be below 1.\r\n   * This parameter only applies if supportsPagination is true.\r\n   * */\r\n  resultRecordCount?: number;\r\n\r\n  /** This option can be used for fetching query results up to the resultRecordCount specified.\r\n   * When resultOffset is specified but this parameter is not, the map service defaults it to maxRecordCount.\r\n   * The maximum value for this parameter is the value of the layer's maxRecordCount property.\r\n   * The minimum value entered for this parameter cannot be below 1.\r\n   * This parameter only applies if supportsPagination is true.\r\n   * */\r\n  resultOffset?: number;\r\n\r\n  /** If true, the result includes the geometry associated with each feature returned. */\r\n  returnGeometry?: boolean;\r\n  geometry?: ArcGisGeometry;\r\n  geometryType?: ArcGisFeatureGeometryType;\r\n  spatialRel?: ArcGisFeatureSpatialRel;\r\n  resultType?: ArcGisFeatureResultType;\r\n  maxRecordCountFactor?: number;\r\n  returnExceededLimitFeatures?: boolean;\r\n  quantizationParameters?: FeatureQueryQuantizationParams;\r\n\r\n  /** Maximum Allowable Offset means the map distance ( usually per pixel) within which two points are considered identical.\r\n   * It is used to generalize thus reduce the number of points\r\n* */\r\n  maxAllowableOffset?: number;\r\n\r\n  /** The list of fields to be included in the returned result set. This list is a comma-delimited list of field names.\r\n   * You can also specify the wildcard \"*\" as the value of this parameter.\r\n   *  */\r\n  outFields?: string;\r\n\r\n  /** The buffer distance for the input geometries.\r\n   *  */\r\n  distance?: number;\r\n}\r\n\r\n/** @internal */\r\nexport class ArcGisFeatureQuery {\r\n  public baseUrl: string;\r\n  public layerIdx: number;\r\n  public format: ArcGisFeatureFormat;\r\n  public resultRecordCount?: number;\r\n  public resultOffset?: number;\r\n  public returnGeometry?: boolean;\r\n  public geometry?: ArcGisGeometry;\r\n  public spatialRel?: ArcGisFeatureSpatialRel;\r\n  public resultType?: ArcGisFeatureResultType;\r\n  public maxRecordCountFactor?: number;\r\n  public returnExceededLimitFeatures?: boolean;\r\n  public outSR: number;\r\n  public outFields?: string;\r\n  public distance?: number;\r\n  public maxAllowableOffset?: number;\r\n\r\n  // public envelopeFilter?: CartographicRange;\r\n  public quantizationParams?: FeatureQueryQuantizationParams;\r\n\r\n  // base url is expected ito be in the format of:\r\n  // https://<hostname>/arcgis/rest/services/<ServiceName>/FeatureServer\r\n  public constructor(baseUrl: string, layerIdx: number, format: ArcGisFeatureFormat, outSR: number, params?: ArcGisFeatureQueryParams) {\r\n    this.baseUrl = baseUrl;\r\n    this.layerIdx = layerIdx;\r\n    this.format = format;\r\n    this.outSR = outSR;\r\n\r\n    if (params !== undefined) {\r\n      this.resultRecordCount = params.resultRecordCount;\r\n      this.resultOffset = params.resultOffset;\r\n      this.returnGeometry = params.returnGeometry;\r\n      this.geometry = params.geometry;\r\n      this.spatialRel = params.spatialRel;\r\n      this.resultType = params.resultType;\r\n      this.maxRecordCountFactor = params.maxRecordCountFactor;\r\n      this.returnExceededLimitFeatures = params.returnExceededLimitFeatures;\r\n      this.quantizationParams = params.quantizationParameters;\r\n      this.outFields = params.outFields;\r\n      this.distance = params.distance;\r\n      this.maxAllowableOffset = params.maxAllowableOffset;\r\n    }\r\n\r\n  }\r\n\r\n  public toString() {\r\n    const url = new URL(`${this.baseUrl}/${this.layerIdx}/query`);\r\n\r\n    url.searchParams.append(\"f\", this.format);\r\n\r\n    if ( this.resultRecordCount !== undefined) {\r\n      url.searchParams.append(\"resultRecordCount\", `${this.resultRecordCount}`);\r\n    }\r\n\r\n    if ( this.resultOffset !== undefined) {\r\n      url.searchParams.append( \"resultOffset\", `${this.resultOffset}`);\r\n    }\r\n\r\n    if ( this.returnGeometry !== undefined) {\r\n      url.searchParams.append(\"returnGeometry\", this.returnGeometry?\"true\":\"false\");\r\n    }\r\n\r\n    if ( this.resultType !== undefined) {\r\n      url.searchParams.append(\"resultType\", this.resultType);\r\n    }\r\n\r\n    if ( this.maxRecordCountFactor !== undefined) {\r\n      url.searchParams.append( \"maxRecordCountFactor\", `${this.maxRecordCountFactor}`);\r\n    }\r\n\r\n    if ( this.returnExceededLimitFeatures !== undefined) {\r\n      url.searchParams.append( \"returnExceededLimitFeatures\", this.returnExceededLimitFeatures?\"true\":\"false\");\r\n    }\r\n\r\n    url.searchParams.append( \"outSR\", `${this.outSR}`);\r\n\r\n    if (this.geometry || this.spatialRel) {\r\n\r\n      if (this.spatialRel) {\r\n        url.searchParams.append( \"spatialRel\", this.spatialRel);\r\n      }\r\n\r\n      if (this.geometry) {\r\n        url.searchParams.append( \"geometryType\", this.geometry.type);\r\n\r\n        const geomStr = JSON.stringify(this.geometry.geom);\r\n        url.searchParams.append( \"geometry\", geomStr);\r\n        url.searchParams.append( \"units\", \"esriSRUnit_Meter\");    // required on older server for get feature info\r\n\r\n        url.searchParams.append( \"inSR\", `${this.geometry.geom.spatialReference.wkid}`);\r\n      }\r\n    } else {\r\n      // No custom params, fetch all geometries\r\n      url.searchParams.append(\"where\", \"1=1\");\r\n    }\r\n\r\n    if (this.quantizationParams) {\r\n      const quantizationParamsStr = JSON.stringify(this.quantizationParams);\r\n      url.searchParams.append(\"quantizationParameters\", quantizationParamsStr);\r\n    }\r\n\r\n    if (this.outFields) {\r\n      url.searchParams.append( \"outFields\", this.outFields);\r\n    }\r\n\r\n    if (this.distance) {\r\n      url.searchParams.append(\"distance\", `${this.distance}`);\r\n    }\r\n\r\n    if (this.maxAllowableOffset) {\r\n      url.searchParams.append(\"maxAllowableOffset\", `${this.maxAllowableOffset}`);\r\n    }\r\n\r\n    return url.toString();\r\n  }\r\n\r\n}\r\n"]}

package/lib/esm/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/esm/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/esm/ArcGisFeature/ArcGisFeatureReader.js

@@ -3,8 +3,10 @@
 * See LICENSE.md in the project root for license terms and full copyright notice.
 *--------------------------------------------------------------------------------------------*/
 import { StandardTypeNames } from "@itwin/appui-abstract";
-/** @internal */
-export class ArcGisFeatureReader {
+/** Internal implementation of [[ArcGisFeatureReader]]
+ * @internal
+ */
+export 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

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

@@ -1 +1 @@
-{"version":3,"file":"ArcGisFeatureReader.js","sourceRoot":"","sources":["../../../src/ArcGisFeature/ArcGisFeatureReader.ts"],"names":[],"mappings":"AAAA;;;+FAG+F;AAE/F,OAAO,EAAc,iBAAiB,EAAE,MAAM,uBAAuB,CAAC;AAMtE,gBAAgB;AAChB,MAAM,OAAgB,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,iBAAiB,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","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,OAAO,EAAc,iBAAiB,EAAE,MAAM,uBAAuB,CAAC;AActE;;GAEG;AACH,MAAM,OAAgB,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,iBAAiB,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","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 { ArcGisGeometryRenderer, ArcGisGraphicsRenderer, MapLayerFeatureInfo } from \"@itwin/core-frontend\";\r\nimport { ArcGisResponseData } from \"./ArcGisFeatureResponse\";\r\n\r\n/** Interface defining minimal implementation needed to create an ArcGIS geometry reader,\r\n * needed by the [[ArcGisFeatureProvider]].\r\n * @internal\r\n */\r\nexport interface ArcGisFeatureReader {\r\n  readAndRender: (response: ArcGisResponseData, renderer: ArcGisGeometryRenderer) => Promise<void>;\r\n  readFeatureInfo: (response: ArcGisResponseData, featureInfos: MapLayerFeatureInfo[], renderer: ArcGisGraphicsRenderer) => Promise<void>;\r\n}\r\n\r\n/** Internal implementation of [[ArcGisFeatureReader]]\r\n * @internal\r\n */\r\nexport abstract class ArcGisBaseFeatureReader implements 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: ArcGisGeometryRenderer): Promise<void>;\r\n  public abstract readFeatureInfo(response: ArcGisResponseData, featureInfos: MapLayerFeatureInfo[], renderer: ArcGisGraphicsRenderer): Promise<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"]}

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

@@ -0,0 +1,14 @@
+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);
+    private applySymbologyAttributes;
+    readAndRender(response: ArcGisResponseData, renderer: ArcGisGeometryRenderer): Promise<void>;
+    readFeatureInfo(response: ArcGisResponseData, featureInfos: MapLayerFeatureInfo[], renderer?: ArcGisGraphicsRenderer): Promise<void>;
+}
+//# sourceMappingURL=ArcGisJsonFeatureReader.d.ts.map

package/lib/esm/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,EAA4D,sBAAsB,EAAE,sBAAsB,EAA6C,mBAAmB,EAAyB,MAAM,sBAAsB,CAAC;AACvO,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;IAKtE,OAAO,CAAC,wBAAwB;IAcnB,aAAa,CAAC,QAAQ,EAAE,kBAAkB,EAAE,QAAQ,EAAE,sBAAsB;IAkB5E,eAAe,CAAC,QAAQ,EAAE,kBAAkB,EAAE,YAAY,EAAE,mBAAmB,EAAE,EAAE,QAAQ,CAAC,EAAE,sBAAsB;CAoGlI"}

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

@@ -3,59 +3,41 @@
 * See LICENSE.md in the project root for license terms and full copyright notice.
 *--------------------------------------------------------------------------------------------*/
 import { PropertyValueFormat, StandardTypeNames } from "@itwin/appui-abstract";
-import { MapFeatureInfoRecord } from "@itwin/core-frontend";
-import { ArcGisFeatureReader } from "./ArcGisFeatureReader";
+import { ArcGisGeometryReaderJSON } from "@itwin/core-frontend";
+import { ArcGisBaseFeatureReader } from "./ArcGisFeatureReader";
 /** @internal */
-export class ArcGisFeatureJSON extends ArcGisFeatureReader {
+export class ArcGisJsonFeatureReader extends ArcGisBaseFeatureReader {
     constructor(settings, layerMetadata) {
         super(settings, layerMetadata);
     }
-    readAndRender(response, renderer) {
-        const responseObj = response.data;
-        if (responseObj?.geometryType === "esriGeometryPolyline" || responseObj?.geometryType === "esriGeometryPolygon") {
-            const fill = (responseObj.geometryType === "esriGeometryPolygon");
-            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);
+    applySymbologyAttributes(attrSymbology, feature) {
+        if (attrSymbology && feature) {
+            const symbolFields = attrSymbology.rendererFields;
+            if (symbolFields && symbolFields.length > 0 && feature.attributes) {
+                const featureAttr = {};
+                for (const [attrKey, attrValue] of Object.entries(feature.attributes))
+                    if (symbolFields.includes(attrKey)) {
+                        featureAttr[attrKey] = attrValue;
                     }
-                }
-                renderer.renderPath(lengths, coords, fill, 2, renderer.transform === undefined);
+                attrSymbology.setActiveFeatureAttributes(featureAttr);
             }
         }
-        else if (responseObj?.geometryType === "esriGeometryPoint" || responseObj?.geometryType === "esriGeometryMultiPoint") {
+    }
+    async readAndRender(response, renderer) {
+        const responseObj = response.data;
+        if (responseObj.geometryType) {
+            const attrSymbology = renderer.attributeSymbology;
+            const geomReader = new ArcGisGeometryReaderJSON(responseObj.geometryType, renderer, renderer.transform === undefined);
             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);
+                if (attrSymbology) {
+                    // Read attributes if needed (attribute driven symbology)
+                    this.applySymbologyAttributes(attrSymbology, feature);
                 }
+                await geomReader.readGeometry(feature.geometry);
             }
         }
     }
-    // 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;
@@ -108,22 +90,36 @@ export class ArcGisFeatureJSON extends ArcGisFeatureReader {
             }
             const typename = getStandardTypeName(fieldType);
             propertyValue.displayValue = this.getDisplayValue(typename, propertyValue.value);
-            return new MapFeatureInfoRecord(propertyValue, { name: fieldName, displayLabel: fieldName, typename });
+            return { value: propertyValue, property: { name: fieldName, displayLabel: fieldName, typename } };
         };
-        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);
+        let geomReader;
+        if (renderer && responseObj?.geometryType) {
+            geomReader = new 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: [],
+        };
+        // 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);
     }
 }
-//# sourceMappingURL=ArcGisFeatureJSON.js.map
+//# sourceMappingURL=ArcGisJsonFeatureReader.js.map

package/lib/esm/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":["/*---------------------------------------------------------------------------------------------\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 { PrimitiveValue, PropertyValueFormat, StandardTypeNames } from \"@itwin/appui-abstract\";\r\nimport { ImageMapLayerSettings } from \"@itwin/core-common\";\r\nimport { ArcGisAttributeDrivenSymbology, ArcGisGeometryReaderJSON, ArcGisGeometryRenderer, ArcGisGraphicsRenderer, MapLayerFeature, MapLayerFeatureAttribute, MapLayerFeatureInfo, MapSubLayerFeatureInfo} from \"@itwin/core-frontend\";\r\nimport { Transform } from \"@itwin/core-geometry\";\r\nimport { ArcGisBaseFeatureReader } from \"./ArcGisFeatureReader\";\r\nimport { ArcGisFieldType, ArcGisResponseData } from \"./ArcGisFeatureResponse\";\r\n\r\n/** @internal */\r\nexport class ArcGisJsonFeatureReader extends ArcGisBaseFeatureReader {\r\n  public transform: Transform | undefined;\r\n\r\n  public constructor(settings: ImageMapLayerSettings, layerMetadata: any) {\r\n    super(settings, layerMetadata);\r\n\r\n  }\r\n\r\n  private applySymbologyAttributes(attrSymbology: ArcGisAttributeDrivenSymbology, feature: any) {\r\n    if (attrSymbology && feature) {\r\n      const symbolFields = attrSymbology.rendererFields;\r\n      if (symbolFields && symbolFields.length > 0 && feature.attributes) {\r\n        const featureAttr: {[key: string]: any} = {};\r\n        for (const [attrKey, attrValue] of Object.entries(feature.attributes))\r\n          if (symbolFields.includes(attrKey)) {\r\n            featureAttr[attrKey] = attrValue;\r\n          }\r\n        attrSymbology.setActiveFeatureAttributes(featureAttr);\r\n      }\r\n    }\r\n  }\r\n\r\n  public async readAndRender(response: ArcGisResponseData, renderer: ArcGisGeometryRenderer) {\r\n    const responseObj = response.data;\r\n    if (responseObj.geometryType) {\r\n      const attrSymbology = renderer.attributeSymbology;\r\n\r\n      const geomReader = new ArcGisGeometryReaderJSON(responseObj.geometryType, renderer, renderer.transform === undefined);\r\n\r\n      for (const feature of responseObj.features) {\r\n        if (attrSymbology) {\r\n          // Read attributes if needed (attribute driven symbology)\r\n          this.applySymbologyAttributes(attrSymbology, feature);\r\n        }\r\n\r\n        await geomReader.readGeometry(feature.geometry);\r\n      }\r\n    }\r\n  }\r\n\r\n  public async readFeatureInfo(response: ArcGisResponseData, featureInfos: MapLayerFeatureInfo[], renderer?: ArcGisGraphicsRenderer) {\r\n    const responseObj = response.data;\r\n    if (responseObj === undefined || !Array.isArray(responseObj.features))\r\n      return;\r\n\r\n    const layerInfo: MapLayerFeatureInfo = { layerName: this._settings.name };\r\n\r\n    // Create a signature index for every field name / type.\r\n    const fieldsType: { [key: string]: ArcGisFieldType } = {};\r\n    for (const fieldInfo of responseObj.fields) {\r\n      fieldsType[fieldInfo.name] = fieldInfo.type;\r\n    }\r\n\r\n    const getStandardTypeName = (fieldType: ArcGisFieldType) => {\r\n      switch (fieldType) {\r\n        case \"esriFieldTypeInteger\":\r\n        case \"esriFieldTypeSmallInteger\":\r\n        case \"esriFieldTypeOID\":\r\n          return StandardTypeNames.Integer;\r\n        case \"esriFieldTypeDouble\":\r\n          return StandardTypeNames.Double;\r\n        case \"esriFieldTypeSingle\":\r\n          return StandardTypeNames.Float;\r\n        case \"esriFieldTypeDate\":\r\n          return StandardTypeNames.DateTime;\r\n        default:\r\n          return StandardTypeNames.String;\r\n      }\r\n    };\r\n\r\n    const getRecordInfo = (fieldName: string, value: any): MapLayerFeatureAttribute => {\r\n      const propertyValue: PrimitiveValue = {valueFormat: PropertyValueFormat.Primitive};\r\n\r\n      if (value === null) {\r\n        value = undefined;\r\n      }\r\n\r\n      const strValue = `${value}`;\r\n      const fieldType = fieldsType[fieldName];\r\n      switch (fieldType) {\r\n        case \"esriFieldTypeInteger\":\r\n        case \"esriFieldTypeSmallInteger\":\r\n        case \"esriFieldTypeOID\":\r\n          propertyValue.value = value as number;\r\n          break;\r\n        case \"esriFieldTypeDouble\":\r\n        case \"esriFieldTypeSingle\":\r\n          propertyValue.value = this.toFixedWithoutPadding(value);\r\n          break;\r\n        case \"esriFieldTypeDate\":\r\n          propertyValue.value = new Date(value);\r\n          break;\r\n        default:\r\n          if (value !== undefined)\r\n            propertyValue.value = strValue;\r\n\r\n          break;\r\n      }\r\n\r\n      const typename = getStandardTypeName(fieldType);\r\n      propertyValue.displayValue = this.getDisplayValue(typename, propertyValue.value);\r\n\r\n      return {value: propertyValue, property: { name: fieldName, displayLabel: fieldName, typename }};\r\n    };\r\n\r\n    let geomReader: ArcGisGeometryReaderJSON|undefined;\r\n    if (renderer && responseObj?.geometryType) {\r\n      geomReader = new ArcGisGeometryReaderJSON(responseObj.geometryType, renderer);\r\n    }\r\n\r\n    // Each feature response represent a single sub-layer, no need to check for existing entry.\r\n    const subLayerInfo: MapSubLayerFeatureInfo = {\r\n      subLayerName: this._layerMetadata.name,\r\n      displayFieldName: this._layerMetadata.name,\r\n      features: [],\r\n    };\r\n\r\n    // Read all features attributes / geometries\r\n    for (const responseFeature of responseObj.features) {\r\n      const feature: MapLayerFeature = {attributes: []};\r\n\r\n      for (const [key, value] of Object.entries(responseFeature.attributes))\r\n        feature.attributes?.push(getRecordInfo(key, value));\r\n\r\n      if (geomReader) {\r\n        await geomReader.readGeometry(responseFeature.geometry);\r\n        const graphics = renderer!.moveGraphics();\r\n        feature.geometries = graphics.map((graphic) => {\r\n          return {graphic};\r\n        });\r\n      }\r\n      subLayerInfo.features.push(feature);\r\n    }\r\n\r\n    if (layerInfo.subLayerInfos === undefined)\r\n      layerInfo.subLayerInfos = [];\r\n    layerInfo.subLayerInfos.push(subLayerInfo);\r\n\r\n    featureInfos.push(layerInfo);\r\n  }\r\n}\r\n"]}

package/lib/esm/ArcGisFeature/ArcGisPbfFeatureReader.d.ts

@@ -0,0 +1,22 @@
+import { esriPBuffer } from "../ArcGisFeature/esriPBuffer.gen";
+import { ArcGisGeometryRenderer, ArcGisGraphicsRenderer, MapLayerFeatureAttribute, MapLayerFeatureInfo } from "@itwin/core-frontend";
+import { ImageMapLayerSettings } from "@itwin/core-common";
+import { ArcGisBaseFeatureReader } from "./ArcGisFeatureReader";
+import { ArcGisResponseData } from "./ArcGisFeatureResponse";
+import { ArcGisFeatureGeometryType } from "./ArcGisFeatureQuery";
+interface PbfFieldInfo {
+    name: string;
+    type: esriPBuffer.FeatureCollectionPBuffer.FieldType;
+}
+/** @internal */
+export declare class ArcGisPbfFeatureReader extends ArcGisBaseFeatureReader {
+    constructor(settings: ImageMapLayerSettings, layerMetadata: any);
+    static getArcGisFeatureGeometryType(geomType: esriPBuffer.FeatureCollectionPBuffer.GeometryType): ArcGisFeatureGeometryType;
+    private getNumericValue;
+    getFeatureAttribute(fieldInfo: PbfFieldInfo, attrValue: esriPBuffer.FeatureCollectionPBuffer.Value): MapLayerFeatureAttribute | undefined;
+    readAndRender(response: ArcGisResponseData, renderer: ArcGisGeometryRenderer): Promise<void>;
+    private applySymbologyAttributes;
+    readFeatureInfo(response: ArcGisResponseData, featureInfos: MapLayerFeatureInfo[], renderer?: ArcGisGraphicsRenderer): Promise<void>;
+}
+export {};
+//# sourceMappingURL=ArcGisPbfFeatureReader.d.ts.map

package/lib/esm/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,EAAkC,sBAAsB,EAAE,sBAAsB,EAAmB,wBAAwB,EAAE,mBAAmB,EAAyB,MAAM,sBAAsB,CAAC;AAE7M,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;AAKjE,UAAU,YAAY;IACpB,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,WAAW,CAAC,wBAAwB,CAAC,SAAS,CAAC;CACtD;AAED,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;IAiBlI,OAAO,CAAC,eAAe;IAiChB,mBAAmB,CAAC,SAAS,EAAE,YAAY,EAAE,SAAS,EAAE,WAAW,CAAC,wBAAwB,CAAC,KAAK,GAAG,wBAAwB,GAAC,SAAS;IA2DjI,aAAa,CAAC,QAAQ,EAAE,kBAAkB,EAAE,QAAQ,EAAE,sBAAsB;IA0CzF,OAAO,CAAC,wBAAwB;IA0BnB,eAAe,CAAC,QAAQ,EAAE,kBAAkB,EAAE,YAAY,EAAE,mBAAmB,EAAE,EAAE,QAAQ,CAAC,EAAE,sBAAsB;CAkElI"}

package/lib/esm/ArcGisFeature/ArcGisPbfFeatureReader.js

@@ -0,0 +1,245 @@
+/*---------------------------------------------------------------------------------------------
+* Copyright (c) Bentley Systems, Incorporated. All rights reserved.
+* See LICENSE.md in the project root for license terms and full copyright notice.
+*--------------------------------------------------------------------------------------------*/
+import { esriPBuffer } from "../ArcGisFeature/esriPBuffer.gen";
+import { PropertyValueFormat, StandardTypeNames } from "@itwin/appui-abstract";
+import { ArcGisBaseFeatureReader } from "./ArcGisFeatureReader";
+import { Logger } from "@itwin/core-bentley";
+const esriGeometryType = esriPBuffer.FeatureCollectionPBuffer.GeometryType;
+const loggerCategory = "MapLayersFormats.ArcGISFeature";
+/** @internal */
+export class ArcGisPbfFeatureReader extends ArcGisBaseFeatureReader {
+    constructor(settings, layerMetadata) {
+        super(settings, layerMetadata);
+    }
+    static getArcGisFeatureGeometryType(geomType) {
+        switch (geomType) {
+            case esriPBuffer.FeatureCollectionPBuffer.GeometryType.esriGeometryTypeMultipatch:
+                return "esriGeometryMultiPatch";
+            case esriPBuffer.FeatureCollectionPBuffer.GeometryType.esriGeometryTypeMultipoint:
+                return "esriGeometryMultipoint";
+            case esriPBuffer.FeatureCollectionPBuffer.GeometryType.esriGeometryTypePoint:
+                return "esriGeometryPoint";
+            case esriPBuffer.FeatureCollectionPBuffer.GeometryType.esriGeometryTypePolygon:
+                return "esriGeometryPolygon";
+            case esriPBuffer.FeatureCollectionPBuffer.GeometryType.esriGeometryTypePolyline:
+                return "esriGeometryPolyline";
+            default:
+                return "esriGeometryNull";
+        }
+    }
+    getNumericValue(attrValue) {
+        const propertyValue = { valueFormat: PropertyValueFormat.Primitive };
+        let typename = StandardTypeNames.Number;
+        if (attrValue.has_double_value) {
+            const value = this.toFixedWithoutPadding(attrValue.double_value);
+            propertyValue.value = value;
+            typename = StandardTypeNames.Double;
+        }
+        else if (attrValue.has_float_value) {
+            const value = this.toFixedWithoutPadding(attrValue.float_value);
+            propertyValue.value = value;
+            typename = StandardTypeNames.Float;
+        }
+        else if (attrValue.has_int64_value) {
+            propertyValue.value = attrValue.int64_value;
+            typename = StandardTypeNames.Integer;
+        }
+        else if (attrValue.has_sint64_value) {
+            propertyValue.value = attrValue.sint64_value;
+            typename = StandardTypeNames.Integer;
+        }
+        else if (attrValue.has_sint_value) {
+            propertyValue.value = attrValue.sint_value;
+            typename = StandardTypeNames.Integer;
+        }
+        else if (attrValue.has_uint64_value) {
+            propertyValue.value = attrValue.uint64_value;
+            typename = StandardTypeNames.Integer;
+        }
+        else if (attrValue.has_uint_value) {
+            propertyValue.value = attrValue.uint_value;
+            typename = StandardTypeNames.Integer;
+        }
+        else {
+            propertyValue.value = undefined;
+        }
+        return { propertyValue, typename };
+    }
+    getFeatureAttribute(fieldInfo, attrValue) {
+        let propertyValue = { valueFormat: PropertyValueFormat.Primitive };
+        let typename = StandardTypeNames.String;
+        if (fieldInfo.type === esriPBuffer.FeatureCollectionPBuffer.FieldType.esriFieldTypeDouble
+            || fieldInfo.type === esriPBuffer.FeatureCollectionPBuffer.FieldType.esriFieldTypeInteger
+            || fieldInfo.type === esriPBuffer.FeatureCollectionPBuffer.FieldType.esriFieldTypeSmallInteger
+            || fieldInfo.type === esriPBuffer.FeatureCollectionPBuffer.FieldType.esriFieldTypeOID
+            || fieldInfo.type === esriPBuffer.FeatureCollectionPBuffer.FieldType.esriFieldTypeSingle
+            || fieldInfo.type === esriPBuffer.FeatureCollectionPBuffer.FieldType.esriFieldTypeDate) {
+            const value = this.getNumericValue(attrValue);
+            if (value.propertyValue === undefined) {
+                Logger.logError(loggerCategory, `Could not read numeric value for field ${fieldInfo.name}`);
+                return undefined;
+            }
+            if (fieldInfo.type === esriPBuffer.FeatureCollectionPBuffer.FieldType.esriFieldTypeDate) {
+                const test = value.propertyValue.value;
+                propertyValue.value = new Date(test);
+                typename = StandardTypeNames.DateTime;
+            }
+            else {
+                typename = value.typename;
+                propertyValue = value.propertyValue;
+            }
+        }
+        else if (fieldInfo.type === esriPBuffer.FeatureCollectionPBuffer.FieldType.esriFieldTypeString) {
+            if (attrValue.has_string_value) {
+                propertyValue.value = attrValue.string_value;
+                typename = StandardTypeNames.String;
+            }
+        }
+        else if (fieldInfo.type === esriPBuffer.FeatureCollectionPBuffer.FieldType.esriFieldTypeGlobalID) {
+            if (attrValue.has_string_value) {
+                propertyValue.value = attrValue.string_value;
+                typename = StandardTypeNames.String;
+            }
+            else {
+                const value = this.getNumericValue(attrValue);
+                if (value.propertyValue === undefined) {
+                    Logger.logError(loggerCategory, `Could not read GlobalId value for field ${fieldInfo.name}`);
+                    return undefined;
+                }
+            }
+        }
+        else if (attrValue.has_string_value) {
+            // If we reach this case that probably mean we don't support the field type, simply try to output string value
+            typename = StandardTypeNames.String;
+            propertyValue.value = attrValue.string_value;
+        }
+        else if (attrValue.value_type === "none") {
+            // Sometimes fields are just empty, use an empty string
+            typename = StandardTypeNames.String;
+            propertyValue.value = undefined;
+        }
+        else {
+            Logger.logError(loggerCategory, `Could not read value for field ${fieldInfo.name}`);
+            return undefined;
+        }
+        propertyValue.displayValue = this.getDisplayValue(typename, propertyValue.value);
+        return { value: propertyValue, property: { name: fieldInfo.name, displayLabel: fieldInfo.name, typename } };
+    }
+    async readAndRender(response, renderer) {
+        if (!(response.data instanceof esriPBuffer.FeatureCollectionPBuffer)) {
+            const msg = "Response was not in PBF format";
+            Logger.logError(loggerCategory, msg);
+            return;
+        }
+        const collection = response.data;
+        if (!collection.has_queryResult || !collection.queryResult.has_featureResult || collection?.queryResult?.featureResult?.features === undefined)
+            return;
+        const attrSymbology = renderer.attributeSymbology;
+        // Fields metadata is stored outside feature results, create dedicated array first
+        const fields = [];
+        for (const field of collection.queryResult.featureResult.fields)
+            fields.push({ name: field.name, type: field.fieldType });
+        const geomType = collection.queryResult.featureResult.geometryType;
+        const stride = (collection.queryResult.featureResult.hasM || collection.queryResult.featureResult.hasZ) ? 3 : 2;
+        const relativeCoords = renderer.transform === undefined;
+        for (const feature of collection.queryResult.featureResult.features) {
+            // Render geometries
+            if (renderer && feature?.has_geometry) {
+                if (attrSymbology) {
+                    // Read attributes if needed (attribute driven symbology)
+                    this.applySymbologyAttributes(attrSymbology, feature, fields);
+                }
+                if (geomType === esriGeometryType.esriGeometryTypePoint || geomType === esriGeometryType.esriGeometryTypeMultipoint) {
+                    await renderer.renderPoint(feature.geometry.lengths, feature.geometry.coords, stride, relativeCoords);
+                }
+                else if (geomType === esriGeometryType.esriGeometryTypePolyline || geomType === esriGeometryType.esriGeometryTypePolygon) {
+                    const fill = (geomType === esriGeometryType.esriGeometryTypePolygon);
+                    await renderer.renderPath(feature.geometry.lengths, feature.geometry.coords, fill, stride, relativeCoords);
+                }
+            }
+        }
+    }
+    applySymbologyAttributes(attrSymbology, feature, fields) {
+        if (attrSymbology) {
+            const symbolFields = attrSymbology.rendererFields;
+            if (symbolFields && symbolFields.length > 0 && feature.attributes) {
+                let fieldIdx = 0;
+                const featureAttr = {};
+                for (const attrValue of feature.attributes) {
+                    if (fieldIdx > fields.length) {
+                        Logger.logError(loggerCategory, "Error while read feature info data: fields metadata missing");
+                        break;
+                    }
+                    const fieldInfo = fields[fieldIdx++];
+                    if (symbolFields.includes(fieldInfo.name)) {
+                        const attr = this.getFeatureAttribute(fieldInfo, attrValue);
+                        if (attr) {
+                            const primitiveValue = attr.value;
+                            featureAttr[fieldInfo.name] = primitiveValue.value;
+                        }
+                    }
+                }
+                attrSymbology.setActiveFeatureAttributes(featureAttr);
+            }
+        }
+    }
+    async readFeatureInfo(response, featureInfos, renderer) {
+        if (!(response.data instanceof esriPBuffer.FeatureCollectionPBuffer)) {
+            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, subLayerInfos: [] };
+        // Fields metadata is stored outside feature results, create dedicated array first
+        const fields = [];
+        for (const field of collection.queryResult.featureResult.fields)
+            fields.push({ name: field.name, type: field.fieldType });
+        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 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) {
+                    Logger.logError(loggerCategory, "Error while read feature info data: fields metadata missing");
+                    break;
+                }
+                // Convert everything to string for now
+                const attr = this.getFeatureAttribute(fields[fieldIdx], attrValue);
+                if (attr) {
+                    feature.attributes?.push(attr);
+                }
+                fieldIdx++;
+            }
+            subLayerInfo.features.push(feature);
+        }
+        if (layerInfo.subLayerInfos === undefined) {
+            layerInfo.subLayerInfos = [];
+        }
+        layerInfo.subLayerInfos.push(subLayerInfo);
+        featureInfos.push(layerInfo);
+    }
+}
+//# sourceMappingURL=ArcGisPbfFeatureReader.js.map