@loaders.gl/wms 4.3.1 → 4.4.0-alpha.1

package/dist/lib/deprecated/create-image-source.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"create-image-source.d.ts","sourceRoot":"","sources":["../../../src/lib/deprecated/create-image-source.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAC,MAAM,EAAE,WAAW,EAAE,gBAAgB,EAAC,MAAM,0BAA0B,CAAC;AACpF,OAAO,KAAK,EAAC,mBAAmB,EAAC,0CAAuC;AAIxE,kBAAkB;AAClB,MAAM,MAAM,gBAAgB,GAAG,KAAK,GAAG,qBAAqB,GAAG,UAAU,CAAC;AAI1E;;GAEG;AACH,KAAK,sBAAsB,GAAG,gBAAgB,GAC5C,mBAAmB,GAAG;IACpB,GAAG,EAAE,MAAM,CAAC;IACZ,IAAI,CAAC,EAAE,gBAAgB,GAAG,MAAM,CAAC;CAClC,CAAC;AAEJ;;;;;;;;GAQG;AACH,wBAAgB,iBAAiB,CAAC,KAAK,EAAE,sBAAsB,EAAE,OAAO,mHAAU,GAAG,WAAW,CAS/F"}
+{"version":3,"file":"create-image-source.d.ts","sourceRoot":"","sources":["../../../src/lib/deprecated/create-image-source.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAC,MAAM,EAAE,yBAAyB,EAAE,iBAAiB,EAAC,MAAM,0BAA0B,CAAC;AACnG,OAAO,KAAK,EAAC,gBAAgB,EAAC,4BAAyB;AAIvD,MAAM,MAAM,eAAe,GAAG,KAAK,GAAG,qBAAqB,GAAG,UAAU,CAAC;AAIzE;;GAEG;AACH,KAAK,wBAAwB,GAAG,iBAAiB,GAC/C,gBAAgB,GAAG;IACjB,IAAI,CAAC,EAAE,eAAe,GAAG,MAAM,CAAC;CACjC,CAAC;AAEJ;;;;;;;;GAQG;AACH,wBAAgB,iBAAiB,CAAC,YAAY,SAAS,MAAM,EAAE,EAAE,OAAO,EAAE;IACxE,GAAG,EAAE,MAAM,CAAC;IACZ,IAAI,EAAE,MAAM,CAAC;IACb,WAAW,EAAE,GAAG,CAAC;IACjB,OAAO,EAAE,QAAQ,CAAC,wBAAwB,CAAC,CAAC;IAC5C,OAAO,EAAE,QAAQ,CAAC,MAAM,EAAE,CAAC,CAAC;CAC7B,GAAG,yBAAyB,CAAC,YAAY,CAAC,CAS1C"}

package/dist/lib/deprecated/create-image-source.js

@@ -1,8 +1,8 @@
 // loaders.gl
 // SPDX-License-Identifier: MIT
 // Copyright (c) vis.gl contributors
-import { WMSSource } from "../../services/ogc/wms-service.js";
-import { ArcGISImageServerSource } from "../../services/arcgis/arcgis-image-server.js";
+import { WMSSource } from "../../wms-source.js";
+import { ArcGISImageServerSource } from "../../arcgis/arcgis-image-source.js";
 const SOURCES = [WMSSource, ArcGISImageServerSource];
 /**
  * Creates an image source
@@ -13,13 +13,13 @@ const SOURCES = [WMSSource, ArcGISImageServerSource];
  *
  * @deprecated Use createDataSource from @loaders.gl/core
  */
-export function createImageSource(props, sources = SOURCES) {
-    const { type = 'auto' } = props;
-    const source = type === 'auto' ? guessSourceType(props.url, sources) : getSourceOfType(type, sources);
+export function createImageSource(options) {
+    const { type = 'auto', url, sources = SOURCES, loadOptions } = options;
+    const source = type === 'auto' ? guessSourceType(url, sources) : getSourceOfType(type, sources);
     if (!source) {
         throw new Error('Not a valid image source type');
     }
-    return source.createDataSource(props.url, props);
+    return source.createDataSource(url, { core: { loadOptions } });
 }
 /** Guess service type from URL */
 function getSourceOfType(type, sources) {

package/dist/wfs-capabilities-loader.js

@@ -2,7 +2,7 @@
 import { parseWFSCapabilities } from "./lib/parsers/wfs/parse-wfs-capabilities.js";
 // __VERSION__ is injected by babel-plugin-version-inline
 // @ts-ignore TS2304: Cannot find name '__VERSION__'.
-const VERSION = typeof "4.3.0" !== 'undefined' ? "4.3.0" : 'latest';
+const VERSION = typeof "4.4.0-alpha.0" !== 'undefined' ? "4.4.0-alpha.0" : 'latest';
 /**
  * Loader for the response to the WFS GetCapability request
  * @deprecated Warning: this loader is still experimental and incomplete

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

@@ -1,9 +1,20 @@
-import { Schema, GeoJSONTable } from '@loaders.gl/schema';
-import type { VectorSourceProps, VectorSourceMetadata, LoaderWithParser, GetFeaturesParameters } from '@loaders.gl/loader-utils';
-import { VectorSource } from '@loaders.gl/loader-utils';
-import type { WFSCapabilities } from "../../wfs-capabilities-loader.js";
+import type { Schema, GeoJSONTable } from '@loaders.gl/schema';
+import type { DataSourceOptions, VectorSourceMetadata, GetFeaturesParameters } from '@loaders.gl/loader-utils';
+import { DataSource, VectorSource } from '@loaders.gl/loader-utils';
+import type { WFSCapabilities } from "./wfs-capabilities-loader.js";
+/** 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 declare const WFSSource: {
@@ -13,31 +24,14 @@ export declare const WFSSource: {
     readonly version: "0.0.0";
     readonly extensions: [];
     readonly mimeTypes: [];
-    readonly options: {
-        readonly url: never;
-        readonly wfs: {
-            /** Tabular loaders, normally the GeoJSONLoader */
-            readonly loaders: [];
-        };
-    };
     readonly type: "wfs";
     readonly fromUrl: true;
     readonly fromBlob: false;
-    readonly testURL: (url: string) => boolean;
-    readonly createDataSource: (url: string | Blob, props: WFSVectorSourceProps) => WFSVectorSource;
-};
-/** 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>;
+    readonly defaultOptions: {
+        readonly wfs: {};
     };
+    readonly testURL: (url: string) => boolean;
+    readonly createDataSource: (url: string, options: WFSourceOptions) => WFSVectorSource;
 };
 /**
  * "Static" WFS parameters (not viewport or selected pixel dependent)
@@ -156,27 +150,24 @@ export type WFSGetLegendGraphicParameters = {
  * - implements the VectorSource interface
  * @note Only the URL parameter conversion is supported. XML posts are not supported.
  */
-export declare class WFSVectorSource extends VectorSource<WFSVectorSourceProps> {
-    /** Base URL to the service */
-    readonly url: string;
-    readonly data: string;
+export declare class WFSVectorSource extends DataSource<string, WFSourceOptions> implements VectorSource {
     /** Default static vendor parameters */
     vendorParameters?: Record<string, unknown>;
     capabilities: WFSCapabilities | null;
     /** Create a WFSVectorSource */
-    constructor(props: WFSVectorSourceProps);
+    constructor(data: string, options: WFSourceOptions);
     getSchema(): Promise<Schema>;
     getMetadata(): Promise<VectorSourceMetadata>;
     getFeatures(parameters: GetFeaturesParameters): Promise<GeoJSONTable>;
     normalizeMetadata(capabilities: WFSCapabilities): VectorSourceMetadata;
     /** Get Capabilities */
-    getCapabilities(wmsParameters?: WFSGetCapabilitiesParameters, vendorParameters?: Record<string, unknown>): Promise<WFSCapabilities>;
+    getCapabilities(wfsParameters?: WFSGetCapabilitiesParameters, vendorParameters?: Record<string, unknown>): Promise<WFSCapabilities>;
     /** 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);
@@ -189,10 +180,10 @@ export declare 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);
@@ -201,10 +192,10 @@ export declare 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);
@@ -213,10 +204,10 @@ export declare 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);
@@ -225,10 +216,10 @@ export declare 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);
@@ -240,14 +231,14 @@ export declare class WFSVectorSource extends VectorSource<WFSVectorSourceProps>
     }
     */
     /** Generate a URL for the GetCapabilities request */
-    getCapabilitiesURL(wmsParameters?: WFSGetCapabilitiesParameters, vendorParameters?: Record<string, unknown>): string;
+    getCapabilitiesURL(wfsParameters?: WFSGetCapabilitiesParameters, vendorParameters?: Record<string, unknown>): string;
     /** Generate a URL for the GetMap request */
-    getMapURL(wmsParameters: WFSGetMapParameters, vendorParameters?: Record<string, unknown>): string;
+    getMapURL(wfsParameters: WFSGetMapParameters, vendorParameters?: Record<string, unknown>): string;
     /** Generate a URL for the GetFeatureInfo request */
-    getFeatureInfoURL(wmsParameters: WFSGetFeatureInfoParameters, vendorParameters?: Record<string, unknown>): string;
+    getFeatureInfoURL(wfsParameters: WFSGetFeatureInfoParameters, vendorParameters?: Record<string, unknown>): string;
     /** Generate a URL for the GetFeatureInfo request */
-    describeLayerURL(wmsParameters: WFSDescribeLayerParameters, vendorParameters?: Record<string, unknown>): string;
-    getLegendGraphicURL(wmsParameters: WFSGetLegendGraphicParameters, vendorParameters?: Record<string, unknown>): string;
+    describeLayerURL(wfsParameters: WFSDescribeLayerParameters, vendorParameters?: Record<string, unknown>): string;
+    getLegendGraphicURL(wfsParameters: WFSGetLegendGraphicParameters, vendorParameters?: Record<string, unknown>): string;
     _parseWFSUrl(url: string): {
         url: string;
         parameters: Record<string, unknown>;
@@ -257,17 +248,17 @@ export declare class WFSVectorSource extends VectorSource<WFSVectorSourceProps>
      * @note case _getWFSUrl may need to be overridden to handle certain backends?
      * @note at the moment, only URLs with parameters are supported (no XML payloads)
      * */
-    protected _getWFSUrl(request: string, wmsParameters: {
+    protected _getWFSUrl(request: string, wfsParameters: {
         version?: '1.3.0' | '1.1.1';
         [key: string]: unknown;
     }, vendorParameters?: Record<string, unknown>): string;
     _getWFS130Parameters<ParametersT extends {
         crs?: string;
         srs?: string;
-    }>(wmsParameters: ParametersT): ParametersT;
-    _getURLParameter(key: string, value: unknown, wmsParameters: WFSParameters): string;
+    }>(wfsParameters: ParametersT): ParametersT;
+    _getURLParameter(key: string, value: unknown, wfsParameters: WFSParameters): string;
     /** Coordinate order is flipped for certain CRS in WFS 1.3.0 */
-    _flipBoundingBox(bboxValue: unknown, wmsParameters: WFSParameters): [number, number, number, number] | null;
+    _flipBoundingBox(bboxValue: unknown, wfsParameters: WFSParameters): [number, number, number, number] | null;
     /** Fetches an array buffer and checks the response (boilerplate reduction) */
     protected _fetchArrayBuffer(url: string): Promise<ArrayBuffer>;
     /** Checks for and parses a WFS XML formatted ServiceError and throws an exception */
@@ -275,4 +266,4 @@ export declare class WFSVectorSource extends VectorSource<WFSVectorSourceProps>
     /** Error situation detected */
     protected _parseError(arrayBuffer: ArrayBuffer): Error;
 }
-//# sourceMappingURL=wfs-service.d.ts.map
+//# sourceMappingURL=wfs-source.d.ts.map

package/dist/wfs-source.d.ts.map

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

package/dist/{services/ogc/wfs-service.js → wfs-source.js}

@@ -1,12 +1,11 @@
 // loaders.gl
 // SPDX-License-Identifier: MIT
 // Copyright (c) vis.gl contributors
-import { VectorSource, mergeLoaderOptions } from '@loaders.gl/loader-utils';
-import { WFSCapabilitiesLoader } from "../../wfs-capabilities-loader.js";
-import { WMSErrorLoader } from "../../wms-error-loader.js";
-/* eslint-disable camelcase */ // WFS XML parameters use snake_case
+import { DataSource, mergeOptions } from '@loaders.gl/loader-utils';
+import { WFSCapabilitiesLoader } from "./wfs-capabilities-loader.js";
+import { WMSErrorLoader } from "./wms-error-loader.js";
 /**
- * @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 = {
@@ -16,18 +15,14 @@ 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,
+    defaultOptions: {
+        wfs: {}
+    },
     testURL: (url) => url.toLowerCase().includes('wfs'),
-    createDataSource: (url, props) => new WFSVectorSource(props)
+    createDataSource: (url, options) => new WFSVectorSource(url, options)
 };
 //
 /**
@@ -37,43 +32,16 @@ export const WFSSource = {
  * - implements the VectorSource interface
  * @note Only the URL parameter conversion is supported. XML posts are not supported.
  */
-export class WFSVectorSource extends VectorSource {
-    /** Base URL to the service */
-    url;
-    data;
-    // /** 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 {
     /** Default static vendor parameters */
     vendorParameters;
     capabilities = null;
     /** Create a WFSVectorSource */
-    constructor(props) {
-        super(props);
+    constructor(data, options) {
+        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() {
         return { metadata: {}, fields: [] };
@@ -86,7 +54,7 @@ export class WFSVectorSource extends VectorSource {
     async getFeatures(parameters) {
         // 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
         // };
@@ -97,8 +65,8 @@ export class WFSVectorSource extends VectorSource {
     }
     // WFS Service API Stubs
     /** Get Capabilities */
-    async getCapabilities(wmsParameters, vendorParameters) {
-        const url = this.getCapabilitiesURL(wmsParameters, vendorParameters);
+    async getCapabilities(wfsParameters, vendorParameters) {
+        const url = this.getCapabilitiesURL(wfsParameters, vendorParameters);
         const response = await this.fetch(url);
         const arrayBuffer = await response.arrayBuffer();
         this._checkResponse(response, arrayBuffer);
@@ -108,10 +76,10 @@ export class WFSVectorSource extends VectorSource {
     }
     /** 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);
@@ -124,10 +92,10 @@ export class WFSVectorSource extends VectorSource {
   
     /** 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);
@@ -136,10 +104,10 @@ export class WFSVectorSource extends VectorSource {
   
     /** 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);
@@ -148,10 +116,10 @@ export class WFSVectorSource extends VectorSource {
   
     /** 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);
@@ -160,10 +128,10 @@ export class WFSVectorSource extends VectorSource {
   
     /** 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);
@@ -177,74 +145,74 @@ export class WFSVectorSource extends VectorSource {
     // Typed URL creators
     // For applications that want full control of fetching and parsing
     /** Generate a URL for the GetCapabilities request */
-    getCapabilitiesURL(wmsParameters, vendorParameters) {
+    getCapabilitiesURL(wfsParameters, vendorParameters) {
         // @ts-expect-error
         const options = {
-            // 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, vendorParameters) {
-        wmsParameters = this._getWFS130Parameters(wmsParameters);
+    getMapURL(wfsParameters, vendorParameters) {
+        wfsParameters = this._getWFS130Parameters(wfsParameters);
         // @ts-expect-error
         const options = {
-            // 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, vendorParameters) {
-        wmsParameters = this._getWFS130Parameters(wmsParameters);
+    getFeatureInfoURL(wfsParameters, vendorParameters) {
+        wfsParameters = this._getWFS130Parameters(wfsParameters);
         // Replace the GetImage `boundingBox` parameter with the WFS flat `bbox` parameter.
-        const { boundingBox, bbox } = wmsParameters;
-        wmsParameters.bbox = boundingBox ? [...boundingBox[0], ...boundingBox[1]] : bbox;
+        const { boundingBox, bbox } = wfsParameters;
+        wfsParameters.bbox = boundingBox ? [...boundingBox[0], ...boundingBox[1]] : bbox;
         // @ts-expect-error
         const options = {
-            // 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, vendorParameters) {
+    describeLayerURL(wfsParameters, vendorParameters) {
         // @ts-expect-error
         const options = {
-            // version: this.wmsParameters.version,
-            ...wmsParameters
+            // version: this.wfsParameters.version,
+            ...wfsParameters
         };
         return this._getWFSUrl('DescribeLayer', options, vendorParameters);
     }
-    getLegendGraphicURL(wmsParameters, vendorParameters) {
+    getLegendGraphicURL(wfsParameters, vendorParameters) {
         // @ts-expect-error
         const options = {
-            // version: this.wmsParameters.version,
+            // version: this.wfsParameters.version,
             // format?
-            ...wmsParameters
+            ...wfsParameters
         };
         return this._getWFSUrl('GetLegendGraphic', options, vendorParameters);
     }
@@ -264,15 +232,15 @@ export class WFSVectorSource extends VectorSource {
      * @note case _getWFSUrl may need to be overridden to handle certain backends?
      * @note at the moment, only URLs with parameters are supported (no XML payloads)
      * */
-    _getWFSUrl(request, wmsParameters, vendorParameters) {
+    _getWFSUrl(request, wfsParameters, vendorParameters) {
         let url = this.url;
         let first = true;
         // Add any vendor searchParams
         const allParameters = {
             service: 'WFS',
-            version: wmsParameters.version,
+            version: wfsParameters.version,
             request,
-            ...wmsParameters,
+            ...wfsParameters,
             ...this.vendorParameters,
             ...vendorParameters
         };
@@ -283,13 +251,13 @@ export class WFSVectorSource extends VectorSource {
             if (!IGNORE_EMPTY_KEYS.includes(key) || value) {
                 url += first ? '?' : '&';
                 first = false;
-                url += this._getURLParameter(key, value, wmsParameters);
+                url += this._getURLParameter(key, value, wfsParameters);
             }
         }
         return encodeURI(url);
     }
-    _getWFS130Parameters(wmsParameters) {
-        const newParameters = { ...wmsParameters };
+    _getWFS130Parameters(wfsParameters) {
+        const newParameters = { ...wfsParameters };
         if (newParameters.srs) {
             newParameters.crs = newParameters.crs || newParameters.srs;
             delete newParameters.srs;
@@ -297,12 +265,12 @@ export class WFSVectorSource extends VectorSource {
         return newParameters;
     }
     // eslint-disable-next-line complexity
-    _getURLParameter(key, value, wmsParameters) {
+    _getURLParameter(key, value, wfsParameters) {
         // 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 */
@@ -312,13 +280,13 @@ export class WFSVectorSource extends VectorSource {
                 break;
             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;
                 }
@@ -326,14 +294,14 @@ export class WFSVectorSource extends VectorSource {
             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;
             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;
@@ -346,18 +314,18 @@ export class WFSVectorSource extends VectorSource {
             : `${key}=${value ? String(value) : ''}`;
     }
     /** Coordinate order is flipped for certain CRS in WFS 1.3.0 */
-    _flipBoundingBox(bboxValue, wmsParameters) {
+    _flipBoundingBox(bboxValue, wfsParameters) {
         // Sanity checks
         if (!Array.isArray(bboxValue) || bboxValue.length !== 4) {
             return null;
         }
         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;
         return flipCoordinates ? [bbox[1], bbox[0], bbox[3], bbox[2]] : bbox;
     }
@@ -373,7 +341,7 @@ export class WFSVectorSource extends VectorSource {
         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(this.loadOptions, {
+            const loadOptions = mergeOptions(this.loadOptions, {
                 wms: { throwOnError: true }
             });
             const error = WMSErrorLoader.parseSync?.(arrayBuffer, loadOptions);