@itwin/map-layers-formats 4.6.0-dev.18 → 4.6.0-dev.19

package/lib/cjs/OgcApiFeatures/OgcApiFeaturesReader.js

@@ -0,0 +1,139 @@
+"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.OgcApiFeaturesReader = void 0;
+const GeoJSONGeometryReader_1 = require("../GeoJSON/GeoJSONGeometryReader");
+const appui_abstract_1 = require("@itwin/appui-abstract");
+const FeatureInfoReader_1 = require("../Feature/FeatureInfoReader");
+/** @internal */
+class OgcApiFeaturesReader extends FeatureInfoReader_1.FeatureInfoReader {
+    constructor() {
+        super();
+    }
+    applySymbologyAttributes(attrSymbology, feature) {
+        if (attrSymbology && feature) {
+            const symbolFields = attrSymbology.rendererFields;
+            if (symbolFields && symbolFields.length > 0 && feature.properties) {
+                const featureAttr = {};
+                for (const [attrKey, attrValue] of Object.entries(feature.properties))
+                    if (symbolFields.includes(attrKey)) {
+                        featureAttr[attrKey] = attrValue;
+                    }
+                attrSymbology.setActiveFeatureAttributes(featureAttr);
+            }
+        }
+    }
+    async readAndRender(data, renderer) {
+        const responseObj = data;
+        if (responseObj.type === "FeatureCollection") {
+            const geomReader = new GeoJSONGeometryReader_1.GeoJSONGeometryReader(renderer);
+            for (const feature of responseObj.features) {
+                // Each feature has potentially a different geometry type, so we need to inform the geometry renderer
+                if (renderer.hasSymbologyRenderer()) {
+                    renderer.symbolRenderer.activeGeometryType = feature.geometry.type;
+                    // Read attributes if needed (attribute driven symbology)
+                    if (renderer.symbolRenderer.isAttributeDriven()) {
+                        this.applySymbologyAttributes(renderer.symbolRenderer, feature);
+                    }
+                }
+                await geomReader.readGeometry(feature.geometry);
+            }
+        }
+    }
+    async readFeatureInfo(opts, featureInfos) {
+        if (!Array.isArray(opts.collection.features))
+            return;
+        const layerInfo = { layerName: opts.layerSettings.name };
+        // Create a signature index for every field name / type.
+        let fieldsType;
+        if (Array.isArray(opts.queryables?.properties)) {
+            fieldsType = {};
+            for (const fieldInfo of opts.queryables) {
+                fieldsType[fieldInfo.name] = fieldInfo.type;
+            }
+        }
+        const getStandardTypeName = (fieldType) => {
+            switch (fieldType) {
+                case "number":
+                    return appui_abstract_1.StandardTypeNames.Double;
+                case "integer":
+                    return appui_abstract_1.StandardTypeNames.Integer;
+                case "boolean":
+                    return appui_abstract_1.StandardTypeNames.Boolean;
+                case "datetime":
+                    return appui_abstract_1.StandardTypeNames.DateTime;
+                default:
+                    return appui_abstract_1.StandardTypeNames.String;
+            }
+        };
+        const getRecordInfo = (fieldName, value) => {
+            let typename = appui_abstract_1.StandardTypeNames.String;
+            const propertyValue = { valueFormat: appui_abstract_1.PropertyValueFormat.Primitive };
+            if (value === null) {
+                value = undefined;
+            }
+            const strValue = `${value}`;
+            if (fieldsType) {
+                const fieldType = fieldsType[fieldName];
+                switch (fieldType) {
+                    case "integer":
+                        propertyValue.value = value;
+                        break;
+                    case "number":
+                        propertyValue.value = this.toFixedWithoutPadding(value);
+                        break;
+                    case "datetime":
+                        propertyValue.value = new Date(value);
+                        break;
+                    default:
+                        if (value !== undefined)
+                            propertyValue.value = strValue;
+                        break;
+                }
+                typename = getStandardTypeName(fieldType);
+                propertyValue.displayValue = this.getDisplayValue(typename, propertyValue.value);
+            }
+            else {
+                // Queryables are optional with OGC Features, in this case everything is string.
+                propertyValue.value = strValue;
+                propertyValue.displayValue = strValue;
+            }
+            return { value: propertyValue, property: { name: fieldName, displayLabel: fieldName, typename } };
+        };
+        let geomReader;
+        if (opts.geomRenderer) {
+            geomReader = new GeoJSONGeometryReader_1.GeoJSONGeometryReader(opts.geomRenderer);
+        }
+        // Each feature response represent a single sub-layer, no need to check for existing entry.
+        const subLayerInfo = {
+            subLayerName: opts.layerSettings.name,
+            displayFieldName: opts.layerSettings.name,
+            features: [],
+        };
+        // Read all features attributes / geometries
+        for (const responseFeature of opts.collection.features) {
+            const feature = { attributes: [] };
+            if (responseFeature.properties) {
+                for (const [key, value] of Object.entries(responseFeature.properties))
+                    feature.attributes?.push(getRecordInfo(key, value));
+            }
+            if (geomReader && opts.geomRenderer) {
+                await geomReader.readGeometry(responseFeature.geometry);
+                const graphics = opts.geomRenderer.moveGraphics();
+                feature.geometries = graphics.map((graphic) => {
+                    return { graphic };
+                });
+            }
+            subLayerInfo.features.push(feature);
+        }
+        if (layerInfo.subLayerInfos === undefined)
+            layerInfo.subLayerInfos = [];
+        layerInfo.subLayerInfos.push(subLayerInfo);
+        featureInfos.push(layerInfo);
+    }
+}
+exports.OgcApiFeaturesReader = OgcApiFeaturesReader;
+//# sourceMappingURL=OgcApiFeaturesReader.js.map

package/lib/cjs/OgcApiFeatures/OgcApiFeaturesReader.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"OgcApiFeaturesReader.js","sourceRoot":"","sources":["../../../src/OgcApiFeatures/OgcApiFeaturesReader.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 { Transform } from \"@itwin/core-geometry\";\r\nimport { GeoJSONGeometryReader } from \"../GeoJSON/GeoJSONGeometryReader\";\r\nimport * as Geojson from \"geojson\";\r\nimport { PrimitiveValue, PropertyValueFormat, StandardTypeNames } from \"@itwin/appui-abstract\";\r\nimport { ImageMapLayerSettings } from \"@itwin/core-common\";\r\nimport { FeatureInfoReader } from \"../Feature/FeatureInfoReader\";\r\nimport { FeatureAttributeDrivenSymbology, FeatureGeometryRenderer, GraphicPrimitive, GraphicsGeometryRenderer, MapLayerFeature, MapLayerFeatureAttribute, MapLayerFeatureInfo, MapSubLayerFeatureInfo } from \"@itwin/core-frontend\";\r\n\r\n/** @internal */\r\nexport type OgcFeaturePropertyType = \"string\" | \"number\" | \"integer\" | \"datetime\" | \"geometry\" | \"boolean\";\r\n\r\n/** @internal */\r\nexport interface ReadOgcApiFeaturesInfoOptions {\r\n  collection: Geojson.FeatureCollection;\r\n  layerSettings: ImageMapLayerSettings;\r\n  queryables?: any;\r\n  geomRenderer?: GraphicsGeometryRenderer;\r\n}\r\n\r\n/** @internal */\r\nexport class OgcApiFeaturesReader extends FeatureInfoReader  {\r\n  public transform: Transform | undefined;\r\n\r\n  public constructor() {\r\n    super();\r\n  }\r\n\r\n  private applySymbologyAttributes(attrSymbology: FeatureAttributeDrivenSymbology, feature: any) {\r\n    if (attrSymbology && feature) {\r\n      const symbolFields = attrSymbology.rendererFields;\r\n      if (symbolFields && symbolFields.length > 0 && feature.properties) {\r\n        const featureAttr: {[key: string]: any} = {};\r\n        for (const [attrKey, attrValue] of Object.entries(feature.properties))\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(data: Geojson.FeatureCollection, renderer: FeatureGeometryRenderer) {\r\n    const responseObj = data;\r\n    if (responseObj.type === \"FeatureCollection\") {\r\n\r\n      const geomReader = new GeoJSONGeometryReader(renderer);\r\n\r\n      for (const feature of responseObj.features) {\r\n        // Each feature has potentially a different geometry type, so we need to inform the geometry renderer\r\n        if (renderer.hasSymbologyRenderer()) {\r\n          renderer.symbolRenderer.activeGeometryType = feature.geometry.type;\r\n          // Read attributes if needed (attribute driven symbology)\r\n          if (renderer.symbolRenderer.isAttributeDriven()) {\r\n            this.applySymbologyAttributes(renderer.symbolRenderer, feature);\r\n          }\r\n        }\r\n\r\n        await geomReader.readGeometry(feature.geometry);\r\n      }\r\n    }\r\n  }\r\n\r\n  public async readFeatureInfo(opts: ReadOgcApiFeaturesInfoOptions, featureInfos: MapLayerFeatureInfo[]) {\r\n    if (!Array.isArray(opts.collection.features))\r\n      return;\r\n\r\n    const layerInfo: MapLayerFeatureInfo = { layerName: opts.layerSettings.name };\r\n\r\n    // Create a signature index for every field name / type.\r\n    let fieldsType: { [key: string]: OgcFeaturePropertyType } | undefined;\r\n    if (Array.isArray(opts.queryables?.properties)) {\r\n      fieldsType = {};\r\n      for (const fieldInfo of opts.queryables) {\r\n        fieldsType[fieldInfo.name] = fieldInfo.type;\r\n      }\r\n    }\r\n\r\n    const getStandardTypeName = (fieldType: OgcFeaturePropertyType) => {\r\n      switch (fieldType) {\r\n        case \"number\":\r\n          return StandardTypeNames.Double;\r\n        case \"integer\":\r\n          return StandardTypeNames.Integer;\r\n        case \"boolean\":\r\n          return StandardTypeNames.Boolean;\r\n        case \"datetime\":\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      let typename = StandardTypeNames.String;\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      if (fieldsType) {\r\n        const fieldType = fieldsType[fieldName];\r\n        switch (fieldType) {\r\n          case \"integer\":\r\n            propertyValue.value = value as number;\r\n            break;\r\n          case \"number\":\r\n            propertyValue.value = this.toFixedWithoutPadding(value);\r\n            break;\r\n          case \"datetime\":\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            break;\r\n        }\r\n        typename = getStandardTypeName(fieldType);\r\n        propertyValue.displayValue = this.getDisplayValue(typename, propertyValue.value);\r\n      } else {\r\n        // Queryables are optional with OGC Features, in this case everything is string.\r\n        propertyValue.value = strValue;\r\n        propertyValue.displayValue = strValue;\r\n      }\r\n\r\n      return {value: propertyValue, property: { name: fieldName, displayLabel: fieldName, typename }};\r\n    };\r\n\r\n    let geomReader: GeoJSONGeometryReader|undefined;\r\n    if (opts.geomRenderer) {\r\n      geomReader = new GeoJSONGeometryReader(opts.geomRenderer);\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: opts.layerSettings.name,\r\n      displayFieldName: opts.layerSettings.name,\r\n      features: [],\r\n    };\r\n\r\n    // Read all features attributes / geometries\r\n    for (const responseFeature of opts.collection.features) {\r\n      const feature: MapLayerFeature = {attributes: []};\r\n\r\n      if (responseFeature.properties) {\r\n        for (const [key, value] of Object.entries(responseFeature.properties))\r\n          feature.attributes?.push(getRecordInfo(key, value));\r\n      }\r\n\r\n      if (geomReader && opts.geomRenderer) {\r\n        await geomReader.readGeometry(responseFeature.geometry as any);\r\n        const graphics = opts.geomRenderer.moveGraphics();\r\n        feature.geometries = graphics.map((graphic: GraphicPrimitive) => {\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}\r\n"]}

package/lib/cjs/mapLayersFormats.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"mapLayersFormats.d.ts","sourceRoot":"","sources":["../../src/mapLayersFormats.ts"],"names":[],"mappings":"AAYA,OAAO,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAC;AAElD;;GAEG;AACH,MAAM,WAAW,sBAAsB;IACrC,YAAY,CAAC,EAAE,YAAY,CAAC;CAC7B;AAED;;GAEG;AACH,qBAAa,gBAAgB;IAE3B,OAAO,CAAC,MAAM,CAAC,UAAU,CAAsB;IAC/C,OAAc,YAAY,EAAE,YAAY,CAAC;IAEzC;;;OAGG;WACiB,UAAU,CAAC,MAAM,CAAC,EAAE,sBAAsB,GAAG,OAAO,CAAC,IAAI,CAAC;IAc9E,kDAAkD;IAClD,WAAkB,qBAAqB,IAAI,MAAM,CAEhD;CAEF"}
+{"version":3,"file":"mapLayersFormats.d.ts","sourceRoot":"","sources":["../../src/mapLayersFormats.ts"],"names":[],"mappings":"AAYA,OAAO,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAC;AAGlD;;GAEG;AACH,MAAM,WAAW,sBAAsB;IACrC,YAAY,CAAC,EAAE,YAAY,CAAC;CAC7B;AAED;;GAEG;AACH,qBAAa,gBAAgB;IAE3B,OAAO,CAAC,MAAM,CAAC,UAAU,CAAsB;IAC/C,OAAc,YAAY,EAAE,YAAY,CAAC;IAEzC;;;OAGG;WACiB,UAAU,CAAC,MAAM,CAAC,EAAE,sBAAsB,GAAG,OAAO,CAAC,IAAI,CAAC;IAgB9E,kDAAkD;IAClD,WAAkB,qBAAqB,IAAI,MAAM,CAEhD;CAEF"}

package/lib/cjs/mapLayersFormats.js

@@ -12,6 +12,7 @@ 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");
+const OgcApiFeaturesFormat_1 = require("./OgcApiFeatures/OgcApiFeaturesFormat");
 /** The primary API for the `@itwin/map-layers-formats` package. It allows the package's features to be [[initialize]]d.
  * @beta
  */
@@ -22,8 +23,10 @@ class MapLayersFormats {
      */
     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)
+        if (core_frontend_1.IModelApp.initialized) {
             core_frontend_1.IModelApp.mapLayerFormatRegistry.register(ArcGisFeatureFormat_1.ArcGisFeatureMapLayerFormat);
+            core_frontend_1.IModelApp.mapLayerFormatRegistry.register(OgcApiFeaturesFormat_1.OgcApiFeaturesMapLayerFormat);
+        }
         // register namespace containing localized strings for this package
         MapLayersFormats.localization = config?.localization ?? core_frontend_1.IModelApp.localization;
         await MapLayersFormats.localization.registerNamespace(MapLayersFormats.localizationNamespace);

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;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":["/*---------------------------------------------------------------------------------------------\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\nimport { MapFeatureInfoTool } from \"./Tools/MapFeatureInfoTool\";\r\nimport { Localization } from \"@itwin/core-common\";\r\n\r\n/** Configuration options.\r\n * @beta\r\n */\r\nexport interface MapLayersFormatsConfig {\r\n  localization?: Localization;\r\n}\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\r\n  private static _defaultNs = \"mapLayersFormats\";\r\n  public static localization: Localization;\r\n\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 async initialize(config?: MapLayersFormatsConfig): Promise<void> {\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    // register namespace containing localized strings for this package\r\n    MapLayersFormats.localization = config?.localization ?? IModelApp.localization;\r\n    await MapLayersFormats.localization.registerNamespace(\r\n      MapLayersFormats.localizationNamespace,\r\n    );\r\n\r\n    MapFeatureInfoTool.register(MapLayersFormats.localizationNamespace);\r\n  }\r\n\r\n  /** The internationalization service namespace. */\r\n  public static get localizationNamespace(): string {\r\n    return MapLayersFormats._defaultNs;\r\n  }\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;AAEhE,gFAAqF;AASrF;;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,EAAE;YACzB,yBAAS,CAAC,sBAAsB,CAAC,QAAQ,CAAC,iDAA2B,CAAC,CAAC;YACvE,yBAAS,CAAC,sBAAsB,CAAC,QAAQ,CAAC,mDAA4B,CAAC,CAAC;SACzE;QAED,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;;AA1Bc,2BAAU,GAAG,kBAAkB,CAAC;AAFpC,4CAAgB","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\nimport { MapFeatureInfoTool } from \"./Tools/MapFeatureInfoTool\";\r\nimport { Localization } from \"@itwin/core-common\";\r\nimport { OgcApiFeaturesMapLayerFormat } from \"./OgcApiFeatures/OgcApiFeaturesFormat\";\r\n\r\n/** Configuration options.\r\n * @beta\r\n */\r\nexport interface MapLayersFormatsConfig {\r\n  localization?: Localization;\r\n}\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\r\n  private static _defaultNs = \"mapLayersFormats\";\r\n  public static localization: Localization;\r\n\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 async initialize(config?: MapLayersFormatsConfig): Promise<void> {\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      IModelApp.mapLayerFormatRegistry.register(OgcApiFeaturesMapLayerFormat);\r\n    }\r\n\r\n    // register namespace containing localized strings for this package\r\n    MapLayersFormats.localization = config?.localization ?? IModelApp.localization;\r\n    await MapLayersFormats.localization.registerNamespace(\r\n      MapLayersFormats.localizationNamespace,\r\n    );\r\n\r\n    MapFeatureInfoTool.register(MapLayersFormats.localizationNamespace);\r\n  }\r\n\r\n  /** The internationalization service namespace. */\r\n  public static get localizationNamespace(): string {\r\n    return MapLayersFormats._defaultNs;\r\n  }\r\n\r\n}\r\n"]}

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

@@ -1,8 +1,9 @@
 import { Cartographic, ImageMapLayerSettings, ImageSource } from "@itwin/core-common";
 import { Transform } from "@itwin/core-geometry";
 import { ArcGISImageryProvider, HitDetail, ImageryMapTileTree, MapFeatureInfoOptions, MapLayerFeatureInfo, QuadId } from "@itwin/core-frontend";
-import { ArcGisExtent, ArcGisFeatureFormat, ArcGisFeatureGeometryType, ArcGisFeatureResultType, ArcGisGeometry } from "./ArcGisFeatureQuery";
-import { EsriPMS, EsriSFS, EsriSLS } from "./EsriSymbology";
+import { ArcGisExtent, ArcGisFeatureFormat, ArcGisFeatureResultType, ArcGisGeometry } from "./ArcGisFeatureQuery";
+import { EsriPMS, EsriSFS, EsriSLS, EsriSLSProps, EsriSymbol } from "./EsriSymbology";
+import { FeatureDefaultSymbology } from "../Feature/FeatureSymbology";
 /**
 * @internal
 */
@@ -10,6 +11,17 @@ interface ArcGisFeatureUrl {
     url: string;
     envelope?: ArcGisExtent;
 }
+/**
+* @internal
+*/
+export declare class DefaultArcGiSymbology implements FeatureDefaultSymbology {
+    static readonly defaultPMS: EsriPMS;
+    static readonly defaultSLSProps: EsriSLSProps;
+    static readonly defaultSLS: EsriSLS;
+    static readonly defaultSFS: EsriSFS;
+    initialize(): Promise<void>;
+    getSymbology(geomType: string): EsriSymbol;
+}
 /**  Provide tiles from a ESRI ArcGIS Feature service
 * @internal
 */
@@ -25,17 +37,14 @@ export declare class ArcGisFeatureProvider extends ArcGISImageryProvider {
     private _minDepthFromLod;
     private _defaultSymbol;
     private _renderer;
+    private _symbologyRenderer;
     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>;

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

@@ -1 +1 @@
-{"version":3,"file":"ArcGisFeatureProvider.d.ts","sourceRoot":"","sources":["../../../src/ArcGisFeature/ArcGisFeatureProvider.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"ArcGisFeatureProvider.d.ts","sourceRoot":"","sources":["../../../src/ArcGisFeature/ArcGisFeatureProvider.ts"],"names":[],"mappings":"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"}

package/lib/esm/ArcGisFeature/ArcGisFeatureProvider.js

@@ -6,15 +6,61 @@ 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, ArcGisGraphicsRenderer, ArcGISImageryProvider, ArcGisUtilities, MapCartoRectangle, MapLayerImageryProviderStatus, setRequestTimeout } from "@itwin/core-frontend";
-import { ArcGisSymbologyRenderer } from "./ArcGisSymbologyRenderer";
+import { ArcGisErrorCode, ArcGISImageryProvider, ArcGisUtilities, FeatureGraphicsRenderer, MapCartoRectangle, MapLayerImageryProviderStatus, setRequestTimeout } from "@itwin/core-frontend";
 import { ArcGisFeatureQuery } from "./ArcGisFeatureQuery";
 import { ArcGisPbfFeatureReader } from "./ArcGisPbfFeatureReader";
 import { ArcGisJsonFeatureReader } from "./ArcGisJsonFeatureReader";
 import { ArcGisFeatureResponse } from "./ArcGisFeatureResponse";
-import { ArcGisCanvasRenderer } from "./ArcGisCanvasRenderer";
 import { EsriPMS, EsriRenderer, EsriSFS, EsriSLS } from "./EsriSymbology";
+import { FeatureCanvasRenderer } from "../Feature/FeatureCanvasRenderer";
+import { ArcGisSymbologyCanvasRenderer } from "./ArcGisSymbologyRenderer";
 const loggerCategory = "MapLayersFormats.ArcGISFeature";
+/**
+* @internal
+*/
+class DefaultArcGiSymbology {
+    async initialize() {
+        // Marker image need to be loaded upfront;
+        await DefaultArcGiSymbology.defaultPMS.loadImage();
+    }
+    getSymbology(geomType) {
+        if (geomType === "esriGeometryPoint" || geomType === "esriGeometryMultipoint") {
+            return DefaultArcGiSymbology.defaultPMS;
+        }
+        else if (geomType === "esriGeometryLine" || geomType === "esriGeometryPolyline") {
+            return DefaultArcGiSymbology.defaultSLS;
+        }
+        else if (geomType === "esriGeometryPolygon") {
+            return DefaultArcGiSymbology.defaultSFS;
+        }
+        throw new Error(`Could not get default symbology for geometry type: '${geomType}'`);
+    }
+}
+_a = DefaultArcGiSymbology;
+DefaultArcGiSymbology.defaultPMS = EsriPMS.fromJSON({
+    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,
+});
+DefaultArcGiSymbology.defaultSLSProps = {
+    type: "esriSLS",
+    color: [0, 0, 255, 255],
+    width: 1,
+    style: "esriSLSSolid",
+};
+DefaultArcGiSymbology.defaultSLS = EsriSLS.fromJSON(_a.defaultSLSProps);
+DefaultArcGiSymbology.defaultSFS = EsriSFS.fromJSON({
+    type: "esriSFS",
+    color: [0, 0, 255, 100],
+    style: "esriSFSSolid",
+    outline: _a.defaultSLSProps,
+});
+export { DefaultArcGiSymbology };
 /**  Provide tiles from a ESRI ArcGIS Feature service
 * @internal
 */
@@ -31,6 +77,7 @@ class ArcGisFeatureProvider extends ArcGISImageryProvider {
         this._outSR = 102100;
         this._maxDepthFromLod = 0;
         this._minDepthFromLod = 0;
+        this._defaultSymbol = new DefaultArcGiSymbology();
     }
     async initialize() {
         const metadata = await this.getServiceJson();
@@ -163,14 +210,6 @@ 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._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();
@@ -178,20 +217,11 @@ class ArcGisFeatureProvider extends ArcGISImageryProvider {
         catch (e) {
             Logger.logError(loggerCategory, `Could not initialize symbology renderer for '${this._settings.name}': ${e}`);
         }
-    }
-    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;
+        // Sanity check: make sure we got default symbology for this geometry type
+        // if not, it will throw
+        this._defaultSymbol.getSymbology(this._layerMetadata?.geometryType);
+        await this._defaultSymbol.initialize(); // images must be loaded upfront
+        this._symbologyRenderer = ArcGisSymbologyCanvasRenderer.create(this._renderer, this._defaultSymbol, this._layerMetadata?.geometryType);
     }
     async fetchLayerExtent() {
         let extentJson;
@@ -356,7 +386,7 @@ class ArcGisFeatureProvider extends ArcGISImageryProvider {
                 return;
             }
             const featureReader = new ArcGisJsonFeatureReader(this._settings, this._layerMetadata);
-            const renderer = new ArcGisGraphicsRenderer({ viewport: hit.viewport });
+            const renderer = new FeatureGraphicsRenderer({ viewport: hit.viewport, crs: "webMercator" });
             await featureReader.readFeatureInfo(responseData, featureInfos, renderer);
         }
         catch (e) {
@@ -429,8 +459,11 @@ class ArcGisFeatureProvider extends ArcGISImageryProvider {
                 }
             }
             // Create the renderer
-            const symbRenderer = ArcGisSymbologyRenderer.create(this._renderer, this._defaultSymbol);
-            const renderer = new ArcGisCanvasRenderer(ctx, symbRenderer, transfo);
+            if (!this._symbologyRenderer) {
+                Logger.logError(loggerCategory, `Unable to load tile: symbology renderer not aailable.`);
+                return undefined;
+            }
+            const renderer = new FeatureCanvasRenderer(ctx, this._symbologyRenderer, 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;
@@ -506,30 +539,7 @@ class ArcGisFeatureProvider extends ArcGISImageryProvider {
         return undefined;
     }
 }
-_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