@loaders.gl/wms 3.3.0-alpha.13 → 3.3.0-alpha.14

package/dist/lib/data-sources/image-services/arcgis-image-service.js

@@ -0,0 +1,85 @@
+"use strict";
+// loaders.gl, MIT license
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.ArcGISImageService = void 0;
+const image_source_1 = require("../image-source");
+const image_service_1 = require("./image-service");
+class ArcGISImageService extends image_source_1.ImageSource {
+    constructor(props) {
+        super();
+        this.props = (0, image_service_1.mergeImageServiceProps)(props);
+        this.fetch = (0, image_service_1.getFetchFunction)(this.props);
+    }
+    // ImageSource (normalized endpoints)
+    async getMetadata() {
+        return (await this.info());
+        // TODO - normalize metadata
+    }
+    async getImage(parameters) {
+        throw new Error('not implemented');
+        // TODO - Map generic parameters to ArcGIS specific parameters
+        // return await this.exportImage(parameters);
+    }
+    // ImageServer endpoints
+    async info() {
+        // We just need a JSON parsing...
+        // return this.getUrl({path: '', ...options});
+        throw new Error('not implemented');
+    }
+    /**
+     * Form a URL to an ESRI ImageServer
+     // https://sampleserver6.arcgisonline.com/arcgis/rest/services/NLCDLandCover2001/ImageServer/exportImage?bbox=${bounds[0]},${bounds[1]},${bounds[2]},${bounds[3]}&bboxSR=4326&size=${width},${height}&imageSR=102100&time=&format=jpgpng&pixelType=U8&noData=&noDataInterpretation=esriNoDataMatchAny&interpolation=+RSP_NearestNeighbor&compression=&compressionQuality=&bandIds=&mosaicRule=&renderingRule=&f=image`,
+     */
+    exportImage(options) {
+        // See WMSService.getMap()
+        throw new Error('not implemented');
+    }
+    // URL creators
+    infoURL(options) {
+        return this.props.url;
+        // return this.getUrl({path: '', ...options});
+    }
+    /**
+     * Form a URL to an ESRI ImageServer
+     // https://sampleserver6.arcgisonline.com/arcgis/rest/services/NLCDLandCover2001/ImageServer/exportImage?bbox=${bounds[0]},${bounds[1]},${bounds[2]},${bounds[3]}&bboxSR=4326&size=${width},${height}&imageSR=102100&time=&format=jpgpng&pixelType=U8&noData=&noDataInterpretation=esriNoDataMatchAny&interpolation=+RSP_NearestNeighbor&compression=&compressionQuality=&bandIds=&mosaicRule=&renderingRule=&f=image`,
+     */
+    exportImageURL(options) {
+        // const {boundingBox} = options;
+        // const bbox = `bbox=${boundingBox[0]},${boundingBox[1]},${boundingBox[2]},${boundingBox[3]}`;
+        // const size = `size=${width},${height}`;
+        // return this.getUrl({path: 'exportImage'});
+        return this.props.url;
+    }
+    // INTERNAL METHODS
+    /**
+     * @note protected, since perhaps getWMSUrl may need to be overridden to handle certain backends?
+     * @note if override is common, maybe add a callback prop?
+     * */
+    getUrl(options, extra) {
+        let url = `${this.props.url}`;
+        let first = true;
+        for (const [key, value] of Object.entries(options)) {
+            url += first ? '?' : '&';
+            first = false;
+            if (Array.isArray(value)) {
+                url += `${key.toUpperCase()}=${value.join(',')}`;
+            }
+            else {
+                url += `${key.toUpperCase()}=${value ? String(value) : ''}`;
+            }
+        }
+        return url;
+    }
+    /** Checks for and parses a WMS XML formatted ServiceError and throws an exception */
+    async checkResponse(response) {
+        if (!response.ok) {
+            // } || response.headers['content-type'] === WMSErrorLoader.mimeTypes[0]) {
+            // const arrayBuffer = await response.arrayBuffer();
+            // const error = await WMSErrorLoader.parse(arrayBuffer, this.loadOptions);
+            throw new Error('error');
+        }
+    }
+}
+exports.ArcGISImageService = ArcGISImageService;
+ArcGISImageService.type = 'arcgis-image-server';
+ArcGISImageService.testURL = (url) => url.toLowerCase().includes('ImageServer');

package/dist/lib/data-sources/image-services/image-service.d.ts

@@ -0,0 +1,39 @@
+import { LoaderOptions } from '@loaders.gl/loader-utils';
+import type { ImageType } from '@loaders.gl/images';
+import type { ImageSourceMetadata, GetImageParameters } from '../image-source';
+import { ImageSource } from '../image-source';
+/** Template URL string should contain `${width}` etc which will be substituted. */
+export type ImageServiceProps = {
+    /** Base URL to the service */
+    url: string;
+    /** Any load options to the loaders.gl Loaders used by the WMSService methods */
+    loadOptions?: LoaderOptions;
+};
+/**
+ * Quickly connect to "ad hoc" image sources without subclassing ImageSource.
+ * ImageSource allows template url strings to be used to ad hoc connect to arbitrary image data sources
+ * Accepts a template url string and builds requests URLs
+ */
+export declare class ImageService extends ImageSource {
+    static type: 'template';
+    static testURL: (url: string) => boolean;
+    props: Required<ImageServiceProps>;
+    fetch: (url: string, options?: RequestInit) => Promise<Response>;
+    constructor(props: ImageServiceProps);
+    getMetadata(): Promise<ImageSourceMetadata>;
+    getImage(parameters: GetImageParameters): Promise<ImageType>;
+    /** Break up bounding box in east, north, south, west */
+    protected getGranularParameters(parameters: GetImageParameters): Record<string, unknown>;
+    /** Supports both ${} and {} notations */
+    protected getURLFromTemplate(parameters: Record<string, unknown>): string;
+}
+/**
+ * Gets the current fetch function from options
+ * @todo - move to loader-utils module
+ * @todo - use in core module counterpart
+ * @param options
+ * @param context
+ */
+export declare function getFetchFunction(options?: LoaderOptions): (url: string, fetchOptions?: RequestInit) => Promise<Response>;
+export declare function mergeImageServiceProps(props: ImageServiceProps): Required<ImageServiceProps>;
+//# sourceMappingURL=image-service.d.ts.map

package/dist/lib/data-sources/image-services/image-service.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"image-service.d.ts","sourceRoot":"","sources":["../../../../src/lib/data-sources/image-services/image-service.ts"],"names":[],"mappings":"AAEA,OAAO,EAAC,aAAa,EAAC,MAAM,0BAA0B,CAAC;AACvD,OAAO,KAAK,EAAC,SAAS,EAAC,MAAM,oBAAoB,CAAC;AAGlD,OAAO,KAAK,EAAC,mBAAmB,EAAE,kBAAkB,EAAC,MAAM,iBAAiB,CAAC;AAC7E,OAAO,EAAC,WAAW,EAAC,MAAM,iBAAiB,CAAC;AAE5C,mFAAmF;AACnF,MAAM,MAAM,iBAAiB,GAAG;IAC9B,8BAA8B;IAC9B,GAAG,EAAE,MAAM,CAAC;IACZ,gFAAgF;IAChF,WAAW,CAAC,EAAE,aAAa,CAAC;CAC7B,CAAC;AAEF;;;;GAIG;AACH,qBAAa,YAAa,SAAQ,WAAW;IAC3C,MAAM,CAAC,IAAI,EAAE,UAAU,CAAc;IACrC,MAAM,CAAC,OAAO,QAAS,MAAM,KAAG,OAAO,CAAoC;IAE3E,KAAK,EAAE,QAAQ,CAAC,iBAAiB,CAAC,CAAC;IACnC,KAAK,EAAE,CAAC,GAAG,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,WAAW,KAAK,OAAO,CAAC,QAAQ,CAAC,CAAC;gBAErD,KAAK,EAAE,iBAAiB;IAQ9B,WAAW,IAAI,OAAO,CAAC,mBAAmB,CAAC;IAI3C,QAAQ,CAAC,UAAU,EAAE,kBAAkB,GAAG,OAAO,CAAC,SAAS,CAAC;IAUlE,wDAAwD;IACxD,SAAS,CAAC,qBAAqB,CAAC,UAAU,EAAE,kBAAkB,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC;IAKxF,yCAAyC;IACzC,SAAS,CAAC,kBAAkB,CAAC,UAAU,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,MAAM;CAU1E;AAED;;;;;;GAMG;AACH,wBAAgB,gBAAgB,CAAC,OAAO,CAAC,EAAE,aAAa,SAKvC,MAAM,iBAAiB,WAAW,uBAWlD;AAED,wBAAgB,sBAAsB,CAAC,KAAK,EAAE,iBAAiB,GAAG,QAAQ,CAAC,iBAAiB,CAAC,CAS5F"}

package/dist/lib/data-sources/image-services/image-service.js

@@ -0,0 +1,82 @@
+"use strict";
+// loaders.gl, MIT license
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.mergeImageServiceProps = exports.getFetchFunction = exports.ImageService = void 0;
+const images_1 = require("@loaders.gl/images");
+const image_source_1 = require("../image-source");
+/**
+ * Quickly connect to "ad hoc" image sources without subclassing ImageSource.
+ * ImageSource allows template url strings to be used to ad hoc connect to arbitrary image data sources
+ * Accepts a template url string and builds requests URLs
+ */
+class ImageService extends image_source_1.ImageSource {
+    constructor(props) {
+        super();
+        this.props = mergeImageServiceProps(props);
+        this.fetch = getFetchFunction(props);
+    }
+    // IMAGE SOURCE API
+    async getMetadata() {
+        throw new Error('ImageSource.getMetadata not implemented');
+    }
+    async getImage(parameters) {
+        const granularParameters = this.getGranularParameters(parameters);
+        const url = this.getURLFromTemplate(granularParameters);
+        const response = await this.fetch(url);
+        const arrayBuffer = await response.arrayBuffer();
+        return await images_1.ImageLoader.parse(arrayBuffer);
+    }
+    // HELPERS
+    /** Break up bounding box in east, north, south, west */
+    getGranularParameters(parameters) {
+        const [east, north, west, south] = parameters.bbox;
+        return { ...parameters, east, north, south, west };
+    }
+    /** Supports both ${} and {} notations */
+    getURLFromTemplate(parameters) {
+        let url = this.props.url;
+        for (const [key, value] of Object.entries(parameters)) {
+            // TODO - parameter could be repeated
+            // const regex = new RegExp(`\${${key}}`, 'g');
+            url = url.replace(`\${${key}}`, String(value));
+            url = url.replace(`{${key}}`, String(value));
+        }
+        return url;
+    }
+}
+exports.ImageService = ImageService;
+ImageService.type = 'template';
+ImageService.testURL = (url) => url.toLowerCase().includes('{');
+/**
+ * Gets the current fetch function from options
+ * @todo - move to loader-utils module
+ * @todo - use in core module counterpart
+ * @param options
+ * @param context
+ */
+function getFetchFunction(options) {
+    const fetchFunction = options?.fetch;
+    // options.fetch can be a function
+    if (fetchFunction && typeof fetchFunction === 'function') {
+        return (url, fetchOptions) => fetchFunction(url, fetchOptions);
+    }
+    // options.fetch can be an options object, use global fetch with those options
+    const fetchOptions = options?.fetch;
+    if (fetchOptions && typeof fetchOptions !== 'function') {
+        return (url) => fetch(url, fetchOptions);
+    }
+    // else return the global fetch function
+    return (url) => fetch(url);
+}
+exports.getFetchFunction = getFetchFunction;
+function mergeImageServiceProps(props) {
+    return {
+        // Default fetch
+        ...props,
+        loadOptions: {
+            ...props.loadOptions,
+            fetch: getFetchFunction(props.loadOptions)
+        }
+    };
+}
+exports.mergeImageServiceProps = mergeImageServiceProps;

package/dist/lib/data-sources/{wms-service.d.ts → image-services/wms-service.d.ts}

@@ -1,9 +1,8 @@
 import type { ImageType } from '@loaders.gl/images';
-import { LoaderOptions } from '@loaders.gl/loader-utils';
-import type { ImageSourceMetadata, GetImageParameters } from './image-source';
-import { ImageSource } from './image-source';
-import type { WMSCapabilities, WMSFeatureInfo, WMSLayerDescription } from '../wms/wms-types';
-type FetchLike = (url: string, options?: RequestInit) => Promise<Response>;
+import type { ImageSourceMetadata, GetImageParameters } from '../image-source';
+import { ImageSource } from '../image-source';
+import { ImageServiceProps } from './image-service';
+import type { WMSCapabilities, WMSFeatureInfo, WMSLayerDescription } from '../../wms/wms-types';
 type WMSCommonParameters = {
     /** In case the endpoint supports multiple services */
     service?: 'WMS';
@@ -42,7 +41,7 @@ export type WMSGetFeatureInfoParameters = WMSCommonParameters & {
     /** list of layers to query (could be different from rendered layers) */
     query_layers: string[];
     /** MIME type of returned feature info */
-    info_format?: 'text/plain';
+    info_format?: 'text/plain' | 'application/vnd.ogc.gml';
     /** Layers to render */
     layers: string[];
     /** Styling */
@@ -66,15 +65,6 @@ export type WMSGetLegendGraphicParameters = WMSCommonParameters & {
     /** Request type */
     request?: 'GetLegendGraphic';
 };
-/** Properties that can be specified when creating a new WMS service */
-export type WMSServiceProps = {
-    /** Base URL to the service */
-    serviceUrl: string;
-    /** Any load options to the loaders.gl Loaders used by the WMSService methods */
-    loadOptions?: LoaderOptions;
-    /** Override the fetch function if required */
-    fetch?: typeof fetch | FetchLike;
-};
 /**
  * The WMSService class provides
  * - provides type safe methods to form URLs to a WMS service
@@ -83,9 +73,11 @@ export type WMSServiceProps = {
  * @note Only the URL parameter conversion is supported. XML posts are not supported.
  */
 export declare class WMSService extends ImageSource {
-    serviceUrl: string;
-    loadOptions: LoaderOptions;
-    fetch: typeof fetch | FetchLike;
+    static type: 'wms';
+    static testURL: (url: string) => boolean;
+    props: Required<ImageServiceProps>;
+    fetch: (url: string, options?: RequestInit) => Promise<Response>;
+    capabilities: WMSCapabilities | null;
     /** A list of loaders used by the WMSService methods */
     readonly loaders: ({
         id: string;
@@ -101,9 +93,9 @@ export declare class WMSService extends ImageSource {
                 throwOnError: boolean;
             };
         };
-        parse: (arrayBuffer: ArrayBuffer, options?: import("../../wms-error-loader").WMSLoaderOptions | undefined) => Promise<string>;
-        parseSync: (arrayBuffer: ArrayBuffer, options?: import("../../wms-error-loader").WMSLoaderOptions | undefined) => string;
-        parseTextSync: (text: string, options?: import("../../wms-error-loader").WMSLoaderOptions | undefined) => string;
+        parse: (arrayBuffer: ArrayBuffer, options?: import("../../../wms-error-loader").WMSLoaderOptions | undefined) => Promise<string>;
+        parseSync: (arrayBuffer: ArrayBuffer, options?: import("../../../wms-error-loader").WMSLoaderOptions | undefined) => string;
+        parseTextSync: (text: string, options?: import("../../../wms-error-loader").WMSLoaderOptions | undefined) => string;
     } | {
         id: string;
         name: string;
@@ -116,13 +108,24 @@ export declare class WMSService extends ImageSource {
         options: {
             wms: {};
         };
-        parse: (arrayBuffer: ArrayBuffer, options?: import("../../wms-capabilities-loader").WMSLoaderOptions | undefined) => Promise<WMSCapabilities>;
-        parseTextSync: (text: string, options?: import("../../wms-capabilities-loader").WMSLoaderOptions | undefined) => WMSCapabilities;
+        /** In case the endpoint supports multiple services */
+        parse: (arrayBuffer: ArrayBuffer, options?: import("../../../wms-capabilities-loader").WMSLoaderOptions | undefined) => Promise<WMSCapabilities>;
+        parseTextSync: (text: string, options?: import("../../../wms-capabilities-loader").WMSLoaderOptions | undefined) => WMSCapabilities;
+    } | {
+        id: string;
+        module: string;
+        name: string;
+        version: any;
+        mimeTypes: string[];
+        extensions: string[];
+        parse: typeof import("modules/images/src/lib/parsers/parse-image").default;
+        tests: ((arrayBuffer: any) => boolean)[];
+        options: import("@loaders.gl/images").ImageLoaderOptions;
     } | {
         id: string;
         name: string;
-        parse: (arrayBuffer: ArrayBuffer, options?: import("../../wms-capabilities-loader").WMSLoaderOptions | undefined) => Promise<WMSFeatureInfo>;
-        parseTextSync: (text: string, options?: import("../../wms-capabilities-loader").WMSLoaderOptions | undefined) => WMSFeatureInfo;
+        parse: (arrayBuffer: ArrayBuffer, options?: import("../../../wms-capabilities-loader").WMSLoaderOptions | undefined) => Promise<WMSFeatureInfo>;
+        parseTextSync: (text: string, options?: import("../../../wms-capabilities-loader").WMSLoaderOptions | undefined) => WMSFeatureInfo;
         module: string;
         version: any;
         worker: boolean;
@@ -135,8 +138,8 @@ export declare class WMSService extends ImageSource {
     } | {
         id: string;
         name: string;
-        parse: (arrayBuffer: ArrayBuffer, options?: import("../../wms-capabilities-loader").WMSLoaderOptions | undefined) => Promise<WMSLayerDescription>;
-        parseTextSync: (text: string, options?: import("../../wms-capabilities-loader").WMSLoaderOptions | undefined) => WMSLayerDescription;
+        parse: (arrayBuffer: ArrayBuffer, options?: import("../../../wms-capabilities-loader").WMSLoaderOptions | undefined) => Promise<WMSLayerDescription>;
+        parseTextSync: (text: string, options?: import("../../../wms-capabilities-loader").WMSLoaderOptions | undefined) => WMSLayerDescription;
         module: string;
         version: any;
         worker: boolean;
@@ -146,19 +149,9 @@ export declare class WMSService extends ImageSource {
         options: {
             wms: {};
         };
-    } | {
-        id: string;
-        module: string;
-        name: string;
-        version: any;
-        mimeTypes: string[];
-        extensions: string[];
-        parse: typeof import("modules/images/src/lib/parsers/parse-image").default;
-        tests: ((arrayBuffer: any) => boolean)[];
-        options: import("@loaders.gl/images").ImageLoaderOptions;
     })[];
     /** Create a WMSService */
-    constructor(props: WMSServiceProps);
+    constructor(props: ImageServiceProps);
     getMetadata(): Promise<ImageSourceMetadata>;
     getImage(parameters: GetImageParameters): Promise<ImageType>;
     /** Get Capabilities */
@@ -167,6 +160,8 @@ export declare class WMSService extends ImageSource {
     getMap(options: WMSGetMapParameters, vendorParameters?: Record<string, unknown>): Promise<ImageType>;
     /** Get Feature Info for a coordinate */
     getFeatureInfo(options: WMSGetFeatureInfoParameters, vendorParameters?: Record<string, unknown>): Promise<WMSFeatureInfo>;
+    /** Get Feature Info for a coordinate */
+    getFeatureInfoText(options: WMSGetFeatureInfoParameters, vendorParameters?: Record<string, unknown>): Promise<string>;
     /** Get more information about a layer */
     describeLayer(options: WMSDescribeLayerParameters, vendorParameters?: Record<string, unknown>): Promise<WMSLayerDescription>;
     /** Get an image with a semantic legend */

package/dist/lib/data-sources/image-services/wms-service.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"wms-service.d.ts","sourceRoot":"","sources":["../../../../src/lib/data-sources/image-services/wms-service.ts"],"names":[],"mappings":"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"}

package/dist/lib/data-sources/{wms-service.js → image-services/wms-service.js}

@@ -3,11 +3,12 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.WMSService = void 0;
 const images_1 = require("@loaders.gl/images");
-const image_source_1 = require("./image-source");
-const wms_capabilities_loader_1 = require("../../wms-capabilities-loader");
-const wms_feature_info_loader_1 = require("../../wip/wms-feature-info-loader");
-const wms_layer_description_loader_1 = require("../../wip/wms-layer-description-loader");
-const wms_error_loader_1 = require("../../wms-error-loader");
+const image_source_1 = require("../image-source");
+const image_service_1 = require("./image-service");
+const wms_capabilities_loader_1 = require("../../../wms-capabilities-loader");
+const wms_feature_info_loader_1 = require("../../../wip/wms-feature-info-loader");
+const wms_layer_description_loader_1 = require("../../../wip/wms-layer-description-loader");
+const wms_error_loader_1 = require("../../../wms-error-loader");
 /**
  * The WMSService class provides
  * - provides type safe methods to form URLs to a WMS service
@@ -19,10 +20,7 @@ class WMSService extends image_source_1.ImageSource {
     /** Create a WMSService */
     constructor(props) {
         super();
-        this.loadOptions = {
-            // We want error responses to throw exceptions, the WMSErrorLoader can do this
-            wms: { throwOnError: true }
-        };
+        this.capabilities = null;
         /** A list of loaders used by the WMSService methods */
         this.loaders = [
             images_1.ImageLoader,
@@ -31,10 +29,13 @@ class WMSService extends image_source_1.ImageSource {
             wms_feature_info_loader_1.WMSFeatureInfoLoader,
             wms_layer_description_loader_1.WMSLayerDescriptionLoader
         ];
-        this.serviceUrl = props.serviceUrl;
-        // TODO Need an options merge function from loaders.gl to merge subobjects
-        Object.assign(this.loadOptions, props.loadOptions);
-        this.fetch = props.fetch || fetch;
+        this.props = (0, image_service_1.mergeImageServiceProps)(props);
+        this.fetch = (0, image_service_1.getFetchFunction)(this.props);
+        this.props.loadOptions = {
+            ...this.props.loadOptions,
+            // We want error responses to throw exceptions, the WMSErrorLoader can do this
+            wms: { ...this.props.loadOptions?.wms, throwOnError: true }
+        };
     }
     // ImageSource implementation
     getMetadata() {
@@ -47,21 +48,21 @@ class WMSService extends image_source_1.ImageSource {
     /** Get Capabilities */
     async getCapabilities(wmsParameters, vendorParameters) {
         const url = this.getCapabilitiesURL(wmsParameters, vendorParameters);
-        const { fetch } = this;
-        const response = await fetch(url, this.loadOptions);
+        const response = await this.fetch(url);
         const arrayBuffer = await response.arrayBuffer();
         this._checkResponse(response, arrayBuffer);
-        return await wms_capabilities_loader_1.WMSCapabilitiesLoader.parse(arrayBuffer, this.loadOptions);
+        const capabilities = await wms_capabilities_loader_1.WMSCapabilitiesLoader.parse(arrayBuffer, this.props.loadOptions);
+        this.capabilities = capabilities;
+        return capabilities;
     }
     /** Get a map image */
     async getMap(options, vendorParameters) {
         const url = this.getMapURL(options, vendorParameters);
-        const { fetch } = this;
-        const response = await fetch(url, this.loadOptions);
+        const response = await this.fetch(url);
         const arrayBuffer = await response.arrayBuffer();
         this._checkResponse(response, arrayBuffer);
         try {
-            return await images_1.ImageLoader.parse(arrayBuffer, this.loadOptions);
+            return await images_1.ImageLoader.parse(arrayBuffer, this.props.loadOptions);
         }
         catch {
             throw this._parseError(arrayBuffer);
@@ -70,27 +71,36 @@ class WMSService extends image_source_1.ImageSource {
     /** Get Feature Info for a coordinate */
     async getFeatureInfo(options, vendorParameters) {
         const url = this.getFeatureInfoURL(options, vendorParameters);
-        const response = await this.fetch(url, this.loadOptions);
+        const response = await this.fetch(url);
+        const arrayBuffer = await response.arrayBuffer();
+        this._checkResponse(response, arrayBuffer);
+        return await wms_feature_info_loader_1.WMSFeatureInfoLoader.parse(arrayBuffer, this.props.loadOptions);
+    }
+    /** Get Feature Info for a coordinate */
+    async getFeatureInfoText(options, vendorParameters) {
+        options = { ...options, info_format: 'text/plain' };
+        const url = this.getFeatureInfoURL(options, vendorParameters);
+        const response = await this.fetch(url);
         const arrayBuffer = await response.arrayBuffer();
         this._checkResponse(response, arrayBuffer);
-        return await wms_feature_info_loader_1.WMSFeatureInfoLoader.parse(arrayBuffer, this.loadOptions);
+        return new TextDecoder().decode(arrayBuffer);
     }
     /** Get more information about a layer */
     async describeLayer(options, vendorParameters) {
         const url = this.describeLayerURL(options, vendorParameters);
-        const response = await this.fetch(url, this.loadOptions);
+        const response = await this.fetch(url);
         const arrayBuffer = await response.arrayBuffer();
         this._checkResponse(response, arrayBuffer);
-        return await wms_layer_description_loader_1.WMSLayerDescriptionLoader.parse(arrayBuffer, this.loadOptions);
+        return await wms_layer_description_loader_1.WMSLayerDescriptionLoader.parse(arrayBuffer, this.props.loadOptions);
     }
     /** Get an image with a semantic legend */
     async getLegendGraphic(options, vendorParameters) {
         const url = this.getLegendGraphicURL(options, vendorParameters);
-        const response = await this.fetch(url, this.loadOptions);
+        const response = await this.fetch(url);
         const arrayBuffer = await response.arrayBuffer();
         this._checkResponse(response, arrayBuffer);
         try {
-            return await images_1.ImageLoader.parse(arrayBuffer, this.loadOptions);
+            return await images_1.ImageLoader.parse(arrayBuffer, this.props.loadOptions);
         }
         catch {
             throw this._parseError(arrayBuffer);
@@ -175,7 +185,7 @@ class WMSService extends image_source_1.ImageSource {
      * @note case _getWMSUrl may need to be overridden to handle certain backends?
      * */
     _getWMSUrl(options, vendorParameters) {
-        let url = `${this.serviceUrl}`;
+        let url = this.props.url;
         let first = true;
         for (const [key, value] of Object.entries(options)) {
             url += first ? '?' : '&';
@@ -193,14 +203,16 @@ class WMSService extends image_source_1.ImageSource {
     _checkResponse(response, arrayBuffer) {
         const contentType = response.headers['content-type'];
         if (!response.ok || wms_error_loader_1.WMSErrorLoader.mimeTypes.includes(contentType)) {
-            const error = wms_error_loader_1.WMSErrorLoader.parseSync(arrayBuffer, this.loadOptions);
+            const error = wms_error_loader_1.WMSErrorLoader.parseSync(arrayBuffer, this.props.loadOptions);
             throw new Error(error);
         }
     }
     /** Error situation detected */
     _parseError(arrayBuffer) {
-        const error = wms_error_loader_1.WMSErrorLoader.parseSync(arrayBuffer, this.loadOptions);
+        const error = wms_error_loader_1.WMSErrorLoader.parseSync(arrayBuffer, this.props.loadOptions);
         return new Error(error);
     }
 }
 exports.WMSService = WMSService;
+WMSService.type = 'wms';
+WMSService.testURL = (url) => url.toLowerCase().includes('wms');

package/dist/wip/arcgis-feature-service.d.ts

@@ -0,0 +1,56 @@
+import { LoaderOptions } from '@loaders.gl/loader-utils';
+type FetchLike = (url: string, options?: RequestInit) => Promise<Response>;
+export type ArcGISImageServiceQueryOptions = {
+    returnGeometry: boolean;
+    where: '1%3D1';
+    outSR: 4326;
+    outFields: string | '*';
+    inSR: 4326;
+    geometry: `${-90}%2C+${30}%2C+${-70}%2C+${50}`;
+    geometryType: 'esriGeometryEnvelope';
+    spatialRel: 'esriSpatialRelIntersects';
+    geometryPrecision: number;
+    resultType: 'tile';
+    f?: 'geojson';
+};
+export type ArcGISFeatureServiceProps = ArcGISImageServiceQueryOptions & {
+    url: string;
+    loadOptions?: LoaderOptions;
+    fetch?: typeof fetch | FetchLike;
+};
+export declare class ArcGISFeatureService {
+    url: string;
+    loadOptions: LoaderOptions;
+    fetch: typeof fetch | FetchLike;
+    constructor(props: ArcGISFeatureServiceProps);
+    metadataURL(options: {
+        parameters?: Record<string, unknown>;
+    }): string;
+    /**
+     * Form a URL to an ESRI FeatureServer
+  // https://services2.arcgis.com/CcI36Pduqd0OR4W9/ArcGIS/rest/services/Bicycle_Routes_Public/FeatureServer/0/query?
+  //   returnGeometry=true&where=1%3D1&outSR=4326&outFields=*&inSR=4326&geometry=${-90}%2C+${30}%2C+${-70}%2C+${50}&
+  //   geometryType=esriGeometryEnvelope&spatialRel=esriSpatialRelIntersects&geometryPrecision=6&resultType=tile&f=geojson`
+     */
+    exportImageURL(options: {
+        boundingBox: [number, number, number, number];
+        boundingBoxSR?: string;
+        width: number;
+        height: number;
+        imageSR?: string;
+        time?: never;
+        f?: 'geojson';
+        resultType?: 'tile';
+        noData?: never;
+        noDataInterpretation?: 'esriNoDataMatchAny';
+        interpolation?: '+RSP_NearestNeighbor';
+        compression?: never;
+        compressionQuality?: never;
+        bandIds?: never;
+        mosaicRule?: never;
+        renderingRule?: never;
+        f?: 'image';
+    }): string;
+}
+export {};
+//# sourceMappingURL=arcgis-feature-service.d.ts.map

package/dist/wip/arcgis-feature-service.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"arcgis-feature-service.d.ts","sourceRoot":"","sources":["../../src/wip/arcgis-feature-service.ts"],"names":[],"mappings":"AAEA,OAAO,EAAC,aAAa,EAAC,MAAM,0BAA0B,CAAC;AAGvD,KAAK,SAAS,GAAG,CAAC,GAAG,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,WAAW,KAAK,OAAO,CAAC,QAAQ,CAAC,CAAC;AAE3E,MAAM,MAAM,8BAA8B,GAAG;IAC3C,cAAc,EAAE,OAAO,CAAC;IACxB,KAAK,EAAE,OAAO,CAAC;IACf,KAAK,EAAE,IAAI,CAAC;IACZ,SAAS,EAAE,MAAM,GAAG,GAAG,CAAC;IACxB,IAAI,EAAE,IAAI,CAAC;IACX,QAAQ,EAAE,GAAG,CAAC,EAAE,OAAO,EAAE,OAAO,CAAC,EAAE,OAAO,EAAE,EAAE,CAAC;IAC/C,YAAY,EAAE,sBAAsB,CAAC;IACrC,UAAU,EAAE,0BAA0B,CAAC;IACvC,iBAAiB,EAAE,MAAM,CAAC;IAC1B,UAAU,EAAE,MAAM,CAAC;IACnB,CAAC,CAAC,EAAE,SAAS,CAAC;CACf,CAAA;AAgBD,MAAM,MAAM,yBAAyB,GAAG,8BAA8B,GAAG;IACvE,GAAG,EAAE,MAAM,CAAC;IACZ,WAAW,CAAC,EAAE,aAAa,CAAC;IAC5B,KAAK,CAAC,EAAE,OAAO,KAAK,GAAG,SAAS,CAAC;CAClC,CAAC;AAEF,qBAAa,oBAAoB;IAC/B,GAAG,EAAE,MAAM,CAAC;IACZ,WAAW,EAAE,aAAa,CAAC;IAC3B,KAAK,EAAE,OAAO,KAAK,GAAG,SAAS,CAAC;gBAEpB,KAAK,EAAE,yBAAyB;IAQ5C,WAAW,CAAC,OAAO,EAAE;QAAC,UAAU,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAA;KAAC,GAAG,MAAM;IAIpE;;;;;OAKG;IACH,cAAc,CAAC,OAAO,EAAE;QACtB,WAAW,EAAE,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,CAAC,CAAC;QAC9C,aAAa,CAAC,EAAE,MAAM,CAAC;QACvB,KAAK,EAAE,MAAM,CAAC;QACd,MAAM,EAAE,MAAM,CAAC;QACf,OAAO,CAAC,EAAE,MAAM,CAAC;QACjB,IAAI,CAAC,EAAE,KAAK,CAAC;QACb,CAAC,CAAC,EAAE,SAAS,CAAC;QACd,UAAU,CAAC,EAAE,MAAM,CAAC;QACpB,MAAM,CAAC,EAAE,KAAK,CAAC;QACf,oBAAoB,CAAC,EAAE,oBAAoB,CAAC;QAC5C,aAAa,CAAC,EAAE,sBAAsB,CAAC;QACvC,WAAW,CAAC,EAAE,KAAK,CAAA;QACnB,kBAAkB,CAAC,EAAE,KAAK,CAAC;QAC3B,OAAO,CAAC,EAAE,KAAK,CAAC;QAChB,UAAU,CAAC,EAAE,KAAK,CAAC;QACnB,aAAa,CAAC,EAAE,KAAK,CAAC;QACtB,CAAC,CAAC,EAAE,OAAO,CAAC;KACb,GAAG,MAAM;CAMX"}

package/dist/wip/arcgis-feature-service.js

@@ -0,0 +1,28 @@
+"use strict";
+// @ts-nocheck
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.ArcGISFeatureService = void 0;
+class ArcGISFeatureService {
+    constructor(props) {
+        this.url = props.url;
+        this.loadOptions = props.loadOptions || {};
+        this.fetch = props.fetch || fetch;
+    }
+    // URL creators
+    metadataURL(options) {
+        return this.getUrl({ ...options });
+    }
+    /**
+     * Form a URL to an ESRI FeatureServer
+  // https://services2.arcgis.com/CcI36Pduqd0OR4W9/ArcGIS/rest/services/Bicycle_Routes_Public/FeatureServer/0/query?
+  //   returnGeometry=true&where=1%3D1&outSR=4326&outFields=*&inSR=4326&geometry=${-90}%2C+${30}%2C+${-70}%2C+${50}&
+  //   geometryType=esriGeometryEnvelope&spatialRel=esriSpatialRelIntersects&geometryPrecision=6&resultType=tile&f=geojson`
+     */
+    exportImageURL(options) {
+        const { boundingBox } = options;
+        // const bbox = `bbox=${boundingBox[0]},${boundingBox[1]},${boundingBox[2]},${boundingBox[3]}`;
+        // const size = `size=${width},${height}`
+        return this.getUrl({ path: 'exportImage', });
+    }
+}
+exports.ArcGISFeatureService = ArcGISFeatureService;

package/dist/wip/data-source.d.ts

@@ -2,19 +2,6 @@
 /** Data source that serves data by tile index *
 export abstract class TileDataSource extends DataSource {};
 
-// Vector Tile Source
-
-export type VectorTileDataSourceCapabilities = {
-  // check tile.json
-}
-
-export type VectorTile = Record<string, any>;
-
-export abstract class VectorTileDataSource extends TileDataSource {
-  abstract getCapabilities(): Promise<VectorTileDataSourceCapabilities>;
-  abstract getTile({x, y, z, width, height, layers, parameters}): Promise<VectorTile>;
-}
-
 // Image Tile Data Source
 
 export type ImageTileDataSourceCapabilities = {
@@ -49,5 +36,19 @@ export abstract class ImageTileDataSource extends TileDataSource {
     return [0, 0, 1, 1];
   }
 }
+
+// Vector Tile Source
+
+export type VectorTileDataSourceCapabilities = {
+  // check tile.json
+}
+
+export type VectorTile = Record<string, any>;
+
+export abstract class VectorTileDataSource extends TileDataSource {
+  abstract getCapabilities(): Promise<VectorTileDataSourceCapabilities>;
+  abstract getTile({x, y, z, width, height, layers, parameters}): Promise<VectorTile>;
+}
+
 */
 //# sourceMappingURL=data-source.d.ts.map

package/dist/wip/data-source.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"data-source.d.ts","sourceRoot":"","sources":["../../src/wip/data-source.ts"],"names":[],"mappings":"AAEA,gCAAgC;AAOhC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EAkDE"}
+{"version":3,"file":"data-source.d.ts","sourceRoot":"","sources":["../../src/wip/data-source.ts"],"names":[],"mappings":"AAEA,gCAAgC;AAQhC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EAmDE"}