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

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

@@ -31,16 +31,19 @@ class WMSService extends image_source_1.ImageSource {
         ];
         // 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.
-        this.props = {
-            loadOptions: undefined,
+        // const {baseUrl, parameters} = this._parseWMSUrl(props.url);
+        this.url = props.url;
+        this.wmsParameters = {
             layers: undefined,
             styles: undefined,
-            version: '1.1.1',
-            srs: 'EPSG:4326',
+            version: '1.3.0',
+            crs: 'EPSG:4326',
             format: 'image/png',
             info_format: 'text/plain',
-            ...props
+            transparent: undefined,
+            ...props.wmsParameters
         };
+        this.vendorParameters = props.vendorParameters || {};
     }
     // ImageSource implementation
     async getMetadata() {
@@ -48,7 +51,10 @@ class WMSService extends image_source_1.ImageSource {
         return this.normalizeMetadata(capabilities);
     }
     async getImage(parameters) {
-        return await this.getMap(parameters);
+        // WMS 1.3.0 renamed SRS to CRS (sigh...)
+        const wmsParameters = { ...parameters, crs: parameters.srs };
+        delete wmsParameters.srs;
+        return await this.getMap(wmsParameters);
     }
     normalizeMetadata(capabilities) {
         return capabilities;
@@ -60,55 +66,55 @@ class WMSService extends image_source_1.ImageSource {
         const response = await this.fetch(url);
         const arrayBuffer = await response.arrayBuffer();
         this._checkResponse(response, arrayBuffer);
-        const capabilities = await wms_capabilities_loader_1.WMSCapabilitiesLoader.parse(arrayBuffer, this.props.loadOptions);
+        const capabilities = await wms_capabilities_loader_1.WMSCapabilitiesLoader.parse(arrayBuffer, this.loadOptions);
         this.capabilities = capabilities;
         return capabilities;
     }
     /** Get a map image */
-    async getMap(options, vendorParameters) {
-        const url = this.getMapURL(options, vendorParameters);
+    async getMap(wmsParameters, vendorParameters) {
+        const url = this.getMapURL(wmsParameters, vendorParameters);
         const response = await this.fetch(url);
         const arrayBuffer = await response.arrayBuffer();
         this._checkResponse(response, arrayBuffer);
         try {
-            return await images_1.ImageLoader.parse(arrayBuffer, this.props.loadOptions);
+            return await images_1.ImageLoader.parse(arrayBuffer, this.loadOptions);
         }
         catch {
             throw this._parseError(arrayBuffer);
         }
     }
     /** Get Feature Info for a coordinate */
-    async getFeatureInfo(options, vendorParameters) {
-        const url = this.getFeatureInfoURL(options, vendorParameters);
+    async getFeatureInfo(wmsParameters, vendorParameters) {
+        const url = this.getFeatureInfoURL(wmsParameters, vendorParameters);
         const response = await this.fetch(url);
         const arrayBuffer = await response.arrayBuffer();
         this._checkResponse(response, arrayBuffer);
-        return await wms_feature_info_loader_1.WMSFeatureInfoLoader.parse(arrayBuffer, this.props.loadOptions);
+        return await wms_feature_info_loader_1.WMSFeatureInfoLoader.parse(arrayBuffer, this.loadOptions);
     }
     /** Get Feature Info for a coordinate */
-    async getFeatureInfoText(options, vendorParameters) {
-        const url = this.getFeatureInfoURL(options, vendorParameters);
+    async getFeatureInfoText(wmsParameters, vendorParameters) {
+        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(options, vendorParameters) {
-        const url = this.describeLayerURL(options, vendorParameters);
+    async describeLayer(wmsParameters, vendorParameters) {
+        const url = this.describeLayerURL(wmsParameters, vendorParameters);
         const response = await this.fetch(url);
         const arrayBuffer = await response.arrayBuffer();
         this._checkResponse(response, arrayBuffer);
-        return await wms_layer_description_loader_1.WMSLayerDescriptionLoader.parse(arrayBuffer, this.props.loadOptions);
+        return await wms_layer_description_loader_1.WMSLayerDescriptionLoader.parse(arrayBuffer, this.loadOptions);
     }
     /** Get an image with a semantic legend */
-    async getLegendGraphic(options, vendorParameters) {
-        const url = this.getLegendGraphicURL(options, vendorParameters);
+    async getLegendGraphic(wmsParameters, vendorParameters) {
+        const url = this.getLegendGraphicURL(wmsParameters, vendorParameters);
         const response = await this.fetch(url);
         const arrayBuffer = await response.arrayBuffer();
         this._checkResponse(response, arrayBuffer);
         try {
-            return await images_1.ImageLoader.parse(arrayBuffer, this.props.loadOptions);
+            return await images_1.ImageLoader.parse(arrayBuffer, this.loadOptions);
         }
         catch {
             throw this._parseError(arrayBuffer);
@@ -119,38 +125,31 @@ class WMSService extends image_source_1.ImageSource {
     /** Generate a URL for the GetCapabilities request */
     getCapabilitiesURL(wmsParameters, vendorParameters) {
         const options = {
-            service: 'WMS',
-            version: this.props.version,
-            request: 'GetCapabilities',
-            ...wmsParameters,
-            ...vendorParameters
+            version: this.wmsParameters.version,
+            ...wmsParameters
         };
-        return this._getWMSUrl(options, vendorParameters);
+        return this._getWMSUrl('GetCapabilities', options, vendorParameters);
     }
     /** Generate a URL for the GetMap request */
     getMapURL(wmsParameters, vendorParameters) {
         const options = {
-            service: 'WMS',
-            version: this.props.version,
-            request: 'GetMap',
+            version: this.wmsParameters.version,
             // layers: [],
             // bbox: [-77.87304, 40.78975, -77.85828, 40.80228],
             // width: 1200,
             // height: 900,
-            styles: this.props.styles,
-            srs: this.props.srs,
-            format: this.props.format,
-            ...wmsParameters,
-            ...vendorParameters
+            styles: this.wmsParameters.styles,
+            crs: this.wmsParameters.crs,
+            format: this.wmsParameters.format,
+            transparent: this.wmsParameters.transparent,
+            ...wmsParameters
         };
-        return this._getWMSUrl(options, vendorParameters);
+        return this._getWMSUrl('GetMap', options, vendorParameters);
     }
     /** Generate a URL for the GetFeatureInfo request */
     getFeatureInfoURL(wmsParameters, vendorParameters) {
         const options = {
-            service: 'WMS',
-            version: this.props.version,
-            request: 'GetFeatureInfo',
+            version: this.wmsParameters.version,
             // layers: this.props.layers,
             // bbox: [-77.87304, 40.78975, -77.85828, 40.80228],
             // width: 1200,
@@ -158,62 +157,98 @@ class WMSService extends image_source_1.ImageSource {
             // x: undefined!,
             // y: undefined!,
             // query_layers: [],
-            srs: this.props.srs,
-            format: this.props.format,
-            info_format: this.props.info_format,
-            styles: this.props.styles,
-            ...wmsParameters,
-            ...vendorParameters
+            srs: this.wmsParameters.crs,
+            format: this.wmsParameters.format,
+            info_format: this.wmsParameters.info_format,
+            styles: this.wmsParameters.styles,
+            ...wmsParameters
         };
-        return this._getWMSUrl(options, vendorParameters);
+        return this._getWMSUrl('GetFeatureInfo', options, vendorParameters);
     }
     /** Generate a URL for the GetFeatureInfo request */
     describeLayerURL(wmsParameters, vendorParameters) {
         const options = {
-            service: 'WMS',
-            version: this.props.version,
-            request: 'DescribeLayer',
-            ...wmsParameters,
-            ...vendorParameters
+            version: this.wmsParameters.version,
+            ...wmsParameters
         };
-        return this._getWMSUrl(options, vendorParameters);
+        return this._getWMSUrl('DescribeLayer', options, vendorParameters);
     }
     getLegendGraphicURL(wmsParameters, vendorParameters) {
         const options = {
-            service: 'WMS',
-            version: this.props.version,
-            request: 'GetLegendGraphic',
+            version: this.wmsParameters.version,
             // format?
-            ...wmsParameters,
-            ...vendorParameters
+            ...wmsParameters
         };
-        return this._getWMSUrl(options, vendorParameters);
+        return this._getWMSUrl('GetLegendGraphic', options, vendorParameters);
     }
     // INTERNAL METHODS
+    _parseWMSUrl(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 _getWMSUrl may need to be overridden to handle certain backends?
+     * @note at the moment, only URLs with parameters are supported (no XML payloads)
      * */
-    _getWMSUrl(options, vendorParameters) {
-        let url = this.props.url;
+    _getWMSUrl(request, wmsParameters, vendorParameters) {
+        let url = this.url;
         let first = true;
-        for (const [key, value] of Object.entries(options)) {
-            url += first ? '?' : '&';
-            first = false;
-            if (Array.isArray(value)) {
-                url += `${key.toUpperCase()}=${value.join(',')}`;
-            }
-            else {
-                url += `${key.toUpperCase()}=${value ? String(value) : ''}`;
+        // Add any vendor searchParams
+        const allParameters = {
+            service: 'WMS',
+            version: wmsParameters.version,
+            request,
+            ...wmsParameters,
+            ...this.vendorParameters,
+            ...vendorParameters
+        };
+        // Encode the keys
+        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 (key !== 'transparent' || value) {
+                url += first ? '?' : '&';
+                first = false;
+                url += this._getParameterValue(wmsParameters.version, key, value);
             }
         }
         return encodeURI(url);
     }
+    _getParameterValue(version, key, value) {
+        // SRS parameter changed to CRS in 1.3.0, in non-backwards compatible way (sigh...)
+        if (key === 'crs' && version !== '1.3.0') {
+            key = 'srs';
+        }
+        key = key.toUpperCase();
+        // TODO - in v1.3.0 only, the order of parameters for BBOX depends on whether the CRS definition has flipped axes
+        // You will see this in the GetCapabilities request at 1.3.0 - the response should show the flipped axes.
+        // BBOX=xmin,ymin,xmax,ymax NON-FLIPPED
+        // BBOX=ymin,xmin,ymax,xmax FLIPPED
+        // / EPSG:4326 needs to have flipped axes. 4326 1 WGS 84 Latitude North Longitude East
+        // In WMS 1.1.1 EPSG:4326 is wrongly defined as having long/lat coordinate axes. In WMS 1.3.0 the correct axes lat/long are used. CRS:84 is defined by OGC as having the same datum as EPSG:4326 (that is the World Geodetic System 1984 datum ~ EPSG::6326) but axis order of long/lat.
+        // CRS:84 was introduced with the publication of the WMS 1.3.0 specification, to overcome this issue.
+        return Array.isArray(value)
+            ? `${key}=${value.join(',')}`
+            : `${key}=${value ? String(value) : ''}`;
+    }
+    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 WMS XML formatted ServiceError and throws an exception */
     _checkResponse(response, arrayBuffer) {
         const contentType = response.headers['content-type'];
         if (!response.ok || wms_error_loader_1.WMSErrorLoader.mimeTypes.includes(contentType)) {
             // We want error responses to throw exceptions, the WMSErrorLoader can do this
-            const loadOptions = (0, loader_utils_1.mergeLoaderOptions)(this.props.loadOptions, {
+            const loadOptions = (0, loader_utils_1.mergeLoaderOptions)(this.loadOptions, {
                 wms: { throwOnError: true }
             });
             const error = wms_error_loader_1.WMSErrorLoader.parseSync(arrayBuffer, loadOptions);
@@ -222,10 +257,10 @@ class WMSService extends image_source_1.ImageSource {
     }
     /** Error situation detected */
     _parseError(arrayBuffer) {
-        const error = wms_error_loader_1.WMSErrorLoader.parseSync(arrayBuffer, this.props.loadOptions);
+        const error = wms_error_loader_1.WMSErrorLoader.parseSync(arrayBuffer, this.loadOptions);
         return new Error(error);
     }
 }
-exports.WMSService = WMSService;
 WMSService.type = 'wms';
 WMSService.testURL = (url) => url.toLowerCase().includes('wms');
+exports.WMSService = WMSService;

package/dist/lib/sources/image-source.d.ts

@@ -12,20 +12,14 @@ export type ImageSourceMetadata = {
     title?: string;
     abstract?: string;
     keywords: string[];
-    layer: {
-        name: string;
-        title?: string;
-        srs?: string[];
-        boundingBox?: [number, number, number, number];
-        layers: ImageSourceLayer[];
-    };
+    layers: ImageSourceLayer[];
 };
 export type ImageSourceLayer = {
-    name: string;
+    name?: string;
     title?: string;
     srs?: string[];
     boundingBox?: [number, number, number, number];
-    layers: ImageSourceLayer[];
+    layers?: ImageSourceLayer[];
 };
 export type GetImageParameters = {
     /** Layers to render */

package/dist/lib/sources/image-source.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"image-source.d.ts","sourceRoot":"","sources":["../../../src/lib/sources/image-source.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAC,SAAS,EAAC,MAAM,oBAAoB,CAAC;AAClD,OAAO,KAAK,EAAC,eAAe,EAAC,MAAM,eAAe,CAAC;AACnD,OAAO,EAAC,UAAU,EAAC,MAAM,eAAe,CAAC;AAEzC;;;;;GAKG;AACH,MAAM,MAAM,mBAAmB,GAAG;IAChC,IAAI,EAAE,MAAM,CAAC;IACb,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,QAAQ,EAAE,MAAM,EAAE,CAAC;IACnB,KAAK,EAAE;QACL,IAAI,EAAE,MAAM,CAAC;QACb,KAAK,CAAC,EAAE,MAAM,CAAC;QACf,GAAG,CAAC,EAAE,MAAM,EAAE,CAAC;QACf,WAAW,CAAC,EAAE,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,CAAC,CAAC;QAC/C,MAAM,EAAE,gBAAgB,EAAE,CAAC;KAC5B,CAAC;CACH,CAAC;AAEF,MAAM,MAAM,gBAAgB,GAAG;IAC7B,IAAI,EAAE,MAAM,CAAC;IACb,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,GAAG,CAAC,EAAE,MAAM,EAAE,CAAC;IACf,WAAW,CAAC,EAAE,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,CAAC,CAAC;IAC/C,MAAM,EAAE,gBAAgB,EAAE,CAAC;CAC5B,CAAC;AAEF,MAAM,MAAM,kBAAkB,GAAG;IAC/B,uBAAuB;IACvB,MAAM,EAAE,MAAM,GAAG,MAAM,EAAE,CAAC;IAC1B,cAAc;IACd,MAAM,CAAC,EAAE,OAAO,CAAC;IACjB,8CAA8C;IAC9C,IAAI,EAAE,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,CAAC,CAAC;IACvC,oCAAoC;IACpC,KAAK,EAAE,MAAM,CAAC;IACd,aAAa;IACb,MAAM,EAAE,MAAM,CAAC;IACf,+CAA+C;IAC/C,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,4CAA4C;IAC5C,MAAM,CAAC,EAAE,WAAW,CAAC;CACtB,CAAC;AAGF,MAAM,MAAM,YAAY,GAAG;IACzB,uBAAuB;IACvB,MAAM,EAAE,MAAM,GAAG,MAAM,EAAE,CAAC;IAC1B,cAAc;IACd,MAAM,CAAC,EAAE,OAAO,CAAC;CAClB,CAAC;AAEF,MAAM,MAAM,WAAW,GAAG;IACxB,8CAA8C;IAC9C,IAAI,EAAE,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,CAAC,CAAC;CACxC,CAAC;AAEF,MAAM,MAAM,WAAW,GAAG;IACxB,oCAAoC;IACpC,KAAK,EAAE,MAAM,CAAC;IACd,aAAa;IACb,MAAM,EAAE,MAAM,CAAC;IACf,+CAA+C;IAC/C,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,4CAA4C;IAC5C,MAAM,CAAC,EAAE,WAAW,CAAC;CACtB,CAAC;AAEF,MAAM,MAAM,gBAAgB,GAAG,eAAe,CAAC;AAE/C;;;;GAIG;AACH,8BAAsB,WAAY,SAAQ,UAAU;IAClD,QAAQ,CAAC,WAAW,IAAI,OAAO,CAAC,mBAAmB,CAAC;IACpD,QAAQ,CAAC,QAAQ,CAAC,UAAU,EAAE,kBAAkB,GAAG,OAAO,CAAC,SAAS,CAAC;CACtE"}
+{"version":3,"file":"image-source.d.ts","sourceRoot":"","sources":["../../../src/lib/sources/image-source.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAC,SAAS,EAAC,MAAM,oBAAoB,CAAC;AAClD,OAAO,KAAK,EAAC,eAAe,EAAC,MAAM,eAAe,CAAC;AACnD,OAAO,EAAC,UAAU,EAAC,MAAM,eAAe,CAAC;AAEzC;;;;;GAKG;AACH,MAAM,MAAM,mBAAmB,GAAG;IAChC,IAAI,EAAE,MAAM,CAAC;IACb,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,QAAQ,EAAE,MAAM,EAAE,CAAC;IACnB,MAAM,EAAE,gBAAgB,EAAE,CAAC;CAC5B,CAAC;AAEF,MAAM,MAAM,gBAAgB,GAAG;IAC7B,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,GAAG,CAAC,EAAE,MAAM,EAAE,CAAC;IACf,WAAW,CAAC,EAAE,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,CAAC,CAAC;IAC/C,MAAM,CAAC,EAAE,gBAAgB,EAAE,CAAC;CAC7B,CAAC;AAEF,MAAM,MAAM,kBAAkB,GAAG;IAC/B,uBAAuB;IACvB,MAAM,EAAE,MAAM,GAAG,MAAM,EAAE,CAAC;IAC1B,cAAc;IACd,MAAM,CAAC,EAAE,OAAO,CAAC;IACjB,8CAA8C;IAC9C,IAAI,EAAE,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,CAAC,CAAC;IACvC,oCAAoC;IACpC,KAAK,EAAE,MAAM,CAAC;IACd,aAAa;IACb,MAAM,EAAE,MAAM,CAAC;IACf,+CAA+C;IAC/C,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,4CAA4C;IAC5C,MAAM,CAAC,EAAE,WAAW,CAAC;CACtB,CAAC;AAGF,MAAM,MAAM,YAAY,GAAG;IACzB,uBAAuB;IACvB,MAAM,EAAE,MAAM,GAAG,MAAM,EAAE,CAAC;IAC1B,cAAc;IACd,MAAM,CAAC,EAAE,OAAO,CAAC;CAClB,CAAC;AAEF,MAAM,MAAM,WAAW,GAAG;IACxB,8CAA8C;IAC9C,IAAI,EAAE,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,CAAC,CAAC;CACxC,CAAC;AAEF,MAAM,MAAM,WAAW,GAAG;IACxB,oCAAoC;IACpC,KAAK,EAAE,MAAM,CAAC;IACd,aAAa;IACb,MAAM,EAAE,MAAM,CAAC;IACf,+CAA+C;IAC/C,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,4CAA4C;IAC5C,MAAM,CAAC,EAAE,WAAW,CAAC;CACtB,CAAC;AAEF,MAAM,MAAM,gBAAgB,GAAG,eAAe,CAAC;AAE/C;;;;GAIG;AACH,8BAAsB,WAAY,SAAQ,UAAU;IAClD,QAAQ,CAAC,WAAW,IAAI,OAAO,CAAC,mBAAmB,CAAC;IACpD,QAAQ,CAAC,QAAQ,CAAC,UAAU,EAAE,kBAAkB,GAAG,OAAO,CAAC,SAAS,CAAC;CACtE"}

package/dist/wip/wmts-capabilities-loader.d.ts

@@ -1,6 +1,4 @@
 import type { LoaderWithParser, LoaderOptions } from '@loaders.gl/loader-utils';
-import { WMTSCapabilities } from './lib/wmts/parse-wmts-capabilities';
-export { WMTSCapabilities };
 export type WMTSLoaderOptions = LoaderOptions & {
     wmts?: {};
 };
@@ -19,9 +17,10 @@ export declare const WMTSCapabilitiesLoader: {
     options: {
         wms: {};
     };
-    parse: (arrayBuffer: ArrayBuffer, options?: WMTSLoaderOptions) => Promise<WMTSCapabilities>;
-    parseTextSync: (text: string, options?: WMTSLoaderOptions) => WMTSCapabilities;
+    parse: (arrayBuffer: ArrayBuffer, options?: WMTSLoaderOptions) => Promise<import("./lib/wmts/parse-wmts-capabilities").WMTSCapabilities>;
+    parseTextSync: (text: string, options?: WMTSLoaderOptions) => import("./lib/wmts/parse-wmts-capabilities").WMTSCapabilities;
 };
 declare function testXMLFile(text: string): boolean;
 export declare const _typecheckWMTSCapabilitiesLoader: LoaderWithParser;
+export {};
 //# sourceMappingURL=wmts-capabilities-loader.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"wmts-capabilities-loader.d.ts","sourceRoot":"","sources":["../../src/wip/wmts-capabilities-loader.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAC,gBAAgB,EAAE,aAAa,EAAC,MAAM,0BAA0B,CAAC;AAC9E,OAAO,EAAC,gBAAgB,EAAC,MAAM,oCAAoC,CAAC;AAOpE,OAAO,EAAC,gBAAgB,EAAC,CAAC;AAE1B,MAAM,MAAM,iBAAiB,GAAG,aAAa,GAAG;IAC9C,IAAI,CAAC,EAAE,EAAE,CAAC;CACX,CAAC;AAEF;;GAEG;AACH,eAAO,MAAM,sBAAsB;;;;;;;;;;;;yBAaN,WAAW,YAAY,iBAAiB;0BAE7C,MAAM,YAAY,iBAAiB;CAC1D,CAAC;AAEF,iBAAS,WAAW,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAG1C;AAED,eAAO,MAAM,gCAAgC,EAAE,gBAAyC,CAAC"}
+{"version":3,"file":"wmts-capabilities-loader.d.ts","sourceRoot":"","sources":["../../src/wip/wmts-capabilities-loader.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAC,gBAAgB,EAAE,aAAa,EAAC,MAAM,0BAA0B,CAAC;AAU9E,MAAM,MAAM,iBAAiB,GAAG,aAAa,GAAG;IAC9C,IAAI,CAAC,EAAE,EAAE,CAAC;CACX,CAAC;AAEF;;GAEG;AACH,eAAO,MAAM,sBAAsB;;;;;;;;;;;;yBAaN,WAAW,YAAY,iBAAiB;0BAE7C,MAAM,YAAY,iBAAiB;CAC1D,CAAC;AAEF,iBAAS,WAAW,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAG1C;AAED,eAAO,MAAM,gCAAgC,EAAE,gBAAyC,CAAC"}

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

@@ -2,6 +2,7 @@
 // loaders.gl, MIT license
 Object.defineProperty(exports, "__esModule", { value: true });
 exports._typecheckWMTSCapabilitiesLoader = exports.WMTSCapabilitiesLoader = void 0;
+// import type {WMTSCapabilities} from './lib/wmts/parse-wmts-capabilities.js';
 const parse_wmts_capabilities_1 = require("./lib/wmts/parse-wmts-capabilities");
 // __VERSION__ is injected by babel-plugin-version-inline
 // @ts-ignore TS2304: Cannot find name '__VERSION__'.

package/dist/wms-capabilities-loader.d.ts

@@ -2,7 +2,12 @@ import type { LoaderWithParser, LoaderOptions } from '@loaders.gl/loader-utils';
 import type { WMSCapabilities } from './lib/parsers/wms/parse-wms-capabilities';
 export type { WMSCapabilities };
 export type WMSLoaderOptions = LoaderOptions & {
-    wms?: {};
+    wms?: {
+        /** Add inherited layer information to sub layers */
+        inheritedLayerProps?: boolean;
+        /** Whether to include "raw" XML-derived JSON */
+        raw?: boolean;
+    };
 };
 /**
  * Loader for the response to the WMS GetCapability request

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

@@ -1 +1 @@
-{"version":3,"file":"wms-capabilities-loader.d.ts","sourceRoot":"","sources":["../src/wms-capabilities-loader.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAC,gBAAgB,EAAE,aAAa,EAAC,MAAM,0BAA0B,CAAC;AAC9E,OAAO,KAAK,EAAC,eAAe,EAAC,MAAM,0CAA0C,CAAC;AAQ9E,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;;;;;;;;;;;;yBAaL,WAAW,YAAY,gBAAgB;0BAE5C,MAAM,YAAY,gBAAgB;CACzD,CAAC;AAEF,iBAAS,WAAW,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAG1C;AAED,eAAO,MAAM,+BAA+B,EAAE,gBAAwC,CAAC"}
+{"version":3,"file":"wms-capabilities-loader.d.ts","sourceRoot":"","sources":["../src/wms-capabilities-loader.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAC,gBAAgB,EAAE,aAAa,EAAC,MAAM,0BAA0B,CAAC;AAC9E,OAAO,KAAK,EAAC,eAAe,EAAC,MAAM,0CAA0C,CAAC;AAQ9E,YAAY,EAAC,eAAe,EAAC,CAAC;AAE9B,MAAM,MAAM,gBAAgB,GAAG,aAAa,GAAG;IAC7C,GAAG,CAAC,EAAE;QACJ,oDAAoD;QACpD,mBAAmB,CAAC,EAAE,OAAO,CAAC;QAC9B,gDAAgD;QAChD,GAAG,CAAC,EAAE,OAAO,CAAC;KACf,CAAC;CACH,CAAC;AAEF;;GAEG;AACH,eAAO,MAAM,qBAAqB;;;;;;;;;;;;yBAaL,WAAW,YAAY,gBAAgB;0BAE5C,MAAM,YAAY,gBAAgB;CAEzD,CAAC;AAEF,iBAAS,WAAW,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAG1C;AAED,eAAO,MAAM,+BAA+B,EAAE,gBAAwC,CAAC"}

package/dist/wms-capabilities-loader.js

@@ -21,8 +21,8 @@ exports.WMSCapabilitiesLoader = {
     options: {
         wms: {}
     },
-    parse: async (arrayBuffer, options) => (0, parse_wms_capabilities_1.parseWMSCapabilities)(new TextDecoder().decode(arrayBuffer), options),
-    parseTextSync: (text, options) => (0, parse_wms_capabilities_1.parseWMSCapabilities)(text, options)
+    parse: async (arrayBuffer, options) => (0, parse_wms_capabilities_1.parseWMSCapabilities)(new TextDecoder().decode(arrayBuffer), options?.wms),
+    parseTextSync: (text, options) => (0, parse_wms_capabilities_1.parseWMSCapabilities)(text, options?.wms)
 };
 function testXMLFile(text) {
     // TODO - There could be space first.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@loaders.gl/wms",
-  "version": "3.4.0-alpha.2",
+  "version": "3.4.0-alpha.3",
   "description": "Framework-independent loaders for the WMS (Web Map Service) standard",
   "license": "MIT",
   "publishConfig": {
@@ -39,10 +39,10 @@
   },
   "dependencies": {
     "@babel/runtime": "^7.3.1",
-    "@loaders.gl/images": "3.4.0-alpha.2",
-    "@loaders.gl/loader-utils": "3.4.0-alpha.2",
-    "@loaders.gl/schema": "3.4.0-alpha.2",
-    "@loaders.gl/xml": "3.4.0-alpha.2",
+    "@loaders.gl/images": "3.4.0-alpha.3",
+    "@loaders.gl/loader-utils": "3.4.0-alpha.3",
+    "@loaders.gl/schema": "3.4.0-alpha.3",
+    "@loaders.gl/xml": "3.4.0-alpha.3",
     "@turf/rewind": "^5.1.5",
     "deep-strict-equal": "^0.2.0",
     "lerc": "^4.0.1"
@@ -50,5 +50,5 @@
   "devDependencies": {
     "xmldom": "0.6.0"
   },
-  "gitHead": "f1c00c124d8d0c41a138ff40afb0d1a00711bf2e"
+  "gitHead": "a954528dd1d78a1f128d8f6b07e4baeb7a296924"
 }

package/src/index.ts

@@ -30,10 +30,9 @@ export {WMSLayerDescriptionLoader as _WMSLayerDescriptionLoader} from './wip/wms
 
 // WMTS - Web Map Tile Service
 
-export type {WMTSLoaderOptions as _WMTSLoaderOptions} from './wip/wmts-capabilities-loader';
-
-export type {WMTSCapabilities as _WMTSCapabilities} from './wip/wmts-capabilities-loader';
-export {WMTSCapabilitiesLoader as _WMTSCapabilitiesLoader} from './wip/wmts-capabilities-loader';
+// export type {WMTSLoaderOptions as _WMTSLoaderOptions} from './wip/wmts-capabilities-loader';
+// export type {WMTSCapabilities as _WMTSCapabilities} from './wip/wmts-capabilities-loader';
+// export {WMTSCapabilitiesLoader as _WMTSCapabilitiesLoader} from './wip/wmts-capabilities-loader';
 
 // WFS - Web Feature Service