npm - @itwin/map-layers-formats - Versions diffs - 3.5.0-dev.52 → 3.5.0-dev.57 - Mend

@itwin/map-layers-formats 3.5.0-dev.52 → 3.5.0-dev.57

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (71) hide show

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

	@@ -1 +1 @@
1	- {"version":3,"file":"ArcGisFeatureProvider.d.ts","sourceRoot":"","sources":["../../../src/ArcGisFeature/ArcGisFeatureProvider.ts"],"names":[],"mappings":"AAKA,OAAO,EAAE,YAAY,EAAE,qBAAqB,EAAE,WAAW,EAAkC,MAAM,oBAAoB,CAAC;AAEtH,OAAO,~~EAAqB~~,SAAS,EAAE,MAAM,sBAAsB,CAAC;~~AACpE~~,OAAO,EAAmB,qBAAqB,EAAmB,kBAAkB,~~EAAE~~,mBAAmB,EAAiC,MAAM,EAAE,MAAM,sBAAsB,CAAC;~~AAE/K~~,OAAO,EAAE,YAAY,EAAE,mBAAmB,EAAsB,cAAc,EAAkC,MAAM,sBAAsB,CAAC;AAO7I;;EAEE;AACF,UAAU,gBAAgB;IACxB,GAAG,EAAE,MAAM,CAAC;IACZ,QAAQ,CAAC,EAAE,YAAY,CAAC;CACzB;AAED;;EAEE;AACF,qBAAa,qBAAsB,SAAQ,qBAAqB;IAE9D,OAAO,CAAC,cAAc,CAAS;IAC/B,OAAO,CAAC,iBAAiB,CAAS;IAElC,OAAO,CAAC,gCAAgC,CAAS;IACjD,OAAO,CAAC,eAAe,CAAS;IAChC,OAAO,CAAC,QAAQ,CAAK;IACrB,OAAO,CAAC,cAAc,CAAM;IAC5B,OAAO,CAAC,OAAO,CAAgC;IACxC,WAAW,EAAE,GAAG,CAAC;IACxB,OAAO,CAAC,kBAAkB,CAAoC;IAC9D,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,WAAW,CAAK;IACxC,OAAO,CAAC,MAAM,CAAU;IAExB,OAAO,CAAC,gBAAgB,CAAK;IAC7B,OAAO,CAAC,gBAAgB,CAAK;IAC7B,IAAoB,gBAAgB,IAAI,MAAM,CAAkC;IAChF,IAAoB,gBAAgB,IAAI,MAAM,CAAkC;gBAEpE,QAAQ,EAAE,qBAAqB;IAIrB,UAAU,IAAI,OAAO,CAAC,IAAI,CAAC;~~cA2HjC~~,gBAAgB,CAAC,OAAO,EAAE,MAAM;IAYhD,IAAoB,QAAQ,IAAI,MAAM,CAAgB;IACtD,IAAW,MAAM,IAAI,mBAAmB,GAAC,SAAS,CAAyB;IAG9D,YAAY,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;IAItF,mBAAmB,CAAC,GAAG,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,EAAE,MAAM,EAAE,mBAAmB,EAAE,YAAY,CAAC,EAAE,cAAc,EAAE,SAAS,CAAC,EAAE,MAAM,EAAE,SAAS,CAAC,EAAE,MAAM,EAAE,cAAc,CAAC,EAAE,OAAO,GAAG,gBAAgB,GAAG,SAAS;IAyD/M,cAAc,CAAC,YAAY,EAAE,mBAAmB,EAAE,EAAE,MAAM,EAAE,MAAM,EAAE,KAAK,EAAE,YAAY,EAAE,KAAK,EAAE,kBAAkB,GAAG,OAAO,CAAC,IAAI,CAAC;YA4D3I,SAAS;~~IAoBf~~,iBAAiB,CAAC,GAAG,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,EAAE,OAAO,EAAE,wBAAwB;IAU3G,SAAS,CAAC,gCAAgC,CAAC,GAAG,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM;IAsBnE,QAAQ,CAAC,GAAG,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,WAAW,GAAG,SAAS,CAAC;CA6GjH"}
1	+ {"version":3,"file":"ArcGisFeatureProvider.d.ts","sourceRoot":"","sources":["../../../src/ArcGisFeature/ArcGisFeatureProvider.ts"],"names":[],"mappings":"AAKA,OAAO,EAAE,YAAY,EAAE,qBAAqB,EAAE,WAAW,EAAkC,MAAM,oBAAoB,CAAC;AAEtH,OAAO,EAA8B,SAAS,EAAE,MAAM,sBAAsB,CAAC;AAC7E,OAAO,EAAmB,qBAAqB,EAAmB,kBAAkB,EAAqB,mBAAmB,EAAiC,MAAM,EAAE,MAAM,sBAAsB,CAAC;AAElM,OAAO,EAAE,YAAY,EAAE,mBAAmB,EAAsB,cAAc,EAAkC,MAAM,sBAAsB,CAAC;AAO7I;;EAEE;AACF,UAAU,gBAAgB;IACxB,GAAG,EAAE,MAAM,CAAC;IACZ,QAAQ,CAAC,EAAE,YAAY,CAAC;CACzB;AAED;;EAEE;AACF,qBAAa,qBAAsB,SAAQ,qBAAqB;IAE9D,OAAO,CAAC,cAAc,CAAS;IAC/B,OAAO,CAAC,iBAAiB,CAAS;IAElC,OAAO,CAAC,gCAAgC,CAAS;IACjD,OAAO,CAAC,eAAe,CAAS;IAChC,OAAO,CAAC,QAAQ,CAAK;IACrB,OAAO,CAAC,cAAc,CAAM;IAC5B,OAAO,CAAC,OAAO,CAAgC;IACxC,WAAW,EAAE,GAAG,CAAC;IACxB,OAAO,CAAC,kBAAkB,CAAoC;IAC9D,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,WAAW,CAAK;IACxC,OAAO,CAAC,MAAM,CAAU;IAExB,OAAO,CAAC,gBAAgB,CAAK;IAC7B,OAAO,CAAC,gBAAgB,CAAK;IAC7B,IAAoB,gBAAgB,IAAI,MAAM,CAAkC;IAChF,IAAoB,gBAAgB,IAAI,MAAM,CAAkC;gBAEpE,QAAQ,EAAE,qBAAqB;IAIrB,UAAU,IAAI,OAAO,CAAC,IAAI,CAAC;cAsJjC,gBAAgB,CAAC,OAAO,EAAE,MAAM;IAYhD,IAAoB,QAAQ,IAAI,MAAM,CAAgB;IACtD,IAAW,MAAM,IAAI,mBAAmB,GAAC,SAAS,CAAyB;IAG9D,YAAY,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;IAItF,mBAAmB,CAAC,GAAG,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,EAAE,MAAM,EAAE,mBAAmB,EAAE,YAAY,CAAC,EAAE,cAAc,EAAE,SAAS,CAAC,EAAE,MAAM,EAAE,SAAS,CAAC,EAAE,MAAM,EAAE,cAAc,CAAC,EAAE,OAAO,GAAG,gBAAgB,GAAG,SAAS;IAyD/M,cAAc,CAAC,YAAY,EAAE,mBAAmB,EAAE,EAAE,MAAM,EAAE,MAAM,EAAE,KAAK,EAAE,YAAY,EAAE,KAAK,EAAE,kBAAkB,GAAG,OAAO,CAAC,IAAI,CAAC;YA4D3I,SAAS;IAiBf,iBAAiB,CAAC,GAAG,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,EAAE,OAAO,EAAE,wBAAwB;IAU3G,SAAS,CAAC,gCAAgC,CAAC,GAAG,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM;IAsBnE,QAAQ,CAAC,GAAG,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,WAAW,GAAG,SAAS,CAAC;CA6GjH"}

package/lib/esm/ArcGisFeature/ArcGisFeatureProvider.js CHANGED Viewed

@@ -4,8 +4,8 @@
 *--------------------------------------------------------------------------------------------*/
 import { ImageSource, ImageSourceFormat, ServerError } from "@itwin/core-common";
 import { assert, base64StringToUint8Array, IModelStatus, Logger } from "@itwin/core-bentley";
-import { Matrix4d, Point3d } from "@itwin/core-geometry";
-import { ArcGisErrorCode, ArcGISImageryProvider, ArcGisUtilities, MapLayerImageryProviderStatus } from "@itwin/core-frontend";
+import { Matrix4d, Point3d, Range2d } from "@itwin/core-geometry";
+import { ArcGisErrorCode, ArcGISImageryProvider, ArcGisUtilities, MapCartoRectangle, MapLayerImageryProviderStatus } from "@itwin/core-frontend";
 import { ArcGisSymbologyRenderer } from "./ArcGisSymbologyRenderer";
 import { ArcGisFeatureQuery } from "./ArcGisFeatureQuery";
 import { ArcGisFeatureRenderer } from "./ArcGisFeatureRenderer";
@@ -32,7 +32,7 @@ export class ArcGisFeatureProvider extends ArcGISImageryProvider {
     get minimumZoomLevel() { return this._minDepthFromLod; }
     get maximumZoomLevel() { return this._maxDepthFromLod; }
     async initialize() {
-        var _a, _b, _c, _d, _f, _g, _h;
+        var _a, _b, _c, _d, _f, _g, _h, _j, _k;
         let json;
         try {
             json = await ArcGisUtilities.getServiceJson(this._settings.url, this._settings.formatId, this._settings.userName, this._settings.password);
@@ -108,11 +108,27 @@ export class ArcGisFeatureProvider extends ArcGISImageryProvider {
                 throw new ServerError(IModelStatus.ValidationFailed, "");
             }
         }
+        // Parse server version
+        let majorVersion;
+        if ((_c = this.serviceJson) === null || _c === void 0 ? void 0 : _c.currentVersion) {
+            try {
+                majorVersion = Math.trunc((_d = this.serviceJson) === null || _d === void 0 ? void 0 : _d.currentVersion);
+            }
+            catch {
+            }
+        }
+        // Coordinates Quantization:  If supported, server will transform for us the coordinates in the Tile coordinate space (pixels, origin = upper left corner
+        // If not supported, transformation will be applied client side.
+        // Note: For some reasons, even though 'supportsCoordinatesQuantization' is set to 'true' on the layer metadata, server will give an error message for server version < 11
+        if (majorVersion && majorVersion >= 11 && this._layerMetadata.supportsCoordinatesQuantization) {
+            this._supportsCoordinatesQuantization = true;
+        }
         // Check supported query formats: JSON and PBF are currently implemented by this provider
         // Note: needs to be checked on the layer metadata, service metadata advertises a different set of formats
+        //       Also, since PBF format does not support floating points, there is no point using this format if supportsCoordinatesQuantization is not available.
         if (this._layerMetadata.supportedQueryFormats) {
             const formats = this._layerMetadata.supportedQueryFormats.split(", ");
-            if (formats.includes("PBF")) {
+            if (formats.includes("PBF") && this._supportsCoordinatesQuantization) {
                 this._format = "PBF";
             }
             else if (formats.includes("JSON")) {
@@ -120,23 +136,32 @@ export class ArcGisFeatureProvider extends ArcGISImageryProvider {
             }
         }
         if (!this._format) {
-            Logger.logError(loggerCategory, "Could not get service JSON");
+            Logger.logError(loggerCategory, "Could not get request format from service JSON");
             throw new ServerError(IModelStatus.ValidationFailed, "");
         }
-        // Coordinates Quantization:  If supported, server will transform for us the coordinates in the Tile coordinate space (pixels, origin = upper left corner
-        // If not supported, transformation will be applied client side.
-        if (this._layerMetadata.supportsCoordinatesQuantization) {
-            this._supportsCoordinatesQuantization = true;
+        // Read range using full extent from service metadata
+        if (json.fullExtent) {
+            if (json.fullExtent.spatialReference.latestWkid === 3857 || json.fullExtent.spatialReference.wkid === 102100) {
+                const range3857 = Range2d.createFrom({
+                    low: { x: json.fullExtent.xmin, y: json.fullExtent.ymin },
+                    high: { x: json.fullExtent.xmax, y: json.fullExtent.ymax }
+                });
+                const west = this.getEPSG4326Lon(range3857.xLow);
+                const south = this.getEPSG4326Lat(range3857.yLow);
+                const east = this.getEPSG4326Lon(range3857.xHigh);
+                const north = this.getEPSG4326Lat(range3857.yHigh);
+                this.cartoRange = MapCartoRectangle.fromDegrees(west, south, east, north);
+            }
         }
         // Check for minScale / max scale
-        const minScale = ((_c = this._layerMetadata) === null || _c === void 0 ? void 0 : _c.minScale) || undefined; // undefined, 0 -> undefined
-        const maxScale = ((_d = this._layerMetadata) === null || _d === void 0 ? void 0 : _d.maxScale) || undefined; // undefined, 0 -> undefined
-        const scales = ArcGisUtilities.getZoomLevelsScales(this.defaultMaximumZoomLevel, this.tileSize, minScale, maxScale);
+        const minScale = ((_f = this._layerMetadata) === null || _f === void 0 ? void 0 : _f.minScale) || undefined; // undefined, 0 -> undefined
+        const maxScale = ((_g = this._layerMetadata) === null || _g === void 0 ? void 0 : _g.maxScale) || undefined; // undefined, 0 -> undefined
+        const scales = ArcGisUtilities.getZoomLevelsScales(this.defaultMaximumZoomLevel, this.tileSize, minScale, maxScale, 1.0);
         if (scales.minLod)
             this._minDepthFromLod = scales.minLod;
-        if (scales.maxLod)
-            this._maxDepthFromLod = scales.maxLod;
-        this._symbologyRenderer = new ArcGisSymbologyRenderer((_f = this._layerMetadata) === null || _f === void 0 ? void 0 : _f.geometryType, (_h = (_g = this._layerMetadata) === null || _g === void 0 ? void 0 : _g.drawingInfo) === null || _h === void 0 ? void 0 : _h.renderer);
+        // Some servers advertises a max LOD of 0, it should be interpreted as 'not defined' (otherwise a max lod of 0 would would mean never display anything)
+        this._maxDepthFromLod = (scales.maxLod ? scales.maxLod : this.defaultMaximumZoomLevel);
+        this._symbologyRenderer = new ArcGisSymbologyRenderer((_h = this._layerMetadata) === null || _h === void 0 ? void 0 : _h.geometryType, (_k = (_j = this._layerMetadata) === null || _j === void 0 ? void 0 : _j.drawingInfo) === null || _k === void 0 ? void 0 : _k.renderer);
     }
     async getLayerMetadata(layerId) {
         let json;
@@ -165,7 +190,7 @@ export class ArcGisFeatureProvider extends ArcGISImageryProvider {
         // Actual spatial filter.
         // By default, we request the tile extent.  If 'cartoPoint' is specified,
         // we restrict the spatial to specific point. (i.e. GetFeatureInfo requests)
-        // We a refine envelope is provided, it has the priority over 'cartoPoint'
+        // If envelope is provided, it has the priority over 'cartoPoint'
         let geometry;
         if (geomOverride) {
             geometry = geomOverride;
@@ -266,9 +291,6 @@ export class ArcGisFeatureProvider extends ArcGISImageryProvider {
             return undefined;
         }
         const response = this.fetch(new URL(tileUrl.url), { method: "GET" });
-        // if ((await response).status !== 200){
-        //   return undefined;
-        // }
         return new ArcGisFeatureResponse(this.format, response, tileUrl.envelope);
     }
     drawTileDebugInfo(row, column, zoomLevel, context) {

package/lib/esm/ArcGisFeature/ArcGisFeatureProvider.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"ArcGisFeatureProvider.js","sourceRoot":"","sources":["../../../src/ArcGisFeature/ArcGisFeatureProvider.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 { Cartographic, ImageMapLayerSettings, ImageSource, ImageSourceFormat, ServerError } from \"@itwin/core-common\";\r\nimport { assert, base64StringToUint8Array, IModelStatus, Logger } from \"@itwin/core-bentley\";\r\nimport { Matrix4d, Point3d, Transform } from \"@itwin/core-geometry\";\r\nimport { ArcGisErrorCode, ArcGISImageryProvider, ArcGisUtilities, ImageryMapTileTree, MapLayerFeatureInfo, MapLayerImageryProviderStatus, QuadId } from \"@itwin/core-frontend\";\r\nimport { ArcGisSymbologyRenderer } from \"./ArcGisSymbologyRenderer\";\r\nimport { ArcGisExtent, ArcGisFeatureFormat, ArcGisFeatureQuery, ArcGisGeometry, FeatureQueryQuantizationParams } from \"./ArcGisFeatureQuery\";\r\nimport { ArcGisFeatureRenderer } from \"./ArcGisFeatureRenderer\";\r\nimport { ArcGisFeaturePBF } from \"./ArcGisFeaturePBF\";\r\nimport { ArcGisFeatureJSON } from \"./ArcGisFeatureJSON\";\r\nimport { ArcGisFeatureResponse, ArcGisResponseData } from \"./ArcGisFeatureResponse\";\r\nimport { ArcGisFeatureReader } from \"./ArcGisFeatureReader\";\r\nconst loggerCategory = \"MapLayersFormats.ArcGISFeature\";\r\n/*\r\n @internal\r\n/\r\ninterface ArcGisFeatureUrl {\r\n url: string;\r\n envelope?: ArcGisExtent; // envelope representing the current computed URL, requiered to refine request.\r\n}\r\n\r\n/* Provide tiles from a ESRI ArcGIS Feature service\r\n* @internal\r\n/\r\nexport class ArcGisFeatureProvider extends ArcGISImageryProvider {\r\n // Debug flags, should always be commited to FALSE !\r\n private _drawDebugInfo = false;\r\n private _debugFeatureGeom = false;\r\n\r\n private _supportsCoordinatesQuantization = false;\r\n private _querySupported = false;\r\n private _layerId = 0;\r\n private _layerMetadata: any;\r\n private _format: ArcGisFeatureFormat\|undefined;\r\n public serviceJson: any;\r\n private _symbologyRenderer: ArcGisSymbologyRenderer\|undefined;\r\n private static readonly _nbSubTiles = 2;\r\n private _outSR = 102100;\r\n\r\n private _maxDepthFromLod = 0;\r\n private _minDepthFromLod = 0;\r\n public override get minimumZoomLevel(): number { return this._minDepthFromLod; }\r\n public override get maximumZoomLevel(): number { return this._maxDepthFromLod; }\r\n\r\n constructor(settings: ImageMapLayerSettings) {\r\n super(settings, true);\r\n }\r\n\r\n public override async initialize(): Promise<void> {\r\n\r\n let json;\r\n try {\r\n json = await ArcGisUtilities.getServiceJson(this._settings.url, this._settings.formatId, this._settings.userName, this._settings.password);\r\n\r\n } catch (_e) {\r\n\r\n }\r\n\r\n if (json === undefined) {\r\n Logger.logError(loggerCategory, \"Could not get service JSON\");\r\n throw new ServerError(IModelStatus.ValidationFailed, \"\");\r\n }\r\n\r\n if (json?.error?.code === ArcGisErrorCode.TokenRequired \|\| json?.error?.code === ArcGisErrorCode.InvalidToken) {\r\n // Check again layer status, it might have change during await.\r\n if (this.status === MapLayerImageryProviderStatus.Valid) {\r\n this.status = MapLayerImageryProviderStatus.RequireAuth;\r\n this.onStatusChanged.raiseEvent(this);\r\n return;\r\n }\r\n }\r\n\r\n if (json.capabilities) {\r\n this._querySupported = json.capabilities.indexOf(\"Query\") >= 0;\r\n if (!this._querySupported)\r\n throw new ServerError(IModelStatus.ValidationFailed, \"\");\r\n }\r\n\r\n this.serviceJson = json;\r\n\r\n let foundVisibleSubLayer = false;\r\n if (this._settings.subLayers.length >= 0) {\r\n // There is more than sub-layer for this layer, pick the first visible one.\r\n for (const layer of this._settings.subLayers) {\r\n if (layer.visible && typeof layer.id === \"number\") {\r\n this._layerId = layer.id;\r\n foundVisibleSubLayer = true;\r\n break;\r\n }\r\n }\r\n }\r\n\r\n if (!foundVisibleSubLayer && json !== undefined) {\r\n // No suitable sublayer was specified on the layerSettings object, lets find a default one in the capabilities\r\n\r\n // Check layer metadata\r\n if (Array.isArray(this.serviceJson.layers) && this.serviceJson.layers.length >= 1) {\r\n\r\n const hasDefaultVisibility = Object.keys(this.serviceJson.layers[0]).includes(\"defaultVisibility\");\r\n if (hasDefaultVisibility) {\r\n for (const layer of this.serviceJson.layers) {\r\n if (layer.defaultVisibility) {\r\n this._layerId = layer.id;\r\n }\r\n }\r\n } else {\r\n // On some older servers, the default visiblity is on the layer capabilities (i.e. not the service capabilities)\r\n for (const layer of this.serviceJson.layers) {\r\n const layerJson = await this.getLayerMetadata(layer.id);\r\n if (!layerJson) {\r\n continue;\r\n }\r\n\r\n if (layerJson.defaultVisibility) {\r\n this._layerId = layer.id;\r\n this._layerMetadata = layerJson;\r\n break;\r\n }\r\n }\r\n }\r\n\r\n } else {\r\n // There is no layer to publish? Something is off with this server..\r\n throw new ServerError(IModelStatus.ValidationFailed, \"\");\r\n }\r\n }\r\n\r\n // Make sure we cache layer info (i.e. rendering info)\r\n if (!this._layerMetadata) {\r\n\r\n this._layerMetadata = await this.getLayerMetadata(this._layerId);\r\n if (!this._layerMetadata) {\r\n Logger.logError(loggerCategory, \"Could not layer metadata\");\r\n throw new ServerError(IModelStatus.ValidationFailed, \"\");\r\n }\r\n }\r\n\r\n // Check supported query formats: JSON and PBF are currently implemented by this provider\r\n // Note: needs to be checked on the layer metadata, service metadata advertises a different set of formats\r\n if (this._layerMetadata.supportedQueryFormats) {\r\n const formats: string[] = this._layerMetadata.supportedQueryFormats.split(\", \");\r\n if (formats.includes(\"PBF\")) {\r\n this._format = \"PBF\";\r\n } else if (formats.includes (\"JSON\")) {\r\n this._format = \"JSON\";\r\n }\r\n }\r\n\r\n if (!this._format) {\r\n Logger.logError(loggerCategory, \"Could not get service JSON\");\r\n throw new ServerError(IModelStatus.ValidationFailed, \"\");\r\n }\r\n\r\n // Coordinates Quantization: If supported, server will transform for us the coordinates in the Tile coordinate space (pixels, origin = upper left corner\r\n // If not supported, transformation will be applied client side.\r\n if (this._layerMetadata.supportsCoordinatesQuantization) {\r\n this._supportsCoordinatesQuantization = true;\r\n }\r\n\r\n // Check for minScale / max scale\r\n const minScale = this._layerMetadata?.minScale \|\| undefined; // undefined, 0 -> undefined\r\n const maxScale = this._layerMetadata?.maxScale \|\| undefined; // undefined, 0 -> undefined\r\n const scales = ArcGisUtilities.getZoomLevelsScales(this.defaultMaximumZoomLevel, this.tileSize, minScale, maxScale);\r\n if (scales.minLod)\r\n this._minDepthFromLod = scales.minLod;\r\n if (scales.maxLod)\r\n this._maxDepthFromLod = scales.maxLod;\r\n\r\n this._symbologyRenderer = new ArcGisSymbologyRenderer(this._layerMetadata?.geometryType, this._layerMetadata?.drawingInfo?.renderer);\r\n }\r\n\r\n protected async getLayerMetadata(layerId: number) {\r\n let json;\r\n try {\r\n const url = new URL(this._settings.url);\r\n url.pathname = `${url.pathname}/${layerId}`;\r\n json = await ArcGisUtilities.getServiceJson(url.toString(), this._settings.formatId, this._settings.userName, this._settings.password);\r\n } catch {\r\n\r\n }\r\n return json;\r\n }\r\n\r\n public override get tileSize(): number { return 512; }\r\n public get format(): ArcGisFeatureFormat\|undefined { return this._format; }\r\n\r\n // We don't use this method inside this provider (see constructFeatureUrl), but since this is an abstract method, we need to define something\r\n public async constructUrl(_row: number, _column: number, _zoomLevel: number): Promise<string> {\r\n return \"\";\r\n }\r\n\r\n public constructFeatureUrl(row: number, column: number, zoomLevel: number, format: ArcGisFeatureFormat, geomOverride?: ArcGisGeometry, outFields?: string, tolerance?: number, returnGeometry?: boolean): ArcGisFeatureUrl \| undefined {\r\n\r\n const tileExtent = this.getEPSG3857Extent(row, column, zoomLevel);\r\n const tileEnvelope = {\r\n xmin: tileExtent.left, ymin: tileExtent.bottom,\r\n xmax: tileExtent.right, ymax: tileExtent.top,\r\n spatialReference: {wkid:102100, latestWkid:3857},\r\n };\r\n\r\n // Actual spatial filter.\r\n // By default, we request the tile extent. If 'cartoPoint' is specified,\r\n // we restrict the spatial to specific point. (i.e. GetFeatureInfo requests)\r\n // We a refine envelope is provided, it has the priority over 'cartoPoint'\r\n let geometry: ArcGisGeometry\|undefined;\r\n if (geomOverride) {\r\n geometry = geomOverride;\r\n } else {\r\n geometry = {geom: tileEnvelope, type: \"esriGeometryEnvelope\"};\r\n }\r\n\r\n let quantizationParameters: FeatureQueryQuantizationParams\|undefined;\r\n const toleranceWorld = (tileExtent.top - tileExtent.bottom) / this.tileSize;\r\n if (this._supportsCoordinatesQuantization) {\r\n quantizationParameters = {\r\n mode: \"view\",\r\n originPosition: \"upperLeft\",\r\n tolerance: toleranceWorld, // pixel size in world units\r\n extent: tileEnvelope,\r\n };\r\n }\r\n const url = new ArcGisFeatureQuery(\r\n this._settings.url,\r\n this._layerId,\r\n format,\r\n this._outSR,\r\n { geometry,\r\n geometryType: \"esriGeometryEnvelope\",\r\n returnExceededLimitFeatures: false,\r\n maxRecordCountFactor: 3, // This was grabbed from the ESRI web viewer request, not sure where this factor come from\r\n resultType: \"tile\",\r\n quantizationParameters,\r\n outFields,\r\n returnGeometry,\r\n distance: (tolerance ? tolerancetoleranceWorld :undefined) });\r\n\r\n let envelope: ArcGisExtent \| undefined;\r\n if (geomOverride && geomOverride.type === \"esriGeometryEnvelope\"){\r\n envelope = geomOverride.geom as ArcGisExtent;\r\n } else {\r\n envelope = tileEnvelope;\r\n }\r\n\r\n return {url: url.toString(), envelope} ;\r\n\r\n }\r\n\r\n // Makes an identify request to ESRI MapService , and return it as a list MapLayerFeatureInfo object\r\n public override async getFeatureInfo(featureInfos: MapLayerFeatureInfo[], quadId: QuadId, carto: Cartographic, _tree: ImageryMapTileTree): Promise<void> {\r\n if (!this._querySupported \|\| this.format === undefined)\r\n return;\r\n\r\n const cartoPoint = {\r\n x: this.getEPSG3857X(carto.longitudeDegrees),\r\n y: this.getEPSG3857Y(carto.latitudeDegrees),\r\n spatialReference: {wkid:102100, latestWkid:3857},\r\n };\r\n\r\n const doFeatureInfoQuery = async (format: ArcGisFeatureFormat, outFields?: string, returnGeometry?: boolean,) => {\r\n const infoUrl = this.constructFeatureUrl(quadId.row, quadId.column, quadId.level, format, {geom: cartoPoint, type: \"esriGeometryPoint\"}, outFields, 3 /* tolerance in pixel/, returnGeometry);\r\n\r\n if (!infoUrl \|\| infoUrl.url.length === 0) {\r\n Logger.logError(loggerCategory, `Could not construct feature info query URL`);\r\n return undefined;\r\n }\r\n\r\n const response = this.fetch(new URL(infoUrl.url), { method: \"GET\" });\r\n\r\n const featureResponse = new ArcGisFeatureResponse(format, response);\r\n return featureResponse.getResponseData();\r\n };\r\n\r\n if (this._debugFeatureGeom) {\r\n try {\r\n let responseData = await doFeatureInfoQuery(\"PBF\", \"\", true);\r\n if (responseData) {\r\n Logger.logInfo(loggerCategory, JSON.stringify(responseData.data.toObject()));\r\n }\r\n responseData = await doFeatureInfoQuery(\"JSON\", \"\", true);\r\n if (responseData) {\r\n Logger.logInfo(loggerCategory, JSON.stringify(responseData.data));\r\n }\r\n } catch (e) {\r\n Logger.logInfo(loggerCategory, `Error occured with debug FeatureInfo: ${e}`);\r\n }\r\n }\r\n\r\n try {\r\n const responseData = await doFeatureInfoQuery(this.format, \"\", false);\r\n if (!responseData) {\r\n Logger.logError(loggerCategory, `Could not get feature info data`);\r\n return;\r\n }\r\n if (responseData.exceedTransferLimit) {\r\n Logger.logError(loggerCategory, `Could not get feature info : transfert limit exeeded.`);\r\n return;\r\n }\r\n const featureReader: ArcGisFeatureReader = this.format === \"PBF\" ? new ArcGisFeaturePBF(this._settings, this._layerMetadata) : new ArcGisFeatureJSON(this._settings, this._layerMetadata);\r\n featureReader.readFeatureInfo(responseData, featureInfos);\r\n\r\n } catch (e) {\r\n Logger.logError(loggerCategory, `Exception occured while loading feature info data : ${e}`);\r\n return;\r\n }\r\n\r\n return;\r\n }\r\n\r\n private async fetchTile(row: number, column: number, zoomLevel: number, refineEnvelope?: ArcGisExtent): Promise<ArcGisFeatureResponse \| undefined> {\r\n if (!this.format) {\r\n assert(!\"No supported query format\");\r\n return undefined;\r\n }\r\n\r\n const geomOverride: ArcGisGeometry\|undefined = (refineEnvelope ? {geom: refineEnvelope, type: \"esriGeometryEnvelope\"} : undefined);\r\n const tileUrl = this.constructFeatureUrl(row, column, zoomLevel, this.format, geomOverride);\r\n if (!tileUrl \|\| tileUrl.url.length === 0) {\r\n Logger.logError(loggerCategory, `Could not construct feature query URL for tile ${zoomLevel}/${row}/${column}`);\r\n return undefined;\r\n }\r\n\r\n const response = this.fetch(new URL(tileUrl.url), { method: \"GET\" });\r\n // if ((await response).status !== 200){\r\n // return undefined;\r\n // }\r\n return new ArcGisFeatureResponse(this.format, response, tileUrl.envelope);\r\n }\r\n\r\n public drawTileDebugInfo(row: number, column: number, zoomLevel: number, context: CanvasRenderingContext2D ){\r\n context.fillStyle = \"cyan\";\r\n context.strokeRect(0, 0, this.tileSize, this.tileSize);\r\n context.font = \"30px Arial\";\r\n context.lineWidth = 5;\r\n context.fillText(`${zoomLevel}-${row}-${column}`, 10, 50);\r\n }\r\n\r\n // Compute transform that provides coordinates in the canvas coordinate system (pixels, origin = top-left)\r\n // from coordinate in world (i.e EPSG:3857)\r\n protected computeTileWorld2CanvasTransform(row: number, column: number, zoomLevel: number) {\r\n\r\n const tileExtentWorld3857 = this.getEPSG3857Extent(row, column, zoomLevel);\r\n const worldTileWidth = tileExtentWorld3857.right - tileExtentWorld3857.left;\r\n const canvasTileWidth = this.tileSize;\r\n const world2CanvasRatio = canvasTileWidth / worldTileWidth;\r\n const worldTileOrigin = Point3d.create(tileExtentWorld3857.left, tileExtentWorld3857.bottom);\r\n const worldTileExtent = Point3d.create(tileExtentWorld3857.right, tileExtentWorld3857.top);\r\n const canvasTileOriginOffset = worldTileOrigin.clone();\r\n const canvasTileExtentOffset = worldTileExtent.clone();\r\n canvasTileOriginOffset.scaleInPlace(world2CanvasRatio);\r\n canvasTileExtentOffset.scaleInPlace(world2CanvasRatio);\r\n const xTranslate = -1canvasTileOriginOffset.x;\r\n\r\n // Canvas origin is uppler left corner, so we need to flip the y axsis\r\n const yTranslate = canvasTileExtentOffset.y; // y-axis flip\r\n const yWorld2CanvasRatio = -1world2CanvasRatio; // y-axis flip\r\n\r\n const matrix = Matrix4d.createTranslationAndScaleXYZ(xTranslate, yTranslate, 0, world2CanvasRatio, yWorld2CanvasRatio, 1);\r\n return matrix.asTransform;\r\n }\r\n\r\n public override async loadTile(row: number, column: number, zoomLevel: number): Promise<ImageSource \| undefined> {\r\n\r\n if ((this.status === MapLayerImageryProviderStatus.RequireAuth)) {\r\n return undefined;\r\n }\r\n const canvas = document.createElement(\"canvas\");\r\n canvas.width = this.tileSize;\r\n canvas.height = this.tileSize;\r\n\r\n const ctx = canvas.getContext(\"2d\");\r\n if (ctx == null) {\r\n Logger.logError(loggerCategory, \"No canvas context available for loading tile.\");\r\n assert(!\"no canvas context\");\r\n return undefined;\r\n }\r\n\r\n if (!this._symbologyRenderer) {\r\n Logger.logError(loggerCategory, \"No symbology renderer available for loading tile.\");\r\n assert(!\"No symbology renderer\");\r\n return undefined;\r\n }\r\n try {\r\n\r\n // Compute transform if CoordinatesQuantization is not supported by service\r\n let transfo: Transform \| undefined;\r\n if (!this._supportsCoordinatesQuantization) {\r\n transfo = this.computeTileWorld2CanvasTransform(row, column, zoomLevel);\r\n if (!transfo) {\r\n Logger.logError(loggerCategory, `Could not compute data transformation for tile (${zoomLevel}/${row}/${column})`);\r\n assert(!\"Could not compute world to canvas transform\");\r\n }\r\n }\r\n\r\n const renderer = new ArcGisFeatureRenderer(ctx, this._symbologyRenderer, transfo);\r\n const featureReader: ArcGisFeatureReader = this.format === \"PBF\" ? new ArcGisFeaturePBF(this._settings, this._layerMetadata) : new ArcGisFeatureJSON(this._settings, this._layerMetadata);\r\n\r\n const getSubEnvelopes = (envelope: ArcGisExtent): ArcGisExtent[] => {\r\n const dx = (envelope.xmax - envelope.xmin) * 0.5;\r\n const dy = (envelope.xmax - envelope.xmin) * 0.5;\r\n const subEnvelopes: ArcGisExtent[] = [];\r\n for (let posX=0; posX<ArcGisFeatureProvider._nbSubTiles; posX++) {\r\n for (let posY=0; posY<ArcGisFeatureProvider._nbSubTiles; posY++) {\r\n subEnvelopes.push({\r\n xmin: envelope.xmin + (dxposX), ymin: envelope.ymin + (dyposY),\r\n xmax: envelope.xmin + (dx(posX+1)), ymax: envelope.ymin + (dy(posY+1)),\r\n spatialReference: {wkid:102100, latestWkid:3857},\r\n });\r\n }\r\n }\r\n return subEnvelopes;\r\n };\r\n\r\n // The strategy here is simple: we make a request for an area that represents the current tile (i.e envelope),\r\n // the server will either return the requested data OR a 'exceedTransferLimit' message (too much data to transfers).\r\n // In the latter case, we subdivide the previous request envelope in for 4 sub-envelopes,\r\n // and repeat again until we get data.\r\n const renderData = async (envelope?: ArcGisExtent) => {\r\n let response: ArcGisFeatureResponse \| undefined;\r\n let responseData: ArcGisResponseData \| undefined;\r\n try {\r\n response = await this.fetchTile(row, column, zoomLevel, envelope);\r\n if (!response) {\r\n Logger.logError(loggerCategory, `Error occurred while fetching tile (${zoomLevel}/${row}/${column})`);\r\n return ;\r\n }\r\n\r\n responseData = await response.getResponseData();\r\n if (!responseData) {\r\n Logger.logError(loggerCategory, `Could not get response data for tile (${zoomLevel}/${row}/${column})`);\r\n return ;\r\n }\r\n } catch (e) {\r\n Logger.logError(loggerCategory, `Exception occurred while loading tile (${zoomLevel}/${row}/${column}) : ${e}`);\r\n return;\r\n }\r\n\r\n if (responseData.exceedTransferLimit) {\r\n if (response.envelope) {\r\n const subEnvelopes = getSubEnvelopes(response.envelope);\r\n const renderPromises = [];\r\n for (const subEnvelope of subEnvelopes) {\r\n renderPromises.push(renderData(subEnvelope));\r\n }\r\n await Promise.all(renderPromises);\r\n } else {\r\n Logger.logError(loggerCategory, `Request exceeded transfer limit, could not refine request`);\r\n }\r\n } else {\r\n featureReader.readAndRender(responseData, renderer);\r\n }\r\n };\r\n await renderData();\r\n if (this._drawDebugInfo)\r\n this.drawTileDebugInfo(row, column, zoomLevel, ctx);\r\n } catch (e) {\r\n Logger.logError(loggerCategory, `Exception occurred while loading tile (${zoomLevel}/${row}/${column}) : ${e}`);\r\n }\r\n\r\n try {\r\n const dataUrl = canvas.toDataURL(\"image/png\");\r\n const header = \"data:image/png;base64,\";\r\n const dataUrl2 = dataUrl.substring(header.length);\r\n return new ImageSource(base64StringToUint8Array(dataUrl2), ImageSourceFormat.Png);\r\n } catch (e) {\r\n Logger.logError(loggerCategory, `Exception occurred while rendering tile (${zoomLevel}/${row}/${column}) : ${e}.`);\r\n }\r\n\r\n return undefined;\r\n }\r\n}\r\n"]}
1	+ {"version":3,"file":"ArcGisFeatureProvider.js","sourceRoot":"","sources":["../../../src/ArcGisFeature/ArcGisFeatureProvider.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 { Cartographic, ImageMapLayerSettings, ImageSource, ImageSourceFormat, ServerError } from \"@itwin/core-common\";\r\nimport { assert, base64StringToUint8Array, IModelStatus, Logger } from \"@itwin/core-bentley\";\r\nimport { Matrix4d, Point3d, Range2d, Transform } from \"@itwin/core-geometry\";\r\nimport { ArcGisErrorCode, ArcGISImageryProvider, ArcGisUtilities, ImageryMapTileTree, MapCartoRectangle, MapLayerFeatureInfo, MapLayerImageryProviderStatus, QuadId } from \"@itwin/core-frontend\";\r\nimport { ArcGisSymbologyRenderer } from \"./ArcGisSymbologyRenderer\";\r\nimport { ArcGisExtent, ArcGisFeatureFormat, ArcGisFeatureQuery, ArcGisGeometry, FeatureQueryQuantizationParams } from \"./ArcGisFeatureQuery\";\r\nimport { ArcGisFeatureRenderer } from \"./ArcGisFeatureRenderer\";\r\nimport { ArcGisFeaturePBF } from \"./ArcGisFeaturePBF\";\r\nimport { ArcGisFeatureJSON } from \"./ArcGisFeatureJSON\";\r\nimport { ArcGisFeatureResponse, ArcGisResponseData } from \"./ArcGisFeatureResponse\";\r\nimport { ArcGisFeatureReader } from \"./ArcGisFeatureReader\";\r\nconst loggerCategory = \"MapLayersFormats.ArcGISFeature\";\r\n/*\r\n @internal\r\n/\r\ninterface ArcGisFeatureUrl {\r\n url: string;\r\n envelope?: ArcGisExtent; // envelope representing the current computed URL, requiered to refine request.\r\n}\r\n\r\n/* Provide tiles from a ESRI ArcGIS Feature service\r\n* @internal\r\n/\r\nexport class ArcGisFeatureProvider extends ArcGISImageryProvider {\r\n // Debug flags, should always be commited to FALSE !\r\n private _drawDebugInfo = false;\r\n private _debugFeatureGeom = false;\r\n\r\n private _supportsCoordinatesQuantization = false;\r\n private _querySupported = false;\r\n private _layerId = 0;\r\n private _layerMetadata: any;\r\n private _format: ArcGisFeatureFormat\|undefined;\r\n public serviceJson: any;\r\n private _symbologyRenderer: ArcGisSymbologyRenderer\|undefined;\r\n private static readonly _nbSubTiles = 2;\r\n private _outSR = 102100;\r\n\r\n private _maxDepthFromLod = 0;\r\n private _minDepthFromLod = 0;\r\n public override get minimumZoomLevel(): number { return this._minDepthFromLod; }\r\n public override get maximumZoomLevel(): number { return this._maxDepthFromLod; }\r\n\r\n constructor(settings: ImageMapLayerSettings) {\r\n super(settings, true);\r\n }\r\n\r\n public override async initialize(): Promise<void> {\r\n\r\n let json;\r\n try {\r\n json = await ArcGisUtilities.getServiceJson(this._settings.url, this._settings.formatId, this._settings.userName, this._settings.password);\r\n\r\n } catch (_e) {\r\n\r\n }\r\n\r\n if (json === undefined) {\r\n Logger.logError(loggerCategory, \"Could not get service JSON\");\r\n throw new ServerError(IModelStatus.ValidationFailed, \"\");\r\n }\r\n\r\n if (json?.error?.code === ArcGisErrorCode.TokenRequired \|\| json?.error?.code === ArcGisErrorCode.InvalidToken) {\r\n // Check again layer status, it might have change during await.\r\n if (this.status === MapLayerImageryProviderStatus.Valid) {\r\n this.status = MapLayerImageryProviderStatus.RequireAuth;\r\n this.onStatusChanged.raiseEvent(this);\r\n return;\r\n }\r\n }\r\n\r\n if (json.capabilities) {\r\n this._querySupported = json.capabilities.indexOf(\"Query\") >= 0;\r\n if (!this._querySupported)\r\n throw new ServerError(IModelStatus.ValidationFailed, \"\");\r\n }\r\n\r\n this.serviceJson = json;\r\n\r\n let foundVisibleSubLayer = false;\r\n if (this._settings.subLayers.length >= 0) {\r\n // There is more than sub-layer for this layer, pick the first visible one.\r\n for (const layer of this._settings.subLayers) {\r\n if (layer.visible && typeof layer.id === \"number\") {\r\n this._layerId = layer.id;\r\n foundVisibleSubLayer = true;\r\n break;\r\n }\r\n }\r\n }\r\n\r\n if (!foundVisibleSubLayer && json !== undefined) {\r\n // No suitable sublayer was specified on the layerSettings object, lets find a default one in the capabilities\r\n\r\n // Check layer metadata\r\n if (Array.isArray(this.serviceJson.layers) && this.serviceJson.layers.length >= 1) {\r\n\r\n const hasDefaultVisibility = Object.keys(this.serviceJson.layers[0]).includes(\"defaultVisibility\");\r\n if (hasDefaultVisibility) {\r\n for (const layer of this.serviceJson.layers) {\r\n if (layer.defaultVisibility) {\r\n this._layerId = layer.id;\r\n }\r\n }\r\n } else {\r\n // On some older servers, the default visiblity is on the layer capabilities (i.e. not the service capabilities)\r\n for (const layer of this.serviceJson.layers) {\r\n const layerJson = await this.getLayerMetadata(layer.id);\r\n if (!layerJson) {\r\n continue;\r\n }\r\n\r\n if (layerJson.defaultVisibility) {\r\n this._layerId = layer.id;\r\n this._layerMetadata = layerJson;\r\n break;\r\n }\r\n }\r\n }\r\n\r\n } else {\r\n // There is no layer to publish? Something is off with this server..\r\n throw new ServerError(IModelStatus.ValidationFailed, \"\");\r\n }\r\n }\r\n\r\n // Make sure we cache layer info (i.e. rendering info)\r\n if (!this._layerMetadata) {\r\n\r\n this._layerMetadata = await this.getLayerMetadata(this._layerId);\r\n if (!this._layerMetadata) {\r\n Logger.logError(loggerCategory, \"Could not layer metadata\");\r\n throw new ServerError(IModelStatus.ValidationFailed, \"\");\r\n }\r\n }\r\n\r\n // Parse server version\r\n let majorVersion: number\|undefined;\r\n if (this.serviceJson?.currentVersion) {\r\n try {\r\n majorVersion = Math.trunc(this.serviceJson?.currentVersion);\r\n } catch {\r\n }\r\n }\r\n\r\n // Coordinates Quantization: If supported, server will transform for us the coordinates in the Tile coordinate space (pixels, origin = upper left corner\r\n // If not supported, transformation will be applied client side.\r\n // Note: For some reasons, even though 'supportsCoordinatesQuantization' is set to 'true' on the layer metadata, server will give an error message for server version < 11\r\n if (majorVersion && majorVersion >= 11 && this._layerMetadata.supportsCoordinatesQuantization) {\r\n this._supportsCoordinatesQuantization = true;\r\n }\r\n\r\n // Check supported query formats: JSON and PBF are currently implemented by this provider\r\n // Note: needs to be checked on the layer metadata, service metadata advertises a different set of formats\r\n // Also, since PBF format does not support floating points, there is no point using this format if supportsCoordinatesQuantization is not available.\r\n if (this._layerMetadata.supportedQueryFormats) {\r\n const formats: string[] = this._layerMetadata.supportedQueryFormats.split(\", \");\r\n if (formats.includes(\"PBF\") && this._supportsCoordinatesQuantization ) {\r\n this._format = \"PBF\";\r\n } else if (formats.includes (\"JSON\")) {\r\n this._format = \"JSON\";\r\n }\r\n }\r\n\r\n if (!this._format) {\r\n Logger.logError(loggerCategory, \"Could not get request format from service JSON\");\r\n throw new ServerError(IModelStatus.ValidationFailed, \"\");\r\n }\r\n\r\n // Read range using full extent from service metadata\r\n if (json.fullExtent) {\r\n if (json.fullExtent.spatialReference.latestWkid === 3857 \|\| json.fullExtent.spatialReference.wkid === 102100) {\r\n const range3857 = Range2d.createFrom({\r\n low: {x: json.fullExtent.xmin, y: json.fullExtent.ymin},\r\n high: {x: json.fullExtent.xmax, y: json.fullExtent.ymax} });\r\n\r\n const west = this.getEPSG4326Lon(range3857.xLow);\r\n const south = this.getEPSG4326Lat(range3857.yLow);\r\n const east = this.getEPSG4326Lon(range3857.xHigh);\r\n const north = this.getEPSG4326Lat(range3857.yHigh);\r\n this.cartoRange = MapCartoRectangle.fromDegrees(west, south, east, north);\r\n }\r\n }\r\n\r\n // Check for minScale / max scale\r\n const minScale = this._layerMetadata?.minScale \|\| undefined; // undefined, 0 -> undefined\r\n const maxScale = this._layerMetadata?.maxScale \|\| undefined; // undefined, 0 -> undefined\r\n const scales = ArcGisUtilities.getZoomLevelsScales(this.defaultMaximumZoomLevel, this.tileSize, minScale, maxScale, 1.0);\r\n if (scales.minLod)\r\n this._minDepthFromLod = scales.minLod;\r\n\r\n // 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)\r\n this._maxDepthFromLod = (scales.maxLod ? scales.maxLod : this.defaultMaximumZoomLevel);\r\n\r\n this._symbologyRenderer = new ArcGisSymbologyRenderer(this._layerMetadata?.geometryType, this._layerMetadata?.drawingInfo?.renderer);\r\n }\r\n\r\n protected async getLayerMetadata(layerId: number) {\r\n let json;\r\n try {\r\n const url = new URL(this._settings.url);\r\n url.pathname = `${url.pathname}/${layerId}`;\r\n json = await ArcGisUtilities.getServiceJson(url.toString(), this._settings.formatId, this._settings.userName, this._settings.password);\r\n } catch {\r\n\r\n }\r\n return json;\r\n }\r\n\r\n public override get tileSize(): number { return 512; }\r\n public get format(): ArcGisFeatureFormat\|undefined { return this._format; }\r\n\r\n // We don't use this method inside this provider (see constructFeatureUrl), but since this is an abstract method, we need to define something\r\n public async constructUrl(_row: number, _column: number, _zoomLevel: number): Promise<string> {\r\n return \"\";\r\n }\r\n\r\n public constructFeatureUrl(row: number, column: number, zoomLevel: number, format: ArcGisFeatureFormat, geomOverride?: ArcGisGeometry, outFields?: string, tolerance?: number, returnGeometry?: boolean): ArcGisFeatureUrl \| undefined {\r\n\r\n const tileExtent = this.getEPSG3857Extent(row, column, zoomLevel);\r\n const tileEnvelope = {\r\n xmin: tileExtent.left, ymin: tileExtent.bottom,\r\n xmax: tileExtent.right, ymax: tileExtent.top,\r\n spatialReference: {wkid:102100, latestWkid:3857},\r\n };\r\n\r\n // Actual spatial filter.\r\n // By default, we request the tile extent. If 'cartoPoint' is specified,\r\n // we restrict the spatial to specific point. (i.e. GetFeatureInfo requests)\r\n // If envelope is provided, it has the priority over 'cartoPoint'\r\n let geometry: ArcGisGeometry\|undefined;\r\n if (geomOverride) {\r\n geometry = geomOverride;\r\n } else {\r\n geometry = {geom: tileEnvelope, type: \"esriGeometryEnvelope\"};\r\n }\r\n\r\n let quantizationParameters: FeatureQueryQuantizationParams\|undefined;\r\n const toleranceWorld = (tileExtent.top - tileExtent.bottom) / this.tileSize;\r\n if (this._supportsCoordinatesQuantization) {\r\n quantizationParameters = {\r\n mode: \"view\",\r\n originPosition: \"upperLeft\",\r\n tolerance: toleranceWorld, // pixel size in world units\r\n extent: tileEnvelope,\r\n };\r\n }\r\n const url = new ArcGisFeatureQuery(\r\n this._settings.url,\r\n this._layerId,\r\n format,\r\n this._outSR,\r\n { geometry,\r\n geometryType: \"esriGeometryEnvelope\",\r\n returnExceededLimitFeatures: false,\r\n maxRecordCountFactor: 3, // This was grabbed from the ESRI web viewer request, not sure where this factor come from\r\n resultType: \"tile\",\r\n quantizationParameters,\r\n outFields,\r\n returnGeometry,\r\n distance: (tolerance ? tolerancetoleranceWorld :undefined) });\r\n\r\n let envelope: ArcGisExtent \| undefined;\r\n if (geomOverride && geomOverride.type === \"esriGeometryEnvelope\"){\r\n envelope = geomOverride.geom as ArcGisExtent;\r\n } else {\r\n envelope = tileEnvelope;\r\n }\r\n\r\n return {url: url.toString(), envelope} ;\r\n\r\n }\r\n\r\n // Makes an identify request to ESRI MapService , and return it as a list MapLayerFeatureInfo object\r\n public override async getFeatureInfo(featureInfos: MapLayerFeatureInfo[], quadId: QuadId, carto: Cartographic, _tree: ImageryMapTileTree): Promise<void> {\r\n if (!this._querySupported \|\| this.format === undefined)\r\n return;\r\n\r\n const cartoPoint = {\r\n x: this.getEPSG3857X(carto.longitudeDegrees),\r\n y: this.getEPSG3857Y(carto.latitudeDegrees),\r\n spatialReference: {wkid:102100, latestWkid:3857},\r\n };\r\n\r\n const doFeatureInfoQuery = async (format: ArcGisFeatureFormat, outFields?: string, returnGeometry?: boolean,) => {\r\n const infoUrl = this.constructFeatureUrl(quadId.row, quadId.column, quadId.level, format, {geom: cartoPoint, type: \"esriGeometryPoint\"}, outFields, 3 /* tolerance in pixel/, returnGeometry);\r\n\r\n if (!infoUrl \|\| infoUrl.url.length === 0) {\r\n Logger.logError(loggerCategory, `Could not construct feature info query URL`);\r\n return undefined;\r\n }\r\n\r\n const response = this.fetch(new URL(infoUrl.url), { method: \"GET\" });\r\n\r\n const featureResponse = new ArcGisFeatureResponse(format, response);\r\n return featureResponse.getResponseData();\r\n };\r\n\r\n if (this._debugFeatureGeom) {\r\n try {\r\n let responseData = await doFeatureInfoQuery(\"PBF\", \"\", true);\r\n if (responseData) {\r\n Logger.logInfo(loggerCategory, JSON.stringify(responseData.data.toObject()));\r\n }\r\n responseData = await doFeatureInfoQuery(\"JSON\", \"\", true);\r\n if (responseData) {\r\n Logger.logInfo(loggerCategory, JSON.stringify(responseData.data));\r\n }\r\n } catch (e) {\r\n Logger.logInfo(loggerCategory, `Error occured with debug FeatureInfo: ${e}`);\r\n }\r\n }\r\n\r\n try {\r\n const responseData = await doFeatureInfoQuery(this.format, \"\", false);\r\n if (!responseData) {\r\n Logger.logError(loggerCategory, `Could not get feature info data`);\r\n return;\r\n }\r\n if (responseData.exceedTransferLimit) {\r\n Logger.logError(loggerCategory, `Could not get feature info : transfert limit exeeded.`);\r\n return;\r\n }\r\n const featureReader: ArcGisFeatureReader = this.format === \"PBF\" ? new ArcGisFeaturePBF(this._settings, this._layerMetadata) : new ArcGisFeatureJSON(this._settings, this._layerMetadata);\r\n featureReader.readFeatureInfo(responseData, featureInfos);\r\n\r\n } catch (e) {\r\n Logger.logError(loggerCategory, `Exception occured while loading feature info data : ${e}`);\r\n return;\r\n }\r\n\r\n return;\r\n }\r\n\r\n private async fetchTile(row: number, column: number, zoomLevel: number, refineEnvelope?: ArcGisExtent): Promise<ArcGisFeatureResponse \| undefined> {\r\n if (!this.format) {\r\n assert(!\"No supported query format\");\r\n return undefined;\r\n }\r\n\r\n const geomOverride: ArcGisGeometry\|undefined = (refineEnvelope ? {geom: refineEnvelope, type: \"esriGeometryEnvelope\"} : undefined);\r\n const tileUrl = this.constructFeatureUrl(row, column, zoomLevel, this.format, geomOverride);\r\n if (!tileUrl \|\| tileUrl.url.length === 0) {\r\n Logger.logError(loggerCategory, `Could not construct feature query URL for tile ${zoomLevel}/${row}/${column}`);\r\n return undefined;\r\n }\r\n\r\n const response = this.fetch(new URL(tileUrl.url), { method: \"GET\" });\r\n return new ArcGisFeatureResponse(this.format, response, tileUrl.envelope);\r\n }\r\n\r\n public drawTileDebugInfo(row: number, column: number, zoomLevel: number, context: CanvasRenderingContext2D ){\r\n context.fillStyle = \"cyan\";\r\n context.strokeRect(0, 0, this.tileSize, this.tileSize);\r\n context.font = \"30px Arial\";\r\n context.lineWidth = 5;\r\n context.fillText(`${zoomLevel}-${row}-${column}`, 10, 50);\r\n }\r\n\r\n // Compute transform that provides coordinates in the canvas coordinate system (pixels, origin = top-left)\r\n // from coordinate in world (i.e EPSG:3857)\r\n protected computeTileWorld2CanvasTransform(row: number, column: number, zoomLevel: number) {\r\n\r\n const tileExtentWorld3857 = this.getEPSG3857Extent(row, column, zoomLevel);\r\n const worldTileWidth = tileExtentWorld3857.right - tileExtentWorld3857.left;\r\n const canvasTileWidth = this.tileSize;\r\n const world2CanvasRatio = canvasTileWidth / worldTileWidth;\r\n const worldTileOrigin = Point3d.create(tileExtentWorld3857.left, tileExtentWorld3857.bottom);\r\n const worldTileExtent = Point3d.create(tileExtentWorld3857.right, tileExtentWorld3857.top);\r\n const canvasTileOriginOffset = worldTileOrigin.clone();\r\n const canvasTileExtentOffset = worldTileExtent.clone();\r\n canvasTileOriginOffset.scaleInPlace(world2CanvasRatio);\r\n canvasTileExtentOffset.scaleInPlace(world2CanvasRatio);\r\n const xTranslate = -1canvasTileOriginOffset.x;\r\n\r\n // Canvas origin is uppler left corner, so we need to flip the y axsis\r\n const yTranslate = canvasTileExtentOffset.y; // y-axis flip\r\n const yWorld2CanvasRatio = -1world2CanvasRatio; // y-axis flip\r\n\r\n const matrix = Matrix4d.createTranslationAndScaleXYZ(xTranslate, yTranslate, 0, world2CanvasRatio, yWorld2CanvasRatio, 1);\r\n return matrix.asTransform;\r\n }\r\n\r\n public override async loadTile(row: number, column: number, zoomLevel: number): Promise<ImageSource \| undefined> {\r\n\r\n if ((this.status === MapLayerImageryProviderStatus.RequireAuth)) {\r\n return undefined;\r\n }\r\n const canvas = document.createElement(\"canvas\");\r\n canvas.width = this.tileSize;\r\n canvas.height = this.tileSize;\r\n\r\n const ctx = canvas.getContext(\"2d\");\r\n if (ctx == null) {\r\n Logger.logError(loggerCategory, \"No canvas context available for loading tile.\");\r\n assert(!\"no canvas context\");\r\n return undefined;\r\n }\r\n\r\n if (!this._symbologyRenderer) {\r\n Logger.logError(loggerCategory, \"No symbology renderer available for loading tile.\");\r\n assert(!\"No symbology renderer\");\r\n return undefined;\r\n }\r\n try {\r\n\r\n // Compute transform if CoordinatesQuantization is not supported by service\r\n let transfo: Transform \| undefined;\r\n if (!this._supportsCoordinatesQuantization) {\r\n transfo = this.computeTileWorld2CanvasTransform(row, column, zoomLevel);\r\n if (!transfo) {\r\n Logger.logError(loggerCategory, `Could not compute data transformation for tile (${zoomLevel}/${row}/${column})`);\r\n assert(!\"Could not compute world to canvas transform\");\r\n }\r\n }\r\n\r\n const renderer = new ArcGisFeatureRenderer(ctx, this._symbologyRenderer, transfo);\r\n const featureReader: ArcGisFeatureReader = this.format === \"PBF\" ? new ArcGisFeaturePBF(this._settings, this._layerMetadata) : new ArcGisFeatureJSON(this._settings, this._layerMetadata);\r\n\r\n const getSubEnvelopes = (envelope: ArcGisExtent): ArcGisExtent[] => {\r\n const dx = (envelope.xmax - envelope.xmin) * 0.5;\r\n const dy = (envelope.xmax - envelope.xmin) * 0.5;\r\n const subEnvelopes: ArcGisExtent[] = [];\r\n for (let posX=0; posX<ArcGisFeatureProvider._nbSubTiles; posX++) {\r\n for (let posY=0; posY<ArcGisFeatureProvider._nbSubTiles; posY++) {\r\n subEnvelopes.push({\r\n xmin: envelope.xmin + (dxposX), ymin: envelope.ymin + (dyposY),\r\n xmax: envelope.xmin + (dx(posX+1)), ymax: envelope.ymin + (dy(posY+1)),\r\n spatialReference: {wkid:102100, latestWkid:3857},\r\n });\r\n }\r\n }\r\n return subEnvelopes;\r\n };\r\n\r\n // The strategy here is simple: we make a request for an area that represents the current tile (i.e envelope),\r\n // the server will either return the requested data OR a 'exceedTransferLimit' message (too much data to transfers).\r\n // In the latter case, we subdivide the previous request envelope in for 4 sub-envelopes,\r\n // and repeat again until we get data.\r\n const renderData = async (envelope?: ArcGisExtent) => {\r\n let response: ArcGisFeatureResponse \| undefined;\r\n let responseData: ArcGisResponseData \| undefined;\r\n try {\r\n response = await this.fetchTile(row, column, zoomLevel, envelope);\r\n if (!response) {\r\n Logger.logError(loggerCategory, `Error occurred while fetching tile (${zoomLevel}/${row}/${column})`);\r\n return ;\r\n }\r\n\r\n responseData = await response.getResponseData();\r\n if (!responseData) {\r\n Logger.logError(loggerCategory, `Could not get response data for tile (${zoomLevel}/${row}/${column})`);\r\n return ;\r\n }\r\n } catch (e) {\r\n Logger.logError(loggerCategory, `Exception occurred while loading tile (${zoomLevel}/${row}/${column}) : ${e}`);\r\n return;\r\n }\r\n\r\n if (responseData.exceedTransferLimit) {\r\n if (response.envelope) {\r\n const subEnvelopes = getSubEnvelopes(response.envelope);\r\n const renderPromises = [];\r\n for (const subEnvelope of subEnvelopes) {\r\n renderPromises.push(renderData(subEnvelope));\r\n }\r\n await Promise.all(renderPromises);\r\n } else {\r\n Logger.logError(loggerCategory, `Request exceeded transfer limit, could not refine request`);\r\n }\r\n } else {\r\n featureReader.readAndRender(responseData, renderer);\r\n }\r\n };\r\n await renderData();\r\n if (this._drawDebugInfo)\r\n this.drawTileDebugInfo(row, column, zoomLevel, ctx);\r\n } catch (e) {\r\n Logger.logError(loggerCategory, `Exception occurred while loading tile (${zoomLevel}/${row}/${column}) : ${e}`);\r\n }\r\n\r\n try {\r\n const dataUrl = canvas.toDataURL(\"image/png\");\r\n const header = \"data:image/png;base64,\";\r\n const dataUrl2 = dataUrl.substring(header.length);\r\n return new ImageSource(base64StringToUint8Array(dataUrl2), ImageSourceFormat.Png);\r\n } catch (e) {\r\n Logger.logError(loggerCategory, `Exception occurred while rendering tile (${zoomLevel}/${row}/${column}) : ${e}.`);\r\n }\r\n\r\n return undefined;\r\n }\r\n}\r\n"]}

package/lib/esm/ArcGisFeature/ArcGisFeatureQuery.d.ts CHANGED Viewed

@@ -89,6 +89,5 @@ export declare class ArcGisFeatureQuery {
     quantizationParams?: FeatureQueryQuantizationParams;
     constructor(baseUrl: string, layerIdx: number, format: ArcGisFeatureFormat, outSR: number, params?: ArcGisFeatureQueryParams);
     toString(): string;
-    private static appendParam;
 }
 //# sourceMappingURL=ArcGisFeatureQuery.d.ts.map

package/lib/esm/ArcGisFeature/ArcGisFeatureQuery.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"ArcGisFeatureQuery.d.ts","sourceRoot":"","sources":["../../../src/ArcGisFeature/ArcGisFeatureQuery.ts"],"names":[],"mappings":"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~~IAgEf,OAAO,CAAC,MAAM,CAAE,WAAW;CAa5B~~"}
1	+ {"version":3,"file":"ArcGisFeatureQuery.d.ts","sourceRoot":"","sources":["../../../src/ArcGisFeature/ArcGisFeatureQuery.ts"],"names":[],"mappings":"AAKA,gBAAgB;AAChB,oBAAY,uBAAuB,GAAG,MAAM,GAAG,UAAU,GAAG,MAAM,CAAC;AAEnE,gBAAgB;AAChB,oBAAY,yBAAyB,GACpC,kBAAkB,GAChB,mBAAmB,GACnB,wBAAwB,GACxB,kBAAkB,GAClB,yBAAyB,GACzB,yBAAyB,GACzB,0BAA0B,GAC1B,kBAAkB,GAClB,sBAAsB,GACtB,kBAAkB,GAClB,qBAAqB,GACrB,sBAAsB,GACtB,iBAAiB,GACjB,iBAAiB,GACjB,wBAAwB,GACxB,2BAA2B,GAC3B,wBAAwB,GACxB,iBAAiB,GACjB,oBAAoB,GACpB,uBAAuB,CAAC;AAE3B,gBAAgB;AAChB,oBAAY,uBAAuB,GAAI,0BAA0B,GAAG,wBAAwB,GAAG,uBAAuB,GAAG,kCAAkC,GAAG,+BAA+B,GAAG,wBAAwB,GAAG,uBAAuB,GAAG,sBAAsB,CAAC;AAE5Q,gBAAgB;AAChB,MAAM,WAAW,cAAc;IAC7B,IAAI,EAAE,yBAAyB,CAAC;IAChC,IAAI,EAAE,YAAY,GAAG,mBAAmB,CAAC;CAC1C;AAED,gBAAgB;AAChB,MAAM,WAAW,sBAAsB;IACrC,IAAI,EAAE,MAAM,CAAC;IACb,UAAU,EAAE,MAAM,CAAC;CACpB;AAED,gBAAgB;AAChB,MAAM,WAAW,YAAY;IAC3B,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,CAAC;IACb,gBAAgB,EAAE,sBAAsB,CAAC;CAC1C;AAED,gBAAgB;AAChB,MAAM,WAAW,mBAAmB;IAClC,CAAC,EAAE,MAAM,CAAC;IACV,CAAC,EAAE,MAAM,CAAC;IACV,gBAAgB,EAAE,sBAAsB,CAAC;CAC1C;AAED,gBAAgB;AAChB,MAAM,WAAW,8BAA8B;IAC7C,MAAM,EAAE,YAAY,CAAC;IACrB,IAAI,EAAE,MAAM,GAAG,MAAM,CAAC;IACtB,cAAc,EAAE,WAAW,GAAG,WAAW,CAAC;IAC1C,SAAS,EAAE,MAAM,CAAC;CACnB;AAED,gBAAgB;AAChB,oBAAY,mBAAmB,GAAG,MAAM,GAAG,KAAK,CAAC;AAIjD,gBAAgB;AAChB,MAAM,WAAW,wBAAwB;IAEvC;;;;;SAKK;IACL,iBAAiB,CAAC,EAAE,MAAM,CAAC;IAE3B;;;;;SAKK;IACL,YAAY,CAAC,EAAE,MAAM,CAAC;IAEtB,uFAAuF;IACvF,cAAc,CAAC,EAAE,OAAO,CAAC;IACzB,QAAQ,CAAC,EAAE,cAAc,CAAC;IAC1B,YAAY,CAAC,EAAE,yBAAyB,CAAC;IACzC,UAAU,CAAC,EAAE,uBAAuB,CAAC;IACrC,UAAU,CAAC,EAAE,uBAAuB,CAAC;IACrC,oBAAoB,CAAC,EAAE,MAAM,CAAC;IAC9B,2BAA2B,CAAC,EAAE,OAAO,CAAC;IACtC,sBAAsB,CAAC,EAAE,8BAA8B,CAAC;IAExD;;UAEM;IACN,SAAS,CAAC,EAAE,MAAM,CAAC;IAEnB;UACM;IACN,QAAQ,CAAC,EAAE,MAAM,CAAC;CACnB;AAED,gBAAgB;AAChB,qBAAa,kBAAkB;IACtB,OAAO,EAAE,MAAM,CAAC;IAChB,QAAQ,EAAE,MAAM,CAAC;IACjB,MAAM,EAAE,mBAAmB,CAAC;IAC5B,iBAAiB,CAAC,EAAE,MAAM,CAAC;IAC3B,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,cAAc,CAAC,EAAE,OAAO,CAAC;IACzB,QAAQ,CAAC,EAAE,cAAc,CAAC;IAC1B,UAAU,CAAC,EAAE,uBAAuB,CAAC;IACrC,UAAU,CAAC,EAAE,uBAAuB,CAAC;IACrC,oBAAoB,CAAC,EAAE,MAAM,CAAC;IAC9B,2BAA2B,CAAC,EAAE,OAAO,CAAC;IACtC,KAAK,EAAE,MAAM,CAAC;IACd,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAGlB,kBAAkB,CAAC,EAAE,8BAA8B,CAAC;gBAIxC,OAAO,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,EAAE,MAAM,EAAE,mBAAmB,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,wBAAwB;IAsB5H,QAAQ;CAmEhB"}

package/lib/esm/ArcGisFeature/ArcGisFeatureQuery.js CHANGED Viewed

@@ -26,62 +26,54 @@ export class ArcGisFeatureQuery {
         }
     }
     toString() {
-        let customParams = "";
+        const url = new URL(`${this.baseUrl}/${this.layerIdx}/query`);
+        url.searchParams.append("f", this.format);
         if (this.resultRecordCount !== undefined) {
-            customParams = ArcGisFeatureQuery.appendParam(customParams, "resultRecordCount", `${this.resultRecordCount}`);
+            url.searchParams.append("resultRecordCount", `${this.resultRecordCount}`);
         }
         if (this.resultOffset !== undefined) {
-            customParams = ArcGisFeatureQuery.appendParam(customParams, "resultOffset", `${this.resultOffset}`);
+            url.searchParams.append("resultOffset", `${this.resultOffset}`);
         }
         if (this.returnGeometry !== undefined) {
-            customParams = ArcGisFeatureQuery.appendParam(customParams, "returnGeometry", this.returnGeometry ? "true" : "false");
+            url.searchParams.append("returnGeometry", this.returnGeometry ? "true" : "false");
         }
         if (this.resultType !== undefined) {
-            customParams = ArcGisFeatureQuery.appendParam(customParams, "resultType", this.resultType);
+            url.searchParams.append("resultType", this.resultType);
         }
         if (this.maxRecordCountFactor !== undefined) {
-            customParams = ArcGisFeatureQuery.appendParam(customParams, "maxRecordCountFactor", `${this.maxRecordCountFactor}`);
+            url.searchParams.append("maxRecordCountFactor", `${this.maxRecordCountFactor}`);
         }
         if (this.returnExceededLimitFeatures !== undefined) {
-            customParams = ArcGisFeatureQuery.appendParam(customParams, "returnExceededLimitFeatures", this.returnExceededLimitFeatures ? "true" : "false");
+            url.searchParams.append("returnExceededLimitFeatures", this.returnExceededLimitFeatures ? "true" : "false");
         }
-        customParams = ArcGisFeatureQuery.appendParam(customParams, "outSR", `${this.outSR}`);
+        url.searchParams.append("outSR", `${this.outSR}`);
         if (this.geometry || this.spatialRel) {
             if (this.spatialRel) {
-                customParams = ArcGisFeatureQuery.appendParam(customParams, "spatialRel", this.spatialRel);
+                url.searchParams.append("spatialRel", this.spatialRel);
             }
             if (this.geometry) {
-                customParams = ArcGisFeatureQuery.appendParam(customParams, "geometryType", this.geometry.type);
+                url.searchParams.append("geometryType", this.geometry.type);
                 const geomStr = JSON.stringify(this.geometry.geom);
-                customParams = ArcGisFeatureQuery.appendParam(customParams, "geometry", geomStr);
-                customParams = ArcGisFeatureQuery.appendParam(customParams, "inSR", `${this.geometry.geom.spatialReference.wkid}`);
+                url.searchParams.append("geometry", geomStr);
+                url.searchParams.append("units", "esriSRUnit_Meter"); // required on older server for get feature info
+                url.searchParams.append("inSR", `${this.geometry.geom.spatialReference.wkid}`);
             }
         }
         else {
             // No custom params, fetch all geometries
-            customParams = "where=1=1";
+            url.searchParams.append("where", "1=1");
         }
         if (this.quantizationParams) {
             const quantizationParamsStr = JSON.stringify(this.quantizationParams);
-            customParams = ArcGisFeatureQuery.appendParam(customParams, "quantizationParameters", quantizationParamsStr);
+            url.searchParams.append("quantizationParameters", quantizationParamsStr);
         }
         if (this.outFields) {
-            customParams = ArcGisFeatureQuery.appendParam(customParams, "outFields", this.outFields);
+            url.searchParams.append("outFields", this.outFields);
         }
         if (this.distance) {
-            customParams = ArcGisFeatureQuery.appendParam(customParams, "distance", `${this.distance}`);
+            url.searchParams.append("distance", `${this.distance}`);
         }
-        return `${this.baseUrl}/${this.layerIdx}/query/?f=${this.format}&${customParams}`;
-    }
-    static appendParam(urlToAppend, paramName, paramValue) {
-        if (paramName.length === 0) {
-            return urlToAppend;
-        }
-        let url = urlToAppend;
-        if (urlToAppend.length > 0 && !urlToAppend.endsWith("&")) {
-            url = `${urlToAppend}&`;
-        }
-        return `${url}${paramName}=${paramValue}`;
+        return url.toString();
     }
 }
 //# sourceMappingURL=ArcGisFeatureQuery.js.map

package/lib/esm/ArcGisFeature/ArcGisFeatureQuery.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"ArcGisFeatureQuery.js","sourceRoot":"","sources":["../../../src/ArcGisFeature/ArcGisFeatureQuery.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\n/** @internal /\r\nexport type ArcGisFeatureResultType = \"none\" \| \"standard\" \| \"tile\";\r\n\r\n/* @internal /\r\nexport type ArcGisFeatureGeometryType =\r\n \"esriGeometryNull\"\r\n \| \"esriGeometryPoint\"\r\n \| \"esriGeometryMultipoint\"\r\n \| \"esriGeometryLine\"\r\n \| \"esriGeometryCircularArc\"\r\n \| \"esriGeometryEllipticArc\"\r\n \| \"esriGeometryBezier3Curve\"\r\n \| \"esriGeometryPath\"\r\n \| \"esriGeometryPolyline\"\r\n \| \"esriGeometryRing\"\r\n \| \"esriGeometryPolygon\"\r\n \| \"esriGeometryEnvelope\"\r\n \| \"esriGeometryAny\"\r\n \| \"esriGeometryBag\"\r\n \| \"esriGeometryMultiPatch\"\r\n \| \"esriGeometryTriangleStrip\"\r\n \| \"esriGeometryTriangeFan\"\r\n \| \"esriGeometryRay\"\r\n \| \"esriGeometrySphere\"\r\n \| \"esriGeometryTriangles\";\r\n\r\n/* @internal /\r\nexport type ArcGisFeatureSpatialRel = \"esriSpatialRelIntersects\" \| \"esriSpatialRelContains\" \| \"esriSpatialRelCrosses\" \| \"esriSpatialRelEnvelopeIntersects\" \| \"esriSpatialRelIndexIntersects\" \| \"esriSpatialRelOverlaps\" \| \"esriSpatialRelTouches\" \| \"esriSpatialRelWithin\";\r\n\r\n/* @internal /\r\nexport interface ArcGisGeometry {\r\n type: ArcGisFeatureGeometryType;\r\n geom: ArcGisExtent \| ArcGisPointGeometry;\r\n}\r\n\r\n/* @internal /\r\nexport interface ArcGisSpatialReference {\r\n wkid: number;\r\n latestWkid: number;\r\n}\r\n\r\n/* @internal /\r\nexport interface ArcGisExtent {\r\n xmin: number;\r\n xmax: number;\r\n ymin: number;\r\n ymax: number;\r\n spatialReference: ArcGisSpatialReference;\r\n}\r\n\r\n/* @internal /\r\nexport interface ArcGisPointGeometry {\r\n x: number;\r\n y: number;\r\n spatialReference: ArcGisSpatialReference;\r\n}\r\n\r\n/* @internal /\r\nexport interface FeatureQueryQuantizationParams {\r\n extent: ArcGisExtent;\r\n mode: \"view\" \| \"edit\";\r\n originPosition: \"upperLeft\" \| \"lowerLeft\";\r\n tolerance: number;\r\n}\r\n\r\n/* @internal /\r\nexport type ArcGisFeatureFormat = \"JSON\" \| \"PBF\";\r\n\r\n// Based on official documentation:\r\n// https://developers.arcgis.com/rest/services-reference/query-feature-service-layer-.htm\r\n/* @internal /\r\nexport interface ArcGisFeatureQueryParams {\r\n\r\n /* This option can be used for fetching query results up to the resultRecordCount specified.\r\n * When resultOffset is specified but this parameter is not, the map service defaults it to maxRecordCount.\r\n * The maximum value for this parameter is the value of the layer's maxRecordCount property.\r\n * The minimum value entered for this parameter cannot be below 1.\r\n * This parameter only applies if supportsPagination is true.\r\n * /\r\n resultRecordCount?: number;\r\n\r\n /* This option can be used for fetching query results up to the resultRecordCount specified.\r\n * When resultOffset is specified but this parameter is not, the map service defaults it to maxRecordCount.\r\n * The maximum value for this parameter is the value of the layer's maxRecordCount property.\r\n * The minimum value entered for this parameter cannot be below 1.\r\n * This parameter only applies if supportsPagination is true.\r\n * /\r\n resultOffset?: number;\r\n\r\n /* If true, the result includes the geometry associated with each feature returned. /\r\n returnGeometry?: boolean;\r\n geometry?: ArcGisGeometry;\r\n geometryType?: ArcGisFeatureGeometryType;\r\n spatialRel?: ArcGisFeatureSpatialRel;\r\n resultType?: ArcGisFeatureResultType;\r\n maxRecordCountFactor?: number;\r\n returnExceededLimitFeatures?: boolean;\r\n quantizationParameters?: FeatureQueryQuantizationParams;\r\n\r\n /* The list of fields to be included in the returned result set. This list is a comma-delimited list of field names.\r\n * You can also specify the wildcard \"\" as the value of this parameter.\r\n /\r\n outFields?: string;\r\n\r\n /* The buffer distance for the input geometries.\r\n * /\r\n distance?: number;\r\n}\r\n\r\n/* @internal */\r\nexport class ArcGisFeatureQuery {\r\n public baseUrl: string;\r\n public layerIdx: number;\r\n public format: ArcGisFeatureFormat;\r\n public resultRecordCount?: number;\r\n public resultOffset?: number;\r\n public returnGeometry?: boolean;\r\n public geometry?: ArcGisGeometry;\r\n public spatialRel?: ArcGisFeatureSpatialRel;\r\n public resultType?: ArcGisFeatureResultType;\r\n public maxRecordCountFactor?: number;\r\n public returnExceededLimitFeatures?: boolean;\r\n public outSR: number;\r\n public outFields?: string;\r\n public distance?: number;\r\n\r\n // public envelopeFilter?: CartographicRange;\r\n public quantizationParams?: FeatureQueryQuantizationParams;\r\n\r\n // base url is expected ito be in the format of:\r\n // https://<hostname>/arcgis/rest/services/<ServiceName>/FeatureServer\r\n public constructor(baseUrl: string, layerIdx: number, format: ArcGisFeatureFormat, outSR: number, params?: ArcGisFeatureQueryParams) {\r\n this.baseUrl = baseUrl;\r\n this.layerIdx = layerIdx;\r\n this.format = format;\r\n this.outSR = outSR;\r\n\r\n if (params !== undefined) {\r\n this.resultRecordCount = params.resultRecordCount;\r\n this.resultOffset = params.resultOffset;\r\n this.returnGeometry = params.returnGeometry;\r\n this.geometry = params.geometry;\r\n this.spatialRel = params.spatialRel;\r\n this.resultType = params.resultType;\r\n this.maxRecordCountFactor = params.maxRecordCountFactor;\r\n this.returnExceededLimitFeatures = params.returnExceededLimitFeatures;\r\n this.quantizationParams = params.quantizationParameters;\r\n this.outFields = params.outFields;\r\n this.distance = params.distance;\r\n }\r\n\r\n }\r\n\r\n public toString() {\r\n let customParams = \"\";\r\n\r\n if ( this.resultRecordCount !== undefined) {\r\n customParams = ArcGisFeatureQuery.appendParam(customParams, \"resultRecordCount\", `${this.resultRecordCount}`);\r\n }\r\n\r\n if ( this.resultOffset !== undefined) {\r\n customParams = ArcGisFeatureQuery.appendParam(customParams, \"resultOffset\", `${this.resultOffset}`);\r\n }\r\n\r\n if ( this.returnGeometry !== undefined) {\r\n customParams = ArcGisFeatureQuery.appendParam(customParams, \"returnGeometry\", this.returnGeometry?\"true\":\"false\");\r\n }\r\n\r\n if ( this.resultType !== undefined) {\r\n customParams = ArcGisFeatureQuery.appendParam(customParams, \"resultType\", this.resultType);\r\n }\r\n\r\n if ( this.maxRecordCountFactor !== undefined) {\r\n customParams = ArcGisFeatureQuery.appendParam(customParams, \"maxRecordCountFactor\", `${this.maxRecordCountFactor}`);\r\n }\r\n\r\n if ( this.returnExceededLimitFeatures !== undefined) {\r\n customParams = ArcGisFeatureQuery.appendParam(customParams, \"returnExceededLimitFeatures\", this.returnExceededLimitFeatures?\"true\":\"false\");\r\n }\r\n\r\n customParams = ArcGisFeatureQuery.appendParam(customParams, \"outSR\", `${this.outSR}`);\r\n\r\n if (this.geometry \|\| this.spatialRel) {\r\n\r\n if (this.spatialRel) {\r\n customParams = ArcGisFeatureQuery.appendParam(customParams, \"spatialRel\", this.spatialRel);\r\n }\r\n\r\n if (this.geometry) {\r\n customParams = ArcGisFeatureQuery.appendParam(customParams, \"geometryType\", this.geometry.type);\r\n\r\n const geomStr = JSON.stringify(this.geometry.geom);\r\n customParams = ArcGisFeatureQuery.appendParam(customParams, \"geometry\", geomStr);\r\n\r\n customParams = ArcGisFeatureQuery.appendParam(customParams, \"inSR\", `${this.geometry.geom.spatialReference.wkid}`);\r\n }\r\n } else {\r\n // No custom params, fetch all geometries\r\n customParams = \"where=1=1\";\r\n }\r\n\r\n if (this.quantizationParams) {\r\n const quantizationParamsStr = JSON.stringify(this.quantizationParams);\r\n customParams = ArcGisFeatureQuery.appendParam(customParams, \"quantizationParameters\", quantizationParamsStr);\r\n }\r\n\r\n if (this.outFields) {\r\n customParams = ArcGisFeatureQuery.appendParam(customParams, \"outFields\", this.outFields);\r\n }\r\n\r\n if (this.distance) {\r\n customParams = ArcGisFeatureQuery.appendParam(customParams, \"distance\", `${this.distance}`);\r\n }\r\n\r\n return `${this.baseUrl}/${this.layerIdx}/query/?f=${this.format}&${customParams}`;\r\n }\r\n\r\n private static appendParam(urlToAppend: string, paramName: string, paramValue: string) {\r\n if (paramName.length === 0) {\r\n return urlToAppend;\r\n }\r\n\r\n let url = urlToAppend;\r\n if (urlToAppend.length > 0 && !urlToAppend.endsWith(\"&\")) {\r\n url = `${urlToAppend }&`;\r\n }\r\n\r\n return `${url}${paramName}=${paramValue}`;\r\n }\r\n\r\n}\r\n"]}
1	+ {"version":3,"file":"ArcGisFeatureQuery.js","sourceRoot":"","sources":["../../../src/ArcGisFeature/ArcGisFeatureQuery.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\n/** @internal /\r\nexport type ArcGisFeatureResultType = \"none\" \| \"standard\" \| \"tile\";\r\n\r\n/* @internal /\r\nexport type ArcGisFeatureGeometryType =\r\n \"esriGeometryNull\"\r\n \| \"esriGeometryPoint\"\r\n \| \"esriGeometryMultipoint\"\r\n \| \"esriGeometryLine\"\r\n \| \"esriGeometryCircularArc\"\r\n \| \"esriGeometryEllipticArc\"\r\n \| \"esriGeometryBezier3Curve\"\r\n \| \"esriGeometryPath\"\r\n \| \"esriGeometryPolyline\"\r\n \| \"esriGeometryRing\"\r\n \| \"esriGeometryPolygon\"\r\n \| \"esriGeometryEnvelope\"\r\n \| \"esriGeometryAny\"\r\n \| \"esriGeometryBag\"\r\n \| \"esriGeometryMultiPatch\"\r\n \| \"esriGeometryTriangleStrip\"\r\n \| \"esriGeometryTriangeFan\"\r\n \| \"esriGeometryRay\"\r\n \| \"esriGeometrySphere\"\r\n \| \"esriGeometryTriangles\";\r\n\r\n/* @internal /\r\nexport type ArcGisFeatureSpatialRel = \"esriSpatialRelIntersects\" \| \"esriSpatialRelContains\" \| \"esriSpatialRelCrosses\" \| \"esriSpatialRelEnvelopeIntersects\" \| \"esriSpatialRelIndexIntersects\" \| \"esriSpatialRelOverlaps\" \| \"esriSpatialRelTouches\" \| \"esriSpatialRelWithin\";\r\n\r\n/* @internal /\r\nexport interface ArcGisGeometry {\r\n type: ArcGisFeatureGeometryType;\r\n geom: ArcGisExtent \| ArcGisPointGeometry;\r\n}\r\n\r\n/* @internal /\r\nexport interface ArcGisSpatialReference {\r\n wkid: number;\r\n latestWkid: number;\r\n}\r\n\r\n/* @internal /\r\nexport interface ArcGisExtent {\r\n xmin: number;\r\n xmax: number;\r\n ymin: number;\r\n ymax: number;\r\n spatialReference: ArcGisSpatialReference;\r\n}\r\n\r\n/* @internal /\r\nexport interface ArcGisPointGeometry {\r\n x: number;\r\n y: number;\r\n spatialReference: ArcGisSpatialReference;\r\n}\r\n\r\n/* @internal /\r\nexport interface FeatureQueryQuantizationParams {\r\n extent: ArcGisExtent;\r\n mode: \"view\" \| \"edit\";\r\n originPosition: \"upperLeft\" \| \"lowerLeft\";\r\n tolerance: number;\r\n}\r\n\r\n/* @internal /\r\nexport type ArcGisFeatureFormat = \"JSON\" \| \"PBF\";\r\n\r\n// Based on official documentation:\r\n// https://developers.arcgis.com/rest/services-reference/query-feature-service-layer-.htm\r\n/* @internal /\r\nexport interface ArcGisFeatureQueryParams {\r\n\r\n /* This option can be used for fetching query results up to the resultRecordCount specified.\r\n * When resultOffset is specified but this parameter is not, the map service defaults it to maxRecordCount.\r\n * The maximum value for this parameter is the value of the layer's maxRecordCount property.\r\n * The minimum value entered for this parameter cannot be below 1.\r\n * This parameter only applies if supportsPagination is true.\r\n * /\r\n resultRecordCount?: number;\r\n\r\n /* This option can be used for fetching query results up to the resultRecordCount specified.\r\n * When resultOffset is specified but this parameter is not, the map service defaults it to maxRecordCount.\r\n * The maximum value for this parameter is the value of the layer's maxRecordCount property.\r\n * The minimum value entered for this parameter cannot be below 1.\r\n * This parameter only applies if supportsPagination is true.\r\n * /\r\n resultOffset?: number;\r\n\r\n /* If true, the result includes the geometry associated with each feature returned. /\r\n returnGeometry?: boolean;\r\n geometry?: ArcGisGeometry;\r\n geometryType?: ArcGisFeatureGeometryType;\r\n spatialRel?: ArcGisFeatureSpatialRel;\r\n resultType?: ArcGisFeatureResultType;\r\n maxRecordCountFactor?: number;\r\n returnExceededLimitFeatures?: boolean;\r\n quantizationParameters?: FeatureQueryQuantizationParams;\r\n\r\n /* The list of fields to be included in the returned result set. This list is a comma-delimited list of field names.\r\n * You can also specify the wildcard \"\" as the value of this parameter.\r\n /\r\n outFields?: string;\r\n\r\n /* The buffer distance for the input geometries.\r\n * /\r\n distance?: number;\r\n}\r\n\r\n/* @internal */\r\nexport class ArcGisFeatureQuery {\r\n public baseUrl: string;\r\n public layerIdx: number;\r\n public format: ArcGisFeatureFormat;\r\n public resultRecordCount?: number;\r\n public resultOffset?: number;\r\n public returnGeometry?: boolean;\r\n public geometry?: ArcGisGeometry;\r\n public spatialRel?: ArcGisFeatureSpatialRel;\r\n public resultType?: ArcGisFeatureResultType;\r\n public maxRecordCountFactor?: number;\r\n public returnExceededLimitFeatures?: boolean;\r\n public outSR: number;\r\n public outFields?: string;\r\n public distance?: number;\r\n\r\n // public envelopeFilter?: CartographicRange;\r\n public quantizationParams?: FeatureQueryQuantizationParams;\r\n\r\n // base url is expected ito be in the format of:\r\n // https://<hostname>/arcgis/rest/services/<ServiceName>/FeatureServer\r\n public constructor(baseUrl: string, layerIdx: number, format: ArcGisFeatureFormat, outSR: number, params?: ArcGisFeatureQueryParams) {\r\n this.baseUrl = baseUrl;\r\n this.layerIdx = layerIdx;\r\n this.format = format;\r\n this.outSR = outSR;\r\n\r\n if (params !== undefined) {\r\n this.resultRecordCount = params.resultRecordCount;\r\n this.resultOffset = params.resultOffset;\r\n this.returnGeometry = params.returnGeometry;\r\n this.geometry = params.geometry;\r\n this.spatialRel = params.spatialRel;\r\n this.resultType = params.resultType;\r\n this.maxRecordCountFactor = params.maxRecordCountFactor;\r\n this.returnExceededLimitFeatures = params.returnExceededLimitFeatures;\r\n this.quantizationParams = params.quantizationParameters;\r\n this.outFields = params.outFields;\r\n this.distance = params.distance;\r\n }\r\n\r\n }\r\n\r\n public toString() {\r\n const url = new URL(`${this.baseUrl}/${this.layerIdx}/query`);\r\n\r\n url.searchParams.append(\"f\", this.format);\r\n\r\n if ( this.resultRecordCount !== undefined) {\r\n url.searchParams.append(\"resultRecordCount\", `${this.resultRecordCount}`);\r\n }\r\n\r\n if ( this.resultOffset !== undefined) {\r\n url.searchParams.append( \"resultOffset\", `${this.resultOffset}`);\r\n }\r\n\r\n if ( this.returnGeometry !== undefined) {\r\n url.searchParams.append(\"returnGeometry\", this.returnGeometry?\"true\":\"false\");\r\n }\r\n\r\n if ( this.resultType !== undefined) {\r\n url.searchParams.append(\"resultType\", this.resultType);\r\n }\r\n\r\n if ( this.maxRecordCountFactor !== undefined) {\r\n url.searchParams.append( \"maxRecordCountFactor\", `${this.maxRecordCountFactor}`);\r\n }\r\n\r\n if ( this.returnExceededLimitFeatures !== undefined) {\r\n url.searchParams.append( \"returnExceededLimitFeatures\", this.returnExceededLimitFeatures?\"true\":\"false\");\r\n }\r\n\r\n url.searchParams.append( \"outSR\", `${this.outSR}`);\r\n\r\n if (this.geometry \|\| this.spatialRel) {\r\n\r\n if (this.spatialRel) {\r\n url.searchParams.append( \"spatialRel\", this.spatialRel);\r\n }\r\n\r\n if (this.geometry) {\r\n url.searchParams.append( \"geometryType\", this.geometry.type);\r\n\r\n const geomStr = JSON.stringify(this.geometry.geom);\r\n url.searchParams.append( \"geometry\", geomStr);\r\n url.searchParams.append( \"units\", \"esriSRUnit_Meter\"); // required on older server for get feature info\r\n\r\n url.searchParams.append( \"inSR\", `${this.geometry.geom.spatialReference.wkid}`);\r\n }\r\n } else {\r\n // No custom params, fetch all geometries\r\n url.searchParams.append(\"where\", \"1=1\");\r\n }\r\n\r\n if (this.quantizationParams) {\r\n const quantizationParamsStr = JSON.stringify(this.quantizationParams);\r\n url.searchParams.append(\"quantizationParameters\", quantizationParamsStr);\r\n }\r\n\r\n if (this.outFields) {\r\n url.searchParams.append( \"outFields\", this.outFields);\r\n }\r\n\r\n if (this.distance) {\r\n url.searchParams.append(\"distance\", `${this.distance}`);\r\n }\r\n\r\n return url.toString();\r\n }\r\n\r\n}\r\n"]}

package/lib/esm/ArcGisFeature/ArcGisSymbologyRenderer.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"ArcGisSymbologyRenderer.d.ts","sourceRoot":"","sources":["../../../src/ArcGisFeature/ArcGisSymbologyRenderer.ts"],"names":[],"mappings":"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~~CAOhC~~;IAEF,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,UAAU,CAKhC;IAEF,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,UAAU,CAIhC;gBAEU,YAAY,EAAE,yBAAyB,EAAE,kBAAkB,EAAE,GAAG;IAmCrE,cAAc,CAAC,OAAO,EAAE,wBAAwB;IAchD,gBAAgB,CAAC,OAAO,EAAE,wBAAwB;IAqBlD,SAAS,CAAC,OAAO,EAAE,wBAAwB,EAAE,GAAG,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM;~~CAyB7E~~"}
1	+ {"version":3,"file":"ArcGisSymbologyRenderer.d.ts","sourceRoot":"","sources":["../../../src/ArcGisFeature/ArcGisSymbologyRenderer.ts"],"names":[],"mappings":"AAMA,OAAO,EAAE,QAAQ,EAAE,MAAM,oBAAoB,CAAC;AAC9C,OAAO,EAAE,yBAAyB,EAAE,MAAM,sBAAsB,CAAC;AAajE,gBAAgB;AAChB,oBAAY,cAAc,GAAG,SAAS,GAAG,SAAS,GAAG,SAAS,GAAG,SAAS,GAAG,QAAQ,GAAG,oBAAoB,CAAC;AAC7G,UAAU,UAAU;IAClB,IAAI,EAAE,cAAc,CAAC;CACtB;AAED,gBAAgB;AAChB,oBAAY,YAAY,GAAG,aAAa,GAAG,gBAAgB,GAAG,mBAAmB,GAAG,YAAY,GAAG,iBAAiB,GAAG,oBAAoB,GAC3I,aAAa,GAAG,kBAAkB,GAAG,qBAAqB,GAAG,wBAAwB,GAAG,iBAAiB,GAAG,cAAc,CAAC;AAE3H,UAAU,YAAY;IACpB,KAAK,EAAE,MAAM,EAAE,CAAC;IAChB,IAAI,EAAE,cAAc,CAAC;IACrB,KAAK,EAAE,MAAM,CAAC;IACd,KAAK,EAAE,YAAY,CAAC;CACrB;AAED,gBAAgB;AAChB,qBAAa,OAAQ,YAAW,UAAU;IACxC,SAAgB,KAAK,EAAE,YAAY,CAAC;IAEpC,IAAW,KAAK,yBAA+C;IAC/D,IAAW,IAAI,mBAA8B;IAC7C,IAAW,KAAK,WAA+B;IAC/C,IAAW,KAAK,iBAA+B;gBAEnC,IAAI,EAAE,YAAY;WAIhB,QAAQ,CAAC,IAAI,EAAE,YAAY;CAG1C;AAED,UAAU,YAAY;IACpB,IAAI,EAAE,cAAc,CAAC;IACrB,GAAG,EAAE,MAAM,CAAC;IACZ,SAAS,EAAE,MAAM,CAAC;IAClB,WAAW,EAAE,MAAM,CAAC;IACpB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,KAAK,CAAC,EAAE,MAAM,CAAC;CAChB;AAED,gBAAgB;AAChB,qBAAa,OAAQ,YAAW,UAAU;IACxC,SAAgB,KAAK,EAAE,YAAY,CAAC;IACpC,OAAO,CAAC,MAAM,CAAmB;IAEjC,IAAW,IAAI,mBAA8B;IAC7C,IAAW,GAAG,WAA6B;IAC3C,IAAW,SAAS,WAAmC;IACvD,IAAW,QAAQ,WAAkE;IACrF,IAAW,KAAK,qBAA0B;IAC1C,IAAW,WAAW,WAAqC;IAC3D,IAAW,KAAK,uBAA+B;IAC/C,IAAW,MAAM,uBAAgC;IACjD,IAAW,OAAO,uBAAiC;IACnD,IAAW,OAAO,uBAAiC;IACnD,IAAW,KAAK,uBAA+B;gBAEnC,IAAI,EAAE,YAAY;WAMhB,QAAQ,CAAC,IAAI,EAAE,YAAY;CAG1C;AAED,gBAAgB;AAChB,oBAAY,iBAAiB,GAAG,yBAAyB,GAAG,cAAc,GAAG,sBAAsB,GAAG,wBAAwB,GAAG,mBAAmB,GAAG,aAAa,GAAG,cAAc,GAAG,iBAAiB,CAAC;AAC1M,UAAU,YAAY;IACpB,KAAK,CAAC,EAAE,MAAM,EAAE,CAAC;IACjB,IAAI,EAAE,cAAc,CAAC;IACrB,KAAK,EAAE,iBAAiB,CAAC;IACzB,OAAO,CAAC,EAAE,YAAY,CAAC;CACxB;AAED,gBAAgB;AAChB,qBAAa,OAAQ,YAAW,UAAU;IACxC,SAAgB,KAAK,EAAE,YAAY,CAAC;IACpC,OAAO,CAAC,QAAQ,CAAsB;IAEtC,IAAW,KAAK,yBAA+C;IAC/D,IAAW,IAAI,mBAA8B;IAC7C,IAAW,KAAK,sBAA+B;IAC/C,IAAW,OAAO,wBAA4B;gBAClC,IAAI,EAAE,YAAY;WAMhB,QAAQ,CAAC,IAAI,EAAE,YAAY,GAAG,OAAO;CAGpD;AAED,gBAAgB;AAChB,qBAAa,uBAAuB;IAClC,OAAO,CAAC,OAAO,CAAyB;IAExC,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,UAAU,CAShC;IAEF,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,UAAU,CAKhC;IAEF,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,UAAU,CAIhC;gBAEU,YAAY,EAAE,yBAAyB,EAAE,kBAAkB,EAAE,GAAG;IAmCrE,cAAc,CAAC,OAAO,EAAE,wBAAwB;IAchD,gBAAgB,CAAC,OAAO,EAAE,wBAAwB;IAqBlD,SAAS,CAAC,OAAO,EAAE,wBAAwB,EAAE,GAAG,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM;CA0B7E"}

package/lib/esm/ArcGisFeature/ArcGisSymbologyRenderer.js CHANGED Viewed

@@ -90,13 +90,13 @@ export class ArcGisSymbologyRenderer {
         if (this._symbol === undefined) {
             Logger.logWarning(loggerCategory, "Symbology definition not supported, using default symbology");
             if (geometryType === "esriGeometryPoint" || geometryType === "esriGeometryMultipoint") {
-                this._symbol = ArcGisSymbologyRenderer.defaultPMS;
+                this._symbol = EsriPMS.fromJSON(ArcGisSymbologyRenderer.defaultPMS);
             }
             else if (geometryType === "esriGeometryLine" || geometryType === "esriGeometryPolyline") {
-                this._symbol = ArcGisSymbologyRenderer.defaultSLS;
+                this._symbol = EsriSLS.fromJSON(ArcGisSymbologyRenderer.defaultSLS);
             }
             else if (geometryType === "esriGeometryPolygon") {
-                this._symbol = ArcGisSymbologyRenderer.defaultSFS;
+                this._symbol = EsriSFS.fromJSON(ArcGisSymbologyRenderer.defaultSFS);
             }
             else {
                 Logger.logError(loggerCategory, "Could not determine default symbology: geometry type not supported");
@@ -146,12 +146,13 @@ export class ArcGisSymbologyRenderer {
             let xOffset = 0, yOffset = 0;
             if (pms.xoffset)
                 xOffset = pms.xoffset;
+            else if (pms.width)
+                xOffset = pms.width * -0.5; // if no offset center in the middle
             if (pms.yoffset)
                 yOffset = pms.yoffset;
+            else if (pms.height)
+                yOffset = pms.height * -0.5; // if no offset center in the middle
             if (pms.width && pms.height) {
-                // // make sure the marker is centered on the point
-                xOffset += pms.width * -0.5;
-                yOffset += pms.height * -0.5;
                 context.drawImage(pms.image, ptX + xOffset, ptY + yOffset, pms.width, pms.height);
             }
             else {
@@ -165,19 +166,21 @@ ArcGisSymbologyRenderer.defaultPMS = {
     type: "esriPMS",
     url: "",
     contentType: "image/png",
-    imageData: "iVBORw0KGgoAAAANSUhEUgAAABMAAAATCAYAAAByUDbMAAAAAXNSR0IB2cksfwAAAAlwSFlzAAAOxAAADsQBlSsOGwAAAT9JREFUOI2t1E8rRGEUx/HvMHViIm5ZXGt/3gFlwdKGhYjyAmxs7IassDHFyguwwkbZYJKNslVWJDZT1C3psRv9NMpmJk/Tvc3MHWf3/PuccxbPyfKPkW1wPmBmQ5L6giB4d849Al+tYjNAHpiQ1AHgnAMoA+dhGG5HUfTQCOsCDoGlhCTdwGIURfPVZPtJWCdwBkwntVF3d6+K78Rh+SYhP7bM7FbSjY8FwHqLEEBGUgEY97E5oCcFBjAGDAMvNWwyJVSLKR8L28QG4a/N7zYx+VipTazkY0VgNSVUAa597MrMniWNpMBOAOdjFUlrwAWQaQFywGZt4f+AIrAB7DYJlc1sQdJrHAZQAN6AA6A/STGzp1wut+ycu/f340bQEXAJrACzwCjQC3wAd8CppGNJP/UPk+bZZ7XKQlJ1cfEL1AZaAcKna+kAAAAASUVORK5CYII=",
-    width: 14,
-    height: 14,
+    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,
 };
 ArcGisSymbologyRenderer.defaultSLS = {
     type: "esriSLS",
-    color: [0, 0.0],
+    color: [0, 0, 0, 255],
     width: 1,
     style: "esriSLSSolid",
 };
 ArcGisSymbologyRenderer.defaultSFS = {
     type: "esriSFS",
-    color: [0, 0.0],
+    color: [0, 0, 0, 255],
     style: "esriSFSSolid",
 };
 //# sourceMappingURL=ArcGisSymbologyRenderer.js.map