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

package/CHANGELOG.json

@@ -1,6 +1,63 @@
 {
   "name": "@itwin/map-layers-formats",
   "entries": [
+    {
+      "version": "3.7.2",
+      "tag": "@itwin/map-layers-formats_v3.7.2",
+      "date": "Wed, 12 Apr 2023 13:12:42 GMT",
+      "comments": {}
+    },
+    {
+      "version": "3.7.1",
+      "tag": "@itwin/map-layers-formats_v3.7.1",
+      "date": "Mon, 03 Apr 2023 15:15:37 GMT",
+      "comments": {}
+    },
+    {
+      "version": "3.7.0",
+      "tag": "@itwin/map-layers-formats_v3.7.0",
+      "date": "Wed, 29 Mar 2023 15:02:27 GMT",
+      "comments": {}
+    },
+    {
+      "version": "3.6.3",
+      "tag": "@itwin/map-layers-formats_v3.6.3",
+      "date": "Mon, 27 Mar 2023 16:26:47 GMT",
+      "comments": {}
+    },
+    {
+      "version": "3.6.2",
+      "tag": "@itwin/map-layers-formats_v3.6.2",
+      "date": "Fri, 17 Mar 2023 17:52:32 GMT",
+      "comments": {}
+    },
+    {
+      "version": "3.6.1",
+      "tag": "@itwin/map-layers-formats_v3.6.1",
+      "date": "Fri, 24 Feb 2023 22:00:48 GMT",
+      "comments": {}
+    },
+    {
+      "version": "3.6.0",
+      "tag": "@itwin/map-layers-formats_v3.6.0",
+      "date": "Wed, 08 Feb 2023 14:58:40 GMT",
+      "comments": {
+        "none": [
+          {
+            "comment": "Allow map-layer requiring authentication to be correctly initialized after a saved view restore."
+          },
+          {
+            "comment": "Map-layers oauth2 requests optimization and improvements"
+          }
+        ]
+      }
+    },
+    {
+      "version": "3.5.6",
+      "tag": "@itwin/map-layers-formats_v3.5.6",
+      "date": "Fri, 24 Feb 2023 16:02:47 GMT",
+      "comments": {}
+    },
     {
       "version": "3.5.5",
       "tag": "@itwin/map-layers-formats_v3.5.5",

package/CHANGELOG.md

@@ -1,6 +1,49 @@
 # Change Log - @itwin/map-layers-formats
 
-This log was last generated on Thu, 26 Jan 2023 22:53:27 GMT and should not be manually modified.
+This log was last generated on Wed, 12 Apr 2023 13:12:42 GMT and should not be manually modified.
+
+## 3.7.2
+Wed, 12 Apr 2023 13:12:42 GMT
+
+_Version update only_
+
+## 3.7.1
+Mon, 03 Apr 2023 15:15:37 GMT
+
+_Version update only_
+
+## 3.7.0
+Wed, 29 Mar 2023 15:02:27 GMT
+
+_Version update only_
+
+## 3.6.3
+Mon, 27 Mar 2023 16:26:47 GMT
+
+_Version update only_
+
+## 3.6.2
+Fri, 17 Mar 2023 17:52:32 GMT
+
+_Version update only_
+
+## 3.6.1
+Fri, 24 Feb 2023 22:00:48 GMT
+
+_Version update only_
+
+## 3.6.0
+Wed, 08 Feb 2023 14:58:40 GMT
+
+### Updates
+
+- Allow map-layer requiring authentication to be correctly initialized after a saved view restore.
+- Map-layers oauth2 requests optimization and improvements
+
+## 3.5.6
+Fri, 24 Feb 2023 16:02:47 GMT
+
+_Version update only_
 
 ## 3.5.5
 Thu, 26 Jan 2023 22:53:27 GMT

package/config/rush-project.json

@@ -1,7 +1,6 @@
 {
   "$schema": "https://developer.microsoft.com/json-schemas/rush/v5/rush-project.schema.json",
   "operationSettings": [
-    { "operationName": "build", "outputFolderNames": ["lib"] },
-    { "operationName": "build:ci", "outputFolderNames": ["lib"] }
+    { "operationName": "build", "outputFolderNames": ["lib"] }
   ]
 }

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

@@ -1,9 +1,9 @@
-import { ImageMapLayerSettings } from "@itwin/core-common";
-import { ImageryMapLayerFormat, MapLayerImageryProvider, MapLayerSourceValidation } from "@itwin/core-frontend";
-/** @internal */
-export declare class ArcGisFeatureMapLayerFormat extends ImageryMapLayerFormat {
-    static formatId: string;
-    static createImageryProvider(settings: ImageMapLayerSettings): MapLayerImageryProvider | undefined;
-    static validateSource(url: string, userName?: string, password?: string, ignoreCache?: boolean): Promise<MapLayerSourceValidation>;
-}
+import { ImageMapLayerSettings } from "@itwin/core-common";
+import { ImageryMapLayerFormat, MapLayerImageryProvider, MapLayerSourceValidation } from "@itwin/core-frontend";
+/** @internal */
+export declare class ArcGisFeatureMapLayerFormat extends ImageryMapLayerFormat {
+    static formatId: string;
+    static createImageryProvider(settings: ImageMapLayerSettings): MapLayerImageryProvider | undefined;
+    static validateSource(url: string, userName?: string, password?: string, ignoreCache?: boolean): Promise<MapLayerSourceValidation>;
+}
 //# sourceMappingURL=ArcGisFeatureFormat.d.ts.map

package/lib/cjs/ArcGisFeature/ArcGisFeatureFormat.js

@@ -1,15 +1,15 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.ArcGisFeatureMapLayerFormat = void 0;
-const core_frontend_1 = require("@itwin/core-frontend");
-const ArcGisFeatureProvider_1 = require("./ArcGisFeatureProvider");
-/** @internal */
-class ArcGisFeatureMapLayerFormat extends core_frontend_1.ImageryMapLayerFormat {
-    static createImageryProvider(settings) { return new ArcGisFeatureProvider_1.ArcGisFeatureProvider(settings); }
-    static async validateSource(url, userName, password, ignoreCache) {
-        return core_frontend_1.ArcGisUtilities.validateSource(url, this.formatId, ["query"], userName, password, ignoreCache);
-    }
-}
-exports.ArcGisFeatureMapLayerFormat = ArcGisFeatureMapLayerFormat;
-ArcGisFeatureMapLayerFormat.formatId = "ArcGISFeature";
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.ArcGisFeatureMapLayerFormat = void 0;
+const core_frontend_1 = require("@itwin/core-frontend");
+const ArcGisFeatureProvider_1 = require("./ArcGisFeatureProvider");
+/** @internal */
+class ArcGisFeatureMapLayerFormat extends core_frontend_1.ImageryMapLayerFormat {
+    static createImageryProvider(settings) { return new ArcGisFeatureProvider_1.ArcGisFeatureProvider(settings); }
+    static async validateSource(url, userName, password, ignoreCache) {
+        return core_frontend_1.ArcGisUtilities.validateSource(url, this.formatId, ["query"], userName, password, ignoreCache);
+    }
+}
+ArcGisFeatureMapLayerFormat.formatId = "ArcGISFeature";
+exports.ArcGisFeatureMapLayerFormat = ArcGisFeatureMapLayerFormat;
 //# sourceMappingURL=ArcGisFeatureFormat.js.map

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;;AALH,kEAMC;AALwB,oCAAQ,GAAG,eAAe,CAAC","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,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"]}

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

@@ -1,15 +1,15 @@
-import { ImageMapLayerSettings } from "@itwin/core-common";
-import { MapLayerFeatureInfo } from "@itwin/core-frontend";
-import { Transform } from "@itwin/core-geometry";
-import { ArcGisFeatureReader } from "./ArcGisFeatureReader";
-import { ArcGisFeatureRenderer } from "./ArcGisFeatureRenderer";
-import { ArcGisResponseData } from "./ArcGisFeatureResponse";
-/** @internal */
-export declare class ArcGisFeatureJSON extends ArcGisFeatureReader {
-    transform: Transform | undefined;
-    constructor(settings: ImageMapLayerSettings, layerMetadata: any);
-    readAndRender(response: ArcGisResponseData, renderer: ArcGisFeatureRenderer): void;
-    protected static deflateCoordinates(coordinates: number[][], flatCoordinates: number[], stride: number, offset: number): number;
-    readFeatureInfo(response: ArcGisResponseData, featureInfos: MapLayerFeatureInfo[]): void;
-}
+import { ImageMapLayerSettings } from "@itwin/core-common";
+import { MapLayerFeatureInfo } from "@itwin/core-frontend";
+import { Transform } from "@itwin/core-geometry";
+import { ArcGisFeatureReader } from "./ArcGisFeatureReader";
+import { ArcGisFeatureRenderer } from "./ArcGisFeatureRenderer";
+import { ArcGisResponseData } from "./ArcGisFeatureResponse";
+/** @internal */
+export declare class ArcGisFeatureJSON extends ArcGisFeatureReader {
+    transform: Transform | undefined;
+    constructor(settings: ImageMapLayerSettings, layerMetadata: any);
+    readAndRender(response: ArcGisResponseData, renderer: ArcGisFeatureRenderer): void;
+    protected static deflateCoordinates(coordinates: number[][], flatCoordinates: number[], stride: number, offset: number): number;
+    readFeatureInfo(response: ArcGisResponseData, featureInfos: MapLayerFeatureInfo[]): void;
+}
 //# sourceMappingURL=ArcGisFeatureJSON.d.ts.map

package/lib/cjs/ArcGisFeature/ArcGisFeatureJSON.js

@@ -1,135 +1,133 @@
-"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.ArcGisFeatureJSON = void 0;
-const appui_abstract_1 = require("@itwin/appui-abstract");
-const core_frontend_1 = require("@itwin/core-frontend");
-const ArcGisFeatureReader_1 = require("./ArcGisFeatureReader");
-/** @internal */
-class ArcGisFeatureJSON extends ArcGisFeatureReader_1.ArcGisFeatureReader {
-    constructor(settings, layerMetadata) {
-        super(settings, layerMetadata);
-    }
-    readAndRender(response, renderer) {
-        var _a, _b, _c, _d;
-        const responseObj = response.data;
-        if ((responseObj === null || responseObj === void 0 ? void 0 : responseObj.geometryType) === "esriGeometryPolyline" || (responseObj === null || responseObj === void 0 ? void 0 : responseObj.geometryType) === "esriGeometryPolygon") {
-            const fill = (responseObj.geometryType === "esriGeometryPolygon");
-            for (const feature of responseObj.features) {
-                let offset = 0;
-                const lengths = [];
-                const coords = [];
-                if ((_a = feature === null || feature === void 0 ? void 0 : feature.geometry) === null || _a === void 0 ? void 0 : _a.rings) {
-                    for (const ring of (_b = feature === null || feature === void 0 ? void 0 : feature.geometry) === null || _b === void 0 ? void 0 : _b.rings) {
-                        offset = ArcGisFeatureJSON.deflateCoordinates(ring, coords, 2, offset);
-                        lengths.push(ring.length);
-                    }
-                }
-                else if ((_c = feature === null || feature === void 0 ? void 0 : feature.geometry) === null || _c === void 0 ? void 0 : _c.paths) {
-                    for (const path of (_d = feature === null || feature === void 0 ? void 0 : feature.geometry) === null || _d === void 0 ? void 0 : _d.paths) {
-                        offset = ArcGisFeatureJSON.deflateCoordinates(path, coords, 2, offset);
-                        lengths.push(path.length);
-                    }
-                }
-                renderer.renderPath(lengths, coords, fill, 2, renderer.transform === undefined);
-            }
-        }
-        else if ((responseObj === null || responseObj === void 0 ? void 0 : responseObj.geometryType) === "esriGeometryPoint" || (responseObj === null || responseObj === void 0 ? void 0 : responseObj.geometryType) === "esriGeometryMultiPoint") {
-            for (const feature of responseObj.features) {
-                // TODO: Add support for multipoint
-                if (feature.geometry) {
-                    const lengths = [];
-                    const coords = [feature.geometry.x, feature.geometry.y];
-                    renderer.renderPoint(lengths, coords, 2, renderer.transform === undefined);
-                }
-            }
-        }
-    }
-    // Converts an [[x1,y1], [x2,y2], ...] to [x1,y1,x2,y2, ...]
-    // stride is the number of dimensions
-    // https://github.com/openlayers/openlayers/blob/7a2f87caca9ddc1912d910f56eb5637445fc11f6/src/ol/geom/flat/deflate.js#L26
-    static deflateCoordinates(coordinates, flatCoordinates, stride, offset) {
-        for (let i = 0, ii = coordinates.length; i < ii; ++i) {
-            const coordinate = coordinates[i];
-            for (let j = 0; j < stride; ++j)
-                flatCoordinates[offset++] = coordinate[j];
-        }
-        return offset;
-    }
-    readFeatureInfo(response, featureInfos) {
-        var _a;
-        const responseObj = response.data;
-        if (responseObj === undefined || !Array.isArray(responseObj.features))
-            return;
-        const layerInfo = { layerName: this._settings.name };
-        // Create a signature index for every field name / type.
-        const fieldsType = {};
-        for (const fieldInfo of responseObj.fields) {
-            fieldsType[fieldInfo.name] = fieldInfo.type;
-        }
-        const getStandardTypeName = (fieldType) => {
-            switch (fieldType) {
-                case "esriFieldTypeInteger":
-                case "esriFieldTypeSmallInteger":
-                case "esriFieldTypeOID":
-                    return appui_abstract_1.StandardTypeNames.Integer;
-                case "esriFieldTypeDouble":
-                    return appui_abstract_1.StandardTypeNames.Double;
-                case "esriFieldTypeSingle":
-                    return appui_abstract_1.StandardTypeNames.Float;
-                case "esriFieldTypeDate":
-                    return appui_abstract_1.StandardTypeNames.DateTime;
-                default:
-                    return appui_abstract_1.StandardTypeNames.String;
-            }
-        };
-        const getRecordInfo = (fieldName, value) => {
-            const propertyValue = { valueFormat: appui_abstract_1.PropertyValueFormat.Primitive };
-            if (value === null) {
-                value = undefined;
-            }
-            const strValue = `${value}`;
-            const fieldType = fieldsType[fieldName];
-            switch (fieldType) {
-                case "esriFieldTypeInteger":
-                case "esriFieldTypeSmallInteger":
-                case "esriFieldTypeOID":
-                    propertyValue.value = value;
-                    break;
-                case "esriFieldTypeDouble":
-                case "esriFieldTypeSingle":
-                    propertyValue.value = this.toFixedWithoutPadding(value);
-                    break;
-                case "esriFieldTypeDate":
-                    propertyValue.value = new Date(value);
-                    break;
-                default:
-                    if (value !== undefined)
-                        propertyValue.value = strValue;
-                    break;
-            }
-            const typename = getStandardTypeName(fieldType);
-            propertyValue.displayValue = this.getDisplayValue(typename, propertyValue.value);
-            return new core_frontend_1.MapFeatureInfoRecord(propertyValue, { name: fieldName, displayLabel: fieldName, typename });
-        };
-        for (const feature of responseObj.features) {
-            const subLayerInfo = {
-                subLayerName: this._layerMetadata.name,
-                displayFieldName: this._layerMetadata.name,
-                records: [],
-            };
-            for (const [key, value] of Object.entries(feature.attributes))
-                (_a = subLayerInfo.records) === null || _a === void 0 ? void 0 : _a.push(getRecordInfo(key, value));
-            if (layerInfo.info === undefined)
-                layerInfo.info = [];
-            if (!(layerInfo.info instanceof HTMLElement))
-                layerInfo.info.push(subLayerInfo);
-        }
-        featureInfos.push(layerInfo);
-    }
-}
-exports.ArcGisFeatureJSON = ArcGisFeatureJSON;
+"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.ArcGisFeatureJSON = void 0;
+const appui_abstract_1 = require("@itwin/appui-abstract");
+const core_frontend_1 = require("@itwin/core-frontend");
+const ArcGisFeatureReader_1 = require("./ArcGisFeatureReader");
+/** @internal */
+class ArcGisFeatureJSON extends ArcGisFeatureReader_1.ArcGisFeatureReader {
+    constructor(settings, layerMetadata) {
+        super(settings, layerMetadata);
+    }
+    readAndRender(response, renderer) {
+        const responseObj = response.data;
+        if (responseObj?.geometryType === "esriGeometryPolyline" || responseObj?.geometryType === "esriGeometryPolygon") {
+            const fill = (responseObj.geometryType === "esriGeometryPolygon");
+            for (const feature of responseObj.features) {
+                let offset = 0;
+                const lengths = [];
+                const coords = [];
+                if (feature?.geometry?.rings) {
+                    for (const ring of feature?.geometry?.rings) {
+                        offset = ArcGisFeatureJSON.deflateCoordinates(ring, coords, 2, offset);
+                        lengths.push(ring.length);
+                    }
+                }
+                else if (feature?.geometry?.paths) {
+                    for (const path of feature?.geometry?.paths) {
+                        offset = ArcGisFeatureJSON.deflateCoordinates(path, coords, 2, offset);
+                        lengths.push(path.length);
+                    }
+                }
+                renderer.renderPath(lengths, coords, fill, 2, renderer.transform === undefined);
+            }
+        }
+        else if (responseObj?.geometryType === "esriGeometryPoint" || responseObj?.geometryType === "esriGeometryMultiPoint") {
+            for (const feature of responseObj.features) {
+                // TODO: Add support for multipoint
+                if (feature.geometry) {
+                    const lengths = [];
+                    const coords = [feature.geometry.x, feature.geometry.y];
+                    renderer.renderPoint(lengths, coords, 2, renderer.transform === undefined);
+                }
+            }
+        }
+    }
+    // Converts an [[x1,y1], [x2,y2], ...] to [x1,y1,x2,y2, ...]
+    // stride is the number of dimensions
+    // https://github.com/openlayers/openlayers/blob/7a2f87caca9ddc1912d910f56eb5637445fc11f6/src/ol/geom/flat/deflate.js#L26
+    static deflateCoordinates(coordinates, flatCoordinates, stride, offset) {
+        for (let i = 0, ii = coordinates.length; i < ii; ++i) {
+            const coordinate = coordinates[i];
+            for (let j = 0; j < stride; ++j)
+                flatCoordinates[offset++] = coordinate[j];
+        }
+        return offset;
+    }
+    readFeatureInfo(response, featureInfos) {
+        const responseObj = response.data;
+        if (responseObj === undefined || !Array.isArray(responseObj.features))
+            return;
+        const layerInfo = { layerName: this._settings.name };
+        // Create a signature index for every field name / type.
+        const fieldsType = {};
+        for (const fieldInfo of responseObj.fields) {
+            fieldsType[fieldInfo.name] = fieldInfo.type;
+        }
+        const getStandardTypeName = (fieldType) => {
+            switch (fieldType) {
+                case "esriFieldTypeInteger":
+                case "esriFieldTypeSmallInteger":
+                case "esriFieldTypeOID":
+                    return appui_abstract_1.StandardTypeNames.Integer;
+                case "esriFieldTypeDouble":
+                    return appui_abstract_1.StandardTypeNames.Double;
+                case "esriFieldTypeSingle":
+                    return appui_abstract_1.StandardTypeNames.Float;
+                case "esriFieldTypeDate":
+                    return appui_abstract_1.StandardTypeNames.DateTime;
+                default:
+                    return appui_abstract_1.StandardTypeNames.String;
+            }
+        };
+        const getRecordInfo = (fieldName, value) => {
+            const propertyValue = { valueFormat: appui_abstract_1.PropertyValueFormat.Primitive };
+            if (value === null) {
+                value = undefined;
+            }
+            const strValue = `${value}`;
+            const fieldType = fieldsType[fieldName];
+            switch (fieldType) {
+                case "esriFieldTypeInteger":
+                case "esriFieldTypeSmallInteger":
+                case "esriFieldTypeOID":
+                    propertyValue.value = value;
+                    break;
+                case "esriFieldTypeDouble":
+                case "esriFieldTypeSingle":
+                    propertyValue.value = this.toFixedWithoutPadding(value);
+                    break;
+                case "esriFieldTypeDate":
+                    propertyValue.value = new Date(value);
+                    break;
+                default:
+                    if (value !== undefined)
+                        propertyValue.value = strValue;
+                    break;
+            }
+            const typename = getStandardTypeName(fieldType);
+            propertyValue.displayValue = this.getDisplayValue(typename, propertyValue.value);
+            return new core_frontend_1.MapFeatureInfoRecord(propertyValue, { name: fieldName, displayLabel: fieldName, typename });
+        };
+        for (const feature of responseObj.features) {
+            const subLayerInfo = {
+                subLayerName: this._layerMetadata.name,
+                displayFieldName: this._layerMetadata.name,
+                records: [],
+            };
+            for (const [key, value] of Object.entries(feature.attributes))
+                subLayerInfo.records?.push(getRecordInfo(key, value));
+            if (layerInfo.info === undefined)
+                layerInfo.info = [];
+            if (!(layerInfo.info instanceof HTMLElement))
+                layerInfo.info.push(subLayerInfo);
+        }
+        featureInfos.push(layerInfo);
+    }
+}
+exports.ArcGisFeatureJSON = ArcGisFeatureJSON;
 //# sourceMappingURL=ArcGisFeatureJSON.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"ArcGisFeatureJSON.js","sourceRoot":"","sources":["../../../src/ArcGisFeature/ArcGisFeatureJSON.ts"],"names":[],"mappings":"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","sourcesContent":["/*---------------------------------------------------------------------------------------------\r\n* Copyright (c) Bentley Systems, Incorporated. All rights reserved.\r\n* See LICENSE.md in the project root for license terms and full copyright notice.\r\n*--------------------------------------------------------------------------------------------*/\r\n\r\nimport { PrimitiveValue, PropertyValueFormat, StandardTypeNames } from \"@itwin/appui-abstract\";\r\nimport { ImageMapLayerSettings } from \"@itwin/core-common\";\r\nimport { MapFeatureInfoRecord, MapLayerFeatureInfo, MapSubLayerFeatureInfo } from \"@itwin/core-frontend\";\r\nimport { Transform } from \"@itwin/core-geometry\";\r\nimport { ArcGisFeatureReader } from \"./ArcGisFeatureReader\";\r\nimport { ArcGisFeatureRenderer } from \"./ArcGisFeatureRenderer\";\r\nimport { ArcGisFieldType, ArcGisResponseData } from \"./ArcGisFeatureResponse\";\r\n\r\n/** @internal */\r\nexport class ArcGisFeatureJSON  extends ArcGisFeatureReader {\r\n  public transform: Transform|undefined;\r\n\r\n  public constructor(settings: ImageMapLayerSettings, layerMetadata: any) {\r\n    super(settings, layerMetadata);\r\n  }\r\n\r\n  public readAndRender(response: ArcGisResponseData, renderer: ArcGisFeatureRenderer) {\r\n    const responseObj = response.data;\r\n\r\n    if (responseObj?.geometryType === \"esriGeometryPolyline\" || responseObj?.geometryType === \"esriGeometryPolygon\") {\r\n      const fill = (responseObj.geometryType === \"esriGeometryPolygon\");\r\n      for (const feature of responseObj.features) {\r\n        let offset = 0;\r\n        const lengths: number[] = [];\r\n        const coords: number[] = [];\r\n\r\n        if (feature?.geometry?.rings) {\r\n          for (const ring of feature?.geometry?.rings) {\r\n            offset = ArcGisFeatureJSON.deflateCoordinates(ring, coords, 2, offset);\r\n            lengths.push(ring.length);\r\n          }\r\n        } else if (feature?.geometry?.paths) {\r\n          for (const path of feature?.geometry?.paths) {\r\n            offset = ArcGisFeatureJSON.deflateCoordinates(path, coords, 2, offset);\r\n            lengths.push(path.length);\r\n          }\r\n        }\r\n        renderer.renderPath(lengths, coords, fill, 2, renderer.transform === undefined);\r\n\r\n      }\r\n    } else if (responseObj?.geometryType === \"esriGeometryPoint\" || responseObj?.geometryType === \"esriGeometryMultiPoint\") {\r\n      for (const feature of responseObj.features) {\r\n        // TODO: Add support for multipoint\r\n        if (feature.geometry) {\r\n          const lengths: number[] = [];\r\n          const coords: number[] = [feature.geometry.x, feature.geometry.y];\r\n          renderer.renderPoint(lengths, coords, 2, renderer.transform === undefined);\r\n        }\r\n      }\r\n    }\r\n  }\r\n\r\n  // Converts an [[x1,y1], [x2,y2], ...] to [x1,y1,x2,y2, ...]\r\n  // stride is the number of dimensions\r\n  // https://github.com/openlayers/openlayers/blob/7a2f87caca9ddc1912d910f56eb5637445fc11f6/src/ol/geom/flat/deflate.js#L26\r\n  protected static deflateCoordinates( coordinates: number[][], flatCoordinates: number[], stride: number, offset: number) {\r\n    for (let i = 0, ii = coordinates.length; i < ii; ++i) {\r\n      const coordinate = coordinates[i];\r\n      for (let j = 0; j < stride; ++j)\r\n        flatCoordinates[offset++] = coordinate[j];\r\n    }\r\n\r\n    return offset;\r\n  }\r\n\r\n  public readFeatureInfo(response: ArcGisResponseData, featureInfos: MapLayerFeatureInfo[]) {\r\n    const responseObj = response.data;\r\n    if (responseObj === undefined || !Array.isArray(responseObj.features))\r\n      return;\r\n\r\n    const layerInfo: MapLayerFeatureInfo = {layerName: this._settings.name};\r\n\r\n    // Create a signature index for every field name / type.\r\n    const fieldsType: {[key: string]: ArcGisFieldType} = {};\r\n    for (const fieldInfo of responseObj.fields) {\r\n      fieldsType[fieldInfo.name] = fieldInfo.type;\r\n    }\r\n\r\n    const getStandardTypeName = (fieldType: ArcGisFieldType) => {\r\n      switch (fieldType) {\r\n        case \"esriFieldTypeInteger\":\r\n        case \"esriFieldTypeSmallInteger\":\r\n        case \"esriFieldTypeOID\":\r\n          return StandardTypeNames.Integer;\r\n        case \"esriFieldTypeDouble\":\r\n          return StandardTypeNames.Double;\r\n        case \"esriFieldTypeSingle\":\r\n          return StandardTypeNames.Float;\r\n        case \"esriFieldTypeDate\":\r\n          return StandardTypeNames.DateTime;\r\n        default:\r\n          return StandardTypeNames.String;\r\n      }\r\n    };\r\n\r\n    const getRecordInfo = (fieldName: string, value: any) => {\r\n      const propertyValue: PrimitiveValue = {valueFormat: PropertyValueFormat.Primitive};\r\n\r\n      if (value === null) {\r\n        value = undefined;\r\n      }\r\n\r\n      const strValue = `${value}`;\r\n      const fieldType = fieldsType[fieldName];\r\n      switch (fieldType) {\r\n        case \"esriFieldTypeInteger\":\r\n        case \"esriFieldTypeSmallInteger\":\r\n        case \"esriFieldTypeOID\":\r\n          propertyValue.value = value as number;\r\n          break;\r\n        case \"esriFieldTypeDouble\":\r\n        case \"esriFieldTypeSingle\":\r\n          propertyValue.value = this.toFixedWithoutPadding(value);\r\n          break;\r\n        case \"esriFieldTypeDate\":\r\n          propertyValue.value = new Date(value);\r\n          break;\r\n        default:\r\n          if (value !== undefined)\r\n            propertyValue.value = strValue;\r\n\r\n          break;\r\n      }\r\n\r\n      const typename = getStandardTypeName(fieldType);\r\n      propertyValue.displayValue = this.getDisplayValue(typename, propertyValue.value);\r\n\r\n      return new MapFeatureInfoRecord (propertyValue, {name: fieldName, displayLabel: fieldName,  typename});\r\n    };\r\n\r\n    for (const feature of responseObj.features) {\r\n      const subLayerInfo: MapSubLayerFeatureInfo = {\r\n        subLayerName: this._layerMetadata.name,\r\n        displayFieldName: this._layerMetadata.name,\r\n        records : [],\r\n      };\r\n\r\n      for (const [key, value] of Object.entries(feature.attributes))\r\n        subLayerInfo.records?.push(getRecordInfo(key,value));\r\n\r\n      if (layerInfo.info === undefined)\r\n        layerInfo.info = [];\r\n\r\n      if (!(layerInfo.info instanceof HTMLElement))\r\n        layerInfo.info.push(subLayerInfo);\r\n    }\r\n\r\n    featureInfos.push(layerInfo);\r\n  }\r\n}\r\n"]}
+{"version":3,"file":"ArcGisFeatureJSON.js","sourceRoot":"","sources":["../../../src/ArcGisFeature/ArcGisFeatureJSON.ts"],"names":[],"mappings":"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","sourcesContent":["/*---------------------------------------------------------------------------------------------\r\n* Copyright (c) Bentley Systems, Incorporated. All rights reserved.\r\n* See LICENSE.md in the project root for license terms and full copyright notice.\r\n*--------------------------------------------------------------------------------------------*/\r\n\r\nimport { PrimitiveValue, PropertyValueFormat, StandardTypeNames } from \"@itwin/appui-abstract\";\r\nimport { ImageMapLayerSettings } from \"@itwin/core-common\";\r\nimport { MapFeatureInfoRecord, MapLayerFeatureInfo, MapSubLayerFeatureInfo } from \"@itwin/core-frontend\";\r\nimport { Transform } from \"@itwin/core-geometry\";\r\nimport { ArcGisFeatureReader } from \"./ArcGisFeatureReader\";\r\nimport { ArcGisFeatureRenderer } from \"./ArcGisFeatureRenderer\";\r\nimport { ArcGisFieldType, ArcGisResponseData } from \"./ArcGisFeatureResponse\";\r\n\r\n/** @internal */\r\nexport class ArcGisFeatureJSON  extends ArcGisFeatureReader {\r\n  public transform: Transform|undefined;\r\n\r\n  public constructor(settings: ImageMapLayerSettings, layerMetadata: any) {\r\n    super(settings, layerMetadata);\r\n  }\r\n\r\n  public readAndRender(response: ArcGisResponseData, renderer: ArcGisFeatureRenderer) {\r\n    const responseObj = response.data;\r\n\r\n    if (responseObj?.geometryType === \"esriGeometryPolyline\" || responseObj?.geometryType === \"esriGeometryPolygon\") {\r\n      const fill = (responseObj.geometryType === \"esriGeometryPolygon\");\r\n      for (const feature of responseObj.features) {\r\n        let offset = 0;\r\n        const lengths: number[] = [];\r\n        const coords: number[] = [];\r\n\r\n        if (feature?.geometry?.rings) {\r\n          for (const ring of feature?.geometry?.rings) {\r\n            offset = ArcGisFeatureJSON.deflateCoordinates(ring, coords, 2, offset);\r\n            lengths.push(ring.length);\r\n          }\r\n        } else if (feature?.geometry?.paths) {\r\n          for (const path of feature?.geometry?.paths) {\r\n            offset = ArcGisFeatureJSON.deflateCoordinates(path, coords, 2, offset);\r\n            lengths.push(path.length);\r\n          }\r\n        }\r\n        renderer.renderPath(lengths, coords, fill, 2, renderer.transform === undefined);\r\n\r\n      }\r\n    } else if (responseObj?.geometryType === \"esriGeometryPoint\" || responseObj?.geometryType === \"esriGeometryMultiPoint\") {\r\n      for (const feature of responseObj.features) {\r\n        // TODO: Add support for multipoint\r\n        if (feature.geometry) {\r\n          const lengths: number[] = [];\r\n          const coords: number[] = [feature.geometry.x, feature.geometry.y];\r\n          renderer.renderPoint(lengths, coords, 2, renderer.transform === undefined);\r\n        }\r\n      }\r\n    }\r\n  }\r\n\r\n  // Converts an [[x1,y1], [x2,y2], ...] to [x1,y1,x2,y2, ...]\r\n  // stride is the number of dimensions\r\n  // https://github.com/openlayers/openlayers/blob/7a2f87caca9ddc1912d910f56eb5637445fc11f6/src/ol/geom/flat/deflate.js#L26\r\n  protected static deflateCoordinates( coordinates: number[][], flatCoordinates: number[], stride: number, offset: number) {\r\n    for (let i = 0, ii = coordinates.length; i < ii; ++i) {\r\n      const coordinate = coordinates[i];\r\n      for (let j = 0; j < stride; ++j)\r\n        flatCoordinates[offset++] = coordinate[j];\r\n    }\r\n\r\n    return offset;\r\n  }\r\n\r\n  public readFeatureInfo(response: ArcGisResponseData, featureInfos: MapLayerFeatureInfo[]) {\r\n    const responseObj = response.data;\r\n    if (responseObj === undefined || !Array.isArray(responseObj.features))\r\n      return;\r\n\r\n    const layerInfo: MapLayerFeatureInfo = {layerName: this._settings.name};\r\n\r\n    // Create a signature index for every field name / type.\r\n    const fieldsType: {[key: string]: ArcGisFieldType} = {};\r\n    for (const fieldInfo of responseObj.fields) {\r\n      fieldsType[fieldInfo.name] = fieldInfo.type;\r\n    }\r\n\r\n    const getStandardTypeName = (fieldType: ArcGisFieldType) => {\r\n      switch (fieldType) {\r\n        case \"esriFieldTypeInteger\":\r\n        case \"esriFieldTypeSmallInteger\":\r\n        case \"esriFieldTypeOID\":\r\n          return StandardTypeNames.Integer;\r\n        case \"esriFieldTypeDouble\":\r\n          return StandardTypeNames.Double;\r\n        case \"esriFieldTypeSingle\":\r\n          return StandardTypeNames.Float;\r\n        case \"esriFieldTypeDate\":\r\n          return StandardTypeNames.DateTime;\r\n        default:\r\n          return StandardTypeNames.String;\r\n      }\r\n    };\r\n\r\n    const getRecordInfo = (fieldName: string, value: any) => {\r\n      const propertyValue: PrimitiveValue = {valueFormat: PropertyValueFormat.Primitive};\r\n\r\n      if (value === null) {\r\n        value = undefined;\r\n      }\r\n\r\n      const strValue = `${value}`;\r\n      const fieldType = fieldsType[fieldName];\r\n      switch (fieldType) {\r\n        case \"esriFieldTypeInteger\":\r\n        case \"esriFieldTypeSmallInteger\":\r\n        case \"esriFieldTypeOID\":\r\n          propertyValue.value = value as number;\r\n          break;\r\n        case \"esriFieldTypeDouble\":\r\n        case \"esriFieldTypeSingle\":\r\n          propertyValue.value = this.toFixedWithoutPadding(value);\r\n          break;\r\n        case \"esriFieldTypeDate\":\r\n          propertyValue.value = new Date(value);\r\n          break;\r\n        default:\r\n          if (value !== undefined)\r\n            propertyValue.value = strValue;\r\n\r\n          break;\r\n      }\r\n\r\n      const typename = getStandardTypeName(fieldType);\r\n      propertyValue.displayValue = this.getDisplayValue(typename, propertyValue.value);\r\n\r\n      return new MapFeatureInfoRecord (propertyValue, {name: fieldName, displayLabel: fieldName,  typename});\r\n    };\r\n\r\n    for (const feature of responseObj.features) {\r\n      const subLayerInfo: MapSubLayerFeatureInfo = {\r\n        subLayerName: this._layerMetadata.name,\r\n        displayFieldName: this._layerMetadata.name,\r\n        records : [],\r\n      };\r\n\r\n      for (const [key, value] of Object.entries(feature.attributes))\r\n        subLayerInfo.records?.push(getRecordInfo(key,value));\r\n\r\n      if (layerInfo.info === undefined)\r\n        layerInfo.info = [];\r\n\r\n      if (!(layerInfo.info instanceof HTMLElement))\r\n        layerInfo.info.push(subLayerInfo);\r\n    }\r\n\r\n    featureInfos.push(layerInfo);\r\n  }\r\n}\r\n"]}

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

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