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

package/lib/test/junit_results.xml

@@ -1,121 +1,121 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<testsuites name="Mocha Tests" time="0.481" tests="69" failures="0">
-  <testsuite name="Root Suite" timestamp="2022-12-09T05:18:57" tests="0" time="0.000" failures="0">
+<testsuites name="Mocha Tests" time="0.464" tests="69" failures="0">
+  <testsuite name="Root Suite" timestamp="2023-01-31T05:15:07" tests="0" time="0.000" failures="0">
   </testsuite>
-  <testsuite name="ArcGisFeaturePBF" timestamp="2022-12-09T05:18:57" tests="2" file="D:\vsts_a\2\s\extensions\map-layers-formats\lib\cjs\test\ArcGisFeature\ArcGisFeatureFeatureFormats.test.js" time="0.016" failures="0">
-    <testcase name="ArcGisFeaturePBF should createImageryProvider" time="0.002" classname="should createImageryProvider">
+  <testsuite name="ArcGisFeaturePBF" timestamp="2023-01-31T05:15:07" tests="2" file="D:\vsts_b\1\s\extensions\map-layers-formats\lib\cjs\test\ArcGisFeature\ArcGisFeatureFeatureFormats.test.js" time="0.015" failures="0">
+    <testcase name="ArcGisFeaturePBF should createImageryProvider" time="0.001" classname="should createImageryProvider">
     </testcase>
-    <testcase name="ArcGisFeaturePBF should validateSource" time="0.005" classname="should validateSource">
+    <testcase name="ArcGisFeaturePBF should validateSource" time="0.004" classname="should validateSource">
     </testcase>
   </testsuite>
-  <testsuite name="ArcGisFeatureJSON" timestamp="2022-12-09T05:18:57" tests="9" file="D:\vsts_a\2\s\extensions\map-layers-formats\lib\cjs\test\ArcGisFeature\ArcGisFeatureJSON.test.js" time="0.034" failures="0">
+  <testsuite name="ArcGisFeatureJSON" timestamp="2023-01-31T05:15:07" tests="9" file="D:\vsts_b\1\s\extensions\map-layers-formats\lib\cjs\test\ArcGisFeature\ArcGisFeatureJSON.test.js" time="0.029" failures="0">
     <testcase name="ArcGisFeatureJSON should read FeatureInfo in JSON (phillyTansportation)" time="0.004" classname="should read FeatureInfo in JSON (phillyTansportation)">
     </testcase>
-    <testcase name="ArcGisFeatureJSON should read FeatureInfo in JSON (phillyAirport)" time="0.000" classname="should read FeatureInfo in JSON (phillyAirport)">
+    <testcase name="ArcGisFeatureJSON should read FeatureInfo in JSON (phillyAirport)" time="0.001" classname="should read FeatureInfo in JSON (phillyAirport)">
     </testcase>
-    <testcase name="ArcGisFeatureJSON should deflate coordinates array" time="0.002" classname="should deflate coordinates array">
+    <testcase name="ArcGisFeatureJSON should deflate coordinates array" time="0.001" classname="should deflate coordinates array">
     </testcase>
     <testcase name="ArcGisFeatureJSON should readAndRender single ring polygon feature" time="0.004" classname="should readAndRender single ring polygon feature">
     </testcase>
-    <testcase name="ArcGisFeatureJSON should readAndRender multiple ring polygon feature" time="0.001" classname="should readAndRender multiple ring polygon feature">
+    <testcase name="ArcGisFeatureJSON should readAndRender multiple ring polygon feature" time="0.002" classname="should readAndRender multiple ring polygon feature">
     </testcase>
     <testcase name="ArcGisFeatureJSON should readAndRender simple path" time="0.001" classname="should readAndRender simple path">
     </testcase>
     <testcase name="ArcGisFeatureJSON should readAndRender multi path" time="0.001" classname="should readAndRender multi path">
     </testcase>
-    <testcase name="ArcGisFeatureJSON should readAndRender simple point" time="0.006" classname="should readAndRender simple point">
+    <testcase name="ArcGisFeatureJSON should readAndRender simple point" time="0.005" classname="should readAndRender simple point">
     </testcase>
     <testcase name="ArcGisFeatureJSON should log error when readAndRender /  readFeatureInfo is called invalid response Data" time="0.003" classname="should log error when readAndRender /  readFeatureInfo is called invalid response Data">
     </testcase>
   </testsuite>
-  <testsuite name="ArcGisFeaturePBF" timestamp="2022-12-09T05:18:57" tests="10" file="D:\vsts_a\2\s\extensions\map-layers-formats\lib\cjs\test\ArcGisFeature\ArcGisFeaturePBF.test.js" time="0.050" failures="0">
+  <testsuite name="ArcGisFeaturePBF" timestamp="2023-01-31T05:15:07" tests="10" file="D:\vsts_b\1\s\extensions\map-layers-formats\lib\cjs\test\ArcGisFeature\ArcGisFeaturePBF.test.js" time="0.058" failures="0">
     <testcase name="ArcGisFeaturePBF should convert pbf geometry type to Esri types" time="0.000" classname="should convert pbf geometry type to Esri types">
     </testcase>
-    <testcase name="ArcGisFeaturePBF should read FeatureInfo in PBF" time="0.012" classname="should read FeatureInfo in PBF">
+    <testcase name="ArcGisFeaturePBF should read FeatureInfo in PBF" time="0.017" classname="should read FeatureInfo in PBF">
     </testcase>
-    <testcase name="ArcGisFeaturePBF should read FeatureInfo from PBF (philly transportation)" time="0.009" classname="should read FeatureInfo from PBF (philly transportation)">
+    <testcase name="ArcGisFeaturePBF should read FeatureInfo from PBF (philly transportation)" time="0.010" classname="should read FeatureInfo from PBF (philly transportation)">
     </testcase>
     <testcase name="ArcGisFeaturePBF should read all data types from FeatureInfo " time="0.003" classname="should read all data types from FeatureInfo ">
     </testcase>
     <testcase name="ArcGisFeaturePBF should readAndRender single ring polygon feature" time="0.002" classname="should readAndRender single ring polygon feature">
     </testcase>
-    <testcase name="ArcGisFeaturePBF should readAndRender multiple ring polygon feature" time="0.001" classname="should readAndRender multiple ring polygon feature">
+    <testcase name="ArcGisFeaturePBF should readAndRender multiple ring polygon feature" time="0.002" classname="should readAndRender multiple ring polygon feature">
     </testcase>
-    <testcase name="ArcGisFeaturePBF should readAndRender simple path" time="0.001" classname="should readAndRender simple path">
+    <testcase name="ArcGisFeaturePBF should readAndRender simple path" time="0.002" classname="should readAndRender simple path">
     </testcase>
     <testcase name="ArcGisFeaturePBF should readAndRender multi path" time="0.001" classname="should readAndRender multi path">
     </testcase>
-    <testcase name="ArcGisFeaturePBF should readAndRender simple point" time="0.003" classname="should readAndRender simple point">
+    <testcase name="ArcGisFeaturePBF should readAndRender simple point" time="0.005" classname="should readAndRender simple point">
     </testcase>
     <testcase name="ArcGisFeaturePBF should log error when readAndRender /  readFeatureInfo is called invalid response Data" time="0.002" classname="should log error when readAndRender /  readFeatureInfo is called invalid response Data">
     </testcase>
   </testsuite>
-  <testsuite name="ArcGisFeatureProvider" timestamp="2022-12-09T05:18:57" tests="23" file="D:\vsts_a\2\s\extensions\map-layers-formats\lib\cjs\test\ArcGisFeature\ArcGisFeatureProvider.test.js" time="0.309" failures="0">
-    <testcase name="ArcGisFeatureProvider should initialize with valid data" time="0.005" classname="should initialize with valid data">
+  <testsuite name="ArcGisFeatureProvider" timestamp="2023-01-31T05:15:07" tests="23" file="D:\vsts_b\1\s\extensions\map-layers-formats\lib\cjs\test\ArcGisFeature\ArcGisFeatureProvider.test.js" time="0.293" failures="0">
+    <testcase name="ArcGisFeatureProvider should initialize with valid data" time="0.004" classname="should initialize with valid data">
     </testcase>
     <testcase name="ArcGisFeatureProvider should not initialize with no service metadata" time="0.003" classname="should not initialize with no service metadata">
     </testcase>
-    <testcase name="ArcGisFeatureProvider should update status when invalid token error from service" time="0.001" classname="should update status when invalid token error from service">
+    <testcase name="ArcGisFeatureProvider should update status when invalid token error from service" time="0.002" classname="should update status when invalid token error from service">
     </testcase>
     <testcase name="ArcGisFeatureProvider should throw    query capability not supported" time="0.001" classname="should throw    query capability not supported">
     </testcase>
-    <testcase name="ArcGisFeatureProvider should pick the first visible sub-layer when multiple visible sub-layers" time="0.003" classname="should pick the first visible sub-layer when multiple visible sub-layers">
+    <testcase name="ArcGisFeatureProvider should pick the first visible sub-layer when multiple visible sub-layers" time="0.002" classname="should pick the first visible sub-layer when multiple visible sub-layers">
     </testcase>
     <testcase name="ArcGisFeatureProvider should pick sub-layers from service metadata if none provided on layer settings" time="0.002" classname="should pick sub-layers from service metadata if none provided on layer settings">
     </testcase>
     <testcase name="ArcGisFeatureProvider should throw error if no layers in capabilities" time="0.001" classname="should throw error if no layers in capabilities">
     </testcase>
-    <testcase name="ArcGisFeatureProvider should throw if no layer metadata from service" time="0.001" classname="should throw if no layer metadata from service">
+    <testcase name="ArcGisFeatureProvider should throw if no layer metadata from service" time="0.002" classname="should throw if no layer metadata from service">
     </testcase>
-    <testcase name="ArcGisFeatureProvider should read supported supported format" time="0.006" classname="should read supported supported format">
+    <testcase name="ArcGisFeatureProvider should read supported supported format" time="0.004" classname="should read supported supported format">
     </testcase>
-    <testcase name="ArcGisFeatureProvider should compute minLod/maxLod" time="0.003" classname="should compute minLod/maxLod">
+    <testcase name="ArcGisFeatureProvider should compute minLod/maxLod" time="0.002" classname="should compute minLod/maxLod">
     </testcase>
     <testcase name="ArcGisFeatureProvider should construct empty url" time="0.000" classname="should construct empty url">
     </testcase>
-    <testcase name="ArcGisFeatureProvider should construct feature query url" time="0.028" classname="should construct feature query url">
+    <testcase name="ArcGisFeatureProvider should construct feature query url" time="0.036" classname="should construct feature query url">
     </testcase>
-    <testcase name="ArcGisFeatureProvider should log error when getFeatureInfo cannot be performed" time="0.003" classname="should log error when getFeatureInfo cannot be performed">
+    <testcase name="ArcGisFeatureProvider should log error when getFeatureInfo cannot be performed" time="0.005" classname="should log error when getFeatureInfo cannot be performed">
     </testcase>
-    <testcase name="ArcGisFeatureProvider should process data in getFeatureInfo" time="0.019" classname="should process data in getFeatureInfo">
+    <testcase name="ArcGisFeatureProvider should process data in getFeatureInfo" time="0.020" classname="should process data in getFeatureInfo">
     </testcase>
-    <testcase name="ArcGisFeatureProvider should log error when exceed transfert limit" time="0.140" classname="should log error when exceed transfert limit">
+    <testcase name="ArcGisFeatureProvider should log error when exceed transfert limit" time="0.130" classname="should log error when exceed transfert limit">
     </testcase>
     <testcase name="ArcGisFeatureProvider should log error when exceed exception thrown limit" time="0.012" classname="should log error when exceed exception thrown limit">
     </testcase>
-    <testcase name="ArcGisFeatureProvider should debug Feature Geom" time="0.031" classname="should debug Feature Geom">
+    <testcase name="ArcGisFeatureProvider should debug Feature Geom" time="0.029" classname="should debug Feature Geom">
     </testcase>
     <testcase name="ArcGisFeatureProvider should compute computeTileWorld2CanvasTransform" time="0.003" classname="should compute computeTileWorld2CanvasTransform">
     </testcase>
-    <testcase name="ArcGisFeatureProvider should loadTile from PBF request" time="0.008" classname="should loadTile from PBF request">
+    <testcase name="ArcGisFeatureProvider should loadTile from PBF request" time="0.007" classname="should loadTile from PBF request">
     </testcase>
     <testcase name="ArcGisFeatureProvider should loadTile from JSON request" time="0.005" classname="should loadTile from JSON request">
     </testcase>
-    <testcase name="ArcGisFeatureProvider should make sub request if loadtile request return &apos;exceedTransferLimit&apos;" time="0.012" classname="should make sub request if loadtile request return &apos;exceedTransferLimit&apos;">
+    <testcase name="ArcGisFeatureProvider should make sub request if loadtile request return &apos;exceedTransferLimit&apos;" time="0.006" classname="should make sub request if loadtile request return &apos;exceedTransferLimit&apos;">
     </testcase>
     <testcase name="ArcGisFeatureProvider fetchTile should return undefined when to format defined" time="0.000" classname="fetchTile should return undefined when to format defined">
     </testcase>
     <testcase name="ArcGisFeatureProvider fetchTile should call fetch with the proper URL" time="0.002" classname="fetchTile should call fetch with the proper URL">
     </testcase>
   </testsuite>
-  <testsuite name="ArcGisFeatureQuery" timestamp="2022-12-09T05:18:57" tests="3" file="D:\vsts_a\2\s\extensions\map-layers-formats\lib\cjs\test\ArcGisFeature\ArcGisFeatureQuery.test.js" time="0.016" failures="0">
+  <testsuite name="ArcGisFeatureQuery" timestamp="2023-01-31T05:15:07" tests="3" file="D:\vsts_b\1\s\extensions\map-layers-formats\lib\cjs\test\ArcGisFeature\ArcGisFeatureQuery.test.js" time="0.018" failures="0">
     <testcase name="ArcGisFeatureQuery should not apply different switches if not needed" time="0.003" classname="should not apply different switches if not needed">
     </testcase>
-    <testcase name="ArcGisFeatureQuery should not apply different switches if not needed" time="0.008" classname="should not apply different switches if not needed">
+    <testcase name="ArcGisFeatureQuery should not apply different switches if not needed" time="0.006" classname="should not apply different switches if not needed">
     </testcase>
-    <testcase name="ArcGisFeatureQuery should not include geometry only when applicable" time="0.003" classname="should not include geometry only when applicable">
+    <testcase name="ArcGisFeatureQuery should not include geometry only when applicable" time="0.002" classname="should not include geometry only when applicable">
     </testcase>
   </testsuite>
-  <testsuite name="ArcGisFeatureRenderer" timestamp="2022-12-09T05:18:57" tests="12" file="D:\vsts_a\2\s\extensions\map-layers-formats\lib\cjs\test\ArcGisFeature\ArcGisFeatureRenderer.test.js" time="0.031" failures="0">
-    <testcase name="ArcGisFeatureRenderer should render simple path, stride = 2" time="0.001" classname="should render simple path, stride = 2">
+  <testsuite name="ArcGisFeatureRenderer" timestamp="2023-01-31T05:15:07" tests="12" file="D:\vsts_b\1\s\extensions\map-layers-formats\lib\cjs\test\ArcGisFeature\ArcGisFeatureRenderer.test.js" time="0.030" failures="0">
+    <testcase name="ArcGisFeatureRenderer should render simple path, stride = 2" time="0.002" classname="should render simple path, stride = 2">
     </testcase>
     <testcase name="ArcGisFeatureRenderer should render simple filled path" time="0.001" classname="should render simple filled path">
     </testcase>
-    <testcase name="ArcGisFeatureRenderer should render simple Path, stride = 3" time="0.001" classname="should render simple Path, stride = 3">
+    <testcase name="ArcGisFeatureRenderer should render simple Path, stride = 3" time="0.000" classname="should render simple Path, stride = 3">
     </testcase>
-    <testcase name="ArcGisFeatureRenderer should render multiple Paths, stride = 2" time="0.001" classname="should render multiple Paths, stride = 2">
+    <testcase name="ArcGisFeatureRenderer should render multiple Paths, stride = 2" time="0.002" classname="should render multiple Paths, stride = 2">
     </testcase>
-    <testcase name="ArcGisFeatureRenderer should not render invalid with stride value" time="0.001" classname="should not render invalid with stride value">
+    <testcase name="ArcGisFeatureRenderer should not render invalid with stride value" time="0.000" classname="should not render invalid with stride value">
     </testcase>
     <testcase name="ArcGisFeatureRenderer should render Path and apply transform, relativeCoords OFF" time="0.001" classname="should render Path and apply transform, relativeCoords OFF">
     </testcase>
@@ -125,33 +125,33 @@
     </testcase>
     <testcase name="ArcGisFeatureRenderer should render multi Point, transform, relativeCoords OFF" time="0.001" classname="should render multi Point, transform, relativeCoords OFF">
     </testcase>
-    <testcase name="ArcGisFeatureRenderer should render multi Point and apply transform, relativeCoords OFF" time="0.001" classname="should render multi Point and apply transform, relativeCoords OFF">
+    <testcase name="ArcGisFeatureRenderer should render multi Point and apply transform, relativeCoords OFF" time="0.002" classname="should render multi Point and apply transform, relativeCoords OFF">
     </testcase>
     <testcase name="ArcGisFeatureRenderer should render multi Point and apply transform, relativeCoords ON" time="0.002" classname="should render multi Point and apply transform, relativeCoords ON">
     </testcase>
     <testcase name="ArcGisFeatureRenderer should render and apply transform, relativeCoords ON" time="0.001" classname="should render and apply transform, relativeCoords ON">
     </testcase>
   </testsuite>
-  <testsuite name="ArcGisFeatureResponse" timestamp="2022-12-09T05:18:57" tests="7" file="D:\vsts_a\2\s\extensions\map-layers-formats\lib\cjs\test\ArcGisFeature\ArcGisFeatureResponse.test.js" time="0.015" failures="0">
+  <testsuite name="ArcGisFeatureResponse" timestamp="2023-01-31T05:15:07" tests="7" file="D:\vsts_b\1\s\extensions\map-layers-formats\lib\cjs\test\ArcGisFeature\ArcGisFeatureResponse.test.js" time="0.012" failures="0">
     <testcase name="ArcGisFeatureResponse should return undefined if http error" time="0.000" classname="should return undefined if http error">
     </testcase>
-    <testcase name="ArcGisFeatureResponse should return undefined if invalid PBF data" time="0.001" classname="should return undefined if invalid PBF data">
+    <testcase name="ArcGisFeatureResponse should return undefined if invalid PBF data" time="0.000" classname="should return undefined if invalid PBF data">
     </testcase>
     <testcase name="ArcGisFeatureResponse should create FeatureCollectionPBuffer from PBF data" time="0.004" classname="should create FeatureCollectionPBuffer from PBF data">
     </testcase>
-    <testcase name="ArcGisFeatureResponse should report exceededTransferLimit from PBF object" time="0.006" classname="should report exceededTransferLimit from PBF object">
+    <testcase name="ArcGisFeatureResponse should report exceededTransferLimit from PBF object" time="0.005" classname="should report exceededTransferLimit from PBF object">
     </testcase>
     <testcase name="ArcGisFeatureResponse should return undefined if invalid JSON" time="0.000" classname="should return undefined if invalid JSON">
     </testcase>
-    <testcase name="ArcGisFeatureResponse should return JSON data" time="0.000" classname="should return JSON data">
+    <testcase name="ArcGisFeatureResponse should return JSON data" time="0.001" classname="should return JSON data">
     </testcase>
-    <testcase name="ArcGisFeatureResponse should report exceededTransferLimit from JSON object" time="0.001" classname="should report exceededTransferLimit from JSON object">
+    <testcase name="ArcGisFeatureResponse should report exceededTransferLimit from JSON object" time="0.000" classname="should report exceededTransferLimit from JSON object">
     </testcase>
   </testsuite>
-  <testsuite name="ArcGisSymbologyRenderer" timestamp="2022-12-09T05:18:57" tests="3" file="D:\vsts_a\2\s\extensions\map-layers-formats\lib\cjs\test\ArcGisFeature\ArcGisSymbologyRenderer.test.js" time="0.005" failures="0">
+  <testsuite name="ArcGisSymbologyRenderer" timestamp="2023-01-31T05:15:07" tests="3" file="D:\vsts_b\1\s\extensions\map-layers-formats\lib\cjs\test\ArcGisFeature\ArcGisSymbologyRenderer.test.js" time="0.004" failures="0">
     <testcase name="ArcGisSymbologyRenderer should construct renderer from incomplete drawing info" time="0.002" classname="should construct renderer from incomplete drawing info">
     </testcase>
-    <testcase name="ArcGisSymbologyRenderer should construct renderer from unique value drawing info" time="0.001" classname="should construct renderer from unique value drawing info">
+    <testcase name="ArcGisSymbologyRenderer should construct renderer from unique value drawing info" time="0.000" classname="should construct renderer from unique value drawing info">
     </testcase>
     <testcase name="ArcGisSymbologyRenderer should construct renderer from point symbology drawing info" time="0.001" classname="should construct renderer from point symbology drawing info">
     </testcase>

package/map-layers-formats.build.log

@@ -1,10 +1,10 @@
 Invoking: betools docs --includes=../../generated-docs/extract --json=../../generated-docs/core/map-layers-formats/file.json --tsIndexFile=./map-layers-formats.ts --onlyJson --excludes=**/ArcGisFeature/*.ts,**/*.gen.ts 
 Running command:
-node D:\vsts_a\2\s\tools\build\scripts\docs.js --json ../../generated-docs/core/map-layers-formats/file.json --includes ../../generated-docs/extract --excludes **/ArcGisFeature/*.ts,**/*.gen.ts --tsIndexFile ./map-layers-formats.ts --onlyJson
+node "D:\vsts_b\1\s\tools\build\scripts\docs.js" --json ../../generated-docs/core/map-layers-formats/file.json --includes ../../generated-docs/extract --excludes **/ArcGisFeature/*.ts,**/*.gen.ts --tsIndexFile ./map-layers-formats.ts --onlyJson
 Arguments to TypeDoc: [
   "--entryPointStrategy",
   "expand",
-  "D:\\vsts_a\\2\\s\\extensions\\map-layers-formats\\src",
+  "D:\\vsts_b\\1\\s\\extensions\\map-layers-formats\\src",
   "--excludePrivate",
   "--hideGenerator",
   "--logLevel",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@itwin/map-layers-formats",
-  "version": "3.6.0-dev.8",
+  "version": "4.0.0-dev.1",
   "description": "Enables additional map-layers formats in iTwin.js",
   "main": "lib/cjs/map-layers-formats.js",
   "module": "lib/esm/map-layers-formats.js",
@@ -21,13 +21,13 @@
     "url": "http://www.bentley.com"
   },
   "devDependencies": {
-    "@itwin/appui-abstract": "3.6.0-dev.8",
-    "@itwin/build-tools": "3.6.0-dev.8",
-    "@itwin/core-bentley": "3.6.0-dev.8",
-    "@itwin/core-common": "3.6.0-dev.8",
-    "@itwin/core-geometry": "3.6.0-dev.8",
-    "@itwin/core-frontend": "3.6.0-dev.8",
-    "@itwin/eslint-plugin": "3.6.0-dev.8",
+    "@itwin/appui-abstract": "4.0.0-dev.1",
+    "@itwin/build-tools": "4.0.0-dev.1",
+    "@itwin/core-bentley": "4.0.0-dev.1",
+    "@itwin/core-common": "4.0.0-dev.1",
+    "@itwin/core-geometry": "4.0.0-dev.1",
+    "@itwin/core-frontend": "4.0.0-dev.1",
+    "@itwin/eslint-plugin": "4.0.0-dev.1",
     "@types/chai": "4.3.1",
     "@types/chai-as-promised": "^7",
     "@types/google-protobuf": "~3.15.6",
@@ -48,10 +48,10 @@
     "typescript": "~4.4.0"
   },
   "peerDependencies": {
-    "@itwin/appui-abstract": "3.6.0-dev.8",
-    "@itwin/core-bentley": "3.6.0-dev.8",
-    "@itwin/core-common": "3.6.0-dev.8",
-    "@itwin/core-geometry": "3.6.0-dev.8"
+    "@itwin/appui-abstract": "4.0.0-dev.1",
+    "@itwin/core-bentley": "4.0.0-dev.1",
+    "@itwin/core-common": "4.0.0-dev.1",
+    "@itwin/core-geometry": "4.0.0-dev.1"
   },
   "dependencies": {
     "google-protobuf": "~3.20.1"

package/src/ArcGisFeature/ArcGisFeatureProvider.ts

@@ -6,7 +6,7 @@
 import { Cartographic, ImageMapLayerSettings, ImageSource, ImageSourceFormat, ServerError } from "@itwin/core-common";
 import { assert, base64StringToUint8Array, IModelStatus, Logger } from "@itwin/core-bentley";
 import { Matrix4d, Point3d, Range2d, Transform } from "@itwin/core-geometry";
-import { ArcGisErrorCode, ArcGISImageryProvider, ArcGisUtilities, ImageryMapTileTree, MapCartoRectangle, MapLayerFeatureInfo, MapLayerImageryProviderStatus, QuadId } from "@itwin/core-frontend";
+import { ArcGisErrorCode, ArcGISImageryProvider, ArcGISServiceMetadata, ArcGisUtilities, ImageryMapTileTree, MapCartoRectangle, MapLayerFeatureInfo, MapLayerImageryProviderStatus, QuadId } from "@itwin/core-frontend";
 import { ArcGisSymbologyRenderer } from "./ArcGisSymbologyRenderer";
 import { ArcGisExtent, ArcGisFeatureFormat, ArcGisFeatureQuery, ArcGisGeometry, FeatureQueryQuantizationParams } from "./ArcGisFeatureQuery";
 import { ArcGisFeatureRenderer } from "./ArcGisFeatureRenderer";
@@ -51,14 +51,8 @@ export class ArcGisFeatureProvider extends ArcGISImageryProvider {
   }
 
   public override async initialize(): Promise<void> {
-
-    let json;
-    try {
-      json = await ArcGisUtilities.getServiceJson(this._settings.url, this._settings.formatId, this._settings.userName, this._settings.password);
-
-    } catch (_e) {
-
-    }
+    const metadata = await this.getServiceJson();
+    const json = metadata?.content;
 
     if (json === undefined) {
       Logger.logError(loggerCategory, "Could not get service JSON");
@@ -68,8 +62,7 @@ export class ArcGisFeatureProvider extends ArcGISImageryProvider {
     if (json?.error?.code === ArcGisErrorCode.TokenRequired || json?.error?.code === ArcGisErrorCode.InvalidToken) {
       // Check again layer status, it might have change during await.
       if (this.status === MapLayerImageryProviderStatus.Valid) {
-        this.status = MapLayerImageryProviderStatus.RequireAuth;
-        this.onStatusChanged.raiseEvent(this);
+        this.setStatus(MapLayerImageryProviderStatus.RequireAuth);
         return;
       }
     }
@@ -201,15 +194,15 @@ export class ArcGisFeatureProvider extends ArcGISImageryProvider {
   }
 
   protected async getLayerMetadata(layerId: number) {
-    let json;
+    let metadata: ArcGISServiceMetadata|undefined;
     try {
       const url = new URL(this._settings.url);
       url.pathname = `${url.pathname}/${layerId}`;
-      json = await ArcGisUtilities.getServiceJson(url.toString(), this._settings.formatId, this._settings.userName, this._settings.password);
+      metadata = await ArcGisUtilities.getServiceJson(url.toString(), this._settings.formatId, this._settings.userName, this._settings.password, this._accessTokenRequired);
     } catch {
 
     }
-    return json;
+    return metadata?.content;
   }
 
   public override get tileSize(): number { return 512; }

package/src/test/ArcGisFeature/ArcGisFeatureProvider.test.ts

@@ -34,8 +34,8 @@ describe("ArcGisFeatureProvider", () => {
 
   it("should initialize with valid data", async () => {
 
-    sandbox.stub(ArcGisUtilities, "getServiceJson").callsFake(async function _(_url: string, _formatId: string, _userName?: string, _password?: string, _ignoreCache?: boolean) {
-      return NewYorkDataset.serviceCapabilities;
+    sandbox.stub(ArcGisUtilities, "getServiceJson").callsFake(async function _(_url: string, _formatId: string, _userName?: string, _password?: string, _ignoreCache?: boolean, _requireToken?: boolean) {
+      return {accessTokenRequired: false, content:NewYorkDataset.serviceCapabilities};
     });
 
     sandbox.stub(ArcGisFeatureProvider.prototype, "getLayerMetadata" as any).callsFake(async function _(_layerId: number) {
@@ -52,7 +52,7 @@ describe("ArcGisFeatureProvider", () => {
 
   it("should not initialize with no service metadata", async () => {
 
-    sandbox.stub(ArcGisUtilities, "getServiceJson").callsFake(async function _(_url: string, _formatId: string, _userName?: string, _password?: string, _ignoreCache?: boolean) {
+    sandbox.stub(ArcGisUtilities, "getServiceJson").callsFake(async function _(_url: string, _formatId: string, _userName?: string, _password?: string, _ignoreCache?: boolean, _requireToken?: boolean) {
       return undefined;
     });
 
@@ -65,8 +65,8 @@ describe("ArcGisFeatureProvider", () => {
 
   it("should update status when invalid token error from service", async () => {
 
-    sandbox.stub(ArcGisUtilities, "getServiceJson").callsFake(async function _(_url: string, _formatId: string, _userName?: string, _password?: string, _ignoreCache?: boolean) {
-      return {error: {code: 499}};
+    sandbox.stub(ArcGisUtilities, "getServiceJson").callsFake(async function _(_url: string, _formatId: string, _userName?: string, _password?: string, _ignoreCache?: boolean, _requireToken?: boolean) {
+      return {accessTokenRequired: false, content:{error: {code: 499}}};
     });
 
     const settings = ImageMapLayerSettings.fromJSON(esriFeatureSampleSource);
@@ -80,8 +80,8 @@ describe("ArcGisFeatureProvider", () => {
 
   it("should throw    query capability not supported", async () => {
 
-    sandbox.stub(ArcGisUtilities, "getServiceJson").callsFake(async function _(_url: string, _formatId: string, _userName?: string, _password?: string, _ignoreCache?: boolean) {
-      return {capabilities: "Test"};
+    sandbox.stub(ArcGisUtilities, "getServiceJson").callsFake(async function _(_url: string, _formatId: string, _userName?: string, _password?: string, _ignoreCache?: boolean, _requireToken?: boolean) {
+      return {accessTokenRequired: false, content:{capabilities: "Test"}};
     });
 
     const settings = ImageMapLayerSettings.fromJSON(esriFeatureSampleSource);
@@ -91,8 +91,8 @@ describe("ArcGisFeatureProvider", () => {
 
   it("should pick the first visible sub-layer when multiple visible sub-layers", async () => {
 
-    sandbox.stub(ArcGisUtilities, "getServiceJson").callsFake(async function _(_url: string, _formatId: string, _userName?: string, _password?: string, _ignoreCache?: boolean) {
-      return {capabilities: "Query"};
+    sandbox.stub(ArcGisUtilities, "getServiceJson").callsFake(async function _(_url: string, _formatId: string, _userName?: string, _password?: string, _ignoreCache?: boolean, _requireToken?: boolean) {
+      return {accessTokenRequired: false, content: {capabilities: "Query"}};
     });
 
     const settings = ImageMapLayerSettings.fromJSON({
@@ -107,8 +107,8 @@ describe("ArcGisFeatureProvider", () => {
 
   it("should pick sub-layers from service metadata if none provided on layer settings", async () => {
 
-    sandbox.stub(ArcGisUtilities, "getServiceJson").callsFake(async function _(_url: string, _formatId: string, _userName?: string, _password?: string, _ignoreCache?: boolean) {
-      return {capabilities: "Query",
+    sandbox.stub(ArcGisUtilities, "getServiceJson").callsFake(async function _(_url: string, _formatId: string, _userName?: string, _password?: string, _ignoreCache?: boolean, _requireToken?: boolean) {
+      return {accessTokenRequired: false, content: {capabilities: "Query",
         layers: [
           {
             id : 0,
@@ -117,7 +117,8 @@ describe("ArcGisFeatureProvider", () => {
           {
             id : 1,
           },
-        ]};
+        ]},
+      };
     });
 
     sandbox.stub((ArcGisFeatureProvider.prototype as any), "getLayerMetadata").callsFake(async function (id: number) {
@@ -137,9 +138,8 @@ describe("ArcGisFeatureProvider", () => {
 
   it("should throw error if no layers in capabilities", async () => {
 
-    sandbox.stub(ArcGisUtilities, "getServiceJson").callsFake(async function _(_url: string, _formatId: string, _userName?: string, _password?: string, _ignoreCache?: boolean) {
-      return {capabilities: "Query",
-        layers: []};
+    sandbox.stub(ArcGisUtilities, "getServiceJson").callsFake(async function _(_url: string, _formatId: string, _userName?: string, _password?: string, _ignoreCache?: boolean, _requireToken?: boolean) {
+      return {accessTokenRequired: false, content: {capabilities: "Query", layers: []}};
     });
 
     const settings = ImageMapLayerSettings.fromJSON(esriFeatureSampleSource);
@@ -154,8 +154,8 @@ describe("ArcGisFeatureProvider", () => {
       subLayers: [{id: 0, name: "layer1", visible:true}, {id:2, name: "layer2", visible:true}]}
     );
 
-    sandbox.stub(ArcGisUtilities, "getServiceJson").callsFake(async function _(_url: string, _formatId: string, _userName?: string, _password?: string, _ignoreCache?: boolean) {
-      return {capabilities: "Query"};
+    sandbox.stub(ArcGisUtilities, "getServiceJson").callsFake(async function _(_url: string, _formatId: string, _userName?: string, _password?: string, _ignoreCache?: boolean, _requireToken?: boolean) {
+      return {accessTokenRequired: false, content:{capabilities: "Query"}};
     });
     sandbox.stub((ArcGisFeatureProvider.prototype as any), "getLayerMetadata").callsFake(async function (_id: number) {
       return undefined;
@@ -176,8 +176,8 @@ describe("ArcGisFeatureProvider", () => {
       return {defaultVisibility:true, supportedQueryFormats:"PBF, JSON"};
     });
 
-    const getServiceJsonStub = sandbox.stub(ArcGisUtilities, "getServiceJson").callsFake(async function _(_url: string, _formatId: string, _userName?: string, _password?: string, _ignoreCache?: boolean) {
-      return {capabilities: "Query"};
+    const getServiceJsonStub = sandbox.stub(ArcGisUtilities, "getServiceJson").callsFake(async function _(_url: string, _formatId: string, _userName?: string, _password?: string, _ignoreCache?: boolean, _requireToken?: boolean) {
+      return {accessTokenRequired: false, content: {capabilities: "Query"}};
     });
 
     let provider = new ArcGisFeatureProvider(settings);
@@ -186,8 +186,8 @@ describe("ArcGisFeatureProvider", () => {
 
     // PBF requires 'supportsCoordinatesQuantization'
     getServiceJsonStub.restore();
-    sandbox.stub(ArcGisUtilities, "getServiceJson").callsFake(async function _(_url: string, _formatId: string, _userName?: string, _password?: string, _ignoreCache?: boolean) {
-      return { currentVersion: 11, capabilities: "Query"};
+    sandbox.stub(ArcGisUtilities, "getServiceJson").callsFake(async function _(_url: string, _formatId: string, _userName?: string, _password?: string, _ignoreCache?: boolean, _requireToken?: boolean) {
+      return {accessTokenRequired: false, content: { currentVersion: 11, capabilities: "Query"}};
     });
     getLayerMetadataStub.restore();
     getLayerMetadataStub = sandbox.stub((ArcGisFeatureProvider.prototype as any), "getLayerMetadata").callsFake(async function (_id: number) {
@@ -204,8 +204,8 @@ describe("ArcGisFeatureProvider", () => {
     });
 
     getServiceJsonStub.restore();
-    sandbox.stub(ArcGisUtilities, "getServiceJson").callsFake(async function _(_url: string, _formatId: string, _userName?: string, _password?: string, _ignoreCache?: boolean) {
-      return { currentVersion: 10.91, capabilities: "Query", supportsCoordinatesQuantization:true};
+    sandbox.stub(ArcGisUtilities, "getServiceJson").callsFake(async function _(_url: string, _formatId: string, _userName?: string, _password?: string, _ignoreCache?: boolean, _requireToken?: boolean) {
+      return {accessTokenRequired: false, content: { currentVersion: 10.91, capabilities: "Query", supportsCoordinatesQuantization:true}};
     });
 
     provider = new ArcGisFeatureProvider(settings);
@@ -246,8 +246,8 @@ describe("ArcGisFeatureProvider", () => {
       };
     });
 
-    sandbox.stub(ArcGisUtilities, "getServiceJson").callsFake(async function _(_url: string, _formatId: string, _userName?: string, _password?: string, _ignoreCache?: boolean) {
-      return {capabilities: "Query"};
+    sandbox.stub(ArcGisUtilities, "getServiceJson").callsFake(async function _(_url: string, _formatId: string, _userName?: string, _password?: string, _ignoreCache?: boolean, _requireToken?: boolean) {
+      return {accessTokenRequired: false, content:{capabilities: "Query"}};
     });
 
     const provider = new ArcGisFeatureProvider(settings);
@@ -279,8 +279,8 @@ describe("ArcGisFeatureProvider", () => {
       };
     });
 
-    sandbox.stub(ArcGisUtilities, "getServiceJson").callsFake(async function _(_url: string, _formatId: string, _userName?: string, _password?: string, _ignoreCache?: boolean) {
-      return {currentVersion: 11, capabilities: "Query"};
+    sandbox.stub(ArcGisUtilities, "getServiceJson").callsFake(async function _(_url: string, _formatId: string, _userName?: string, _password?: string, _ignoreCache?: boolean, _requireToken?: boolean) {
+      return {accessTokenRequired: false, content:{currentVersion: 11, capabilities: "Query"}};
     });
 
     const provider = new ArcGisFeatureProvider(settings);
@@ -379,8 +379,8 @@ describe("ArcGisFeatureProvider", () => {
       };
     });
 
-    sandbox.stub(ArcGisUtilities, "getServiceJson").callsFake(async function _(_url: string, _formatId: string, _userName?: string, _password?: string, _ignoreCache?: boolean) {
-      return {currentVersion: 11, capabilities: "Query"};
+    sandbox.stub(ArcGisUtilities, "getServiceJson").callsFake(async function _(_url: string, _formatId: string, _userName?: string, _password?: string, _ignoreCache?: boolean, _requireToken?: boolean) {
+      return {accessTokenRequired: false, content:{currentVersion: 11, capabilities: "Query"}};
     });
     sandbox.stub(ArcGisFeatureProvider.prototype, "constructFeatureUrl").callsFake(function _(_row: number, _column: number, _zoomLevel: number, _format: ArcGisFeatureFormat, _geomOverride?: ArcGisGeometry, _outFields?: string, _tolerance?: number, _returnGeometry?: boolean) {
       return undefined;
@@ -413,8 +413,8 @@ describe("ArcGisFeatureProvider", () => {
       };
     });
 
-    sandbox.stub(ArcGisUtilities, "getServiceJson").callsFake(async function _(_url: string, _formatId: string, _userName?: string, _password?: string, _ignoreCache?: boolean) {
-      return {currentVersion: 11, capabilities: "Query"};
+    sandbox.stub(ArcGisUtilities, "getServiceJson").callsFake(async function _(_url: string, _formatId: string, _userName?: string, _password?: string, _ignoreCache?: boolean, _requireToken?: boolean) {
+      return {accessTokenRequired: false, content:{currentVersion: 11, capabilities: "Query"}};
     });
     sandbox.stub((ArcGISImageryProvider.prototype as any), "fetch").callsFake(async  function _(_url: URL, _options?: RequestInit) {
       const test = {
@@ -452,8 +452,8 @@ describe("ArcGisFeatureProvider", () => {
         maxScale: 5000,
       };
     });
-    sandbox.stub(ArcGisUtilities, "getServiceJson").callsFake(async function _(_url: string, _formatId: string, _userName?: string, _password?: string, _ignoreCache?: boolean) {
-      return {capabilities: "Query"};
+    sandbox.stub(ArcGisUtilities, "getServiceJson").callsFake(async function _(_url: string, _formatId: string, _userName?: string, _password?: string, _ignoreCache?: boolean, _requireToken?: boolean) {
+      return {accessTokenRequired: false, content:{capabilities: "Query"}};
     });
 
     sandbox.stub((ArcGisFeatureResponse.prototype as any), "getResponseData").callsFake(async  function _() {
@@ -484,8 +484,8 @@ describe("ArcGisFeatureProvider", () => {
         maxScale: 5000,
       };
     });
-    sandbox.stub(ArcGisUtilities, "getServiceJson").callsFake(async function _(_url: string, _formatId: string, _userName?: string, _password?: string, _ignoreCache?: boolean) {
-      return {capabilities: "Query"};
+    sandbox.stub(ArcGisUtilities, "getServiceJson").callsFake(async function _(_url: string, _formatId: string, _userName?: string, _password?: string, _ignoreCache?: boolean, _requireToken?: boolean) {
+      return {accessTokenRequired: false, content:{capabilities: "Query"}};
     });
 
     sandbox.stub((ArcGisFeatureResponse.prototype as any), "getResponseData").callsFake(async  function _() {
@@ -516,8 +516,8 @@ describe("ArcGisFeatureProvider", () => {
         maxScale: 5000,
       };
     });
-    sandbox.stub(ArcGisUtilities, "getServiceJson").callsFake(async function _(_url: string, _formatId: string, _userName?: string, _password?: string, _ignoreCache?: boolean) {
-      return {capabilities: "Query"};
+    sandbox.stub(ArcGisUtilities, "getServiceJson").callsFake(async function _(_url: string, _formatId: string, _userName?: string, _password?: string, _ignoreCache?: boolean, _requireToken?: boolean) {
+      return {accessTokenRequired: false, content:{capabilities: "Query"}};
     });
 
     sandbox.stub((ArcGisFeatureResponse.prototype as any), "getResponseData").callsFake(async  function _() {
@@ -597,8 +597,8 @@ describe("ArcGisFeatureProvider", () => {
         supportsCoordinatesQuantization:true,
       };
     });
-    sandbox.stub(ArcGisUtilities, "getServiceJson").callsFake(async function _(_url: string, _formatId: string, _userName?: string, _password?: string, _ignoreCache?: boolean) {
-      return {currentVersion: 11, capabilities: "Query"};
+    sandbox.stub(ArcGisUtilities, "getServiceJson").callsFake(async function _(_url: string, _formatId: string, _userName?: string, _password?: string, _ignoreCache?: boolean, _requireToken?: boolean) {
+      return {accessTokenRequired: false, content:{currentVersion: 11, capabilities: "Query"}};
     });
     sandbox.stub(HTMLCanvasElement.prototype, "getContext").callsFake( function _(_contextId: any, _options?: any) {
       return {} as RenderingContext;
@@ -646,8 +646,8 @@ describe("ArcGisFeatureProvider", () => {
         supportedQueryFormats:"JSON",
       };
     });
-    sandbox.stub(ArcGisUtilities, "getServiceJson").callsFake(async function _(_url: string, _formatId: string, _userName?: string, _password?: string, _ignoreCache?: boolean) {
-      return {capabilities: "Query"};
+    sandbox.stub(ArcGisUtilities, "getServiceJson").callsFake(async function _(_url: string, _formatId: string, _userName?: string, _password?: string, _ignoreCache?: boolean, _requireToken?: boolean) {
+      return {accessTokenRequired: false, content:{capabilities: "Query"}};
     });
     sandbox.stub(HTMLCanvasElement.prototype, "getContext").callsFake( function _(_contextId: any, _options?: any) {
       return {} as RenderingContext;
@@ -693,8 +693,8 @@ describe("ArcGisFeatureProvider", () => {
         supportedQueryFormats:"JSON",
       };
     });
-    sandbox.stub(ArcGisUtilities, "getServiceJson").callsFake(async function _(_url: string, _formatId: string, _userName?: string, _password?: string, _ignoreCache?: boolean) {
-      return {capabilities: "Query"};
+    sandbox.stub(ArcGisUtilities, "getServiceJson").callsFake(async function _(_url: string, _formatId: string, _userName?: string, _password?: string, _ignoreCache?: boolean, _requireToken?: boolean) {
+      return {accessTokenRequired: false, content:{capabilities: "Query"}};
     });
     sandbox.stub(HTMLCanvasElement.prototype, "getContext").callsFake( function _(_contextId: any, _options?: any) {
       return {} as RenderingContext;
@@ -783,8 +783,8 @@ describe("ArcGisFeatureProvider", () => {
         supportedQueryFormats:"JSON",
       };
     });
-    sandbox.stub(ArcGisUtilities, "getServiceJson").callsFake(async function _(_url: string, _formatId: string, _userName?: string, _password?: string, _ignoreCache?: boolean) {
-      return {capabilities: "Query"};
+    sandbox.stub(ArcGisUtilities, "getServiceJson").callsFake(async function _(_url: string, _formatId: string, _userName?: string, _password?: string, _ignoreCache?: boolean, _requireToken?: boolean) {
+      return {accessTokenRequired: false, content:{capabilities: "Query"}};
     });
     const fetchStub = sandbox.stub((ArcGISImageryProvider.prototype as any), "fetch");