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

package/dist/services/ogc/wfs-service.js

@@ -0,0 +1,388 @@
+// 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
+/**
+ * @ndeprecated This is a WIP, not fully implemented
+ * @see https://developers.arcgis.com/rest/services-reference/enterprise/feature-service.htm
+ */
+export const WFSSource = {
+    name: 'WFS',
+    id: 'wfs',
+    module: 'wms',
+    version: '0.0.0',
+    extensions: [],
+    mimeTypes: [],
+    options: {
+        url: undefined,
+        wfs: {
+            /** Tabular loaders, normally the GeoJSONLoader */
+            loaders: []
+        }
+    },
+    type: 'wfs',
+    fromUrl: true,
+    fromBlob: false,
+    testURL: (url) => url.toLowerCase().includes('wfs'),
+    createDataSource: (url, props) => new WFSVectorSource(props)
+};
+//
+/**
+ * The WFSVectorSource class provides
+ * - provides type safe methods to form URLs to a WFS service
+ * - provides type safe methods to query and parse results (and errors) from a WFS service
+ * - 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>;
+    /** Default static vendor parameters */
+    vendorParameters;
+    capabilities = null;
+    /** Create a WFSVectorSource */
+    constructor(props) {
+        super(props);
+        // 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 || {};
+    }
+    async getSchema() {
+        return { metadata: {}, fields: [] };
+    }
+    // VectorSource implementation
+    async getMetadata() {
+        const capabilities = await this.getCapabilities();
+        return this.normalizeMetadata(capabilities);
+    }
+    async getFeatures(parameters) {
+        // Replace the GetImage `boundingBox` parameter with the WFS flat `bbox` parameter.
+        // const {boundingBox, bbox, ...rest} = parameters;
+        // const wmsParameters: WFSGetMapParameters = {
+        //   bbox: boundingBox ? [...boundingBox[0], ...boundingBox[1]] : bbox!,
+        //   ...rest
+        // };
+        return { shape: 'geojson-table', type: 'FeatureCollection', features: [] };
+    }
+    normalizeMetadata(capabilities) {
+        return capabilities;
+    }
+    // WFS Service API Stubs
+    /** Get Capabilities */
+    async getCapabilities(wmsParameters, vendorParameters) {
+        const url = this.getCapabilitiesURL(wmsParameters, vendorParameters);
+        const response = await this.fetch(url);
+        const arrayBuffer = await response.arrayBuffer();
+        this._checkResponse(response, arrayBuffer);
+        const capabilities = await WFSCapabilitiesLoader.parse(arrayBuffer, this.loadOptions);
+        this.capabilities = capabilities;
+        return capabilities;
+    }
+    /** Get a map image *
+    async getMap(
+      wmsParameters: WFSGetMapParameters,
+      vendorParameters?: Record<string, unknown>
+    ): Promise<ImageType> {
+      const url = this.getMapURL(wmsParameters, vendorParameters);
+      const response = await this.fetch(url);
+      const arrayBuffer = await response.arrayBuffer();
+      this._checkResponse(response, arrayBuffer);
+      try {
+        return await ImageLoader.parse(arrayBuffer, this.loadOptions);
+      } catch {
+        throw this._parseError(arrayBuffer);
+      }
+    }
+  
+    /** Get Feature Info for a coordinate *
+    async getFeatureInfo(
+      wmsParameters: WFSGetFeatureInfoParameters,
+      vendorParameters?: Record<string, unknown>
+    ): Promise<WFSFeatureInfo> {
+      const url = this.getFeatureInfoURL(wmsParameters, vendorParameters);
+      const response = await this.fetch(url);
+      const arrayBuffer = await response.arrayBuffer();
+      this._checkResponse(response, arrayBuffer);
+      return await WFSFeatureInfoLoader.parse(arrayBuffer, this.loadOptions);
+    }
+  
+    /** Get Feature Info for a coordinate *
+    async getFeatureInfoText(
+      wmsParameters: WFSGetFeatureInfoParameters,
+      vendorParameters?: Record<string, unknown>
+    ): Promise<string> {
+      const url = this.getFeatureInfoURL(wmsParameters, vendorParameters);
+      const response = await this.fetch(url);
+      const arrayBuffer = await response.arrayBuffer();
+      this._checkResponse(response, arrayBuffer);
+      return new TextDecoder().decode(arrayBuffer);
+    }
+  
+    /** Get more information about a layer *
+    async describeLayer(
+      wmsParameters: WFSDescribeLayerParameters,
+      vendorParameters?: Record<string, unknown>
+    ): Promise<WFSLayerDescription> {
+      const url = this.describeLayerURL(wmsParameters, vendorParameters);
+      const response = await this.fetch(url);
+      const arrayBuffer = await response.arrayBuffer();
+      this._checkResponse(response, arrayBuffer);
+      return await WFSLayerDescriptionLoader.parse(arrayBuffer, this.loadOptions);
+    }
+  
+    /** Get an image with a semantic legend *
+    async getLegendGraphic(
+      wmsParameters: WFSGetLegendGraphicParameters,
+      vendorParameters?: Record<string, unknown>
+    ): Promise<ImageType> {
+      const url = this.getLegendGraphicURL(wmsParameters, vendorParameters);
+      const response = await this.fetch(url);
+      const arrayBuffer = await response.arrayBuffer();
+      this._checkResponse(response, arrayBuffer);
+      try {
+        return await ImageLoader.parse(arrayBuffer, this.loadOptions);
+      } catch {
+        throw this._parseError(arrayBuffer);
+      }
+    }
+    */
+    // Typed URL creators
+    // For applications that want full control of fetching and parsing
+    /** Generate a URL for the GetCapabilities request */
+    getCapabilitiesURL(wmsParameters, vendorParameters) {
+        // @ts-expect-error
+        const options = {
+            // version: this.wmsParameters.version,
+            ...wmsParameters
+        };
+        return this._getWFSUrl('GetCapabilities', options, vendorParameters);
+    }
+    /** Generate a URL for the GetMap request */
+    getMapURL(wmsParameters, vendorParameters) {
+        wmsParameters = this._getWFS130Parameters(wmsParameters);
+        // @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,
+            // bbox: [-77.87304, 40.78975, -77.85828, 40.80228],
+            // width: 1200,
+            // height: 900,
+            ...wmsParameters
+        };
+        return this._getWFSUrl('GetMap', options, vendorParameters);
+    }
+    /** Generate a URL for the GetFeatureInfo request */
+    getFeatureInfoURL(wmsParameters, vendorParameters) {
+        wmsParameters = this._getWFS130Parameters(wmsParameters);
+        // Replace the GetImage `boundingBox` parameter with the WFS flat `bbox` parameter.
+        const { boundingBox, bbox } = wmsParameters;
+        wmsParameters.bbox = boundingBox ? [...boundingBox[0], ...boundingBox[1]] : bbox;
+        // @ts-expect-error
+        const options = {
+            // version: this.wmsParameters.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,
+            // bbox: [-77.87304, 40.78975, -77.85828, 40.80228],
+            // width: 1200,
+            // height: 900,
+            // x: undefined!,
+            // y: undefined!,
+            ...wmsParameters
+        };
+        return this._getWFSUrl('GetFeatureInfo', options, vendorParameters);
+    }
+    /** Generate a URL for the GetFeatureInfo request */
+    describeLayerURL(wmsParameters, vendorParameters) {
+        // @ts-expect-error
+        const options = {
+            // version: this.wmsParameters.version,
+            ...wmsParameters
+        };
+        return this._getWFSUrl('DescribeLayer', options, vendorParameters);
+    }
+    getLegendGraphicURL(wmsParameters, vendorParameters) {
+        // @ts-expect-error
+        const options = {
+            // version: this.wmsParameters.version,
+            // format?
+            ...wmsParameters
+        };
+        return this._getWFSUrl('GetLegendGraphic', options, vendorParameters);
+    }
+    // INTERNAL METHODS
+    _parseWFSUrl(url) {
+        const [baseUrl, search] = url.split('?');
+        const searchParams = search.split('&');
+        const parameters = {};
+        for (const parameter of searchParams) {
+            const [key, value] = parameter.split('=');
+            parameters[key] = value;
+        }
+        return { url: baseUrl, parameters };
+    }
+    /**
+     * Generate a URL with parameters
+     * @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) {
+        let url = this.url;
+        let first = true;
+        // Add any vendor searchParams
+        const allParameters = {
+            service: 'WFS',
+            version: wmsParameters.version,
+            request,
+            ...wmsParameters,
+            ...this.vendorParameters,
+            ...vendorParameters
+        };
+        // Encode the keys
+        const IGNORE_EMPTY_KEYS = ['transparent', 'time', 'elevation'];
+        for (const [key, value] of Object.entries(allParameters)) {
+            // hack to preserve test cases. Not super clear if keys should be included when values are undefined
+            if (!IGNORE_EMPTY_KEYS.includes(key) || value) {
+                url += first ? '?' : '&';
+                first = false;
+                url += this._getURLParameter(key, value, wmsParameters);
+            }
+        }
+        return encodeURI(url);
+    }
+    _getWFS130Parameters(wmsParameters) {
+        const newParameters = { ...wmsParameters };
+        if (newParameters.srs) {
+            newParameters.crs = newParameters.crs || newParameters.srs;
+            delete newParameters.srs;
+        }
+        return newParameters;
+    }
+    // eslint-disable-next-line complexity
+    _getURLParameter(key, value, wmsParameters) {
+        // Substitute by key
+        switch (key) {
+            case 'crs':
+                // CRS was called SRS before WFS 1.3.0
+                if (wmsParameters.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 */
+                    //   // Substitute by value
+                    //   value = 'CRS:84';
+                }
+                break;
+            case 'srs':
+                // CRS was called SRS before WFS 1.3.0
+                if (wmsParameters.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);
+                if (bbox) {
+                    value = bbox;
+                }
+                break;
+            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') {
+                    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') {
+                    key = 'j';
+                }
+                break;
+            default:
+            // do nothing
+        }
+        key = key.toUpperCase();
+        return Array.isArray(value)
+            ? `${key}=${value.join(',')}`
+            : `${key}=${value ? String(value) : ''}`;
+    }
+    /** Coordinate order is flipped for certain CRS in WFS 1.3.0 */
+    _flipBoundingBox(bboxValue, wmsParameters) {
+        // 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' &&
+        // // 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 substituting EPSG:4326 with CRS:84
+        // !(this.substituteCRS84 && wmsParameters.crs === 'EPSG:4326');
+        const bbox = bboxValue;
+        return flipCoordinates ? [bbox[1], bbox[0], bbox[3], bbox[2]] : bbox;
+    }
+    /** Fetches an array buffer and checks the response (boilerplate reduction) */
+    async _fetchArrayBuffer(url) {
+        const response = await this.fetch(url);
+        const arrayBuffer = await response.arrayBuffer();
+        this._checkResponse(response, arrayBuffer);
+        return arrayBuffer;
+    }
+    /** Checks for and parses a WFS XML formatted ServiceError and throws an exception */
+    _checkResponse(response, arrayBuffer) {
+        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, {
+                wms: { throwOnError: true }
+            });
+            const error = WMSErrorLoader.parseSync?.(arrayBuffer, loadOptions);
+            throw new Error(error);
+        }
+    }
+    /** Error situation detected */
+    _parseError(arrayBuffer) {
+        const error = WMSErrorLoader.parseSync?.(arrayBuffer, this.loadOptions);
+        return new Error(error);
+    }
+}

package/dist/services/ogc/wms-service.d.ts

@@ -1,14 +1,46 @@
 import type { ImageType } from '@loaders.gl/images';
-import type { Service, ImageSourceMetadata, GetImageParameters } from '@loaders.gl/loader-utils';
+import type { 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.js";
 import type { WMSCapabilities } from "../../wms-capabilities-loader.js";
 import type { WMSFeatureInfo } from "../../wip/wms-feature-info-loader.js";
 import type { WMSLayerDescription } from "../../wip/wms-layer-description-loader.js";
-export declare const WMSService: Service<WMSSource, WMSSourceProps>;
+export declare const WMSSource: {
+    readonly name: "Web Map Service (OGC WMS)";
+    readonly id: "wms";
+    readonly module: "wms";
+    readonly version: "0.0.0";
+    readonly extensions: [];
+    readonly mimeTypes: [];
+    readonly options: {
+        readonly wms: {};
+    };
+    readonly type: "wms";
+    readonly fromUrl: true;
+    readonly fromBlob: false;
+    readonly testURL: (url: string) => boolean;
+    readonly createDataSource: (url: string | Blob, props: WMSImageSourceProps) => WMSImageSource;
+};
+/** 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?: {
+        /** 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>;
+    };
+};
 /**
  * "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) */
@@ -25,7 +57,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;
@@ -116,25 +148,14 @@ export type WMSGetLegendGraphicParameters = {
     /** In case the endpoint supports multiple WMS versions */
     version?: '1.3.0' | '1.1.1';
 };
-/** 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 declare class WMSSource extends ImageSource<WMSSourceProps> {
+export declare class WMSImageSource extends ImageSource<WMSImageSourceProps> {
     /** Base URL to the service */
     readonly url: string;
     readonly data: string;
@@ -147,8 +168,8 @@ export declare class WMSSource extends ImageSource<WMSSourceProps> {
     /** Default static vendor parameters */
     vendorParameters?: Record<string, unknown>;
     capabilities: WMSCapabilities | null;
-    /** Create a WMSSource */
-    constructor(props: WMSSourceProps);
+    /** Create a WMSImageSource */
+    constructor(url: string, props: WMSImageSourceProps);
     getMetadata(): Promise<ImageSourceMetadata>;
     getImage(parameters: GetImageParameters): Promise<ImageType>;
     normalizeMetadata(capabilities: WMSCapabilities): ImageSourceMetadata;

package/dist/services/ogc/wms-service.d.ts.map

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

package/dist/services/ogc/wms-service.js

@@ -8,19 +8,33 @@ import { WMSCapabilitiesLoader } from "../../wms-capabilities-loader.js";
 import { WMSFeatureInfoLoader } from "../../wip/wms-feature-info-loader.js";
 import { WMSLayerDescriptionLoader } from "../../wip/wms-layer-description-loader.js";
 import { WMSErrorLoader } from "../../wms-error-loader.js";
-export const WMSService = {
+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) => url.toLowerCase().includes('wms'),
-    create: (props) => new WMSSource(props)
+    createDataSource: (url, props) => new WMSImageSource(url, props)
 };
+//
 /**
- * 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 {
+export class WMSImageSource extends ImageSource {
     /** Base URL to the service */
     url;
     data;
@@ -33,15 +47,15 @@ export class WMSSource extends ImageSource {
     /** Default static vendor parameters */
     vendorParameters;
     capabilities = null;
-    /** Create a WMSSource */
-    constructor(props) {
+    /** Create a WMSImageSource */
+    constructor(url, props) {
         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.substituteCRS84 = props.substituteCRS84 ?? false;
+        this.url = url;
+        this.data = url;
+        this.substituteCRS84 = props.wms?.substituteCRS84 ?? props.substituteCRS84 ?? false;
         this.flipCRS = ['EPSG:4326'];
         this.wmsParameters = {
             layers: undefined,
@@ -54,11 +68,12 @@ export class WMSSource extends ImageSource {
             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() {
         const capabilities = await this.getCapabilities();
         return this.normalizeMetadata(capabilities);

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

@@ -1,11 +1,12 @@
 import type { LoaderWithParser, LoaderOptions } from '@loaders.gl/loader-utils';
-import type { WFSCapabilities } from "./lib/wfs/parse-wfs-capabilities.js";
+import type { WFSCapabilities } from "./lib/parsers/wfs/parse-wfs-capabilities.js";
 export type { WFSCapabilities };
 export type WFSLoaderOptions = LoaderOptions & {
     wfs?: {};
 };
 /**
  * Loader for the response to the WFS GetCapability request
+ * @deprecated Warning: this loader is still experimental and incomplete
  */
 export declare const WFSCapabilitiesLoader: {
     readonly dataType: WFSCapabilities;

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

@@ -0,0 +1 @@
+{"version":3,"file":"wfs-capabilities-loader.d.ts","sourceRoot":"","sources":["../src/wfs-capabilities-loader.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAC,gBAAgB,EAAE,aAAa,EAAC,MAAM,0BAA0B,CAAC;AAC9E,OAAO,KAAK,EAAC,eAAe,EAAC,oDAAiD;AAO9E,YAAY,EAAC,eAAe,EAAC,CAAC;AAE9B,MAAM,MAAM,gBAAgB,GAAG,aAAa,GAAG;IAC7C,GAAG,CAAC,EAAE,EAAE,CAAC;CACV,CAAC;AAEF;;;GAGG;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/dist/{wip/wfs-capabilities-loader.js → wfs-capabilities-loader.js}

@@ -1,10 +1,11 @@
 // loaders.gl, MIT license
-import { parseWFSCapabilities } from "./lib/wfs/parse-wfs-capabilities.js";
+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-alpha.1" !== 'undefined' ? "4.3.0-alpha.1" : 'latest';
+const VERSION = typeof "4.3.0-alpha.2" !== 'undefined' ? "4.3.0-alpha.2" : 'latest';
 /**
  * Loader for the response to the WFS GetCapability request
+ * @deprecated Warning: this loader is still experimental and incomplete
  */
 export const WFSCapabilitiesLoader = {
     dataType: null,

package/dist/wip/wcs-capabilities-loader.js

@@ -2,7 +2,7 @@
 import { parseWCSCapabilities } from "./lib/wcs/parse-wcs-capabilities.js";
 // __VERSION__ is injected by babel-plugin-version-inline
 // @ts-ignore TS2304: Cannot find name '__VERSION__'.
-const VERSION = typeof "4.3.0-alpha.1" !== 'undefined' ? "4.3.0-alpha.1" : 'latest';
+const VERSION = typeof "4.3.0-alpha.2" !== 'undefined' ? "4.3.0-alpha.2" : 'latest';
 /**
  * Loader for the response to the WCS GetCapability request
  */

package/dist/wip/wmts-capabilities-loader.js

@@ -3,7 +3,7 @@
 import { parseWMTSCapabilities } from "./lib/wmts/parse-wmts-capabilities.js";
 // __VERSION__ is injected by babel-plugin-version-inline
 // @ts-ignore TS2304: Cannot find name '__VERSION__'.
-const VERSION = typeof "4.3.0-alpha.1" !== 'undefined' ? "4.3.0-alpha.1" : 'latest';
+const VERSION = typeof "4.3.0-alpha.2" !== 'undefined' ? "4.3.0-alpha.2" : 'latest';
 /**
  * Loader for the response to the WMTS GetCapability request
  */

package/dist/wms-capabilities-loader.js

@@ -4,7 +4,7 @@
 import { parseWMSCapabilities } from "./lib/parsers/wms/parse-wms-capabilities.js";
 // __VERSION__ is injected by babel-plugin-version-inline
 // @ts-ignore TS2304: Cannot find name '__VERSION__'.
-const VERSION = typeof "4.3.0-alpha.1" !== 'undefined' ? "4.3.0-alpha.1" : 'latest';
+const VERSION = typeof "4.3.0-alpha.2" !== 'undefined' ? "4.3.0-alpha.2" : 'latest';
 /**
  * Loader for the response to the WMS GetCapability request
  */

package/dist/wms-error-loader.js

@@ -4,7 +4,7 @@
 import { parseWMSError } from "./lib/parsers/wms/parse-wms-error.js";
 // __VERSION__ is injected by babel-plugin-version-inline
 // @ts-ignore TS2304: Cannot find name '__VERSION__'.
-const VERSION = typeof "4.3.0-alpha.1" !== 'undefined' ? "4.3.0-alpha.1" : 'latest';
+const VERSION = typeof "4.3.0-alpha.2" !== 'undefined' ? "4.3.0-alpha.2" : 'latest';
 /**
  * Loader for the response to the WMS GetCapability request
  */