@loaders.gl/wms 4.3.2 → 4.4.0-alpha.2

package/src/{services/ogc/wfs-service.ts → wfs-source.ts}

@@ -2,25 +2,36 @@
 // SPDX-License-Identifier: MIT
 // Copyright (c) vis.gl contributors
 
-import {Schema, GeoJSONTable} from '@loaders.gl/schema';
+import type {Schema, GeoJSONTable} from '@loaders.gl/schema';
 import type {
-  VectorSourceProps,
+  DataSourceOptions,
   VectorSourceMetadata,
-  LoaderWithParser,
   GetFeaturesParameters
 } from '@loaders.gl/loader-utils';
-import {Source, VectorSource, mergeLoaderOptions} from '@loaders.gl/loader-utils';
+import {Source, DataSource, VectorSource, mergeOptions} from '@loaders.gl/loader-utils';
 
-import type {WFSCapabilities} from '../../wfs-capabilities-loader';
-import {WFSCapabilitiesLoader} from '../../wfs-capabilities-loader';
+import type {WFSCapabilities} from './wfs-capabilities-loader';
+import {WFSCapabilitiesLoader} from './wfs-capabilities-loader';
 
-import type {WMSLoaderOptions} from '../../wms-error-loader';
-import {WMSErrorLoader} from '../../wms-error-loader';
+import type {WMSLoaderOptions} from './wms-error-loader';
+import {WMSErrorLoader} from './wms-error-loader';
 
 /* eslint-disable camelcase */ // WFS XML parameters use snake_case
 
+/** Properties for creating a enw WFS service */
+export type WFSourceOptions = DataSourceOptions & {
+  wfs?: {
+    /** In 1.3.0, replaces references to EPSG:4326 with CRS:84 */
+    substituteCRS84?: boolean;
+    /** Default WFS parameters. If not provided here, must be provided in the various request */
+    wfsParameters?: WFSParameters;
+    /** Any additional service specific parameters */
+    vendorParameters?: Record<string, unknown>;
+  };
+};
+
 /**
- * @ndeprecated This is a WIP, not fully implemented
+ * @deprecated This is a WIP, not fully implemented
  * @see https://developers.arcgis.com/rest/services-reference/enterprise/feature-service.htm
  */
 export const WFSSource = {
@@ -30,36 +41,18 @@ export const WFSSource = {
   version: '0.0.0',
   extensions: [],
   mimeTypes: [],
-  options: {
-    url: undefined!,
-    wfs: {
-      /** Tabular loaders, normally the GeoJSONLoader */
-      loaders: []
-    }
-  },
-
   type: 'wfs',
   fromUrl: true,
   fromBlob: false,
 
-  testURL: (url: string): boolean => url.toLowerCase().includes('wfs'),
-  createDataSource: (url, props: WFSVectorSourceProps): WFSVectorSource =>
-    new WFSVectorSource(props)
-} as const satisfies Source<WFSVectorSource, WFSVectorSourceProps>;
+  defaultOptions: {
+    wfs: {}
+  },
 
-/** Properties for creating a enw WFS service */
-export type WFSVectorSourceProps = VectorSourceProps & {
-  url: string;
-  wfs?: {
-    loaders: LoaderWithParser[];
-    /** In 1.3.0, replaces references to EPSG:4326 with CRS:84 */
-    substituteCRS84?: boolean;
-    /** Default WFS parameters. If not provided here, must be provided in the various request */
-    wmsParameters?: WFSParameters;
-    /** Any additional service specific parameters */
-    vendorParameters?: Record<string, unknown>;
-  };
-};
+  testURL: (url: string): boolean => url.toLowerCase().includes('wfs'),
+  createDataSource: (url: string, options: WFSourceOptions): WFSVectorSource =>
+    new WFSVectorSource(url, options)
+} as const satisfies Source<WFSVectorSource>;
 
 // PARAMETER TYPES FOR WFS SOURCE
 
@@ -203,52 +196,19 @@ export type WFSGetLegendGraphicParameters = {
  * - implements the VectorSource interface
  * @note Only the URL parameter conversion is supported. XML posts are not supported.
  */
-export class WFSVectorSource extends VectorSource<WFSVectorSourceProps> {
-  /** Base URL to the service */
-  readonly url: string;
-  readonly data: string;
-
-  // /** In WFS 1.3.0, replaces references to EPSG:4326 with CRS:84. But not always supported. Default: false */
-  // substituteCRS84: boolean;
-  // /** In WFS 1.3.0, flips x,y (lng, lat) coordinates for the supplied coordinate systems. Default: ['ESPG:4326'] */
-  // flipCRS: string[];
-
-  // /** Default static WFS parameters */
-  // wmsParameters: Required<WFSParameters>;
+export class WFSVectorSource extends DataSource<string, WFSourceOptions> implements VectorSource {
   /** Default static vendor parameters */
   vendorParameters?: Record<string, unknown>;
 
   capabilities: WFSCapabilities | null = null;
 
   /** Create a WFSVectorSource */
-  constructor(props: WFSVectorSourceProps) {
-    super(props);
+  constructor(data: string, options: WFSourceOptions) {
+    super(data, options, WFSSource.defaultOptions);
 
     // TODO - defaults such as version, layers etc could be extracted from a base URL with parameters
     // This would make pasting in any WFS URL more likely to make this class just work.
-    // const {baseUrl, parameters} = this._parseWFSUrl(props.url);
-
-    this.url = props.url;
-    this.data = props.url;
-
-    // this.substituteCRS84 = props.substituteCRS84 ?? false;
-    // this.flipCRS = ['EPSG:4326'];
-
-    // this.wmsParameters = {
-    //   layers: undefined!,
-    //   query_layers: undefined!,
-    //   styles: undefined,
-    //   version: '1.3.0',
-    //   crs: 'EPSG:4326',
-    //   format: 'image/png',
-    //   info_format: 'text/plain',
-    //   transparent: undefined!,
-    //   time: undefined!,
-    //   elevation: undefined!,
-    //   ...props.wmsParameters
-    // };
-
-    // this.vendorParameters = props.vendorParameters || {};
+    // const {baseUrl, parameters} = this._parseWFSUrl(options.url);
   }
 
   async getSchema(): Promise<Schema> {
@@ -264,7 +224,7 @@ export class WFSVectorSource extends VectorSource<WFSVectorSourceProps> {
   async getFeatures(parameters: GetFeaturesParameters): Promise<GeoJSONTable> {
     // Replace the GetImage `boundingBox` parameter with the WFS flat `bbox` parameter.
     // const {boundingBox, bbox, ...rest} = parameters;
-    // const wmsParameters: WFSGetMapParameters = {
+    // const wfsParameters: WFSGetMapParameters = {
     //   bbox: boundingBox ? [...boundingBox[0], ...boundingBox[1]] : bbox!,
     //   ...rest
     // };
@@ -279,10 +239,10 @@ export class WFSVectorSource extends VectorSource<WFSVectorSourceProps> {
 
   /** Get Capabilities */
   async getCapabilities(
-    wmsParameters?: WFSGetCapabilitiesParameters,
+    wfsParameters?: WFSGetCapabilitiesParameters,
     vendorParameters?: Record<string, unknown>
   ): Promise<WFSCapabilities> {
-    const url = this.getCapabilitiesURL(wmsParameters, vendorParameters);
+    const url = this.getCapabilitiesURL(wfsParameters, vendorParameters);
     const response = await this.fetch(url);
     const arrayBuffer = await response.arrayBuffer();
     this._checkResponse(response, arrayBuffer);
@@ -293,10 +253,10 @@ export class WFSVectorSource extends VectorSource<WFSVectorSourceProps> {
 
   /** Get a map image *
   async getMap(
-    wmsParameters: WFSGetMapParameters,
+    wfsParameters: WFSGetMapParameters,
     vendorParameters?: Record<string, unknown>
   ): Promise<ImageType> {
-    const url = this.getMapURL(wmsParameters, vendorParameters);
+    const url = this.getMapURL(wfsParameters, vendorParameters);
     const response = await this.fetch(url);
     const arrayBuffer = await response.arrayBuffer();
     this._checkResponse(response, arrayBuffer);
@@ -309,10 +269,10 @@ export class WFSVectorSource extends VectorSource<WFSVectorSourceProps> {
 
   /** Get Feature Info for a coordinate *
   async getFeatureInfo(
-    wmsParameters: WFSGetFeatureInfoParameters,
+    wfsParameters: WFSGetFeatureInfoParameters,
     vendorParameters?: Record<string, unknown>
   ): Promise<WFSFeatureInfo> {
-    const url = this.getFeatureInfoURL(wmsParameters, vendorParameters);
+    const url = this.getFeatureInfoURL(wfsParameters, vendorParameters);
     const response = await this.fetch(url);
     const arrayBuffer = await response.arrayBuffer();
     this._checkResponse(response, arrayBuffer);
@@ -321,10 +281,10 @@ export class WFSVectorSource extends VectorSource<WFSVectorSourceProps> {
 
   /** Get Feature Info for a coordinate *
   async getFeatureInfoText(
-    wmsParameters: WFSGetFeatureInfoParameters,
+    wfsParameters: WFSGetFeatureInfoParameters,
     vendorParameters?: Record<string, unknown>
   ): Promise<string> {
-    const url = this.getFeatureInfoURL(wmsParameters, vendorParameters);
+    const url = this.getFeatureInfoURL(wfsParameters, vendorParameters);
     const response = await this.fetch(url);
     const arrayBuffer = await response.arrayBuffer();
     this._checkResponse(response, arrayBuffer);
@@ -333,10 +293,10 @@ export class WFSVectorSource extends VectorSource<WFSVectorSourceProps> {
 
   /** Get more information about a layer *
   async describeLayer(
-    wmsParameters: WFSDescribeLayerParameters,
+    wfsParameters: WFSDescribeLayerParameters,
     vendorParameters?: Record<string, unknown>
   ): Promise<WFSLayerDescription> {
-    const url = this.describeLayerURL(wmsParameters, vendorParameters);
+    const url = this.describeLayerURL(wfsParameters, vendorParameters);
     const response = await this.fetch(url);
     const arrayBuffer = await response.arrayBuffer();
     this._checkResponse(response, arrayBuffer);
@@ -345,10 +305,10 @@ export class WFSVectorSource extends VectorSource<WFSVectorSourceProps> {
 
   /** Get an image with a semantic legend *
   async getLegendGraphic(
-    wmsParameters: WFSGetLegendGraphicParameters,
+    wfsParameters: WFSGetLegendGraphicParameters,
     vendorParameters?: Record<string, unknown>
   ): Promise<ImageType> {
-    const url = this.getLegendGraphicURL(wmsParameters, vendorParameters);
+    const url = this.getLegendGraphicURL(wfsParameters, vendorParameters);
     const response = await this.fetch(url);
     const arrayBuffer = await response.arrayBuffer();
     this._checkResponse(response, arrayBuffer);
@@ -365,94 +325,94 @@ export class WFSVectorSource extends VectorSource<WFSVectorSourceProps> {
 
   /** Generate a URL for the GetCapabilities request */
   getCapabilitiesURL(
-    wmsParameters?: WFSGetCapabilitiesParameters,
+    wfsParameters?: WFSGetCapabilitiesParameters,
     vendorParameters?: Record<string, unknown>
   ): string {
     // @ts-expect-error
     const options: Required<WFSGetCapabilitiesParameters> = {
-      // version: this.wmsParameters.version,
-      ...wmsParameters
+      // version: this.wfsParameters.version,
+      ...wfsParameters
     };
     return this._getWFSUrl('GetCapabilities', options, vendorParameters);
   }
 
   /** Generate a URL for the GetMap request */
   getMapURL(
-    wmsParameters: WFSGetMapParameters,
+    wfsParameters: WFSGetMapParameters,
     vendorParameters?: Record<string, unknown>
   ): string {
-    wmsParameters = this._getWFS130Parameters(wmsParameters);
+    wfsParameters = this._getWFS130Parameters(wfsParameters);
     // @ts-expect-error
     const options: Required<WFSGetMapParameters> = {
-      // version: this.wmsParameters.version,
-      // format: this.wmsParameters.format,
-      // transparent: this.wmsParameters.transparent,
-      // time: this.wmsParameters.time,
-      // elevation: this.wmsParameters.elevation,
-      // layers: this.wmsParameters.layers,
-      // styles: this.wmsParameters.styles,
-      // crs: this.wmsParameters.crs,
+      // version: this.wfsParameters.version,
+      // format: this.wfsParameters.format,
+      // transparent: this.wfsParameters.transparent,
+      // time: this.wfsParameters.time,
+      // elevation: this.wfsParameters.elevation,
+      // layers: this.wfsParameters.layers,
+      // styles: this.wfsParameters.styles,
+      // crs: this.wfsParameters.crs,
       // bbox: [-77.87304, 40.78975, -77.85828, 40.80228],
       // width: 1200,
       // height: 900,
-      ...wmsParameters
+      ...wfsParameters
     };
     return this._getWFSUrl('GetMap', options, vendorParameters);
   }
 
   /** Generate a URL for the GetFeatureInfo request */
   getFeatureInfoURL(
-    wmsParameters: WFSGetFeatureInfoParameters,
+    wfsParameters: WFSGetFeatureInfoParameters,
     vendorParameters?: Record<string, unknown>
   ): string {
-    wmsParameters = this._getWFS130Parameters(wmsParameters);
+    wfsParameters = this._getWFS130Parameters(wfsParameters);
 
     // Replace the GetImage `boundingBox` parameter with the WFS flat `bbox` parameter.
-    const {boundingBox, bbox} = wmsParameters as any;
-    wmsParameters.bbox = boundingBox ? [...boundingBox[0], ...boundingBox[1]] : bbox!;
+    const {boundingBox, bbox} = wfsParameters as any;
+    wfsParameters.bbox = boundingBox ? [...boundingBox[0], ...boundingBox[1]] : bbox!;
 
     // @ts-expect-error
     const options: Required<WFSGetFeatureInfoParameters> = {
-      // version: this.wmsParameters.version,
+      // version: this.wfsParameters.version,
       // // query_layers: [],
-      // // format: this.wmsParameters.format,
-      // info_format: this.wmsParameters.info_format,
-      // layers: this.wmsParameters.layers,
-      // query_layers: this.wmsParameters.query_layers,
-      // styles: this.wmsParameters.styles,
-      // crs: this.wmsParameters.crs,
+      // // format: this.wfsParameters.format,
+      // info_format: this.wfsParameters.info_format,
+      // layers: this.wfsParameters.layers,
+      // query_layers: this.wfsParameters.query_layers,
+      // styles: this.wfsParameters.styles,
+      // crs: this.wfsParameters.crs,
       // bbox: [-77.87304, 40.78975, -77.85828, 40.80228],
       // width: 1200,
       // height: 900,
       // x: undefined!,
       // y: undefined!,
-      ...wmsParameters
+      ...wfsParameters
     };
     return this._getWFSUrl('GetFeatureInfo', options, vendorParameters);
   }
 
   /** Generate a URL for the GetFeatureInfo request */
   describeLayerURL(
-    wmsParameters: WFSDescribeLayerParameters,
+    wfsParameters: WFSDescribeLayerParameters,
     vendorParameters?: Record<string, unknown>
   ): string {
     // @ts-expect-error
     const options: Required<WFSDescribeLayerParameters> = {
-      // version: this.wmsParameters.version,
-      ...wmsParameters
+      // version: this.wfsParameters.version,
+      ...wfsParameters
     };
     return this._getWFSUrl('DescribeLayer', options, vendorParameters);
   }
 
   getLegendGraphicURL(
-    wmsParameters: WFSGetLegendGraphicParameters,
+    wfsParameters: WFSGetLegendGraphicParameters,
     vendorParameters?: Record<string, unknown>
   ): string {
     // @ts-expect-error
     const options: Required<WFSGetLegendGraphicParameters> = {
-      // version: this.wmsParameters.version,
+      // version: this.wfsParameters.version,
       // format?
-      ...wmsParameters
+      ...wfsParameters
     };
     return this._getWFSUrl('GetLegendGraphic', options, vendorParameters);
   }
@@ -479,7 +439,7 @@ export class WFSVectorSource extends VectorSource<WFSVectorSourceProps> {
    * */
   protected _getWFSUrl(
     request: string,
-    wmsParameters: {version?: '1.3.0' | '1.1.1'; [key: string]: unknown},
+    wfsParameters: {version?: '1.3.0' | '1.1.1'; [key: string]: unknown},
     vendorParameters?: Record<string, unknown>
   ): string {
     let url = this.url;
@@ -488,9 +448,9 @@ export class WFSVectorSource extends VectorSource<WFSVectorSourceProps> {
     // Add any vendor searchParams
     const allParameters = {
       service: 'WFS',
-      version: wmsParameters.version,
+      version: wfsParameters.version,
       request,
-      ...wmsParameters,
+      ...wfsParameters,
       ...this.vendorParameters,
       ...vendorParameters
     };
@@ -502,7 +462,7 @@ export class WFSVectorSource extends VectorSource<WFSVectorSourceProps> {
       if (!IGNORE_EMPTY_KEYS.includes(key) || value) {
         url += first ? '?' : '&';
         first = false;
-        url += this._getURLParameter(key, value, wmsParameters);
+        url += this._getURLParameter(key, value, wfsParameters);
       }
     }
 
@@ -510,9 +470,9 @@ export class WFSVectorSource extends VectorSource<WFSVectorSourceProps> {
   }
 
   _getWFS130Parameters<ParametersT extends {crs?: string; srs?: string}>(
-    wmsParameters: ParametersT
+    wfsParameters: ParametersT
   ): ParametersT {
-    const newParameters = {...wmsParameters};
+    const newParameters = {...wfsParameters};
     if (newParameters.srs) {
       newParameters.crs = newParameters.crs || newParameters.srs;
       delete newParameters.srs;
@@ -521,12 +481,12 @@ export class WFSVectorSource extends VectorSource<WFSVectorSourceProps> {
   }
 
   // eslint-disable-next-line complexity
-  _getURLParameter(key: string, value: unknown, wmsParameters: WFSParameters): string {
+  _getURLParameter(key: string, value: unknown, wfsParameters: WFSParameters): string {
     // Substitute by key
     switch (key) {
       case 'crs':
         // CRS was called SRS before WFS 1.3.0
-        if (wmsParameters.version !== '1.3.0') {
+        if (wfsParameters.version !== '1.3.0') {
           key = 'srs';
           // } else if (this.substituteCRS84 && value === 'EPSG:4326') {
           //   /** In 1.3.0, replaces references to 'EPSG:4326' with the new backwards compatible CRS:84 */
@@ -537,14 +497,14 @@ export class WFSVectorSource extends VectorSource<WFSVectorSourceProps> {
 
       case 'srs':
         // CRS was called SRS before WFS 1.3.0
-        if (wmsParameters.version === '1.3.0') {
+        if (wfsParameters.version === '1.3.0') {
           key = 'crs';
         }
         break;
 
       case 'bbox':
         // Coordinate order is flipped for certain CRS in WFS 1.3.0
-        const bbox = this._flipBoundingBox(value, wmsParameters);
+        const bbox = this._flipBoundingBox(value, wfsParameters);
         if (bbox) {
           value = bbox;
         }
@@ -553,7 +513,7 @@ export class WFSVectorSource extends VectorSource<WFSVectorSourceProps> {
       case 'x':
         // i is the parameter used in WFS 1.3
         // TODO - change parameter to `i` and convert to `x` if not 1.3
-        if (wmsParameters.version === '1.3.0') {
+        if (wfsParameters.version === '1.3.0') {
           key = 'i';
         }
         break;
@@ -561,7 +521,7 @@ export class WFSVectorSource extends VectorSource<WFSVectorSourceProps> {
       case 'y':
         // j is the parameter used in WFS 1.3
         // TODO - change parameter to `j` and convert to `y` if not 1.3
-        if (wmsParameters.version === '1.3.0') {
+        if (wfsParameters.version === '1.3.0') {
           key = 'j';
         }
         break;
@@ -580,7 +540,7 @@ export class WFSVectorSource extends VectorSource<WFSVectorSourceProps> {
   /** Coordinate order is flipped for certain CRS in WFS 1.3.0 */
   _flipBoundingBox(
     bboxValue: unknown,
-    wmsParameters: WFSParameters
+    wfsParameters: WFSParameters
   ): [number, number, number, number] | null {
     // Sanity checks
     if (!Array.isArray(bboxValue) || bboxValue.length !== 4) {
@@ -589,11 +549,11 @@ export class WFSVectorSource extends VectorSource<WFSVectorSourceProps> {
 
     const flipCoordinates = false;
     // // Only affects WFS 1.3.0
-    // wmsParameters.version === '1.3.0' &&
+    // wfsParameters.version === '1.3.0' &&
     // // Flip if we are dealing with a CRS that was flipped in 1.3.0
-    // this.flipCRS.includes(wmsParameters.crs || '') &&
+    // this.flipCRS.includes(wfsParameters.crs || '') &&
     // // Don't flip if we are substituting EPSG:4326 with CRS:84
-    // !(this.substituteCRS84 && wmsParameters.crs === 'EPSG:4326');
+    // !(this.substituteCRS84 && wfsParameters.crs === 'EPSG:4326');
 
     const bbox = bboxValue as [number, number, number, number];
     return flipCoordinates ? [bbox[1], bbox[0], bbox[3], bbox[2]] : bbox;
@@ -612,7 +572,7 @@ export class WFSVectorSource extends VectorSource<WFSVectorSourceProps> {
     const contentType = response.headers['content-type'];
     if (!response.ok || WMSErrorLoader.mimeTypes.includes(contentType)) {
       // We want error responses to throw exceptions, the WMSErrorLoader can do this
-      const loadOptions = mergeLoaderOptions<WMSLoaderOptions>(this.loadOptions, {
+      const loadOptions = mergeOptions<WMSLoaderOptions>(this.loadOptions, {
         wms: {throwOnError: true}
       });
       const error = WMSErrorLoader.parseSync?.(arrayBuffer, loadOptions);

package/src/{services/ogc/wms-service.ts → wms-source.ts}

@@ -3,27 +3,40 @@
 // Copyright (c) vis.gl contributors
 
 /* eslint-disable camelcase */
-import type {ImageType} from '@loaders.gl/images';
-import {ImageLoader} from '@loaders.gl/images';
-import {mergeLoaderOptions, ImageSource} from '@loaders.gl/loader-utils';
-
 import type {
   Source,
+  DataSourceOptions,
   ImageSourceMetadata,
-  GetImageParameters,
-  ImageSourceProps
+  GetImageParameters
 } from '@loaders.gl/loader-utils';
+import {DataSource, ImageSource, mergeOptions} from '@loaders.gl/loader-utils';
+
+import type {ImageType} from '@loaders.gl/images';
+import {ImageLoader} from '@loaders.gl/images';
+
+import type {WMSCapabilities} from './wms-capabilities-loader';
+import type {WMSFeatureInfo} from './wip/wms-feature-info-loader';
+import type {WMSLayerDescription} from './wip/wms-layer-description-loader';
 
-import type {WMSCapabilities} from '../../wms-capabilities-loader';
-import type {WMSFeatureInfo} from '../../wip/wms-feature-info-loader';
-import type {WMSLayerDescription} from '../../wip/wms-layer-description-loader';
+import {WMSCapabilitiesLoader} from './wms-capabilities-loader';
+import {WMSFeatureInfoLoader} from './wip/wms-feature-info-loader';
+import {WMSLayerDescriptionLoader} from './wip/wms-layer-description-loader';
 
-import {WMSCapabilitiesLoader} from '../../wms-capabilities-loader';
-import {WMSFeatureInfoLoader} from '../../wip/wms-feature-info-loader';
-import {WMSLayerDescriptionLoader} from '../../wip/wms-layer-description-loader';
+import type {WMSLoaderOptions} from './wms-error-loader';
+import {WMSErrorLoader} from './wms-error-loader';
 
-import type {WMSLoaderOptions} from '../../wms-error-loader';
-import {WMSErrorLoader} from '../../wms-error-loader';
+/** Properties for creating a enw WMS service */
+export type WMSSourceOptions = DataSourceOptions & {
+  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>;
+  };
+};
 
 export const WMSSource = {
   name: 'Web Map Service (OGC WMS)',
@@ -32,37 +45,19 @@ export const WMSSource = {
   version: '0.0.0',
   extensions: [],
   mimeTypes: [],
-  options: {
+  type: 'wms',
+  fromUrl: true,
+  fromBlob: false,
+
+  defaultOptions: {
     wms: {
       // TODO - add options here
     }
   },
-  type: 'wms',
-  fromUrl: true,
-  fromBlob: false,
 
   testURL: (url: string): boolean => url.toLowerCase().includes('wms'),
-  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>;
-  };
-};
+  createDataSource: (url, options: WMSSourceOptions) => new WMSImageSource(url as string, options)
+} as const satisfies Source<WMSImageSource>;
 
 // PARAMETER TYPES FOR WMS SOURCE
 
@@ -206,11 +201,7 @@ export type WMSGetLegendGraphicParameters = {
  * - implements the ImageSource interface
  * @note Only the URL parameter conversion is supported. XML posts are not supported.
  */
-export class WMSImageSource extends ImageSource<WMSImageSourceProps> {
-  /** Base URL to the service */
-  readonly url: string;
-  readonly data: string;
-
+export class WMSImageSource extends DataSource<string, WMSSourceOptions> implements ImageSource {
   /** In WMS 1.3.0, replaces references to EPSG:4326 with CRS:84. But not always supported. Default: false */
   substituteCRS84: boolean;
   /** In WMS 1.3.0, flips x,y (lng, lat) coordinates for the supplied coordinate systems. Default: ['ESPG:4326'] */
@@ -224,17 +215,14 @@ export class WMSImageSource extends ImageSource<WMSImageSourceProps> {
   capabilities: WMSCapabilities | null = null;
 
   /** Create a WMSImageSource */
-  constructor(url: string, props: WMSImageSourceProps) {
-    super(props);
+  constructor(url: string, options: WMSSourceOptions) {
+    super(url, options, WMSSource.defaultOptions);
 
     // 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 = url;
-    this.data = url;
+    // const {baseUrl, parameters} = this._parseWMSUrl(options.url);
 
-    this.substituteCRS84 = props.wms?.substituteCRS84 ?? props.substituteCRS84 ?? false;
+    this.substituteCRS84 = options.wms?.substituteCRS84 ?? false;
     this.flipCRS = ['EPSG:4326'];
 
     this.wmsParameters = {
@@ -248,11 +236,11 @@ export class WMSImageSource extends ImageSource<WMSImageSourceProps> {
       transparent: undefined!,
       time: undefined!,
       elevation: undefined!,
-      ...props.wmsParameters, // deprecated
-      ...props.wms?.wmsParameters
+      ...options.wmsParameters, // deprecated
+      ...options.wms?.wmsParameters
     };
 
-    this.vendorParameters = props.wms?.vendorParameters || props.vendorParameters || {};
+    this.vendorParameters = options.wms?.vendorParameters || options.vendorParameters || {};
   }
 
   // ImageSource implementation
@@ -606,7 +594,7 @@ export class WMSImageSource extends ImageSource<WMSImageSourceProps> {
     const contentType = response.headers['content-type'];
     if (!response.ok || WMSErrorLoader.mimeTypes.includes(contentType)) {
       // We want error responses to throw exceptions, the WMSErrorLoader can do this
-      const loadOptions = mergeLoaderOptions<WMSLoaderOptions>(this.loadOptions, {
+      const loadOptions = mergeOptions<WMSLoaderOptions>(this.loadOptions, {
         wms: {throwOnError: true}
       });
       const error = WMSErrorLoader.parseSync?.(arrayBuffer, loadOptions);
@@ -616,7 +604,7 @@ export class WMSImageSource extends ImageSource<WMSImageSourceProps> {
 
   /** Error situation detected */
   protected _parseError(arrayBuffer: ArrayBuffer): Error {
-    const error = WMSErrorLoader.parseSync?.(arrayBuffer, this.loadOptions);
+    const error = WMSErrorLoader.parseSync?.(arrayBuffer, this.options.core?.loadOptions);
     return new Error(error);
   }
 }

package/dist/services/arcgis/arcgis-feature-server.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"arcgis-feature-server.d.ts","sourceRoot":"","sources":["../../../src/services/arcgis/arcgis-feature-server.ts"],"names":[],"mappings":"AAIA,OAAO,EAAC,MAAM,EAAE,YAAY,EAAC,MAAM,oBAAoB,CAAC;AACxD,OAAO,KAAK,EACV,iBAAiB,EACjB,oBAAoB,EACpB,qBAAqB,EACrB,gBAAgB,EACjB,MAAM,0BAA0B,CAAC;AAClC,OAAO,EAAS,YAAY,EAAC,MAAM,0BAA0B,CAAC;AAW9D,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,CAAC;AAuEF;;;GAGG;AACH,eAAO,MAAM,yBAAyB;;;;;;;;;;YAUhC,kDAAkD;;;;;;;4BASvC,MAAM,KAAG,OAAO;2DACA,uBAAuB,KAAG,kBAAkB;CAEL,CAAC;AAEzE,MAAM,MAAM,uBAAuB,GAAG,iBAAiB,GAAG;IACxD,GAAG,EAAE,MAAM,CAAC;IACZ,uBAAuB,CAAC,EAAE;QACxB,OAAO,EAAE,gBAAgB,EAAE,CAAC;KAC7B,CAAC;CACH,CAAC;AAEF;;;;GAIG;AACH,qBAAa,kBAAmB,SAAQ,YAAY,CAAC,uBAAuB,CAAC;IAC3E,IAAI,EAAE,MAAM,CAAC;IACb,SAAS,CAAC,sBAAsB,EAAE,OAAO,CAAC,GAAG,CAAC,CAAC;gBAEnC,KAAK,EAAE,uBAAuB;IAM1C,8HAA8H;IACxH,SAAS,IAAI,OAAO,CAAC,MAAM,CAAC;IAK5B,WAAW,CAAC,OAAO,EAAE;QAAC,sBAAsB,MAAA;KAAC,GAAG,OAAO,CAAC,oBAAoB,CAAC;IAa7E,WAAW,CAAC,UAAU,EAAE,qBAAqB,GAAG,OAAO,CAAC,YAAY,CAAC;cAY3D,0BAA0B;CAM3C;AA2ID;;GAEG"}

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

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

package/dist/services/arcgis/arcgis-server.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"arcgis-server.d.ts","sourceRoot":"","sources":["../../../src/services/arcgis/arcgis-server.ts"],"names":[],"mappings":"AAIA,MAAM,MAAM,OAAO,GAAG;IAAC,IAAI,EAAE,MAAM,CAAC;IAAC,IAAI,EAAE,MAAM,CAAC;IAAC,GAAG,EAAE,MAAM,CAAA;CAAC,CAAC;AAEhE,KAAK,SAAS,GAAG,OAAO,KAAK,CAAC;AAE9B;;;;;GAKG;AACH,wBAAsB,iBAAiB,CACrC,GAAG,EAAE,MAAM,EACX,SAAS,GAAE,SAAiB,GAC3B,OAAO,CAAC,OAAO,EAAE,GAAG,IAAI,CAAC,CAM3B"}