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

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 = 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,CAC/B,MAAM,SAAS,gBAAgB,GAAG,gBAAgB,CAClD,SAAQ,UAAU,CAAC,MAAM,CAAC;IAC1B,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/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@loaders.gl/wms",
-  "version": "3.4.0-alpha.3",
+  "version": "3.4.0-alpha.5",
   "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": "3.4.0-alpha.5",
+    "@loaders.gl/loader-utils": "3.4.0-alpha.5",
+    "@loaders.gl/schema": "3.4.0-alpha.5",
+    "@loaders.gl/xml": "3.4.0-alpha.5",
     "@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": "686929f85b3420c15df051eab769942b260dd242"
 }

package/src/index.ts

@@ -49,8 +49,8 @@ export {GMLLoader as _GMLLoader} from './gml-loader';
 
 // EXPERIMENTAL: DATA SOURCES
 
-export type {ImageSourceMetadata} from './lib/sources/image-source';
 export type {ImageType} from '@loaders.gl/images';
+export type {ImageSourceProps, ImageSourceMetadata} from './lib/sources/image-source';
 export {ImageSource} from './lib/sources/image-source';
 
 export type {ImageServiceType} from './lib/create-image-source';

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/wms/parse-wms-capabilities.ts

@@ -73,6 +73,9 @@ export type WMSLayer = {
   // FeatureListURL
   // DataURL
 
+  /** any extra dimension such as time */
+  dimensions?: WMSDimension[];
+
   /** Whether queries can be performed on the layer */
   queryable?: boolean;
   /** `false` if layer has significant no-data areas that the client can display as transparent. */
@@ -105,6 +108,30 @@ export type WMSBoundingBox = {
   yResolution?: number;
 };
 
+/**
+ * An optional dimension that can be queried using the `name=...` parameter
+ * Note that layers that have at least one dimension without `default` value
+ * become unrenderable unless the dimension value is supplied to GetMap requests.
+ */
+export type WMSDimension = {
+  /** name of dimension, becomes a valid parameter key for this layer */
+  name: string;
+  /** Textual units for this dimensional axis */
+  units: string;
+  /** Unit symbol for this dimensional axis */
+  unitSymbol?: string;
+  /** Default value if no value is supplied. If dimension lacks defaultValue, requests fail if no value is supplied */
+  defaultValue?: string;
+  /** Can multiple values of the dimension be requested? */
+  multipleValues?: boolean;
+  /* Will nearest values will be substituted when out of range, if false exact values are required */
+  nearestValue?: boolean;
+  /** A special value "current" is supported, typically for time dimension */
+  current?: boolean;
+  /** Text content indicating available values for dimension */
+  extent: string;
+};
+
 /** Metadata about a supported WMS request  */
 export type WMSRequest = {
   /** MIMEtypes that can be returned by this request. */
@@ -258,6 +285,13 @@ function extractLayer(xmlLayer: any): WMSLayer {
     layer.boundingBoxes = boundingBoxes;
   }
 
+  // Extract dimensions
+  const xmlDimensions = getXMLArray(xmlLayer?.Dimension);
+  const dimensions = xmlDimensions.map((xml) => extractDimension(xml));
+  if (dimensions.length) {
+    layer.dimensions = dimensions;
+  }
+
   if (xmlLayer?.opaque) {
     layer.opaque = getXMLBoolean(xmlLayer?.opaque);
   }
@@ -339,7 +373,38 @@ function extractWMSBoundingBox(xmlBoundingBox: any): WMSBoundingBox {
   return boundingBox;
 }
 
+/**
+ * Extracts optional WMS Dimension layer field
+ * @param xmlDimension
+ * @example <Dimension name="time" units="ISO8601" default="2018-01-01" nearestValue="0">2001-01-01/2018-01-01/P1Y</Dimension>
+ * @see https://mapserver.org/ogc/wms_dimension.html
+ */
+function extractDimension(xmlDimension: any): WMSDimension {
+  const {name, units, value: extent} = xmlDimension;
+
+  const dimension: WMSDimension = {name, units, extent};
+
+  if (xmlDimension.unitSymbol) {
+    dimension.unitSymbol = xmlDimension.unitSymbol;
+  }
+  if (xmlDimension.default) {
+    dimension.defaultValue = xmlDimension.default;
+  }
+  if (xmlDimension.multipleValues) {
+    dimension.multipleValues = getXMLBoolean(xmlDimension.multipleValues);
+  }
+  if (xmlDimension.nearestValue) {
+    dimension.nearestValue = getXMLBoolean(xmlDimension.nearestValue);
+  }
+  if (xmlDimension.current) {
+    dimension.current = getXMLBoolean(xmlDimension.current);
+  }
+
+  return dimension;
+}
+
 /** 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/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> {

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

@@ -1,7 +1,6 @@
 // loaders.gl, MIT license
 
 /* eslint-disable camelcase */
-
 import type {ImageType} from '@loaders.gl/images';
 import {ImageLoader} from '@loaders.gl/images';
 import {mergeLoaderOptions} from '@loaders.gl/loader-utils';
@@ -21,68 +20,87 @@ import {WMSLayerDescriptionLoader} from '../../../wip/wms-layer-description-load
 import type {WMSLoaderOptions} from '../../../wms-error-loader';
 import {WMSErrorLoader} from '../../../wms-error-loader';
 
-/** Static WMS parameters (not viewport or selected pixel dependent) that can be provided as defaults */
+/**
+ * "Static" WMS parameters (not viewport or selected pixel dependent)
+ * These can be provided as defaults in the WMSService constructor
+ */
 export type WMSParameters = {
-  /** WMS version */
+  /** WMS version (all requests) */
   version?: '1.3.0' | '1.1.1';
-  /** Layers to render */
+  /** Layers to render (GetMap, GetFeatureInfo) */
   layers?: string[];
+  /** list of layers to query.. (GetFeatureInfo) */
+  query_layers?: string[];
+
   /** Coordinate Reference System (CRS) for the image (not the bounding box) */
   crs?: string;
-  /** Requested format for the return image */
+  /** Requested format for the return image (GetMap, GetLegendGraphic) */
   format?: 'image/png';
-  /** Requested MIME type of returned feature info */
+  /** Requested MIME type of returned feature info (GetFeatureInfo) */
   info_format?: 'text/plain' | 'application/geojson' | 'application/vnd.ogc.gml';
   /** Styling - Not yet supported */
   styles?: unknown;
-  /** Any additional parameters specific to this WMSService */
+  /** Any additional parameters specific to this WMSService (GetMap) */
   transparent?: boolean;
 };
 
-type WMSCommonParameters = {
+/** Parameters for GetCapabilities */
+export type WMSGetCapabilitiesParameters = {
   /** In case the endpoint supports multiple WMS versions */
   version?: '1.3.0' | '1.1.1';
 };
 
-/** Parameters for GetCapabilities */
-export type WMSGetCapabilitiesParameters = WMSCommonParameters;
-
 /** Parameters for GetMap */
-export type WMSGetMapParameters = WMSCommonParameters & {
-  /** Layers to render */
-  layers: string | string[];
+export type WMSGetMapParameters = {
+  /** In case the endpoint supports multiple WMS versions */
+  version?: '1.3.0' | '1.1.1';
   /** bounding box of the requested map image */
   bbox: [number, number, number, number];
   /** pixel width of returned image */
   width: number;
   /** pixels */
   height: number;
-  /** Coordinate Reference System for the image (not the bounding box). */
+  /** Layers to render - can be provided in service constructor */
+  layers?: string | string[];
+  /** Coordinate Reference System for the image (not bounding box). can be provided in service constructor. */
   crs?: string;
-  /** Styling */
+  /** Styling. can be provided in service constructor */
   styles?: unknown;
-  /** Don't render background when no data */
+  /** Don't render background when no data. can be provided in service constructor */
   transparent?: boolean;
-  /** requested format for the return image */
+  /** requested format for the return image. can be provided in service constructor */
   format?: 'image/png';
 };
 
+/** GetMap parameters that are specific to the current view */
+export type WMSGetMapViewParameters = {
+  /** pixel width of returned image */
+  width: number;
+  /** pixels */
+  height: number;
+  /** bounding box of the requested map image */
+  bbox: [number, number, number, number];
+  /** Coordinate Reference System for the image (not bounding box). can be provided in service constructor. */
+  crs?: string;
+};
+
 /**
  * Parameters for GetFeatureInfo
  * @see https://imagery.pasda.psu.edu/arcgis/services/pasda/UrbanTreeCanopy_Landcover/MapServer/WmsServer?SERVICE=WMS&
  */
-export type WMSGetFeatureInfoParameters = WMSCommonParameters & {
+export type WMSGetFeatureInfoParameters = {
+  /** In case the endpoint supports multiple WMS versions */
+  version?: '1.3.0' | '1.1.1';
   /** x coordinate for the feature info request */
   x: number;
   /** y coordinate for the feature info request */
   y: number;
-  /** list of layers to query (could be different from rendered layers) */
-  query_layers: string[];
-  /** Requested MIME type of returned feature info */
+  /** MIME type of returned feature info. Can be specified in service constructor */
   info_format?: 'text/plain' | 'application/geojson' | 'application/vnd.ogc.gml';
-
-  /** Layers to render */
-  layers: string[];
+  /** list of layers to query. Required but can be specified in service constructor. */
+  query_layers?: string[];
+  /** Layers to render. Required, but can be specified in service constructor */
+  layers?: string[];
   /** Styling */
   styles?: unknown;
   /** bounding box of the requested map image */
@@ -92,16 +110,36 @@ export type WMSGetFeatureInfoParameters = WMSCommonParameters & {
   /** pixels */
   height: number;
   /** srs for the image (not the bounding box) */
-  srs?: string;
-  /** requested format for the return image */
-  format?: 'image/png';
+  crs?: string;
+};
+
+/** GetMap parameters that are specific to the current view */
+export type WMSGetFeatureInfoViewParameters = {
+  /** x coordinate for the feature info request */
+  x: number;
+  /** y coordinate for the feature info request */
+  y: number;
+  /** pixel width of returned image */
+  width: number;
+  /** pixels */
+  height: number;
+  /** bounding box of the requested map image */
+  bbox: [number, number, number, number];
+  /** srs for the image (not the bounding box) */
+  crs?: string;
 };
 
 /** Parameters for DescribeLayer */
-export type WMSDescribeLayerParameters = WMSCommonParameters;
+export type WMSDescribeLayerParameters = {
+  /** In case the endpoint supports multiple WMS versions */
+  version?: '1.3.0' | '1.1.1';
+};
 
 /** Parameters for GetLegendGraphic */
-export type WMSGetLegendGraphicParameters = WMSCommonParameters;
+export type WMSGetLegendGraphicParameters = {
+  /** In case the endpoint supports multiple WMS versions */
+  version?: '1.3.0' | '1.1.1';
+};
 
 //
 
@@ -109,6 +147,9 @@ export type WMSGetLegendGraphicParameters = WMSCommonParameters;
 export type WMSServiceProps = ImageSourceProps & {
   /** 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 */
@@ -122,11 +163,18 @@ export type WMSServiceProps = ImageSourceProps & {
  * - implements the ImageService interface
  * @note Only the URL parameter conversion is supported. XML posts are not supported.
  */
-export class WMSService extends ImageSource {
+export class WMSService extends ImageSource<WMSServiceProps> {
   static type: 'wms' = 'wms';
   static testURL = (url: string): boolean => url.toLowerCase().includes('wms');
 
+  /** Base URL to the service */
   readonly url: string;
+
+  /** In WMS 1.3.0, replaces references to EPSG:4326 with CRS:84. But not always supported. Default: false */
+  substituteCRS84: boolean;
+  /** In WMS 1.3.0, flips x,y (lng, lat) coordinates for the supplied coordinate systems. Default: ['ESPG:4326'] */
+  flipCRS: string[];
+
   /** Default static WMS parameters */
   wmsParameters: Required<WMSParameters>;
   /** Default static vendor parameters */
@@ -153,8 +201,12 @@ export class WMSService extends ImageSource {
 
     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',
@@ -174,10 +226,7 @@ export class WMSService extends ImageSource {
   }
 
   async getImage(parameters: GetImageParameters): Promise<ImageType> {
-    // 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: WMSCapabilities): ImageSourceMetadata {
@@ -288,16 +337,17 @@ export class WMSService extends ImageSource {
     wmsParameters: WMSGetMapParameters,
     vendorParameters?: Record<string, unknown>
   ): string {
+    wmsParameters = this._getWMS130Parameters(wmsParameters);
     const options: Required<WMSGetMapParameters> = {
       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);
@@ -310,17 +360,18 @@ export class WMSService extends ImageSource {
   ): string {
     const options: Required<WMSGetFeatureInfoParameters> = {
       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);
@@ -372,7 +423,7 @@ export class WMSService extends ImageSource {
    * */
   protected _getWMSUrl(
     request: string,
-    wmsParameters: WMSCommonParameters & {[key: string]: unknown},
+    wmsParameters: {version?: '1.3.0' | '1.1.1'; [key: string]: unknown},
     vendorParameters?: Record<string, unknown>
   ): string {
     let url = this.url;
@@ -394,34 +445,88 @@ export class WMSService extends 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: string, key: string, value: unknown): string {
-    // 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<ParametersT extends {crs?: string; srs?: string}>(
+    wmsParameters: ParametersT
+  ): ParametersT {
+    const newParameters = {...wmsParameters};
+    if (newParameters.srs) {
+      newParameters.crs = newParameters.crs || newParameters.srs;
+      delete newParameters.srs;
     }
+    return newParameters;
+  }
 
-    key = key.toUpperCase();
+  // eslint-disable-complexity
+  _getURLParameter(key: string, value: unknown, wmsParameters: WMSParameters): string {
+    // 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
+    }
 
-    // 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.
+    key = key.toUpperCase();
 
     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: unknown,
+    wmsParameters: WMSParameters
+  ): [number, number, number, number] | null {
+    // 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 as [number, number, number, number];
+    return flipCoordinates ? [bbox[1], bbox[0], bbox[3], bbox[2]] : bbox;
+  }
+
+  /** Fetches an array buffer and checks the response (boilerplate reduction) */
   protected async _fetchArrayBuffer(url: string): Promise<ArrayBuffer> {
     const response = await this.fetch(url);
     const arrayBuffer = await response.arrayBuffer();