@loaders.gl/wms 4.3.0-alpha.1 → 4.3.0-alpha.3

package/src/services/ogc/wms-service.ts

@@ -7,9 +7,9 @@ import type {ImageType} from '@loaders.gl/images';
 import {ImageLoader} from '@loaders.gl/images';
 import {mergeLoaderOptions} from '@loaders.gl/loader-utils';
 
-import type {Service, ImageSourceMetadata, GetImageParameters} from '@loaders.gl/loader-utils';
+import type {Source, ImageSourceMetadata, GetImageParameters} from '@loaders.gl/loader-utils';
+import type {ImageSourceProps} from '@loaders.gl/loader-utils';
 import {ImageSource} from '@loaders.gl/loader-utils';
-import type {ImageServiceProps} from '../../lib/services/image-service';
 
 import type {WMSCapabilities} from '../../wms-capabilities-loader';
 import type {WMSFeatureInfo} from '../../wip/wms-feature-info-loader';
@@ -22,15 +22,50 @@ import {WMSLayerDescriptionLoader} from '../../wip/wms-layer-description-loader'
 import type {WMSLoaderOptions} from '../../wms-error-loader';
 import {WMSErrorLoader} from '../../wms-error-loader';
 
-export const WMSService: Service<WMSSource, WMSSourceProps> = {
+export const WMSSource = {
+  name: 'Web Map Service (OGC WMS)',
+  id: 'wms',
+  module: 'wms',
+  version: '0.0.0',
+  extensions: [],
+  mimeTypes: [],
+  options: {
+    wms: {
+      // TODO - add options here
+    }
+  },
   type: 'wms',
+  fromUrl: true,
+  fromBlob: false,
+
   testURL: (url: string): boolean => url.toLowerCase().includes('wms'),
-  create: (props: WMSSourceProps) => new WMSSource(props)
+  createDataSource: (url, props: WMSImageSourceProps) => new WMSImageSource(url as string, props)
+} as const satisfies Source<WMSImageSource, WMSImageSourceProps>;
+
+/** Properties for creating a enw WMS service */
+export type WMSImageSourceProps = ImageSourceProps & {
+  /** @deprecated Use props.wms.substituteCRS84 */
+  substituteCRS84?: boolean;
+  /** @deprecated Use props.wms.wmsParameters */
+  wmsParameters?: WMSParameters;
+  /** @deprecated Use props.wms.vendorParameters */
+  vendorParameters?: Record<string, unknown>;
+  wms?: {
+    // TODO - move parameters inside WMS scope
+    /** In 1.3.0, replaces references to EPSG:4326 with CRS:84 */
+    substituteCRS84?: boolean;
+    /** Default WMS parameters. If not provided here, must be provided in the various request */
+    wmsParameters?: WMSParameters;
+    /** Any additional service specific parameters */
+    vendorParameters?: Record<string, unknown>;
+  };
 };
 
+// PARAMETER TYPES FOR WMS SOURCE
+
 /**
  * "Static" WMS parameters (not viewport or selected pixel dependent)
- * These can be provided as defaults in the WMSSource constructor
+ * These can be provided as defaults in the WMSImageSource constructor
  */
 export type WMSParameters = {
   /** WMS version (all requests) */
@@ -48,7 +83,7 @@ export type WMSParameters = {
   info_format?: 'text/plain' | 'application/geojson' | 'application/vnd.ogc.gml';
   /** Styling - Not yet supported */
   styles?: unknown;
-  /** Any additional parameters specific to this WMSSource (GetMap) */
+  /** Any additional parameters specific to this WMSImageSource (GetMap) */
   transparent?: boolean;
   /** If layer supports time dimension */
   time?: string;
@@ -161,26 +196,14 @@ export type WMSGetLegendGraphicParameters = {
 
 //
 
-/** Properties for creating a enw WMS service */
-export type WMSSourceProps = ImageServiceProps & {
-  /** Base URL to the service */
-  url: string;
-  /** In 1.3.0, replaces references to EPSG:4326 with CRS:84 */
-  substituteCRS84?: boolean;
-  /** Default WMS parameters. If not provided here, must be provided in the various request */
-  wmsParameters?: WMSParameters;
-  /** Any additional service specific parameters */
-  vendorParameters?: Record<string, unknown>;
-};
-
 /**
- * The WMSSource class provides
+ * The WMSImageSource class provides
  * - provides type safe methods to form URLs to a WMS service
  * - provides type safe methods to query and parse results (and errors) from a WMS service
- * - implements the ImageService interface
+ * - implements the ImageSource interface
  * @note Only the URL parameter conversion is supported. XML posts are not supported.
  */
-export class WMSSource extends ImageSource<WMSSourceProps> {
+export class WMSImageSource extends ImageSource<WMSImageSourceProps> {
   /** Base URL to the service */
   readonly url: string;
   readonly data: string;
@@ -197,18 +220,18 @@ export class WMSSource extends ImageSource<WMSSourceProps> {
 
   capabilities: WMSCapabilities | null = null;
 
-  /** Create a WMSSource */
-  constructor(props: WMSSourceProps) {
+  /** Create a WMSImageSource */
+  constructor(url: string, props: WMSImageSourceProps) {
     super(props);
 
     // TODO - defaults such as version, layers etc could be extracted from a base URL with parameters
     // This would make pasting in any WMS URL more likely to make this class just work.
     // const {baseUrl, parameters} = this._parseWMSUrl(props.url);
 
-    this.url = props.url;
-    this.data = props.url;
+    this.url = url;
+    this.data = url;
 
-    this.substituteCRS84 = props.substituteCRS84 ?? false;
+    this.substituteCRS84 = props.wms?.substituteCRS84 ?? props.substituteCRS84 ?? false;
     this.flipCRS = ['EPSG:4326'];
 
     this.wmsParameters = {
@@ -222,13 +245,14 @@ export class WMSSource extends ImageSource<WMSSourceProps> {
       transparent: undefined!,
       time: undefined!,
       elevation: undefined!,
-      ...props.wmsParameters
+      ...props.wmsParameters, // deprecated
+      ...props.wms?.wmsParameters
     };
 
-    this.vendorParameters = props.vendorParameters || {};
+    this.vendorParameters = props.wms?.vendorParameters || props.vendorParameters || {};
   }
 
-  // ImageService implementation
+  // ImageSource implementation
   async getMetadata(): Promise<ImageSourceMetadata> {
     const capabilities = await this.getCapabilities();
     return this.normalizeMetadata(capabilities);
@@ -559,7 +583,7 @@ export class WMSSource extends ImageSource<WMSSourceProps> {
       wmsParameters.version === '1.3.0' &&
       // Flip if we are dealing with a CRS that was flipped in 1.3.0
       this.flipCRS.includes(wmsParameters.crs || '') &&
-      // Don't flip if we are subsituting EPSG:4326 with CRS:84
+      // Don't flip if we are substituting EPSG:4326 with CRS:84
       !(this.substituteCRS84 && wmsParameters.crs === 'EPSG:4326');
 
     const bbox = bboxValue as [number, number, number, number];

package/src/{wip/wfs-capabilities-loader.ts → wfs-capabilities-loader.ts}

@@ -1,8 +1,8 @@
 // loaders.gl, MIT license
 
 import type {LoaderWithParser, LoaderOptions} from '@loaders.gl/loader-utils';
-import type {WFSCapabilities} from './lib/wfs/parse-wfs-capabilities';
-import {parseWFSCapabilities} from './lib/wfs/parse-wfs-capabilities';
+import type {WFSCapabilities} from './lib/parsers/wfs/parse-wfs-capabilities';
+import {parseWFSCapabilities} from './lib/parsers/wfs/parse-wfs-capabilities';
 
 // __VERSION__ is injected by babel-plugin-version-inline
 // @ts-ignore TS2304: Cannot find name '__VERSION__'.
@@ -16,6 +16,7 @@ export type WFSLoaderOptions = LoaderOptions & {
 
 /**
  * Loader for the response to the WFS GetCapability request
+ * @deprecated Warning: this loader is still experimental and incomplete
  */
 export const WFSCapabilitiesLoader = {
   dataType: null as unknown as WFSCapabilities,

package/dist/lib/services/create-image-service.d.ts

@@ -1,14 +0,0 @@
-import { ImageSource, Service } from '@loaders.gl/loader-utils';
-import { ImageServiceProps } from "./image-service.js";
-export type CreateImageServiceProps = ImageServiceProps & {
-    type?: string | 'auto';
-};
-/**
- * Creates an image source
- * If type is not supplied, will try to automatically detect the the
- * @param url URL to the image source
- * @param type type of source. if not known, set to 'auto'
- * @returns an ImageSource instance
- */
-export declare function createImageService(props: CreateImageServiceProps, services: Service[]): ImageSource;
-//# sourceMappingURL=create-image-service.d.ts.map

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

@@ -1 +0,0 @@
-{"version":3,"file":"create-image-service.d.ts","sourceRoot":"","sources":["../../../src/lib/services/create-image-service.ts"],"names":[],"mappings":"AAIA,OAAO,EAAC,WAAW,EAAE,OAAO,EAAC,MAAM,0BAA0B,CAAC;AAC9D,OAAO,EAAC,iBAAiB,EAAC,2BAAwB;AAElD,MAAM,MAAM,uBAAuB,GAAG,iBAAiB,GAAG;IACxD,IAAI,CAAC,EAAE,MAAM,GAAG,MAAM,CAAC;CACxB,CAAC;AAEF;;;;;;GAMG;AACH,wBAAgB,kBAAkB,CAChC,KAAK,EAAE,uBAAuB,EAC9B,QAAQ,EAAE,OAAO,EAAE,GAClB,WAAW,CASb"}

package/dist/lib/services/create-image-service.js

@@ -1,39 +0,0 @@
-// loaders.gl
-// SPDX-License-Identifier: MIT
-// Copyright (c) vis.gl contributors
-/**
- * Creates an image source
- * If type is not supplied, will try to automatically detect the the
- * @param url URL to the image source
- * @param type type of source. if not known, set to 'auto'
- * @returns an ImageSource instance
- */
-export function createImageService(props, services) {
-    const { type = 'auto' } = props;
-    const service = type === 'auto' ? guessServiceType(props.url, services) : getServiceOfType(type, services);
-    if (!service) {
-        throw new Error('Not a valid image source type');
-    }
-    return service.create(props);
-}
-/** Guess service type from URL */
-function getServiceOfType(type, services) {
-    // if (type === 'template') {
-    //   return ImageService;
-    // }
-    for (const service of services) {
-        if (service.type === type) {
-            return service;
-        }
-    }
-    return null;
-}
-/** Guess service type from URL */
-function guessServiceType(url, services) {
-    for (const service of services) {
-        if (service.testURL && service.testURL(url)) {
-            return service;
-        }
-    }
-    return null;
-}

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

@@ -1,28 +0,0 @@
-import { LoaderOptions } from '@loaders.gl/loader-utils';
-import type { ImageType } from '@loaders.gl/images';
-import type { ImageSourceMetadata, GetImageParameters } from '@loaders.gl/loader-utils';
-import { ImageSource } from '@loaders.gl/loader-utils';
-/** 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 abstract class ImageService<PropsT extends ImageServiceProps = ImageServiceProps> extends ImageSource<PropsT> {
-    static type: string;
-    static testURL: (url: string) => boolean;
-    constructor(props: PropsT);
-    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;
-}
-//# sourceMappingURL=image-service.d.ts.map

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

@@ -1 +0,0 @@
-{"version":3,"file":"image-service.d.ts","sourceRoot":"","sources":["../../../src/lib/services/image-service.ts"],"names":[],"mappings":"AAIA,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,0BAA0B,CAAC;AACtF,OAAO,EAAC,WAAW,EAAC,MAAM,0BAA0B,CAAC;AAErD,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,8BAAsB,YAAY,CAChC,MAAM,SAAS,iBAAiB,GAAG,iBAAiB,CACpD,SAAQ,WAAW,CAAC,MAAM,CAAC;IAC3B,MAAM,CAAC,IAAI,EAAE,MAAM,CAAc;IACjC,MAAM,CAAC,OAAO,QAAS,MAAM,KAAG,OAAO,CAAoC;gBAE/D,KAAK,EAAE,MAAM;IAMnB,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"}

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

@@ -1,45 +0,0 @@
-// loaders.gl
-// SPDX-License-Identifier: MIT
-// Copyright (c) vis.gl contributors
-import { ImageLoader } from '@loaders.gl/images';
-import { ImageSource } from '@loaders.gl/loader-utils';
-/**
- * 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 class ImageService extends ImageSource {
-    static type = 'template';
-    static testURL = (url) => url.toLowerCase().includes('{');
-    constructor(props) {
-        super(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 ImageLoader.parse(arrayBuffer);
-    }
-    // HELPERS
-    /** Break up bounding box in east, north, south, west */
-    getGranularParameters(parameters) {
-        const [[east, north], [west, south]] = parameters.boundingBox;
-        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;
-    }
-}

package/dist/services/arcgis/arcgis-image-service.d.ts.map

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

package/dist/services/create-image-source.d.ts

@@ -1,18 +0,0 @@
-import type { ImageSource } from '@loaders.gl/loader-utils';
-import { ImageServiceProps } from "../lib/services/image-service.js";
-import { CreateImageServiceProps } from "../lib/services/create-image-service.js";
-import type { WMSSourceProps } from "./ogc/wms-service.js";
-export type ImageServiceType = 'wms' | 'arcgis-image-server' | 'template';
-type CreateImageSourceProps = CreateImageServiceProps & ImageServiceProps & WMSSourceProps & {
-    type?: ImageServiceType | 'auto';
-};
-/**
- * Creates an image source
- * If type is not supplied, will try to automatically detect the the
- * @param url URL to the image source
- * @param type type of source. if not known, set to 'auto'
- * @returns an ImageSource instance
- */
-export declare function createImageSource(props: CreateImageSourceProps): ImageSource;
-export {};
-//# sourceMappingURL=create-image-source.d.ts.map

package/dist/services/create-image-source.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"create-image-source.d.ts","sourceRoot":"","sources":["../../src/services/create-image-source.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAU,WAAW,EAAC,MAAM,0BAA0B,CAAC;AAEnE,OAAO,EAAC,iBAAiB,EAAC,yCAAsC;AAChE,OAAO,EAAqB,uBAAuB,EAAC,gDAA6C;AAEjG,OAAO,KAAK,EAAC,cAAc,EAAC,6BAA0B;AAItD,MAAM,MAAM,gBAAgB,GAAG,KAAK,GAAG,qBAAqB,GAAG,UAAU,CAAC;AAI1E,KAAK,sBAAsB,GAAG,uBAAuB,GACnD,iBAAiB,GACjB,cAAc,GAAG;IACf,IAAI,CAAC,EAAE,gBAAgB,GAAG,MAAM,CAAC;CAClC,CAAC;AAEJ;;;;;;GAMG;AACH,wBAAgB,iBAAiB,CAAC,KAAK,EAAE,sBAAsB,GAAG,WAAW,CAE5E"}

package/dist/services/create-image-source.js

@@ -1,17 +0,0 @@
-// loaders.gl
-// SPDX-License-Identifier: MIT
-// Copyright (c) vis.gl contributors
-import { createImageService } from "../lib/services/create-image-service.js";
-import { WMSService } from "./ogc/wms-service.js";
-import { ArcGISImageService } from "./arcgis/arcgis-image-service.js";
-const SERVICES = [WMSService, ArcGISImageService];
-/**
- * Creates an image source
- * If type is not supplied, will try to automatically detect the the
- * @param url URL to the image source
- * @param type type of source. if not known, set to 'auto'
- * @returns an ImageSource instance
- */
-export function createImageSource(props) {
-    return createImageService(props, SERVICES);
-}

package/dist/wip/lib/wfs/parse-wfs-capabilities.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"parse-wfs-capabilities.d.ts","sourceRoot":"","sources":["../../../../src/wip/lib/wfs/parse-wfs-capabilities.ts"],"names":[],"mappings":"AAIA,gHAAgH;AAChH,MAAM,MAAM,eAAe,GAAG;IAC5B,qBAAqB,EAAE;QACrB,KAAK,EAAE,MAAM,CAAC;QACd,kBAAkB,EAAE,MAAM,CAAC;QAC3B,WAAW,EAAE,MAAM,CAAC;KACrB,CAAC;IAEF,eAAe,EAAE;QACf,YAAY,EAAE,MAAM,CAAC;QACrB,YAAY,EAAE,MAAM,CAAC;QACrB,cAAc,EAAE;YACd,cAAc,EAAE,MAAM,CAAC;YACvB,YAAY,EAAE,MAAM,CAAC;YACrB,WAAW,EAAE;gBACX,OAAO,EAAE;oBACP,kBAAkB,EAAE,MAAM,CAAC;oBAC3B,IAAI,EAAE,MAAM,CAAC;oBACb,OAAO,EAAE,MAAM,CAAC;oBAChB,aAAa,EAAE,MAAM,CAAC;oBACtB,qBAAqB,EAAE,MAAM,CAAC;oBAC9B,UAAU,EAAE,MAAM,CAAC;iBACpB,CAAC;gBACF,KAAK,EAAE;oBACL,KAAK,EAAE,MAAM,CAAC;iBACf,CAAC;aACH,CAAC;SACH,CAAC;KACH,CAAC;IAEF,kBAAkB,EAAE;QAClB,eAAe,EAAE,GAAG,CAAC;QACrB,cAAc,EAAE,GAAG,CAAC;QACpB,OAAO,EAAE,GAAG,CAAC;KACd,CAAC;IAEF,QAAQ,EAAE;QACR,MAAM,EAAE;YACN,QAAQ,EAAE,MAAM,CAAC;YACjB,UAAU,EAAE,MAAM,CAAC;YACnB,KAAK,EAAE,MAAM,CAAC;YACd,OAAO,EAAE,MAAM,EAAE,CAAC;YAClB,MAAM,EAAE;gBACN,UAAU,EAAE,MAAM,CAAC;gBACnB,SAAS,EAAE,MAAM,CAAC;gBAClB,KAAK,EAAE,MAAM,CAAC;gBACd,QAAQ,CAAC,EAAE,MAAM,CAAC;aACnB,EAAE,CAAC;YACJ,MAAM,EAAE;gBACN,IAAI,EAAE,MAAM,CAAC;gBACb,KAAK,EAAE,MAAM,CAAC;gBACd,MAAM,EAAE,MAAM,CAAC;gBACf,GAAG,EAAE,MAAM,CAAC;aACb,CAAC;YACF,kBAAkB,EAAE;gBAClB,aAAa,EAAE,MAAM,CAAC;aACvB,EAAE,CAAC;YACJ,cAAc,EAAE;gBACd,UAAU,EAAE,MAAM,CAAC;gBACnB,SAAS,EAAE;oBACT,UAAU,EAAE,MAAM,CAAC;oBACnB,YAAY,EAAE,MAAM,CAAC;oBACrB,WAAW,EAAE,MAAM,CAAC;oBACpB,gBAAgB,EAAE,MAAM,CAAC;oBACzB,SAAS,EAAE,MAAM,CAAC;oBAClB,UAAU,EAAE,MAAM,CAAC;oBACnB,aAAa,EAAE;wBACb,GAAG,EAAE,MAAM,CAAC;wBACZ,GAAG,EAAE,MAAM,CAAC;qBACb,CAAC;iBACH,EAAE,CAAC;aACL,CAAC;SACH,EAAE,CAAC;KACL,CAAC;CACH,CAAC;AAEF;;;GAGG;AACH,wBAAgB,oBAAoB,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,KAAA,GAAG,eAAe,CAS3E"}

package/dist/wip/lib/wfs/parse-wfs.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"parse-wfs.d.ts","sourceRoot":"","sources":["../../../../src/wip/lib/wfs/parse-wfs.ts"],"names":[],"mappings":"AAIA,MAAM,MAAM,eAAe,GAAG,EAAE,CAAC;AAEjC;;;GAGG;AACH,wBAAgB,oBAAoB,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,KAAA,GAAG,eAAe,CAM3E"}

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

@@ -1,56 +0,0 @@
-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/services/arcgis-feature-service.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"arcgis-feature-service.d.ts","sourceRoot":"","sources":["../../../src/wip/services/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/services/arcgis-feature-service.js

@@ -1,27 +0,0 @@
-// @ts-nocheck
-export class ArcGISFeatureService {
-    url;
-    loadOptions;
-    fetch;
-    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', });
-    }
-}

package/dist/wip/wfs-capabilities-loader.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"wfs-capabilities-loader.d.ts","sourceRoot":"","sources":["../../src/wip/wfs-capabilities-loader.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAC,gBAAgB,EAAE,aAAa,EAAC,MAAM,0BAA0B,CAAC;AAC9E,OAAO,KAAK,EAAC,eAAe,EAAC,4CAAyC;AAOtE,YAAY,EAAC,eAAe,EAAC,CAAC;AAE9B,MAAM,MAAM,gBAAgB,GAAG,aAAa,GAAG;IAC7C,GAAG,CAAC,EAAE,EAAE,CAAC;CACV,CAAC;AAEF;;GAEG;AACH,eAAO,MAAM,qBAAqB;;;;;;;;;;;;;;kCAgBL,WAAW,YAAY,gBAAgB;mCAE5C,MAAM,YAAY,gBAAgB;CACqB,CAAC;AAEhF,iBAAS,WAAW,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAG1C;AAED,eAAO,MAAM,+BAA+B,EAAE,gBAAwC,CAAC"}

package/src/services/create-image-source.ts

@@ -1,33 +0,0 @@
-// loaders.gl
-// SPDX-License-Identifier: MIT
-// Copyright (c) vis.gl contributors
-
-import type {Service, ImageSource} from '@loaders.gl/loader-utils';
-// import {ImageService} from '../lib/services/image-service';
-import {ImageServiceProps} from '../lib/services/image-service';
-import {createImageService, CreateImageServiceProps} from '../lib/services/create-image-service';
-
-import type {WMSSourceProps} from './ogc/wms-service';
-import {WMSService} from './ogc/wms-service';
-import {ArcGISImageService} from './arcgis/arcgis-image-service';
-
-export type ImageServiceType = 'wms' | 'arcgis-image-server' | 'template';
-
-const SERVICES: Service[] = [WMSService, ArcGISImageService];
-
-type CreateImageSourceProps = CreateImageServiceProps &
-  ImageServiceProps &
-  WMSSourceProps & {
-    type?: ImageServiceType | 'auto';
-  };
-
-/**
- * Creates an image source
- * If type is not supplied, will try to automatically detect the the
- * @param url URL to the image source
- * @param type type of source. if not known, set to 'auto'
- * @returns an ImageSource instance
- */
-export function createImageSource(props: CreateImageSourceProps): ImageSource {
-  return createImageService(props, SERVICES);
-}

package/src/wip/services/arcgis-feature-service.ts

@@ -1,89 +0,0 @@
-// @ts-nocheck
-
-import {LoaderOptions} from '@loaders.gl/loader-utils';
-// import {GeoJSONLoader} from '@loaders.gl/geojson';
-
-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'; // TODO - look up valid values in Esri docs
-  spatialRel: 'esriSpatialRelIntersects'; // TODO - look up valid values in Esri docs
-  geometryPrecision: number; // TODO - look up valid values in Esri docs
-  resultType: 'tile'; // TODO - look up valid values in Esri docs
-  f?: 'geojson'; // TODO - look up valid values in Esri docs
-}
-
-// const DEFAULT_QUERY_OPTIONS: Required<ArcGISImageServiceQueryOptions>  = {
-//   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'
-// };
-
-export type ArcGISFeatureServiceProps = ArcGISImageServiceQueryOptions & {
-  url: string;
-  loadOptions?: LoaderOptions;
-  fetch?: typeof fetch | FetchLike;
-};
-
-export class ArcGISFeatureService {
-  url: string;
-  loadOptions: LoaderOptions;
-  fetch: typeof fetch | FetchLike;
-
-  constructor(props: ArcGISFeatureServiceProps) {
-    this.url = props.url;
-    this.loadOptions = props.loadOptions || {};
-    this.fetch = props.fetch || fetch;
-  }
-
- // URL creators
-
-  metadataURL(options: {parameters?: Record<string, unknown>}): string {
-    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: {
-    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 {
-    const {boundingBox} = options;
-    // const bbox = `bbox=${boundingBox[0]},${boundingBox[1]},${boundingBox[2]},${boundingBox[3]}`;
-    // const size = `size=${width},${height}`
-    return this.getUrl({path: 'exportImage', });
-  }
-}