@loaders.gl/wms 3.4.0-alpha.3 → 4.0.0-alpha.6

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

@@ -33,8 +33,11 @@ class WMSService extends image_source_1.ImageSource {
         // 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.substituteCRS84 = props.substituteCRS84 ?? false;
+        this.flipCRS = ['EPSG:4326'];
         this.wmsParameters = {
             layers: undefined,
+            query_layers: undefined,
             styles: undefined,
             version: '1.3.0',
             crs: 'EPSG:4326',
@@ -51,10 +54,7 @@ class WMSService extends image_source_1.ImageSource {
         return this.normalizeMetadata(capabilities);
     }
     async getImage(parameters) {
-        // WMS 1.3.0 renamed SRS to CRS (sigh...)
-        const wmsParameters = { ...parameters, crs: parameters.srs };
-        delete wmsParameters.srs;
-        return await this.getMap(wmsParameters);
+        return await this.getMap(parameters);
     }
     normalizeMetadata(capabilities) {
         return capabilities;
@@ -132,16 +132,17 @@ class WMSService extends image_source_1.ImageSource {
     }
     /** Generate a URL for the GetMap request */
     getMapURL(wmsParameters, vendorParameters) {
+        wmsParameters = this._getWMS130Parameters(wmsParameters);
         const options = {
             version: this.wmsParameters.version,
-            // layers: [],
+            format: this.wmsParameters.format,
+            transparent: this.wmsParameters.transparent,
+            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,
-            styles: this.wmsParameters.styles,
-            crs: this.wmsParameters.crs,
-            format: this.wmsParameters.format,
-            transparent: this.wmsParameters.transparent,
             ...wmsParameters
         };
         return this._getWMSUrl('GetMap', options, vendorParameters);
@@ -150,17 +151,18 @@ class WMSService extends image_source_1.ImageSource {
     getFeatureInfoURL(wmsParameters, vendorParameters) {
         const options = {
             version: this.wmsParameters.version,
-            // layers: this.props.layers,
+            // 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!,
-            // query_layers: [],
-            srs: this.wmsParameters.crs,
-            format: this.wmsParameters.format,
-            info_format: this.wmsParameters.info_format,
-            styles: this.wmsParameters.styles,
             ...wmsParameters
         };
         return this._getWMSUrl('GetFeatureInfo', options, vendorParameters);
@@ -215,28 +217,72 @@ class WMSService extends image_source_1.ImageSource {
             if (key !== 'transparent' || value) {
                 url += first ? '?' : '&';
                 first = false;
-                url += this._getParameterValue(wmsParameters.version, key, value);
+                url += this._getURLParameter(key, value, wmsParameters);
             }
         }
         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';
+    _getWMS130Parameters(wmsParameters) {
+        const newParameters = { ...wmsParameters };
+        if (newParameters.srs) {
+            newParameters.crs = newParameters.crs || newParameters.srs;
+            delete newParameters.srs;
+        }
+        return newParameters;
+    }
+    // eslint-disable-complexity
+    _getURLParameter(key, value, wmsParameters) {
+        // Substitute by key
+        switch (key) {
+            case 'crs':
+                // CRS was called SRS before WMS 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 WMS 1.3.0
+                if (wmsParameters.version === '1.3.0') {
+                    key = 'crs';
+                }
+                break;
+            case 'bbox':
+                // Coordinate order is flipped for certain CRS in WMS 1.3.0
+                const bbox = this._flipBoundingBox(value, wmsParameters);
+                if (bbox) {
+                    value = bbox;
+                }
+                break;
+            default:
+            // do nothing
         }
         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) : ''}`;
     }
+    /** Coordinate order is flipped for certain CRS in WMS 1.3.0 */
+    _flipBoundingBox(bboxValue, wmsParameters) {
+        // Sanity checks
+        if (!Array.isArray(bboxValue) || bboxValue.length !== 4) {
+            return null;
+        }
+        const flipCoordinates = 
+        // Only affects WMS 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 subsituting 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();

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

@@ -4,12 +4,22 @@ export type DataSourceProps = {
     loadOptions?: LoaderOptions;
 };
 /** base class of all data sources */
-export declare abstract class DataSource {
+export declare abstract class DataSource<PropsT extends DataSourceProps> {
     /** A resolved fetch function extracted from loadOptions prop */
     fetch: (url: string, options?: RequestInit) => Promise<Response>;
     /** The actual load options, if calling a loaders.gl loader */
     loadOptions: LoaderOptions;
-    constructor(props: DataSourceProps);
+    _needsRefresh: boolean;
+    props: PropsT;
+    constructor(props: PropsT);
+    setProps(props: PropsT): void;
+    /** Mark this data source as needing a refresh (redraw) */
+    setNeedsRefresh(): void;
+    /**
+     * Does this data source need refreshing?
+     * @note The specifics of the refresh mechanism depends on type of data source
+     */
+    getNeedsRefresh(clear?: boolean): boolean;
 }
 /**
  * Gets the current fetch function from options

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

@@ -1 +1 @@
-{"version":3,"file":"data-source.d.ts","sourceRoot":"","sources":["../../../src/lib/sources/data-source.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAC,aAAa,EAAC,MAAM,0BAA0B,CAAC;AAE5D,MAAM,MAAM,eAAe,GAAG;IAC5B,kGAAkG;IAClG,WAAW,CAAC,EAAE,aAAa,CAAC;CAC7B,CAAC;AAEF,qCAAqC;AACrC,8BAAsB,UAAU;IAC9B,gEAAgE;IAChE,KAAK,EAAE,CAAC,GAAG,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,WAAW,KAAK,OAAO,CAAC,QAAQ,CAAC,CAAC;IACjE,8DAA8D;IAC9D,WAAW,EAAE,aAAa,CAAC;gBAEf,KAAK,EAAE,eAAe;CAInC;AAED;;;;;;GAMG;AACH,wBAAgB,gBAAgB,CAAC,OAAO,CAAC,EAAE,aAAa,SAKvC,MAAM,iBAAiB,WAAW,uBAWlD"}
+{"version":3,"file":"data-source.d.ts","sourceRoot":"","sources":["../../../src/lib/sources/data-source.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAC,aAAa,EAAC,MAAM,0BAA0B,CAAC;AAE5D,MAAM,MAAM,eAAe,GAAG;IAC5B,kGAAkG;IAClG,WAAW,CAAC,EAAE,aAAa,CAAC;CAC7B,CAAC;AAEF,qCAAqC;AACrC,8BAAsB,UAAU,CAAC,MAAM,SAAS,eAAe;IAC7D,gEAAgE;IAChE,KAAK,EAAE,CAAC,GAAG,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,WAAW,KAAK,OAAO,CAAC,QAAQ,CAAC,CAAC;IACjE,8DAA8D;IAC9D,WAAW,EAAE,aAAa,CAAC;IAC3B,aAAa,EAAE,OAAO,CAAQ;IAE9B,KAAK,EAAE,MAAM,CAAC;gBAEF,KAAK,EAAE,MAAM;IAMzB,QAAQ,CAAC,KAAK,EAAE,MAAM;IAMtB,0DAA0D;IAC1D,eAAe,IAAI,IAAI;IAIvB;;;OAGG;IACH,eAAe,CAAC,KAAK,GAAE,OAAc;CAOtC;AAED;;;;;;GAMG;AACH,wBAAgB,gBAAgB,CAAC,OAAO,CAAC,EAAE,aAAa,SAKvC,MAAM,iBAAiB,WAAW,uBAWlD"}

package/dist/lib/sources/data-source.js

@@ -5,9 +5,31 @@ exports.getFetchFunction = exports.DataSource = void 0;
 /** base class of all data sources */
 class DataSource {
     constructor(props) {
+        this._needsRefresh = true;
+        this.props = { ...props };
         this.loadOptions = { ...props.loadOptions };
         this.fetch = getFetchFunction(this.loadOptions);
     }
+    setProps(props) {
+        this.props = Object.assign(this.props, props);
+        // TODO - add a shallow compare to avoid setting refresh if no change?
+        this.setNeedsRefresh();
+    }
+    /** Mark this data source as needing a refresh (redraw) */
+    setNeedsRefresh() {
+        this._needsRefresh = true;
+    }
+    /**
+     * Does this data source need refreshing?
+     * @note The specifics of the refresh mechanism depends on type of data source
+     */
+    getNeedsRefresh(clear = true) {
+        const needsRefresh = this._needsRefresh;
+        if (clear) {
+            this._needsRefresh = false;
+        }
+        return needsRefresh;
+    }
 }
 exports.DataSource = DataSource;
 /**

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

@@ -17,7 +17,7 @@ export type ImageSourceMetadata = {
 export type ImageSourceLayer = {
     name?: string;
     title?: string;
-    srs?: string[];
+    crs?: string[];
     boundingBox?: [number, number, number, number];
     layers?: ImageSourceLayer[];
 };
@@ -32,8 +32,8 @@ export type GetImageParameters = {
     width: number;
     /** pixels */
     height: number;
-    /** srs for the image (not the bounding box) */
-    srs?: string;
+    /** crs for the image (not the bounding box) */
+    crs?: string;
     /** requested format for the return image */
     format?: 'image/png';
 };
@@ -52,8 +52,8 @@ export type ImageFormat = {
     width: number;
     /** pixels */
     height: number;
-    /** srs for the image (not the bounding box) */
-    srs?: string;
+    /** crs for the image (not the bounding box) */
+    crs?: string;
     /** requested format for the return image */
     format?: 'image/png';
 };
@@ -63,7 +63,7 @@ export type ImageSourceProps = DataSourceProps;
  * @note
  * - If geospatial, bounding box is expected to be in web mercator coordinates
  */
-export declare abstract class ImageSource extends DataSource {
+export declare abstract class ImageSource<PropsT extends ImageSourceProps> extends DataSource<PropsT> {
     abstract getMetadata(): Promise<ImageSourceMetadata>;
     abstract getImage(parameters: GetImageParameters): Promise<ImageType>;
 }

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,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"}
+{"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,WAAW,CAAC,MAAM,SAAS,gBAAgB,CAAE,SAAQ,UAAU,CAAC,MAAM,CAAC;IAC3F,QAAQ,CAAC,WAAW,IAAI,OAAO,CAAC,mBAAmB,CAAC;IACpD,QAAQ,CAAC,QAAQ,CAAC,UAAU,EAAE,kBAAkB,GAAG,OAAO,CAAC,SAAS,CAAC;CACtE"}

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

@@ -1,5 +1,5 @@
 import type { ImageType } from '@loaders.gl/images';
-import { DataSource } from './data-source';
+import { DataSource, DataSourceProps } from './data-source';
 /**
  * Normalized capabilities of an Image service
  * @example
@@ -42,13 +42,15 @@ export type GetTileParameters = {
     /** requested format for the return image */
     format?: 'image/png';
 };
+type TileSourceProps = DataSourceProps;
 /**
  * MapTileSource - data sources that allow data to be queried by (geospatial) extents
  * @note
  * - If geospatial, bounding box is expected to be in web mercator coordinates
  */
-export declare abstract class TileSource extends DataSource {
+export declare abstract class TileSource<PropsT extends TileSourceProps> extends DataSource<PropsT> {
     abstract getMetadata(): Promise<TileSourceMetadata>;
     abstract getTile(parameters: GetTileParameters): Promise<ImageType>;
 }
+export {};
 //# sourceMappingURL=tile-source.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"tile-source.d.ts","sourceRoot":"","sources":["../../../src/lib/sources/tile-source.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAC,SAAS,EAAC,MAAM,oBAAoB,CAAC;AAClD,OAAO,EAAC,UAAU,EAAC,MAAM,eAAe,CAAC;AAEzC;;;;;GAKG;AACH,MAAM,MAAM,kBAAkB,GAAG;IAC/B,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,eAAe,EAAE,CAAC;KAC3B,CAAC;CACH,CAAC;AAEF,MAAM,MAAM,eAAe,GAAG;IAC5B,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,eAAe,EAAE,CAAC;CAC3B,CAAC;AAEF,MAAM,MAAM,iBAAiB,GAAG;IAC9B,uBAAuB;IACvB,MAAM,EAAE,MAAM,GAAG,MAAM,EAAE,CAAC;IAC1B,cAAc;IACd,MAAM,CAAC,EAAE,OAAO,CAAC;IACjB,8CAA8C;IAC9C,IAAI,EAAE,MAAM,CAAC;IACb,wBAAwB;IACxB,CAAC,EAAE,MAAM,CAAC;IACV,wBAAwB;IACxB,CAAC,EAAE,MAAM,CAAC;IACV,+CAA+C;IAC/C,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,4CAA4C;IAC5C,MAAM,CAAC,EAAE,WAAW,CAAC;CACtB,CAAC;AAEF;;;;GAIG;AACH,8BAAsB,UAAW,SAAQ,UAAU;IACjD,QAAQ,CAAC,WAAW,IAAI,OAAO,CAAC,kBAAkB,CAAC;IACnD,QAAQ,CAAC,OAAO,CAAC,UAAU,EAAE,iBAAiB,GAAG,OAAO,CAAC,SAAS,CAAC;CACpE"}
+{"version":3,"file":"tile-source.d.ts","sourceRoot":"","sources":["../../../src/lib/sources/tile-source.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAC,SAAS,EAAC,MAAM,oBAAoB,CAAC;AAClD,OAAO,EAAC,UAAU,EAAE,eAAe,EAAC,MAAM,eAAe,CAAC;AAE1D;;;;;GAKG;AACH,MAAM,MAAM,kBAAkB,GAAG;IAC/B,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,eAAe,EAAE,CAAC;KAC3B,CAAC;CACH,CAAC;AAEF,MAAM,MAAM,eAAe,GAAG;IAC5B,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,eAAe,EAAE,CAAC;CAC3B,CAAC;AAEF,MAAM,MAAM,iBAAiB,GAAG;IAC9B,uBAAuB;IACvB,MAAM,EAAE,MAAM,GAAG,MAAM,EAAE,CAAC;IAC1B,cAAc;IACd,MAAM,CAAC,EAAE,OAAO,CAAC;IACjB,8CAA8C;IAC9C,IAAI,EAAE,MAAM,CAAC;IACb,wBAAwB;IACxB,CAAC,EAAE,MAAM,CAAC;IACV,wBAAwB;IACxB,CAAC,EAAE,MAAM,CAAC;IACV,+CAA+C;IAC/C,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,4CAA4C;IAC5C,MAAM,CAAC,EAAE,WAAW,CAAC;CACtB,CAAC;AAEF,KAAK,eAAe,GAAG,eAAe,CAAC;AAEvC;;;;GAIG;AACH,8BAAsB,UAAU,CAAC,MAAM,SAAS,eAAe,CAAE,SAAQ,UAAU,CAAC,MAAM,CAAC;IACzF,QAAQ,CAAC,WAAW,IAAI,OAAO,CAAC,kBAAkB,CAAC;IACnD,QAAQ,CAAC,OAAO,CAAC,UAAU,EAAE,iBAAiB,GAAG,OAAO,CAAC,SAAS,CAAC;CACpE"}

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

@@ -0,0 +1,7 @@
+export type WFSCapabilities = {};
+/**
+ * Parses a typed data structure from raw XML for `GetCapabilities` response
+ * @note Error handlings is fairly weak
+ */
+export declare function parseWFSCapabilities(text: string, options: any): WFSCapabilities;
+//# sourceMappingURL=parse-wfs.d.ts.map

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

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

package/dist/lib/wfs/parse-wfs.js

@@ -0,0 +1,32 @@
+"use strict";
+// loaders.gl, MIT license
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.parseWFSCapabilities = void 0;
+const xml_1 = require("@loaders.gl/xml");
+/**
+ * Parses a typed data structure from raw XML for `GetCapabilities` response
+ * @note Error handlings is fairly weak
+ */
+function parseWFSCapabilities(text, options) {
+    // Remove namespaces in XML
+    options = { ...options, xml: { ...options?.xml, removeNSPrefix: true } };
+    const parsedXML = xml_1.XMLLoader.parseTextSync?.(text, options);
+    const xmlCapabilities = parsedXML.Capabilities || parsedXML;
+    return uncapitalizeKeys(xmlCapabilities);
+}
+exports.parseWFSCapabilities = parseWFSCapabilities;
+/** Uncapitalize all keys of an object */
+function uncapitalizeKeys(object) {
+    if (object && typeof object === 'object') {
+        const newObject = {};
+        for (const [key, value] of Object.entries(object)) {
+            newObject[uncapitalize(key)] = uncapitalizeKeys(value);
+        }
+        return newObject;
+    }
+    return object;
+}
+/** Uncapitalize first letter of a string */
+function uncapitalize(str) {
+    return typeof str === 'string' ? str.charAt(0).toLowerCase() + str.slice(1) : str;
+}

package/dist/lib/wmts/parse-wmts.d.ts

@@ -0,0 +1,7 @@
+export type WMTSCapabilities = {};
+/**
+ * Parses a typed data structure from raw XML for `GetCapabilities` response
+ * @note Error handlings is fairly weak
+ */
+export declare function parseWMTSCapabilities(text: string, options: any): WMTSCapabilities;
+//# sourceMappingURL=parse-wmts.d.ts.map

package/dist/lib/wmts/parse-wmts.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"parse-wmts.d.ts","sourceRoot":"","sources":["../../../src/lib/wmts/parse-wmts.ts"],"names":[],"mappings":"AAIA,MAAM,MAAM,gBAAgB,GAAG,EAAE,CAAC;AAElC;;;GAGG;AACH,wBAAgB,qBAAqB,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,KAAA,GAAG,gBAAgB,CAM7E"}

package/dist/lib/wmts/parse-wmts.js

@@ -0,0 +1,35 @@
+"use strict";
+// loaders.gl, MIT license
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.parseWMTSCapabilities = void 0;
+const xml_1 = require("@loaders.gl/xml");
+/**
+ * Parses a typed data structure from raw XML for `GetCapabilities` response
+ * @note Error handlings is fairly weak
+ */
+function parseWMTSCapabilities(text, options) {
+    // Remove namespaces in XML
+    options = { ...options, xml: { ...options?.xml, removeNSPrefix: true } };
+    const parsedXML = xml_1.XMLLoader.parseTextSync?.(text, options);
+    const xmlCapabilities = parsedXML.Capabilities || parsedXML;
+    return uncapitalizeKeys(xmlCapabilities);
+}
+exports.parseWMTSCapabilities = parseWMTSCapabilities;
+function uncapitalizeKeys(object) {
+    if (object && typeof object === 'object') {
+        const newObject = {};
+        for (const [key, value] of Object.entries(object)) {
+            newObject[uncapitalize(key)] = uncapitalizeKeys(value);
+        }
+        return newObject;
+    }
+    return object;
+}
+/**
+ * Uncapitalize first letter of a string
+ * @param {string} str
+ * @returns {string}
+ */
+function uncapitalize(str) {
+    return typeof str === 'string' ? str.charAt(0).toLowerCase() + str.slice(1) : str;
+}

package/dist/wip/lib/wcs/parse-wcs-capabilities.js

@@ -8,7 +8,7 @@ const xml_1 = require("@loaders.gl/xml");
  * @note Error handlings is fairly weak
  */
 function parseWCSCapabilities(text, options) {
-    const parsedXML = xml_1.XMLLoader.parseTextSync(text, { ...options, xml: { ...options?.xml, removeNSPrefix: true } });
+    const parsedXML = xml_1.XMLLoader.parseTextSync?.(text, { ...options, xml: { ...options?.xml, removeNSPrefix: true } });
     const xmlCapabilities = parsedXML.Capabilities || parsedXML;
     return xmlCapabilities;
 }

package/dist/wip/lib/wfs/parse-wfs-capabilities.js

@@ -8,7 +8,7 @@ const xml_1 = require("@loaders.gl/xml");
  * @note Error handlings is fairly weak
  */
 function parseWFSCapabilities(text, options) {
-    const parsedXML = xml_1.XMLLoader.parseTextSync(text, { ...options, xml: {
+    const parsedXML = xml_1.XMLLoader.parseTextSync?.(text, { ...options, xml: {
             ...options?.xml,
             removeNSPrefix: true,
             uncapitalizeKeys: true

package/dist/wip/lib/wmts/parse-wmts-capabilities.js

@@ -8,7 +8,7 @@ const xml_1 = require("@loaders.gl/xml");
  * @note Error handlings is fairly weak
  */
 function parseWMTSCapabilities(text, options) {
-    const parsedXML = xml_1.XMLLoader.parseTextSync(text, { ...options, xml: {
+    const parsedXML = xml_1.XMLLoader.parseTextSync?.(text, { ...options, xml: {
             ...options?.xml,
             removeNSPrefix: true,
             uncapitalizeKeys: true

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@loaders.gl/wms",
-  "version": "3.4.0-alpha.3",
+  "version": "4.0.0-alpha.6",
   "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.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",
+    "@loaders.gl/images": "4.0.0-alpha.6",
+    "@loaders.gl/loader-utils": "4.0.0-alpha.6",
+    "@loaders.gl/schema": "4.0.0-alpha.6",
+    "@loaders.gl/xml": "4.0.0-alpha.6",
     "@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": "a954528dd1d78a1f128d8f6b07e4baeb7a296924"
+  "gitHead": "acc1985050dfaa0f1f0c066f8da5bce7454a046c"
 }

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

@@ -22,7 +22,7 @@ type ImageSourceProps = ImageServiceProps &
  * @param type type of source. if not known, set to 'auto'
  * @returns an ImageSource instance
  */
-export function createImageSource(props: ImageSourceProps): ImageSource {
+export function createImageSource(props: ImageSourceProps): ImageSource<ImageSourceProps> {
   const {type = 'auto'} = props;
   const serviceType = type === 'auto' ? guessServiceType(props.url) : type;
   switch (serviceType) {

package/src/lib/parsers/csw/parse-csw-capabilities.ts

@@ -87,7 +87,7 @@ export type CSWCapabilities = {
  * @note Error handlings is fairly weak
  */
 export function parseCSWCapabilities(text: string, options?: XMLLoaderOptions): CSWCapabilities {
-  const parsedXML = XMLLoader.parseTextSync(text, {
+  const parsedXML = XMLLoader.parseTextSync?.(text, {
     ...options,
     xml: {
       ...options?.xml,

package/src/lib/parsers/csw/parse-csw-domain.ts

@@ -20,7 +20,7 @@ export type CSWDomain = {
  * @note Error handlings is fairly weak
  */
 export function parseCSWDomain(text: string, options?: XMLLoaderOptions): CSWDomain {
-  const parsedXML = XMLLoader.parseTextSync(text, {
+  const parsedXML = XMLLoader.parseTextSync?.(text, {
     ...options,
     xml: {
       ...options?.xml,

package/src/lib/parsers/csw/parse-csw-records.ts

@@ -35,17 +35,17 @@ export type CSWRecords = {
  * @note Error handlings is fairly weak
  */
 export function parseCSWRecords(text: string, options?: XMLLoaderOptions): CSWRecords {
-  const parsedXML = XMLLoader.parseTextSync(text, {
+  const parsedXML = XMLLoader.parseTextSync?.(text, {
     ...options,
     xml: {
       ...options?.xml,
       removeNSPrefix: true,
       uncapitalizeKeys: true,
-      arrayPaths: []
-    },
-    _fastXML: {
-      ...options?._fastXML,
-      parseAttributeValue: true
+      arrayPaths: [],
+      _fastXML: {
+        ...options?.xml?._fastXML,
+        parseAttributeValue: true
+      }
     }
   });
 

package/src/lib/parsers/csw/parse-exception-report.ts

@@ -8,7 +8,7 @@
  * @note Error handlings is fairly weak
  */
 export function parseExceptionReport(parsedXML: any): void {
-  // const parsedXML = XMLLoader.parseTextSync(text, {
+  // const parsedXML = XMLLoader.parseTextSync?.(text, {
   //   ...options,
   //   xml: {
   //     ...options?.xml,

package/src/lib/parsers/gml/parse-gml.ts

@@ -45,7 +45,7 @@ export type ParseGMLContext = {
  */
 export function parseGML(text: string, options) {
   // GeoJSON | null {
-  const parsedXML = XMLLoader.parseTextSync(text, options);
+  const parsedXML = XMLLoader.parseTextSync?.(text, options);
 
   options = {transformCoords: noTransform, stride: 2, ...options};
   const context = createChildContext(parsedXML, options, {});

package/src/lib/parsers/wms/parse-wms-capabilities.ts

@@ -137,7 +137,7 @@ export function parseWMSCapabilities(
   xmlText: string,
   options?: parseWMSCapabilitiesOptions
 ): WMSCapabilities {
-  const parsedXML = XMLLoader.parseTextSync(xmlText, options);
+  const parsedXML = XMLLoader.parseTextSync?.(xmlText, options);
   const xmlCapabilities: any =
     parsedXML.WMT_MS_Capabilities || parsedXML.WMS_Capabilities || parsedXML;
   const capabilities = extractCapabilities(xmlCapabilities);
@@ -340,6 +340,7 @@ function extractWMSBoundingBox(xmlBoundingBox: any): WMSBoundingBox {
 }
 
 /** Traverse layers and inject missing props from parents */
+// eslint-disable-next-line complexity
 function addInheritedLayerProps(layer: WMSLayer, parent: WMSLayer | null): void {
   if (parent && parent.geographicBoundingBox && !layer.geographicBoundingBox) {
     layer.geographicBoundingBox = [...parent.geographicBoundingBox];

package/src/lib/parsers/wms/parse-wms-features.ts

@@ -18,7 +18,7 @@ export type WMSFeature = {
  * @note Error handlings is fairly weak
  */
 export function parseWMSFeatureInfo(text: string, options): WMSFeatureInfo {
-  const parsedXML = XMLLoader.parseTextSync(text, options);
+  const parsedXML = XMLLoader.parseTextSync?.(text, options);
   const xmlFeatureInfo: any = parsedXML.FeatureInfoResponse?.FIELDS || [];
 
   const xmlFeatures = Array.isArray(xmlFeatureInfo) ? xmlFeatureInfo : [xmlFeatureInfo];

package/src/lib/parsers/wms/parse-wms-layer-description.ts

@@ -12,7 +12,7 @@ export type WMSLayerDescription = {
  * @note Error handlings is fairly weak
  */
 export function parseWMSLayerDescription(text: string, options): WMSLayerDescription {
-  const parsedXML = XMLLoader.parseTextSync(text, options);
+  const parsedXML = XMLLoader.parseTextSync?.(text, options);
   // TODO - implement parser
   return parsedXML as unknown as WMSLayerDescription;
 }

package/src/lib/services/arcgis/arcgis-image-service.ts

@@ -14,15 +14,12 @@ export type ArcGISImageServerProps = ImageSourceProps & {
  * Note - exports a big API, that could be exposed here if there is a use case
  * @see https://developers.arcgis.com/rest/services-reference/enterprise/image-service.htm
  */
-export class ArcGISImageServer extends ImageSource {
+export class ArcGISImageServer extends ImageSource<ArcGISImageServerProps> {
   static type: 'arcgis-image-server' = 'arcgis-image-server';
   static testURL = (url: string): boolean => url.toLowerCase().includes('ImageServer');
 
-  props: ArcGISImageServerProps;
-
   constructor(props: ArcGISImageServerProps) {
     super(props);
-    this.props = props;
   }
 
   // ImageSource (normalized endpoints)

package/src/lib/services/generic/image-service.ts

@@ -20,15 +20,12 @@ export type ImageServiceProps = {
  * ImageSource allows template url strings to be used to ad hoc connect to arbitrary image data sources
  * Accepts a template url string and builds requests URLs
  */
-export class ImageService extends ImageSource {
+export class ImageService<PropsT extends ImageServiceProps> extends ImageSource<PropsT> {
   static type: 'template' = 'template';
   static testURL = (url: string): boolean => url.toLowerCase().includes('{');
 
-  props: ImageServiceProps;
-
-  constructor(props: ImageServiceProps) {
+  constructor(props: PropsT) {
     super(props);
-    this.props = props;
   }
 
   // IMAGE SOURCE API

package/src/lib/services/ogc/csw-service.ts

@@ -54,11 +54,10 @@ export type CSWServiceProps = DataSourceProps & {
  * - implements the ImageService interface
  * @note Only the URL parameter conversion is supported. XML posts are not supported.
  */
-export class CSWService extends DataSource {
+export class CSWService extends DataSource<CSWServiceProps> {
   static type: 'csw' = 'csw';
   static testURL = (url: string): boolean => url.toLowerCase().includes('csw');
 
-  props: CSWServiceProps;
   capabilities: CSWCapabilities | null = null;
 
   /** A list of loaders used by the CSWService methods */
@@ -67,7 +66,6 @@ export class CSWService extends DataSource {
   /** Create a CSWService */
   constructor(props: CSWServiceProps) {
     super(props);
-    this.props = props;
   }
 
   async getMetadata(): Promise<CSWCapabilities> {