@itwin/map-layers-formats 4.1.0-dev.6 → 4.1.0-dev.63

package/CHANGELOG.md

@@ -1,6 +1,54 @@
 # Change Log - @itwin/map-layers-formats
 
-This log was last generated on Tue, 25 Apr 2023 17:50:35 GMT and should not be manually modified.
+This log was last generated on Mon, 03 Jul 2023 15:28:41 GMT and should not be manually modified.
+
+## 4.0.3
+Mon, 03 Jul 2023 15:28:41 GMT
+
+_Version update only_
+
+## 4.0.2
+Wed, 21 Jun 2023 22:04:43 GMT
+
+_Version update only_
+
+## 4.0.1
+Wed, 21 Jun 2023 20:29:14 GMT
+
+_Version update only_
+
+## 4.0.0
+Mon, 22 May 2023 15:34:14 GMT
+
+### Updates
+
+- Update to eslint@8
+- Upgrade TypeScript compile target to es2021.
+
+## 3.7.9
+Tue, 20 Jun 2023 12:51:02 GMT
+
+_Version update only_
+
+## 3.7.8
+Thu, 01 Jun 2023 17:00:39 GMT
+
+_Version update only_
+
+## 3.7.7
+Wed, 24 May 2023 17:27:09 GMT
+
+_Version update only_
+
+## 3.7.6
+Mon, 15 May 2023 18:23:41 GMT
+
+_Version update only_
+
+## 3.7.5
+Thu, 04 May 2023 19:43:18 GMT
+
+_Version update only_
 
 ## 3.7.4
 Tue, 25 Apr 2023 17:50:35 GMT

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

@@ -0,0 +1,17 @@
+import { Transform } from "@itwin/core-geometry";
+import { ArcGisSymbologyRenderer } from "./ArcGisSymbologyRenderer";
+import { ArcGisGeometryBaseRenderer } from "@itwin/core-frontend";
+export declare class ArcGisCanvasRenderer extends ArcGisGeometryBaseRenderer {
+    private _context;
+    private _symbol;
+    constructor(context: CanvasRenderingContext2D, symbol: ArcGisSymbologyRenderer, world2PixelTransform?: Transform);
+    protected beginPath(): void;
+    protected closePath(): void;
+    protected lineTo(x: number, y: number): void;
+    protected moveTo(x: number, y: number): void;
+    protected fill(): Promise<void>;
+    protected stroke(): Promise<void>;
+    protected finishPoints(): Promise<void>;
+    protected drawPoint(x: number, y: number): Promise<void>;
+}
+//# sourceMappingURL=ArcGisCanvasRenderer.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"ArcGisCanvasRenderer.d.ts","sourceRoot":"","sources":["../../../src/ArcGisFeature/ArcGisCanvasRenderer.ts"],"names":[],"mappings":"AAKA,OAAO,EAAE,SAAS,EAAE,MAAM,sBAAsB,CAAC;AACjD,OAAO,EAAE,uBAAuB,EAAE,MAAM,2BAA2B,CAAC;AACpE,OAAO,EAAE,0BAA0B,EAAE,MAAM,sBAAsB,CAAC;AAElE,qBAAa,oBAAqB,SAAQ,0BAA0B;IAClE,OAAO,CAAC,QAAQ,CAA2B;IAC3C,OAAO,CAAC,OAAO,CAA0B;gBAE7B,OAAO,EAAE,wBAAwB,EAAE,MAAM,EAAE,uBAAuB,EAAE,oBAAoB,CAAC,EAAE,SAAS;IAMhH,SAAS,CAAC,SAAS;IAInB,SAAS,CAAC,SAAS;IAInB,SAAS,CAAC,MAAM,CAAC,CAAC,EAAE,MAAM,EAAE,CAAC,EAAE,MAAM;IAIrC,SAAS,CAAC,MAAM,CAAC,CAAC,EAAE,MAAM,EAAE,CAAC,EAAE,MAAM;cAIrB,IAAI;cAKJ,MAAM;cAKN,YAAY;cAGZ,SAAS,CAAC,CAAC,EAAE,MAAM,EAAE,CAAC,EAAE,MAAM;CAI/C"}

package/lib/cjs/ArcGisFeature/ArcGisCanvasRenderer.js

@@ -0,0 +1,42 @@
+"use strict";
+/*---------------------------------------------------------------------------------------------
+* 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.ArcGisCanvasRenderer = void 0;
+const core_frontend_1 = require("@itwin/core-frontend");
+class ArcGisCanvasRenderer extends core_frontend_1.ArcGisGeometryBaseRenderer {
+    constructor(context, symbol, world2PixelTransform) {
+        super(world2PixelTransform);
+        this._symbol = symbol;
+        this._context = context;
+    }
+    beginPath() {
+        this._context.beginPath();
+    }
+    closePath() {
+        this._context.closePath();
+    }
+    lineTo(x, y) {
+        this._context.lineTo(x, y);
+    }
+    moveTo(x, y) {
+        this._context.moveTo(x, y);
+    }
+    async fill() {
+        this._symbol.applyFillStyle(this._context);
+        this._context.fill();
+    }
+    async stroke() {
+        this._symbol.applyStrokeStyle(this._context);
+        this._context.stroke();
+    }
+    async finishPoints() {
+    }
+    async drawPoint(x, y) {
+        this._symbol.drawPoint(this._context, x, y);
+    }
+}
+exports.ArcGisCanvasRenderer = ArcGisCanvasRenderer;
+//# sourceMappingURL=ArcGisCanvasRenderer.js.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"ArcGisCanvasRenderer.js","sourceRoot":"","sources":["../../../src/ArcGisFeature/ArcGisCanvasRenderer.ts"],"names":[],"mappings":";AAAA;;;+FAG+F;;;AAI/F,wDAAkE;AAElE,MAAa,oBAAqB,SAAQ,0CAA0B;IAIlE,YAAY,OAAiC,EAAE,MAA+B,EAAE,oBAAgC;QAC9G,KAAK,CAAC,oBAAoB,CAAC,CAAC;QAC5B,IAAI,CAAC,OAAO,GAAG,MAAM,CAAC;QACtB,IAAI,CAAC,QAAQ,GAAG,OAAO,CAAC;IAC1B,CAAC;IAES,SAAS;QACjB,IAAI,CAAC,QAAQ,CAAC,SAAS,EAAE,CAAC;IAC5B,CAAC;IAES,SAAS;QACjB,IAAI,CAAC,QAAQ,CAAC,SAAS,EAAE,CAAC;IAC5B,CAAC;IAES,MAAM,CAAC,CAAS,EAAE,CAAS;QACnC,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;IAC7B,CAAC;IAES,MAAM,CAAC,CAAS,EAAE,CAAS;QACnC,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;IAC7B,CAAC;IAES,KAAK,CAAC,IAAI;QAClB,IAAI,CAAC,OAAO,CAAC,cAAc,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;QAC3C,IAAI,CAAC,QAAQ,CAAC,IAAI,EAAE,CAAC;IACvB,CAAC;IAES,KAAK,CAAC,MAAM;QACpB,IAAI,CAAC,OAAO,CAAC,gBAAgB,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;QAC7C,IAAI,CAAC,QAAQ,CAAC,MAAM,EAAE,CAAC;IACzB,CAAC;IAES,KAAK,CAAC,YAAY;IAC5B,CAAC;IAES,KAAK,CAAC,SAAS,CAAC,CAAS,EAAE,CAAS;QAC5C,IAAI,CAAC,OAAO,CAAC,SAAS,CAAC,IAAI,CAAC,QAAQ,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC;IAC9C,CAAC;CAEF;AA3CD,oDA2CC","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 { Transform } from \"@itwin/core-geometry\";\r\nimport { ArcGisSymbologyRenderer } from \"./ArcGisSymbologyRenderer\";\r\nimport { ArcGisGeometryBaseRenderer } from \"@itwin/core-frontend\";\r\n\r\nexport class ArcGisCanvasRenderer extends ArcGisGeometryBaseRenderer {\r\n  private _context: CanvasRenderingContext2D;\r\n  private _symbol: ArcGisSymbologyRenderer;\r\n\r\n  constructor(context: CanvasRenderingContext2D, symbol: ArcGisSymbologyRenderer, world2PixelTransform?: Transform) {\r\n    super(world2PixelTransform);\r\n    this._symbol = symbol;\r\n    this._context = context;\r\n  }\r\n\r\n  protected beginPath() {\r\n    this._context.beginPath();\r\n  }\r\n\r\n  protected closePath() {\r\n    this._context.closePath();\r\n  }\r\n\r\n  protected lineTo(x: number, y: number) {\r\n    this._context.lineTo(x, y);\r\n  }\r\n\r\n  protected moveTo(x: number, y: number) {\r\n    this._context.moveTo(x, y);\r\n  }\r\n\r\n  protected async fill() {\r\n    this._symbol.applyFillStyle(this._context);\r\n    this._context.fill();\r\n  }\r\n\r\n  protected async stroke() {\r\n    this._symbol.applyStrokeStyle(this._context);\r\n    this._context.stroke();\r\n  }\r\n\r\n  protected async finishPoints() {\r\n  }\r\n\r\n  protected async drawPoint(x: number, y: number) {\r\n    this._symbol.drawPoint(this._context, x, y);\r\n  }\r\n\r\n}\r\n"]}

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

@@ -1 +1 @@
-{"version":3,"file":"ArcGisFeatureFormat.d.ts","sourceRoot":"","sources":["../../../src/ArcGisFeature/ArcGisFeatureFormat.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,qBAAqB,EAAE,MAAM,oBAAoB,CAAC;AAC3D,OAAO,EAAmB,qBAAqB,EAAE,uBAAuB,EAAE,wBAAwB,EAAE,MAAM,sBAAsB,CAAC;AAGjI,gBAAgB;AAChB,qBAAa,2BAA4B,SAAQ,qBAAqB;IACpE,OAAuB,QAAQ,SAAmB;WAC3B,qBAAqB,CAAC,QAAQ,EAAE,qBAAqB,GAAG,uBAAuB,GAAG,SAAS;WACrF,cAAc,CAAC,GAAG,EAAE,MAAM,EAAE,QAAQ,CAAC,EAAE,MAAM,EAAE,QAAQ,CAAC,EAAE,MAAM,EAAE,WAAW,CAAC,EAAE,OAAO,GAAG,OAAO,CAAC,wBAAwB,CAAC;CAGzJ"}
+{"version":3,"file":"ArcGisFeatureFormat.d.ts","sourceRoot":"","sources":["../../../src/ArcGisFeature/ArcGisFeatureFormat.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,qBAAqB,EAAE,MAAM,oBAAoB,CAAC;AAC3D,OAAO,EAAmB,qBAAqB,EAAE,uBAAuB,EAAwB,wBAAwB,EAAE,MAAM,sBAAsB,CAAC;AAGvJ,gBAAgB;AAChB,qBAAa,2BAA4B,SAAQ,qBAAqB;IACpE,OAAuB,QAAQ,SAAmB;WAC3B,qBAAqB,CAAC,QAAQ,EAAE,qBAAqB,GAAG,uBAAuB,GAAG,SAAS;WACrF,cAAc,CAAC,GAAG,EAAE,MAAM,EAAE,QAAQ,CAAC,EAAE,MAAM,EAAE,QAAQ,CAAC,EAAE,MAAM,EAAE,WAAW,CAAC,EAAE,OAAO,GAAG,OAAO,CAAC,wBAAwB,CAAC;CAOzJ"}

package/lib/cjs/ArcGisFeature/ArcGisFeatureFormat.js

@@ -7,6 +7,9 @@ const ArcGisFeatureProvider_1 = require("./ArcGisFeatureProvider");
 class ArcGisFeatureMapLayerFormat extends core_frontend_1.ImageryMapLayerFormat {
     static createImageryProvider(settings) { return new ArcGisFeatureProvider_1.ArcGisFeatureProvider(settings); }
     static async validateSource(url, userName, password, ignoreCache) {
+        const urlValidation = core_frontend_1.ArcGisUtilities.validateUrl(url, "FeatureServer");
+        if (urlValidation !== core_frontend_1.MapLayerSourceStatus.Valid)
+            return { status: urlValidation };
         return core_frontend_1.ArcGisUtilities.validateSource(url, this.formatId, ["query"], userName, password, ignoreCache);
     }
 }

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

@@ -1 +1 @@
-{"version":3,"file":"ArcGisFeatureFormat.js","sourceRoot":"","sources":["../../../src/ArcGisFeature/ArcGisFeatureFormat.ts"],"names":[],"mappings":";;;AAKA,wDAAiI;AACjI,mEAAgE;AAEhE,gBAAgB;AAChB,MAAa,2BAA4B,SAAQ,qCAAqB;IAE7D,MAAM,CAAU,qBAAqB,CAAC,QAA+B,IAAyC,OAAO,IAAI,6CAAqB,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC;IAC3J,MAAM,CAAU,KAAK,CAAC,cAAc,CAAC,GAAW,EAAE,QAAiB,EAAE,QAAiB,EAAE,WAAqB;QAClH,OAAO,+BAAe,CAAC,cAAc,CAAC,GAAG,EAAE,IAAI,CAAC,QAAQ,EAAE,CAAC,OAAO,CAAC,EAAE,QAAQ,EAAE,QAAQ,EAAE,WAAW,CAAC,CAAC;IACxG,CAAC;;AAJsB,oCAAQ,GAAG,eAAe,CAAC;AADvC,kEAA2B","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\nimport { ImageMapLayerSettings } from \"@itwin/core-common\";\r\nimport { ArcGisUtilities, ImageryMapLayerFormat, MapLayerImageryProvider, MapLayerSourceValidation } from \"@itwin/core-frontend\";\r\nimport { ArcGisFeatureProvider } from \"./ArcGisFeatureProvider\";\r\n\r\n/** @internal */\r\nexport class ArcGisFeatureMapLayerFormat extends ImageryMapLayerFormat {\r\n  public static override formatId = \"ArcGISFeature\";\r\n  public static override createImageryProvider(settings: ImageMapLayerSettings): MapLayerImageryProvider | undefined { return new ArcGisFeatureProvider(settings); }\r\n  public static override async validateSource(url: string, userName?: string, password?: string, ignoreCache?: boolean): Promise<MapLayerSourceValidation> {\r\n    return ArcGisUtilities.validateSource(url, this.formatId, [\"query\"], userName, password, ignoreCache);\r\n  }\r\n}\r\n"]}
+{"version":3,"file":"ArcGisFeatureFormat.js","sourceRoot":"","sources":["../../../src/ArcGisFeature/ArcGisFeatureFormat.ts"],"names":[],"mappings":";;;AAKA,wDAAuJ;AACvJ,mEAAgE;AAEhE,gBAAgB;AAChB,MAAa,2BAA4B,SAAQ,qCAAqB;IAE7D,MAAM,CAAU,qBAAqB,CAAC,QAA+B,IAAyC,OAAO,IAAI,6CAAqB,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC;IAC3J,MAAM,CAAU,KAAK,CAAC,cAAc,CAAC,GAAW,EAAE,QAAiB,EAAE,QAAiB,EAAE,WAAqB;QAClH,MAAM,aAAa,GAAG,+BAAe,CAAC,WAAW,CAAC,GAAG,EAAE,eAAe,CAAC,CAAC;QACxE,IAAI,aAAa,KAAK,oCAAoB,CAAC,KAAK;YAC9C,OAAO,EAAC,MAAM,EAAE,aAAa,EAAC,CAAC;QAEjC,OAAO,+BAAe,CAAC,cAAc,CAAC,GAAG,EAAE,IAAI,CAAC,QAAQ,EAAE,CAAC,OAAO,CAAC,EAAE,QAAQ,EAAE,QAAQ,EAAE,WAAW,CAAC,CAAC;IACxG,CAAC;;AARsB,oCAAQ,GAAG,eAAe,CAAC;AADvC,kEAA2B","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\nimport { ImageMapLayerSettings } from \"@itwin/core-common\";\r\nimport { ArcGisUtilities, ImageryMapLayerFormat, MapLayerImageryProvider, MapLayerSourceStatus, MapLayerSourceValidation } from \"@itwin/core-frontend\";\r\nimport { ArcGisFeatureProvider } from \"./ArcGisFeatureProvider\";\r\n\r\n/** @internal */\r\nexport class ArcGisFeatureMapLayerFormat extends ImageryMapLayerFormat {\r\n  public static override formatId = \"ArcGISFeature\";\r\n  public static override createImageryProvider(settings: ImageMapLayerSettings): MapLayerImageryProvider | undefined { return new ArcGisFeatureProvider(settings); }\r\n  public static override async validateSource(url: string, userName?: string, password?: string, ignoreCache?: boolean): Promise<MapLayerSourceValidation> {\r\n    const urlValidation = ArcGisUtilities.validateUrl(url, \"FeatureServer\");\r\n    if (urlValidation !== MapLayerSourceStatus.Valid)\r\n      return {status: urlValidation};\r\n\r\n    return ArcGisUtilities.validateSource(url, this.formatId, [\"query\"], userName, password, ignoreCache);\r\n  }\r\n}\r\n"]}

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

@@ -1,7 +1,7 @@
 import { Cartographic, ImageMapLayerSettings, ImageSource } from "@itwin/core-common";
 import { Transform } from "@itwin/core-geometry";
-import { ArcGISImageryProvider, ImageryMapTileTree, MapLayerFeatureInfo, QuadId } from "@itwin/core-frontend";
-import { ArcGisExtent, ArcGisFeatureFormat, ArcGisGeometry } from "./ArcGisFeatureQuery";
+import { ArcGISImageryProvider, HitDetail, ImageryMapTileTree, MapLayerFeatureInfo, QuadId } from "@itwin/core-frontend";
+import { ArcGisExtent, ArcGisFeatureFormat, ArcGisFeatureResultType, ArcGisGeometry } from "./ArcGisFeatureQuery";
 /**
 * @internal
 */
@@ -16,7 +16,6 @@ export declare class ArcGisFeatureProvider extends ArcGISImageryProvider {
     private _drawDebugInfo;
     private _debugFeatureGeom;
     private _supportsCoordinatesQuantization;
-    private _querySupported;
     private _layerId;
     private _layerMetadata;
     private _format;
@@ -28,14 +27,17 @@ export declare class ArcGisFeatureProvider extends ArcGISImageryProvider {
     private _minDepthFromLod;
     get minimumZoomLevel(): number;
     get maximumZoomLevel(): number;
+    private static _extentCache;
     constructor(settings: ImageMapLayerSettings);
     initialize(): Promise<void>;
+    private fetchLayerExtent;
+    private setCartoRangeFromExtentJson;
     protected getLayerMetadata(layerId: number): Promise<any>;
     get tileSize(): number;
     get format(): ArcGisFeatureFormat | undefined;
     constructUrl(_row: number, _column: number, _zoomLevel: number): Promise<string>;
-    constructFeatureUrl(row: number, column: number, zoomLevel: number, format: ArcGisFeatureFormat, geomOverride?: ArcGisGeometry, outFields?: string, tolerance?: number, returnGeometry?: boolean): ArcGisFeatureUrl | undefined;
-    getFeatureInfo(featureInfos: MapLayerFeatureInfo[], quadId: QuadId, carto: Cartographic, _tree: ImageryMapTileTree): Promise<void>;
+    constructFeatureUrl(row: number, column: number, zoomLevel: number, format: ArcGisFeatureFormat, resultType: ArcGisFeatureResultType, geomOverride?: ArcGisGeometry, outFields?: string, tolerance?: number, returnGeometry?: boolean, maxAllowableOffset?: number): ArcGisFeatureUrl | undefined;
+    getFeatureInfo(featureInfos: MapLayerFeatureInfo[], quadId: QuadId, carto: Cartographic, _tree: ImageryMapTileTree, hit: HitDetail): Promise<void>;
     private fetchTile;
     drawTileDebugInfo(row: number, column: number, zoomLevel: number, context: CanvasRenderingContext2D): void;
     protected computeTileWorld2CanvasTransform(row: number, column: number, zoomLevel: number): Transform | undefined;

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

@@ -1 +1 @@
-{"version":3,"file":"ArcGisFeatureProvider.d.ts","sourceRoot":"","sources":["../../../src/ArcGisFeature/ArcGisFeatureProvider.ts"],"names":[],"mappings":"AAKA,OAAO,EAAE,YAAY,EAAE,qBAAqB,EAAE,WAAW,EAAkC,MAAM,oBAAoB,CAAC;AAEtH,OAAO,EAA8B,SAAS,EAAE,MAAM,sBAAsB,CAAC;AAC7E,OAAO,EAAmB,qBAAqB,EAA0C,kBAAkB,EAAqB,mBAAmB,EAAiC,MAAM,EAAE,MAAM,sBAAsB,CAAC;AAEzN,OAAO,EAAE,YAAY,EAAE,mBAAmB,EAAsB,cAAc,EAAkC,MAAM,sBAAsB,CAAC;AAO7I;;EAEE;AACF,UAAU,gBAAgB;IACxB,GAAG,EAAE,MAAM,CAAC;IACZ,QAAQ,CAAC,EAAE,YAAY,CAAC;CACzB;AAED;;EAEE;AACF,qBAAa,qBAAsB,SAAQ,qBAAqB;IAE9D,OAAO,CAAC,cAAc,CAAS;IAC/B,OAAO,CAAC,iBAAiB,CAAS;IAElC,OAAO,CAAC,gCAAgC,CAAS;IACjD,OAAO,CAAC,eAAe,CAAS;IAChC,OAAO,CAAC,QAAQ,CAAK;IACrB,OAAO,CAAC,cAAc,CAAM;IAC5B,OAAO,CAAC,OAAO,CAAgC;IACxC,WAAW,EAAE,GAAG,CAAC;IACxB,OAAO,CAAC,kBAAkB,CAAoC;IAC9D,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,WAAW,CAAK;IACxC,OAAO,CAAC,MAAM,CAAU;IAExB,OAAO,CAAC,gBAAgB,CAAK;IAC7B,OAAO,CAAC,gBAAgB,CAAK;IAC7B,IAAoB,gBAAgB,IAAI,MAAM,CAAkC;IAChF,IAAoB,gBAAgB,IAAI,MAAM,CAAkC;gBAEpE,QAAQ,EAAE,qBAAqB;IAIrB,UAAU,IAAI,OAAO,CAAC,IAAI,CAAC;cA+IjC,gBAAgB,CAAC,OAAO,EAAE,MAAM;IAYhD,IAAoB,QAAQ,IAAI,MAAM,CAAgB;IACtD,IAAW,MAAM,IAAI,mBAAmB,GAAC,SAAS,CAAyB;IAG9D,YAAY,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;IAItF,mBAAmB,CAAC,GAAG,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,EAAE,MAAM,EAAE,mBAAmB,EAAE,YAAY,CAAC,EAAE,cAAc,EAAE,SAAS,CAAC,EAAE,MAAM,EAAE,SAAS,CAAC,EAAE,MAAM,EAAE,cAAc,CAAC,EAAE,OAAO,GAAG,gBAAgB,GAAG,SAAS;IAyD/M,cAAc,CAAC,YAAY,EAAE,mBAAmB,EAAE,EAAE,MAAM,EAAE,MAAM,EAAE,KAAK,EAAE,YAAY,EAAE,KAAK,EAAE,kBAAkB,GAAG,OAAO,CAAC,IAAI,CAAC;YA4D3I,SAAS;IAgBf,iBAAiB,CAAC,GAAG,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,EAAE,OAAO,EAAE,wBAAwB;IAU3G,SAAS,CAAC,gCAAgC,CAAC,GAAG,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM;IAsBnE,QAAQ,CAAC,GAAG,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,WAAW,GAAG,SAAS,CAAC;CA0GjH"}
+{"version":3,"file":"ArcGisFeatureProvider.d.ts","sourceRoot":"","sources":["../../../src/ArcGisFeature/ArcGisFeatureProvider.ts"],"names":[],"mappings":"AAKA,OAAO,EAAE,YAAY,EAAE,qBAAqB,EAAE,WAAW,EAAkC,MAAM,oBAAoB,CAAC;AAEtH,OAAO,EAA8B,SAAS,EAAE,MAAM,sBAAsB,CAAC;AAC7E,OAAO,EAA2C,qBAAqB,EAA0C,SAAS,EAAE,kBAAkB,EAAqB,mBAAmB,EAAiC,MAAM,EAAE,MAAM,sBAAsB,CAAC;AAE5P,OAAO,EAAE,YAAY,EAAE,mBAAmB,EAAsB,uBAAuB,EAAE,cAAc,EAAkC,MAAM,sBAAsB,CAAC;AAStK;;EAEE;AACF,UAAU,gBAAgB;IACxB,GAAG,EAAE,MAAM,CAAC;IACZ,QAAQ,CAAC,EAAE,YAAY,CAAC;CACzB;AAED;;EAEE;AACF,qBAAa,qBAAsB,SAAQ,qBAAqB;IAE9D,OAAO,CAAC,cAAc,CAAS;IAC/B,OAAO,CAAC,iBAAiB,CAAS;IAElC,OAAO,CAAC,gCAAgC,CAAS;IAEjD,OAAO,CAAC,QAAQ,CAAK;IACrB,OAAO,CAAC,cAAc,CAAM;IAC5B,OAAO,CAAC,OAAO,CAAkC;IAC1C,WAAW,EAAE,GAAG,CAAC;IACxB,OAAO,CAAC,kBAAkB,CAAsC;IAChE,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,WAAW,CAAK;IACxC,OAAO,CAAC,MAAM,CAAU;IAExB,OAAO,CAAC,gBAAgB,CAAK;IAC7B,OAAO,CAAC,gBAAgB,CAAK;IAC7B,IAAoB,gBAAgB,IAAI,MAAM,CAAkC;IAChF,IAAoB,gBAAgB,IAAI,MAAM,CAAkC;IAEhF,OAAO,CAAC,MAAM,CAAC,YAAY,CAA0B;gBAEzC,QAAQ,EAAE,qBAAqB;IAIrB,UAAU,IAAI,OAAO,CAAC,IAAI,CAAC;YAuJnC,gBAAgB;IAmB9B,OAAO,CAAC,2BAA2B;cAanB,gBAAgB,CAAC,OAAO,EAAE,MAAM;IAYhD,IAAoB,QAAQ,IAAI,MAAM,CAAgB;IACtD,IAAW,MAAM,IAAI,mBAAmB,GAAG,SAAS,CAAyB;IAGhE,YAAY,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;IAItF,mBAAmB,CAAC,GAAG,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,EAAE,MAAM,EAAE,mBAAmB,EAAE,UAAU,EAAE,uBAAuB,EAAE,YAAY,CAAC,EAAE,cAAc,EAAE,SAAS,CAAC,EAAE,MAAM,EAAE,SAAS,CAAC,EAAE,MAAM,EAAE,cAAc,CAAC,EAAE,OAAO,EAAE,kBAAkB,CAAC,EAAE,MAAM,GAAG,gBAAgB,GAAG,SAAS;IA4DlR,cAAc,CAAC,YAAY,EAAE,mBAAmB,EAAE,EAAE,MAAM,EAAE,MAAM,EAAE,KAAK,EAAE,YAAY,EAAE,KAAK,EAAE,kBAAkB,EAAE,GAAG,EAAE,SAAS,GAAG,OAAO,CAAC,IAAI,CAAC;YA6E1J,SAAS;IAgBhB,iBAAiB,CAAC,GAAG,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,EAAE,OAAO,EAAE,wBAAwB;IAU1G,SAAS,CAAC,gCAAgC,CAAC,GAAG,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM;IAsBnE,QAAQ,CAAC,GAAG,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,WAAW,GAAG,SAAS,CAAC;CA2GjH"}

package/lib/cjs/ArcGisFeature/ArcGisFeatureProvider.js

@@ -11,10 +11,10 @@ const core_geometry_1 = require("@itwin/core-geometry");
 const core_frontend_1 = require("@itwin/core-frontend");
 const ArcGisSymbologyRenderer_1 = require("./ArcGisSymbologyRenderer");
 const ArcGisFeatureQuery_1 = require("./ArcGisFeatureQuery");
-const ArcGisFeatureRenderer_1 = require("./ArcGisFeatureRenderer");
-const ArcGisFeaturePBF_1 = require("./ArcGisFeaturePBF");
-const ArcGisFeatureJSON_1 = require("./ArcGisFeatureJSON");
+const ArcGisPbfFeatureReader_1 = require("./ArcGisPbfFeatureReader");
+const ArcGisJsonFeatureReader_1 = require("./ArcGisJsonFeatureReader");
 const ArcGisFeatureResponse_1 = require("./ArcGisFeatureResponse");
+const ArcGisCanvasRenderer_1 = require("./ArcGisCanvasRenderer");
 const loggerCategory = "MapLayersFormats.ArcGISFeature";
 /**  Provide tiles from a ESRI ArcGIS Feature service
 * @internal
@@ -28,7 +28,6 @@ class ArcGisFeatureProvider extends core_frontend_1.ArcGISImageryProvider {
         this._drawDebugInfo = false;
         this._debugFeatureGeom = false;
         this._supportsCoordinatesQuantization = false;
-        this._querySupported = false;
         this._layerId = 0;
         this._outSR = 102100;
         this._maxDepthFromLod = 0;
@@ -74,6 +73,7 @@ class ArcGisFeatureProvider extends core_frontend_1.ArcGISImageryProvider {
                     for (const layer of this.serviceJson.layers) {
                         if (layer.defaultVisibility) {
                             this._layerId = layer.id;
+                            break;
                         }
                     }
                 }
@@ -137,17 +137,23 @@ class ArcGisFeatureProvider extends core_frontend_1.ArcGISImageryProvider {
             throw new core_common_1.ServerError(core_bentley_1.IModelStatus.ValidationFailed, "");
         }
         // Read range using full extent from service metadata
-        if (json.fullExtent) {
-            if (json.fullExtent.spatialReference.latestWkid === 3857 || json.fullExtent.spatialReference.wkid === 102100) {
-                const range3857 = core_geometry_1.Range2d.createFrom({
-                    low: { x: json.fullExtent.xmin, y: json.fullExtent.ymin },
-                    high: { x: json.fullExtent.xmax, y: json.fullExtent.ymax }
-                });
-                const west = this.getEPSG4326Lon(range3857.xLow);
-                const south = this.getEPSG4326Lat(range3857.yLow);
-                const east = this.getEPSG4326Lon(range3857.xHigh);
-                const north = this.getEPSG4326Lat(range3857.yHigh);
-                this.cartoRange = core_frontend_1.MapCartoRectangle.fromDegrees(west, south, east, north);
+        if (this._layerMetadata?.extent) {
+            const layerExtent = this._layerMetadata.extent;
+            if (layerExtent.spatialReference.latestWkid === 3857 || layerExtent.spatialReference.wkid === 102100) {
+                this.setCartoRangeFromExtentJson(layerExtent);
+            }
+        }
+        if (!this.cartoRange) {
+            // Range could not be found (or is not in a coordinate system we support), make a request to compute the extent
+            try {
+                const extentJson = await this.fetchLayerExtent();
+                if (extentJson)
+                    this.setCartoRangeFromExtentJson(extentJson);
+                else
+                    core_bentley_1.Logger.logWarning(loggerCategory, `Could not get features extent, disabling extent filtering`);
+            }
+            catch {
+                core_bentley_1.Logger.logError(loggerCategory, `Could not get feature extent`);
             }
         }
         // Check for minScale / max scale
@@ -160,6 +166,36 @@ class ArcGisFeatureProvider extends core_frontend_1.ArcGISImageryProvider {
         this._maxDepthFromLod = (scales.maxLod ? scales.maxLod : this.defaultMaximumZoomLevel);
         this._symbologyRenderer = new ArcGisSymbologyRenderer_1.ArcGisSymbologyRenderer(this._layerMetadata?.geometryType, this._layerMetadata?.drawingInfo?.renderer);
     }
+    async fetchLayerExtent() {
+        let extentJson;
+        const tmpUrl = new URL(this._settings.url);
+        tmpUrl.pathname = `${tmpUrl.pathname}/${this._layerId}/query`;
+        tmpUrl.searchParams.append("where", "1=1");
+        tmpUrl.searchParams.append("outSR", "3857");
+        tmpUrl.searchParams.append("returnExtentOnly", "true");
+        tmpUrl.searchParams.append("f", "json");
+        const cached = ArcGisFeatureProvider._extentCache.get(tmpUrl.toString());
+        if (cached) {
+            extentJson = cached;
+        }
+        else {
+            const response = await this.fetch(tmpUrl, { method: "GET" });
+            extentJson = await response.json();
+            ArcGisFeatureProvider._extentCache.set(tmpUrl.toString(), extentJson);
+        }
+        return (extentJson ? extentJson.extent : undefined);
+    }
+    setCartoRangeFromExtentJson(extent) {
+        const range3857 = core_geometry_1.Range2d.createFrom({
+            low: { x: extent.xmin, y: extent.ymin },
+            high: { x: extent.xmax, y: extent.ymax },
+        });
+        const west = this.getEPSG4326Lon(range3857.xLow);
+        const south = this.getEPSG4326Lat(range3857.yLow);
+        const east = this.getEPSG4326Lon(range3857.xHigh);
+        const north = this.getEPSG4326Lat(range3857.yHigh);
+        this.cartoRange = core_frontend_1.MapCartoRectangle.fromDegrees(west, south, east, north);
+    }
     async getLayerMetadata(layerId) {
         let metadata;
         try {
@@ -177,7 +213,7 @@ class ArcGisFeatureProvider extends core_frontend_1.ArcGISImageryProvider {
     async constructUrl(_row, _column, _zoomLevel) {
         return "";
     }
-    constructFeatureUrl(row, column, zoomLevel, format, geomOverride, outFields, tolerance, returnGeometry) {
+    constructFeatureUrl(row, column, zoomLevel, format, resultType, geomOverride, outFields, tolerance, returnGeometry, maxAllowableOffset) {
         const tileExtent = this.getEPSG3857Extent(row, column, zoomLevel);
         const tileEnvelope = {
             xmin: tileExtent.left, ymin: tileExtent.bottom,
@@ -197,7 +233,7 @@ class ArcGisFeatureProvider extends core_frontend_1.ArcGISImageryProvider {
         }
         let quantizationParameters;
         const toleranceWorld = (tileExtent.top - tileExtent.bottom) / this.tileSize;
-        if (this._supportsCoordinatesQuantization) {
+        if (resultType === "tile" && this._supportsCoordinatesQuantization) {
             quantizationParameters = {
                 mode: "view",
                 originPosition: "upperLeft",
@@ -205,15 +241,18 @@ class ArcGisFeatureProvider extends core_frontend_1.ArcGISImageryProvider {
                 extent: tileEnvelope,
             };
         }
-        const url = new ArcGisFeatureQuery_1.ArcGisFeatureQuery(this._settings.url, this._layerId, format, this._outSR, { geometry,
+        const url = new ArcGisFeatureQuery_1.ArcGisFeatureQuery(this._settings.url, this._layerId, format, this._outSR, {
+            geometry,
             geometryType: "esriGeometryEnvelope",
             returnExceededLimitFeatures: false,
             maxRecordCountFactor: 3,
-            resultType: "tile",
+            resultType,
             quantizationParameters,
             outFields,
             returnGeometry,
-            distance: (tolerance ? tolerance * toleranceWorld : undefined) });
+            distance: (tolerance ? tolerance * toleranceWorld : undefined),
+            maxAllowableOffset,
+        });
         let envelope;
         if (geomOverride && geomOverride.type === "esriGeometryEnvelope") {
             envelope = geomOverride.geom;
@@ -224,16 +263,27 @@ class ArcGisFeatureProvider extends core_frontend_1.ArcGISImageryProvider {
         return { url: url.toString(), envelope };
     }
     // Makes an identify request to ESRI MapService , and return it as a list MapLayerFeatureInfo object
-    async getFeatureInfo(featureInfos, quadId, carto, _tree) {
+    async getFeatureInfo(featureInfos, quadId, carto, _tree, hit) {
         if (!this._querySupported || this.format === undefined)
             return;
-        const cartoPoint = {
-            x: this.getEPSG3857X(carto.longitudeDegrees),
-            y: this.getEPSG3857Y(carto.latitudeDegrees),
-            spatialReference: { wkid: 102100, latestWkid: 3857 },
+        const epsg3857X = this.getEPSG3857X(carto.longitudeDegrees);
+        const epsg3857Y = this.getEPSG3857Y(carto.latitudeDegrees);
+        const tileExtent = this.getEPSG3857Extent(quadId.row, quadId.column, quadId.level);
+        const tilePixelSize = (tileExtent.top - tileExtent.bottom) / this.tileSize;
+        const tolerancePixel = 3;
+        const toleranceWorld = tilePixelSize * tolerancePixel;
+        // Note: We used to pass a single point as the query 'geometry' and leverage the 'distance' parameter, turns
+        // out that approach was a lot slower on some server compared to using a single envelope.
+        const queryEnvelope = {
+            type: "esriGeometryEnvelope",
+            geom: {
+                xmin: epsg3857X - toleranceWorld, ymin: epsg3857Y - toleranceWorld,
+                xmax: epsg3857X + toleranceWorld, ymax: epsg3857Y + toleranceWorld,
+                spatialReference: { wkid: 102100, latestWkid: 3857 },
+            }
         };
         const doFeatureInfoQuery = async (format, outFields, returnGeometry) => {
-            const infoUrl = this.constructFeatureUrl(quadId.row, quadId.column, quadId.level, format, { geom: cartoPoint, type: "esriGeometryPoint" }, outFields, 3 /* tolerance in pixel*/, returnGeometry);
+            const infoUrl = this.constructFeatureUrl(quadId.row, quadId.column, quadId.level, format, "standard", queryEnvelope, outFields, undefined, returnGeometry, toleranceWorld);
             if (!infoUrl || infoUrl.url.length === 0) {
                 core_bentley_1.Logger.logError(loggerCategory, `Could not construct feature info query URL`);
                 return undefined;
@@ -258,20 +308,22 @@ class ArcGisFeatureProvider extends core_frontend_1.ArcGISImageryProvider {
             }
         }
         try {
-            const responseData = await doFeatureInfoQuery(this.format, "*", false);
+            // Feature Info requests are always made in JSON for now.
+            const responseData = await doFeatureInfoQuery("JSON", "*", true);
             if (!responseData) {
                 core_bentley_1.Logger.logError(loggerCategory, `Could not get feature info data`);
                 return;
             }
             if (responseData.exceedTransferLimit) {
-                core_bentley_1.Logger.logError(loggerCategory, `Could not get feature info : transfert limit exeeded.`);
+                core_bentley_1.Logger.logError(loggerCategory, `Could not get feature info : transfer limit exceeded.`);
                 return;
             }
-            const featureReader = this.format === "PBF" ? new ArcGisFeaturePBF_1.ArcGisFeaturePBF(this._settings, this._layerMetadata) : new ArcGisFeatureJSON_1.ArcGisFeatureJSON(this._settings, this._layerMetadata);
-            featureReader.readFeatureInfo(responseData, featureInfos);
+            const featureReader = new ArcGisJsonFeatureReader_1.ArcGisJsonFeatureReader(this._settings, this._layerMetadata);
+            const renderer = new core_frontend_1.ArcGisGraphicsRenderer(hit.iModel);
+            await featureReader.readFeatureInfo(responseData, featureInfos, renderer);
         }
         catch (e) {
-            core_bentley_1.Logger.logError(loggerCategory, `Exception occured while loading feature info data : ${e}`);
+            core_bentley_1.Logger.logError(loggerCategory, `Exception occurred while loading feature info data : ${e}`);
             return;
         }
         return;
@@ -281,7 +333,7 @@ class ArcGisFeatureProvider extends core_frontend_1.ArcGISImageryProvider {
             return undefined;
         }
         const geomOverride = (refineEnvelope ? { geom: refineEnvelope, type: "esriGeometryEnvelope" } : undefined);
-        const tileUrl = this.constructFeatureUrl(row, column, zoomLevel, this.format, geomOverride);
+        const tileUrl = this.constructFeatureUrl(row, column, zoomLevel, this.format, "tile", geomOverride);
         if (!tileUrl || tileUrl.url.length === 0) {
             core_bentley_1.Logger.logError(loggerCategory, `Could not construct feature query URL for tile ${zoomLevel}/${row}/${column}`);
             return undefined;
@@ -341,8 +393,8 @@ class ArcGisFeatureProvider extends core_frontend_1.ArcGISImageryProvider {
                     core_bentley_1.Logger.logError(loggerCategory, `Could not compute data transformation for tile (${zoomLevel}/${row}/${column})`);
                 }
             }
-            const renderer = new ArcGisFeatureRenderer_1.ArcGisFeatureRenderer(ctx, this._symbologyRenderer, transfo);
-            const featureReader = this.format === "PBF" ? new ArcGisFeaturePBF_1.ArcGisFeaturePBF(this._settings, this._layerMetadata) : new ArcGisFeatureJSON_1.ArcGisFeatureJSON(this._settings, this._layerMetadata);
+            const renderer = new ArcGisCanvasRenderer_1.ArcGisCanvasRenderer(ctx, this._symbologyRenderer, transfo);
+            const featureReader = this.format === "PBF" ? new ArcGisPbfFeatureReader_1.ArcGisPbfFeatureReader(this._settings, this._layerMetadata) : new ArcGisJsonFeatureReader_1.ArcGisJsonFeatureReader(this._settings, this._layerMetadata);
             const getSubEnvelopes = (envelope) => {
                 const dx = (envelope.xmax - envelope.xmin) * 0.5;
                 const dy = (envelope.xmax - envelope.xmin) * 0.5;
@@ -395,7 +447,7 @@ class ArcGisFeatureProvider extends core_frontend_1.ArcGISImageryProvider {
                     }
                 }
                 else {
-                    featureReader.readAndRender(responseData, renderer);
+                    await featureReader.readAndRender(responseData, renderer);
                 }
             };
             await renderData();
@@ -418,5 +470,6 @@ class ArcGisFeatureProvider extends core_frontend_1.ArcGISImageryProvider {
     }
 }
 ArcGisFeatureProvider._nbSubTiles = 2;
+ArcGisFeatureProvider._extentCache = new Map();
 exports.ArcGisFeatureProvider = ArcGisFeatureProvider;
 //# sourceMappingURL=ArcGisFeatureProvider.js.map