@itwin/map-layers-formats 4.1.0-dev.8 → 4.1.0-dev.80

package/lib/cjs/mapLayersFormats.js

@@ -11,6 +11,7 @@ exports.MapLayersFormats = void 0;
 const core_bentley_1 = require("@itwin/core-bentley");
 const core_frontend_1 = require("@itwin/core-frontend");
 const ArcGisFeatureFormat_1 = require("./ArcGisFeature/ArcGisFeatureFormat");
+const MapFeatureInfoTool_1 = require("./Tools/MapFeatureInfoTool");
 /** The primary API for the `@itwin/map-layers-formats` package. It allows the package's features to be [[initialize]]d.
  * @beta
  */
@@ -19,11 +20,20 @@ class MapLayersFormats {
      * Typically, an application will call `MapLayersFormats.initialize` immediately after [IModelApp.startup]($frontend).
      * This function has no effect if called **before** [IModelApp.startup]($frontend) or **after** [IModelApp.shutdown]($frontend).
      */
-    static initialize() {
+    static async initialize(config) {
         (0, core_bentley_1.assert)(core_frontend_1.IModelApp.initialized, "MapLayersFormats.initialize must be called after IModelApp.startup and before IModelApp.shutdown");
         if (core_frontend_1.IModelApp.initialized)
             core_frontend_1.IModelApp.mapLayerFormatRegistry.register(ArcGisFeatureFormat_1.ArcGisFeatureMapLayerFormat);
+        // register namespace containing localized strings for this package
+        MapLayersFormats.localization = config?.localization ?? core_frontend_1.IModelApp.localization;
+        await MapLayersFormats.localization.registerNamespace(MapLayersFormats.localizationNamespace);
+        MapFeatureInfoTool_1.MapFeatureInfoTool.register(MapLayersFormats.localizationNamespace);
+    }
+    /** The internationalization service namespace. */
+    static get localizationNamespace() {
+        return MapLayersFormats._defaultNs;
     }
 }
+MapLayersFormats._defaultNs = "mapLayersFormats";
 exports.MapLayersFormats = MapLayersFormats;
 //# sourceMappingURL=mapLayersFormats.js.map

package/lib/cjs/mapLayersFormats.js.map

@@ -1 +1 @@
-{"version":3,"file":"mapLayersFormats.js","sourceRoot":"","sources":["../../src/mapLayersFormats.ts"],"names":[],"mappings":";AAAA;;;+FAG+F;;;AAE/F;;GAEG;AACH,sDAA6C;AAC7C,wDAAiD;AACjD,6EAAkF;AAElF;;GAEG;AACH,MAAa,gBAAgB;IAC3B;;;OAGG;IACI,MAAM,CAAC,UAAU;QACtB,IAAA,qBAAM,EAAC,yBAAS,CAAC,WAAW,EAAE,kGAAkG,CAAC,CAAC;QAClI,IAAI,yBAAS,CAAC,WAAW;YACvB,yBAAS,CAAC,sBAAsB,CAAC,QAAQ,CAAC,iDAA2B,CAAC,CAAC;IAC3E,CAAC;CACF;AAVD,4CAUC","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/** @packageDocumentation\r\n * @module MapLayersFormats\r\n */\r\nimport { assert } from \"@itwin/core-bentley\";\r\nimport { IModelApp } from \"@itwin/core-frontend\";\r\nimport { ArcGisFeatureMapLayerFormat } from \"./ArcGisFeature/ArcGisFeatureFormat\";\r\n\r\n/** The primary API for the `@itwin/map-layers-formats` package. It allows the package's features to be [[initialize]]d.\r\n * @beta\r\n */\r\nexport class MapLayersFormats {\r\n  /** Registers the [MapLayerFormat]($frontend)s provided by this package for use with [IModelApp]($frontend).\r\n   * Typically, an application will call `MapLayersFormats.initialize` immediately after [IModelApp.startup]($frontend).\r\n   * This function has no effect if called **before** [IModelApp.startup]($frontend) or **after** [IModelApp.shutdown]($frontend).\r\n   */\r\n  public static initialize() {\r\n    assert(IModelApp.initialized, \"MapLayersFormats.initialize must be called after IModelApp.startup and before IModelApp.shutdown\");\r\n    if (IModelApp.initialized)\r\n      IModelApp.mapLayerFormatRegistry.register(ArcGisFeatureMapLayerFormat);\r\n  }\r\n}\r\n"]}
+{"version":3,"file":"mapLayersFormats.js","sourceRoot":"","sources":["../../src/mapLayersFormats.ts"],"names":[],"mappings":";AAAA;;;+FAG+F;;;AAE/F;;GAEG;AACH,sDAA6C;AAC7C,wDAAiD;AACjD,6EAAkF;AAClF,mEAAgE;AAUhE;;GAEG;AACH,MAAa,gBAAgB;IAK3B;;;OAGG;IACI,MAAM,CAAC,KAAK,CAAC,UAAU,CAAC,MAA+B;QAC5D,IAAA,qBAAM,EAAC,yBAAS,CAAC,WAAW,EAAE,kGAAkG,CAAC,CAAC;QAClI,IAAI,yBAAS,CAAC,WAAW;YACvB,yBAAS,CAAC,sBAAsB,CAAC,QAAQ,CAAC,iDAA2B,CAAC,CAAC;QAEzE,mEAAmE;QACnE,gBAAgB,CAAC,YAAY,GAAG,MAAM,EAAE,YAAY,IAAI,yBAAS,CAAC,YAAY,CAAC;QAC/E,MAAM,gBAAgB,CAAC,YAAY,CAAC,iBAAiB,CACnD,gBAAgB,CAAC,qBAAqB,CACvC,CAAC;QAEF,uCAAkB,CAAC,QAAQ,CAAC,gBAAgB,CAAC,qBAAqB,CAAC,CAAC;IACtE,CAAC;IAED,kDAAkD;IAC3C,MAAM,KAAK,qBAAqB;QACrC,OAAO,gBAAgB,CAAC,UAAU,CAAC;IACrC,CAAC;;AAxBc,2BAAU,GAAG,kBAAkB,CAAC;AAFpC,4CAAgB","sourcesContent":["/*---------------------------------------------------------------------------------------------\n* Copyright (c) Bentley Systems, Incorporated. All rights reserved.\n* See LICENSE.md in the project root for license terms and full copyright notice.\n*--------------------------------------------------------------------------------------------*/\n\n/** @packageDocumentation\n * @module MapLayersFormats\n */\nimport { assert } from \"@itwin/core-bentley\";\nimport { IModelApp } from \"@itwin/core-frontend\";\nimport { ArcGisFeatureMapLayerFormat } from \"./ArcGisFeature/ArcGisFeatureFormat\";\nimport { MapFeatureInfoTool } from \"./Tools/MapFeatureInfoTool\";\nimport { Localization } from \"@itwin/core-common\";\n\n/** Configuration options.\n * @beta\n */\nexport interface MapLayersFormatsConfig {\n  localization?: Localization;\n}\n\n/** The primary API for the `@itwin/map-layers-formats` package. It allows the package's features to be [[initialize]]d.\n * @beta\n */\nexport class MapLayersFormats {\n\n  private static _defaultNs = \"mapLayersFormats\";\n  public static localization: Localization;\n\n  /** Registers the [MapLayerFormat]($frontend)s provided by this package for use with [IModelApp]($frontend).\n   * Typically, an application will call `MapLayersFormats.initialize` immediately after [IModelApp.startup]($frontend).\n   * This function has no effect if called **before** [IModelApp.startup]($frontend) or **after** [IModelApp.shutdown]($frontend).\n   */\n  public static async initialize(config?: MapLayersFormatsConfig): Promise<void> {\n    assert(IModelApp.initialized, \"MapLayersFormats.initialize must be called after IModelApp.startup and before IModelApp.shutdown\");\n    if (IModelApp.initialized)\n      IModelApp.mapLayerFormatRegistry.register(ArcGisFeatureMapLayerFormat);\n\n    // register namespace containing localized strings for this package\n    MapLayersFormats.localization = config?.localization ?? IModelApp.localization;\n    await MapLayersFormats.localization.registerNamespace(\n      MapLayersFormats.localizationNamespace,\n    );\n\n    MapFeatureInfoTool.register(MapLayersFormats.localizationNamespace);\n  }\n\n  /** The internationalization service namespace. */\n  public static get localizationNamespace(): string {\n    return MapLayersFormats._defaultNs;\n  }\n\n}\n"]}

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

@@ -0,0 +1,19 @@
+import { Transform } from "@itwin/core-geometry";
+import { ArcGisSymbologyRenderer } from "./ArcGisSymbologyRenderer";
+import { ArcGisAttributeDrivenSymbology, ArcGisGeometryBaseRenderer } from "@itwin/core-frontend";
+/** @internal */
+export declare class ArcGisCanvasRenderer extends ArcGisGeometryBaseRenderer {
+    private _context;
+    private _symbol;
+    get attributeSymbology(): ArcGisAttributeDrivenSymbology | undefined;
+    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/esm/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,8BAA8B,EAAE,0BAA0B,EAAE,MAAM,sBAAsB,CAAC;AAElG,gBAAgB;AAChB,qBAAa,oBAAqB,SAAQ,0BAA0B;IAClE,OAAO,CAAC,QAAQ,CAA2B;IAC3C,OAAO,CAAC,OAAO,CAA0B;IAEzC,IAAoB,kBAAkB,IAAI,8BAA8B,GAAG,SAAS,CAEnF;gBAEW,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;CAG/C"}

package/lib/esm/ArcGisFeature/ArcGisCanvasRenderer.js

@@ -0,0 +1,42 @@
+/*---------------------------------------------------------------------------------------------
+* Copyright (c) Bentley Systems, Incorporated. All rights reserved.
+* See LICENSE.md in the project root for license terms and full copyright notice.
+*--------------------------------------------------------------------------------------------*/
+import { ArcGisGeometryBaseRenderer } from "@itwin/core-frontend";
+/** @internal */
+export class ArcGisCanvasRenderer extends ArcGisGeometryBaseRenderer {
+    get attributeSymbology() {
+        return this._symbol.isAttributeDriven() ? this._symbol : undefined;
+    }
+    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);
+    }
+}
+//# sourceMappingURL=ArcGisCanvasRenderer.js.map

package/lib/esm/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,OAAO,EAAkC,0BAA0B,EAAE,MAAM,sBAAsB,CAAC;AAElG,gBAAgB;AAChB,MAAM,OAAO,oBAAqB,SAAQ,0BAA0B;IAIlE,IAAoB,kBAAkB;QACpC,OAAO,IAAI,CAAC,OAAO,CAAC,iBAAiB,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC,SAAS,CAAC;IACrE,CAAC;IAED,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;CACF","sourcesContent":["/*---------------------------------------------------------------------------------------------\n* Copyright (c) Bentley Systems, Incorporated. All rights reserved.\n* See LICENSE.md in the project root for license terms and full copyright notice.\n*--------------------------------------------------------------------------------------------*/\n\nimport { Transform } from \"@itwin/core-geometry\";\nimport { ArcGisSymbologyRenderer } from \"./ArcGisSymbologyRenderer\";\nimport { ArcGisAttributeDrivenSymbology, ArcGisGeometryBaseRenderer } from \"@itwin/core-frontend\";\n\n/** @internal */\nexport class ArcGisCanvasRenderer extends ArcGisGeometryBaseRenderer {\n  private _context: CanvasRenderingContext2D;\n  private _symbol: ArcGisSymbologyRenderer;\n\n  public override get attributeSymbology(): ArcGisAttributeDrivenSymbology | undefined {\n    return this._symbol.isAttributeDriven() ? this._symbol : undefined;\n  }\n\n  constructor(context: CanvasRenderingContext2D, symbol: ArcGisSymbologyRenderer, world2PixelTransform?: Transform) {\n    super(world2PixelTransform);\n    this._symbol = symbol;\n    this._context = context;\n  }\n\n  protected beginPath() {\n    this._context.beginPath();\n  }\n\n  protected closePath() {\n    this._context.closePath();\n  }\n\n  protected lineTo(x: number, y: number) {\n    this._context.lineTo(x, y);\n  }\n\n  protected moveTo(x: number, y: number) {\n    this._context.moveTo(x, y);\n  }\n\n  protected async fill() {\n    this._symbol.applyFillStyle(this._context);\n    this._context.fill();\n  }\n\n  protected async stroke() {\n    this._symbol.applyStrokeStyle(this._context);\n    this._context.stroke();\n  }\n\n  protected async finishPoints() {\n  }\n\n  protected async drawPoint(x: number, y: number) {\n    this._symbol.drawPoint(this._context, x, y);\n  }\n}\n"]}

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

@@ -1,9 +1,12 @@
-import { ArcGisUtilities, ImageryMapLayerFormat } from "@itwin/core-frontend";
+import { ArcGisUtilities, ImageryMapLayerFormat, MapLayerSourceStatus } from "@itwin/core-frontend";
 import { ArcGisFeatureProvider } from "./ArcGisFeatureProvider";
 /** @internal */
 class ArcGisFeatureMapLayerFormat extends ImageryMapLayerFormat {
     static createImageryProvider(settings) { return new ArcGisFeatureProvider(settings); }
     static async validateSource(url, userName, password, ignoreCache) {
+        const urlValidation = ArcGisUtilities.validateUrl(url, "FeatureServer");
+        if (urlValidation !== MapLayerSourceStatus.Valid)
+            return { status: urlValidation };
         return ArcGisUtilities.validateSource(url, this.formatId, ["query"], userName, password, ignoreCache);
     }
 }

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

@@ -1 +1 @@
-{"version":3,"file":"ArcGisFeatureFormat.js","sourceRoot":"","sources":["../../../src/ArcGisFeature/ArcGisFeatureFormat.ts"],"names":[],"mappings":"AAKA,OAAO,EAAE,eAAe,EAAE,qBAAqB,EAAqD,MAAM,sBAAsB,CAAC;AACjI,OAAO,EAAE,qBAAqB,EAAE,MAAM,yBAAyB,CAAC;AAEhE,gBAAgB;AAChB,MAAa,2BAA4B,SAAQ,qBAAqB;IAE7D,MAAM,CAAU,qBAAqB,CAAC,QAA+B,IAAyC,OAAO,IAAI,qBAAqB,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC;IAC3J,MAAM,CAAU,KAAK,CAAC,cAAc,CAAC,GAAW,EAAE,QAAiB,EAAE,QAAiB,EAAE,WAAqB;QAClH,OAAO,eAAe,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;SADvC,2BAA2B","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,OAAO,EAAE,eAAe,EAAE,qBAAqB,EAA2B,oBAAoB,EAA4B,MAAM,sBAAsB,CAAC;AACvJ,OAAO,EAAE,qBAAqB,EAAE,MAAM,yBAAyB,CAAC;AAEhE,gBAAgB;AAChB,MAAa,2BAA4B,SAAQ,qBAAqB;IAE7D,MAAM,CAAU,qBAAqB,CAAC,QAA+B,IAAyC,OAAO,IAAI,qBAAqB,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC;IAC3J,MAAM,CAAU,KAAK,CAAC,cAAc,CAAC,GAAW,EAAE,QAAiB,EAAE,QAAiB,EAAE,WAAqB;QAClH,MAAM,aAAa,GAAG,eAAe,CAAC,WAAW,CAAC,GAAG,EAAE,eAAe,CAAC,CAAC;QACxE,IAAI,aAAa,KAAK,oBAAoB,CAAC,KAAK;YAC9C,OAAO,EAAC,MAAM,EAAE,aAAa,EAAC,CAAC;QAEjC,OAAO,eAAe,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;SADvC,2BAA2B","sourcesContent":["/*---------------------------------------------------------------------------------------------\n* Copyright (c) Bentley Systems, Incorporated. All rights reserved.\n* See LICENSE.md in the project root for license terms and full copyright notice.\n*--------------------------------------------------------------------------------------------*/\nimport { ImageMapLayerSettings } from \"@itwin/core-common\";\nimport { ArcGisUtilities, ImageryMapLayerFormat, MapLayerImageryProvider, MapLayerSourceStatus, MapLayerSourceValidation } from \"@itwin/core-frontend\";\nimport { ArcGisFeatureProvider } from \"./ArcGisFeatureProvider\";\n\n/** @internal */\nexport class ArcGisFeatureMapLayerFormat extends ImageryMapLayerFormat {\n  public static override formatId = \"ArcGISFeature\";\n  public static override createImageryProvider(settings: ImageMapLayerSettings): MapLayerImageryProvider | undefined { return new ArcGisFeatureProvider(settings); }\n  public static override async validateSource(url: string, userName?: string, password?: string, ignoreCache?: boolean): Promise<MapLayerSourceValidation> {\n    const urlValidation = ArcGisUtilities.validateUrl(url, \"FeatureServer\");\n    if (urlValidation !== MapLayerSourceStatus.Valid)\n      return {status: urlValidation};\n\n    return ArcGisUtilities.validateSource(url, this.formatId, [\"query\"], userName, password, ignoreCache);\n  }\n}\n"]}

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

@@ -1,7 +1,8 @@
 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, ArcGisFeatureGeometryType, ArcGisFeatureResultType, ArcGisGeometry } from "./ArcGisFeatureQuery";
+import { EsriPMS, EsriSFS, EsriSLS } from "./EsriSymbology";
 /**
 * @internal
 */
@@ -16,26 +17,33 @@ export declare class ArcGisFeatureProvider extends ArcGISImageryProvider {
     private _drawDebugInfo;
     private _debugFeatureGeom;
     private _supportsCoordinatesQuantization;
-    private _querySupported;
     private _layerId;
     private _layerMetadata;
     private _format;
-    serviceJson: any;
-    private _symbologyRenderer;
-    private static readonly _nbSubTiles;
     private _outSR;
     private _maxDepthFromLod;
     private _minDepthFromLod;
+    private _defaultSymbol;
+    private _renderer;
+    private static readonly _nbSubTiles;
+    serviceJson: any;
+    private static readonly defaultPMS;
+    private static readonly defaultSLS;
+    private static readonly defaultSFS;
     get minimumZoomLevel(): number;
     get maximumZoomLevel(): number;
+    private static _extentCache;
     constructor(settings: ImageMapLayerSettings);
     initialize(): Promise<void>;
+    static getDefaultSymbology(geomType: ArcGisFeatureGeometryType): EsriSFS | EsriSLS | EsriPMS | undefined;
+    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/esm/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":"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"}

package/lib/esm/ArcGisFeature/ArcGisFeatureProvider.js

@@ -2,16 +2,18 @@
 * Copyright (c) Bentley Systems, Incorporated. All rights reserved.
 * See LICENSE.md in the project root for license terms and full copyright notice.
 *--------------------------------------------------------------------------------------------*/
+var _a;
 import { ImageSource, ImageSourceFormat, ServerError } from "@itwin/core-common";
 import { base64StringToUint8Array, IModelStatus, Logger } from "@itwin/core-bentley";
 import { Matrix4d, Point3d, Range2d } from "@itwin/core-geometry";
-import { ArcGisErrorCode, ArcGISImageryProvider, ArcGisUtilities, MapCartoRectangle, MapLayerImageryProviderStatus } from "@itwin/core-frontend";
+import { ArcGisErrorCode, ArcGisGraphicsRenderer, ArcGISImageryProvider, ArcGisUtilities, MapCartoRectangle, MapLayerImageryProviderStatus } from "@itwin/core-frontend";
 import { ArcGisSymbologyRenderer } from "./ArcGisSymbologyRenderer";
 import { ArcGisFeatureQuery } from "./ArcGisFeatureQuery";
-import { ArcGisFeatureRenderer } from "./ArcGisFeatureRenderer";
-import { ArcGisFeaturePBF } from "./ArcGisFeaturePBF";
-import { ArcGisFeatureJSON } from "./ArcGisFeatureJSON";
+import { ArcGisPbfFeatureReader } from "./ArcGisPbfFeatureReader";
+import { ArcGisJsonFeatureReader } from "./ArcGisJsonFeatureReader";
 import { ArcGisFeatureResponse } from "./ArcGisFeatureResponse";
+import { ArcGisCanvasRenderer } from "./ArcGisCanvasRenderer";
+import { EsriPMS, EsriRenderer, EsriSFS, EsriSLS } from "./EsriSymbology";
 const loggerCategory = "MapLayersFormats.ArcGISFeature";
 /**  Provide tiles from a ESRI ArcGIS Feature service
 * @internal
@@ -21,11 +23,10 @@ class ArcGisFeatureProvider extends ArcGISImageryProvider {
     get maximumZoomLevel() { return this._maxDepthFromLod; }
     constructor(settings) {
         super(settings, true);
-        // Debug flags, should always be commited to FALSE !
+        // Debug flags, should always be committed to FALSE !
         this._drawDebugInfo = false;
         this._debugFeatureGeom = false;
         this._supportsCoordinatesQuantization = false;
-        this._querySupported = false;
         this._layerId = 0;
         this._outSR = 102100;
         this._maxDepthFromLod = 0;
@@ -71,6 +72,7 @@ class ArcGisFeatureProvider extends ArcGISImageryProvider {
                     for (const layer of this.serviceJson.layers) {
                         if (layer.defaultVisibility) {
                             this._layerId = layer.id;
+                            break;
                         }
                     }
                 }
@@ -134,17 +136,23 @@ class ArcGisFeatureProvider extends ArcGISImageryProvider {
             throw new ServerError(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 = 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 = 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
+                    Logger.logWarning(loggerCategory, `Could not get features extent, disabling extent filtering`);
+            }
+            catch {
+                Logger.logError(loggerCategory, `Could not get feature extent`);
             }
         }
         // Check for minScale / max scale
@@ -155,7 +163,65 @@ class ArcGisFeatureProvider extends ArcGISImageryProvider {
             this._minDepthFromLod = scales.minLod;
         // Some servers advertises a max LOD of 0, it should be interpreted as 'not defined' (otherwise a max lod of 0 would would mean never display anything)
         this._maxDepthFromLod = (scales.maxLod ? scales.maxLod : this.defaultMaximumZoomLevel);
-        this._symbologyRenderer = new ArcGisSymbologyRenderer(this._layerMetadata?.geometryType, this._layerMetadata?.drawingInfo?.renderer);
+        this._defaultSymbol = ArcGisFeatureProvider.getDefaultSymbology(this._layerMetadata?.geometryType);
+        if (!this._defaultSymbol) {
+            Logger.logError(loggerCategory, "Could not determine default symbology: geometry type not supported");
+            throw new Error("Could not determine default symbology: geometry type not supported");
+        }
+        if (this._defaultSymbol.type === "esriPMS") {
+            await this._defaultSymbol.loadImage();
+        }
+        try {
+            this._renderer = EsriRenderer.fromJSON(this._layerMetadata?.drawingInfo?.renderer);
+            await this._renderer.initialize();
+        }
+        catch {
+            Logger.logError(loggerCategory, `Could not initialize symbology renderer`);
+        }
+    }
+    static getDefaultSymbology(geomType) {
+        if (geomType) {
+            if (geomType === "esriGeometryPoint" || geomType === "esriGeometryMultipoint") {
+                return EsriPMS.fromJSON(ArcGisFeatureProvider.defaultPMS);
+            }
+            else if (geomType === "esriGeometryLine" || geomType === "esriGeometryPolyline") {
+                return EsriSLS.fromJSON(ArcGisFeatureProvider.defaultSLS);
+            }
+            else if (geomType === "esriGeometryPolygon") {
+                return EsriSFS.fromJSON(ArcGisFeatureProvider.defaultSFS);
+            }
+        }
+        return undefined;
+    }
+    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 = 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 = MapCartoRectangle.fromDegrees(west, south, east, north);
     }
     async getLayerMetadata(layerId) {
         let metadata;
@@ -174,7 +240,7 @@ class ArcGisFeatureProvider extends 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,
@@ -194,7 +260,7 @@ class ArcGisFeatureProvider extends ArcGISImageryProvider {
         }
         let quantizationParameters;
         const toleranceWorld = (tileExtent.top - tileExtent.bottom) / this.tileSize;
-        if (this._supportsCoordinatesQuantization) {
+        if (resultType === "tile" && this._supportsCoordinatesQuantization) {
             quantizationParameters = {
                 mode: "view",
                 originPosition: "upperLeft",
@@ -202,15 +268,18 @@ class ArcGisFeatureProvider extends ArcGISImageryProvider {
                 extent: tileEnvelope,
             };
         }
-        const url = new ArcGisFeatureQuery(this._settings.url, this._layerId, format, this._outSR, { geometry,
+        const url = new 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;
@@ -221,16 +290,27 @@ class ArcGisFeatureProvider extends 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) {
                 Logger.logError(loggerCategory, `Could not construct feature info query URL`);
                 return undefined;
@@ -243,32 +323,36 @@ class ArcGisFeatureProvider extends ArcGISImageryProvider {
             try {
                 let responseData = await doFeatureInfoQuery("PBF", "", true);
                 if (responseData) {
-                    Logger.logInfo(loggerCategory, JSON.stringify(responseData.data.toObject()));
+                    const json = JSON.stringify(responseData.data.toObject());
+                    Logger.logInfo(loggerCategory, json);
                 }
                 responseData = await doFeatureInfoQuery("JSON", "", true);
                 if (responseData) {
-                    Logger.logInfo(loggerCategory, JSON.stringify(responseData.data));
+                    const json = JSON.stringify(responseData.data);
+                    Logger.logInfo(loggerCategory, json);
                 }
             }
             catch (e) {
-                Logger.logInfo(loggerCategory, `Error occured with debug FeatureInfo: ${e}`);
+                Logger.logInfo(loggerCategory, `Error occurred with debug FeatureInfo: ${e}`);
             }
         }
         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) {
                 Logger.logError(loggerCategory, `Could not get feature info data`);
                 return;
             }
             if (responseData.exceedTransferLimit) {
-                Logger.logError(loggerCategory, `Could not get feature info : transfert limit exeeded.`);
+                Logger.logError(loggerCategory, `Could not get feature info : transfer limit exceeded.`);
                 return;
             }
-            const featureReader = this.format === "PBF" ? new ArcGisFeaturePBF(this._settings, this._layerMetadata) : new ArcGisFeatureJSON(this._settings, this._layerMetadata);
-            featureReader.readFeatureInfo(responseData, featureInfos);
+            const featureReader = new ArcGisJsonFeatureReader(this._settings, this._layerMetadata);
+            const renderer = new ArcGisGraphicsRenderer(hit.iModel);
+            await featureReader.readFeatureInfo(responseData, featureInfos, renderer);
         }
         catch (e) {
-            Logger.logError(loggerCategory, `Exception occured while loading feature info data : ${e}`);
+            Logger.logError(loggerCategory, `Exception occurred while loading feature info data : ${e}`);
             return;
         }
         return;
@@ -278,7 +362,13 @@ class ArcGisFeatureProvider extends ArcGISImageryProvider {
             return undefined;
         }
         const geomOverride = (refineEnvelope ? { geom: refineEnvelope, type: "esriGeometryEnvelope" } : undefined);
-        const tileUrl = this.constructFeatureUrl(row, column, zoomLevel, this.format, geomOverride);
+        let outFields;
+        if (this._renderer?.type === "uniqueValue") {
+            const uvRenderer = this._renderer;
+            if (uvRenderer.field1)
+                outFields = uvRenderer.field1;
+        }
+        const tileUrl = this.constructFeatureUrl(row, column, zoomLevel, this.format, "tile", geomOverride, outFields);
         if (!tileUrl || tileUrl.url.length === 0) {
             Logger.logError(loggerCategory, `Could not construct feature query URL for tile ${zoomLevel}/${row}/${column}`);
             return undefined;
@@ -325,10 +415,6 @@ class ArcGisFeatureProvider extends ArcGISImageryProvider {
             Logger.logError(loggerCategory, "No canvas context available for loading tile.");
             return undefined;
         }
-        if (!this._symbologyRenderer) {
-            Logger.logError(loggerCategory, "No symbology renderer available for loading tile.");
-            return undefined;
-        }
         try {
             // Compute transform if CoordinatesQuantization is not supported by service
             let transfo;
@@ -338,8 +424,10 @@ class ArcGisFeatureProvider extends ArcGISImageryProvider {
                     Logger.logError(loggerCategory, `Could not compute data transformation for tile (${zoomLevel}/${row}/${column})`);
                 }
             }
-            const renderer = new ArcGisFeatureRenderer(ctx, this._symbologyRenderer, transfo);
-            const featureReader = this.format === "PBF" ? new ArcGisFeaturePBF(this._settings, this._layerMetadata) : new ArcGisFeatureJSON(this._settings, this._layerMetadata);
+            // Create the renderer
+            const symbRenderer = ArcGisSymbologyRenderer.create(this._renderer, this._defaultSymbol);
+            const renderer = new ArcGisCanvasRenderer(ctx, symbRenderer, transfo);
+            const featureReader = this.format === "PBF" ? new ArcGisPbfFeatureReader(this._settings, this._layerMetadata) : new ArcGisJsonFeatureReader(this._settings, this._layerMetadata);
             const getSubEnvelopes = (envelope) => {
                 const dx = (envelope.xmax - envelope.xmin) * 0.5;
                 const dy = (envelope.xmax - envelope.xmin) * 0.5;
@@ -392,7 +480,7 @@ class ArcGisFeatureProvider extends ArcGISImageryProvider {
                     }
                 }
                 else {
-                    featureReader.readAndRender(responseData, renderer);
+                    await featureReader.readAndRender(responseData, renderer);
                 }
             };
             await renderData();
@@ -414,6 +502,30 @@ class ArcGisFeatureProvider extends ArcGISImageryProvider {
         return undefined;
     }
 }
-ArcGisFeatureProvider._nbSubTiles = 2;
+_a = ArcGisFeatureProvider;
+ArcGisFeatureProvider._nbSubTiles = 2; // Number of subtiles for a single axis
+ArcGisFeatureProvider.defaultPMS = {
+    type: "esriPMS",
+    url: "",
+    contentType: "image/png",
+    imageData: "iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAmBJREFUOE+Nk01IVFEUx//n3jfvOZOaJkMtiiJ7o9RG3LgoqKhFSFJBTS1ahFBBi0ijfJXCIyQr+hBbSIsoW7iQoKKFCw2CkAI3tZAgy8Ei+xhoTCbnje/NPfHGnA816KzuPR+/c8/HJRQJE7o+VUhym0DcCOYGgBQEXjOLlyqo+nHanCkMoaL4rslKjZwOQLT4ek3Mmz3FACFNLB67ut6M1nWphbg8wI6VyJK5KEH0EQFVJRKbwzokAW++p/ErraAYSQK3u47bC3vLnA+ZB9i2gHF0oyQMCfCGNaUa+vauxs71wWz2V18cnBj8gQ8J1/eeBnHUa4sMFQDGdGno+4gwEAoQzjVUon3rqlx1KY9x7+0MWobjAPg3QJ2eZV4tAEyFNCN5FkSXyw2B3j1hRGvLcgBXMV5MptA4MOXr0gT0u5bZnAf0jBsyiSgJPAxqhON1K3FlRxUMvwFAtv7u0Wl0jvwEmJNEuOhakTt5wKEBifr6Oo14BIBRpgt07w6jcVMIngKGY7NofR5HwlF+zDcpsC193vyYB/innvHywCzdZfAR/+onX1segBTAxHzzfPE7/8yzzIPLjJE1LTixHZx5CtCK4gXLzovBiDPUsYxVM7gUkB3nWKlm6DYEnQGzXARxCOK+a1WfKtQXb6LNAvr7iCboCUA1Ocdsdv5KLPe7F6pH/w3wLbc+BwOuc5IZ1wEE/jonQbjptZn24tKKX7BgvR2r0NKZRwDvAqCI+Z30VJPTURv7P4A9psuQcYAUPwAoReBLrmX2Lmls7i8sZ7kWLwuoxA1FVJGxzMPLufi6P2r+2xFbOUjGAAAAAElFTkSuQmCC",
+    width: 16,
+    height: 16,
+    xoffset: -8,
+    yoffset: -16,
+};
+ArcGisFeatureProvider.defaultSLS = {
+    type: "esriSLS",
+    color: [0, 0, 0, 255],
+    width: 1,
+    style: "esriSLSSolid",
+};
+ArcGisFeatureProvider.defaultSFS = {
+    type: "esriSFS",
+    color: [0, 0, 255, 255],
+    style: "esriSFSSolid",
+    outline: _a.defaultSLS,
+};
+ArcGisFeatureProvider._extentCache = new Map();
 export { ArcGisFeatureProvider };
 //# sourceMappingURL=ArcGisFeatureProvider.js.map