@loaders.gl/wms 4.0.4 → 4.0.5

package/dist/index.cjs

@@ -1089,7 +1089,12 @@ var WMSSource = class extends import_loader_utils2.ImageSource {
     return this.normalizeMetadata(capabilities);
   }
   async getImage(parameters) {
-    return await this.getMap(parameters);
+    const { boundingBox, ...rest } = parameters;
+    const wmsParameters = {
+      bbox: [...boundingBox[0], ...boundingBox[1]],
+      ...rest
+    };
+    return await this.getMap(wmsParameters);
   }
   normalizeMetadata(capabilities) {
     return capabilities;
@@ -1279,14 +1284,6 @@ var WMSSource = class extends import_loader_utils2.ImageSource {
           key = "crs";
         }
         break;
-      case "boundingBox":
-        const boundingBox = value;
-        let bbox2 = [...boundingBox[0], ...boundingBox[1]];
-        bbox2 = this._flipBoundingBox(boundingBox, wmsParameters);
-        if (bbox2) {
-          value = bbox2;
-        }
-        break;
       case "bbox":
         const bbox = this._flipBoundingBox(value, wmsParameters);
         if (bbox) {

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

@@ -45,7 +45,15 @@ export class WMSSource extends ImageSource {
     return this.normalizeMetadata(capabilities);
   }
   async getImage(parameters) {
-    return await this.getMap(parameters);
+    const {
+      boundingBox,
+      ...rest
+    } = parameters;
+    const wmsParameters = {
+      bbox: [...boundingBox[0], ...boundingBox[1]],
+      ...rest
+    };
+    return await this.getMap(wmsParameters);
   }
   normalizeMetadata(capabilities) {
     return capabilities;
@@ -209,14 +217,6 @@ export class WMSSource extends ImageSource {
           key = 'crs';
         }
         break;
-      case 'boundingBox':
-        const boundingBox = value;
-        let bbox2 = [...boundingBox[0], ...boundingBox[1]];
-        bbox2 = this._flipBoundingBox(boundingBox, wmsParameters);
-        if (bbox2) {
-          value = bbox2;
-        }
-        break;
       case 'bbox':
         const bbox = this._flipBoundingBox(value, wmsParameters);
         if (bbox) {

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

@@ -1 +1 @@
-{"version":3,"file":"wms-service.js","names":["ImageLoader","mergeLoaderOptions","ImageSource","WMSCapabilitiesLoader","WMSFeatureInfoLoader","WMSLayerDescriptionLoader","WMSErrorLoader","WMSService","type","testURL","url","toLowerCase","includes","create","props","WMSSource","constructor","_props$substituteCRS","data","substituteCRS84","flipCRS","wmsParameters","vendorParameters","capabilities","layers","undefined","query_layers","styles","version","crs","format","info_format","transparent","time","elevation","getMetadata","getCapabilities","normalizeMetadata","getImage","parameters","getMap","getCapabilitiesURL","response","fetch","arrayBuffer","_checkResponse","parse","loadOptions","getMapURL","_parseError","getFeatureInfo","getFeatureInfoURL","getFeatureInfoText","TextDecoder","decode","describeLayer","describeLayerURL","getLegendGraphic","getLegendGraphicURL","options","_getWMSUrl","_getWMS130Parameters","_parseWMSUrl","baseUrl","search","split","searchParams","parameter","key","value","request","first","allParameters","service","IGNORE_EMPTY_KEYS","Object","entries","_getURLParameter","encodeURI","newParameters","srs","boundingBox","bbox2","_flipBoundingBox","bbox","toUpperCase","Array","isArray","join","String","bboxValue","length","flipCoordinates","_fetchArrayBuffer","contentType","headers","ok","mimeTypes","_WMSErrorLoader$parse","wms","throwOnError","error","parseSync","call","Error","_WMSErrorLoader$parse2"],"sources":["../../../src/services/ogc/wms-service.ts"],"sourcesContent":["// loaders.gl, MIT license\n// Copyright (c) vis.gl contributors\n\n/* eslint-disable camelcase */\nimport type {ImageType} from '@loaders.gl/images';\nimport {ImageLoader} from '@loaders.gl/images';\nimport {mergeLoaderOptions} from '@loaders.gl/loader-utils';\n\nimport type {Service, ImageSourceMetadata, GetImageParameters} from '@loaders.gl/loader-utils';\nimport {ImageSource} from '@loaders.gl/loader-utils';\nimport type {ImageServiceProps} from '../../lib/services/image-service';\n\nimport type {WMSCapabilities} from '../../wms-capabilities-loader';\nimport type {WMSFeatureInfo} from '../../wip/wms-feature-info-loader';\nimport type {WMSLayerDescription} from '../../wip/wms-layer-description-loader';\n\nimport {WMSCapabilitiesLoader} from '../../wms-capabilities-loader';\nimport {WMSFeatureInfoLoader} from '../../wip/wms-feature-info-loader';\nimport {WMSLayerDescriptionLoader} from '../../wip/wms-layer-description-loader';\n\nimport type {WMSLoaderOptions} from '../../wms-error-loader';\nimport {WMSErrorLoader} from '../../wms-error-loader';\n\nexport const WMSService: Service<WMSSource, WMSSourceProps> = {\n  type: 'wms',\n  testURL: (url: string): boolean => url.toLowerCase().includes('wms'),\n  create: (props: WMSSourceProps) => new WMSSource(props)\n};\n\n/**\n * \"Static\" WMS parameters (not viewport or selected pixel dependent)\n * These can be provided as defaults in the WMSSource constructor\n */\nexport type WMSParameters = {\n  /** WMS version (all requests) */\n  version?: '1.3.0' | '1.1.1';\n  /** Layers to render (GetMap, GetFeatureInfo) */\n  layers?: string[];\n  /** list of layers to query.. (GetFeatureInfo) */\n  query_layers?: string[];\n\n  /** Coordinate Reference System (CRS) for the image (not the bounding box) */\n  crs?: string;\n  /** Requested format for the return image (GetMap, GetLegendGraphic) */\n  format?: 'image/png';\n  /** Requested MIME type of returned feature info (GetFeatureInfo) */\n  info_format?: 'text/plain' | 'application/geojson' | 'application/vnd.ogc.gml';\n  /** Styling - Not yet supported */\n  styles?: unknown;\n  /** Any additional parameters specific to this WMSSource (GetMap) */\n  transparent?: boolean;\n  /** If layer supports time dimension */\n  time?: string;\n  /** If layer supports elevation dimension */\n  elevation?: string;\n};\n\n/** Parameters for GetCapabilities */\nexport type WMSGetCapabilitiesParameters = {\n  /** In case the endpoint supports multiple WMS versions */\n  version?: '1.3.0' | '1.1.1';\n};\n\n/** Parameters for GetMap */\nexport type WMSGetMapParameters = {\n  /** In case the endpoint supports multiple WMS versions */\n  version?: '1.3.0' | '1.1.1';\n  /** bounding box of the requested map image `[[w, s], [e, n]]`  */\n  // boundingBox: [min: [x: number, y: number], max: [x: number, y: number]];\n  /** bounding box of the requested map image @deprecated Use .boundingBox */\n  bbox: [number, number, number, number];\n  /** pixel width of returned image */\n  width: number;\n  /** pixels */\n  height: number;\n  /** requested format for the return image. can be provided in service constructor */\n  format?: 'image/png';\n  /** Layers to render - can be provided in service constructor */\n  layers?: string | string[];\n  /** Coordinate Reference System for the image (not bounding box). can be provided in service constructor. */\n  crs?: string;\n  /** Styling. can be provided in service constructor */\n  styles?: unknown;\n  /** Don't render background when no data. can be provided in service constructor */\n  transparent?: boolean;\n  /** If layer supports time dimension */\n  time?: string;\n  /** If layer supports elevation dimension */\n  elevation?: string;\n};\n\n// /** GetMap parameters that are specific to the current view */\n// export type WMSGetMapViewParameters = {\n//   /** pixel width of returned image */\n//   width: number;\n//   /** pixels */\n//   height: number;\n//   /** bounding box of the requested map image */\n//   bbox: [number, number, number, number];\n//   /** Coordinate Reference System for the image (not bounding box). can be provided in service constructor. */\n//   crs?: string;\n// };\n\n/**\n * Parameters for GetFeatureInfo\n * @see https://imagery.pasda.psu.edu/arcgis/services/pasda/UrbanTreeCanopy_Landcover/MapServer/WmsServer?SERVICE=WMS&\n */\nexport type WMSGetFeatureInfoParameters = {\n  /** In case the endpoint supports multiple WMS versions */\n  version?: '1.3.0' | '1.1.1';\n  /** x coordinate for the feature info request */\n  x: number;\n  /** y coordinate for the feature info request */\n  y: number;\n  /** MIME type of returned feature info. Can be specified in service constructor */\n  info_format?: 'text/plain' | 'application/geojson' | 'application/vnd.ogc.gml';\n  /** list of layers to query. Required but can be specified in service constructor. */\n  query_layers?: string[];\n  /** Layers to render. Required, but can be specified in service constructor */\n  layers?: string[];\n  /** Styling */\n  styles?: unknown;\n  /** bounding box of the requested map image */\n  bbox: [number, number, number, number];\n  /** pixel width of returned image */\n  width: number;\n  /** pixels */\n  height: number;\n  /** srs for the image (not the bounding box) */\n  crs?: string;\n};\n\n/** GetMap parameters that are specific to the current view */\nexport type WMSGetFeatureInfoViewParameters = {\n  /** x coordinate for the feature info request */\n  x: number;\n  /** y coordinate for the feature info request */\n  y: number;\n  /** pixel width of returned image */\n  width: number;\n  /** pixels */\n  height: number;\n  /** bounding box of the requested map image */\n  bbox: [number, number, number, number];\n  /** srs for the image (not the bounding box) */\n  crs?: string;\n};\n\n/** Parameters for DescribeLayer */\nexport type WMSDescribeLayerParameters = {\n  /** In case the endpoint supports multiple WMS versions */\n  version?: '1.3.0' | '1.1.1';\n};\n\n/** Parameters for GetLegendGraphic */\nexport type WMSGetLegendGraphicParameters = {\n  /** In case the endpoint supports multiple WMS versions */\n  version?: '1.3.0' | '1.1.1';\n};\n\n//\n\n/** Properties for creating a enw WMS service */\nexport type WMSSourceProps = ImageServiceProps & {\n  /** Base URL to the service */\n  url: string;\n  /** In 1.3.0, replaces references to EPSG:4326 with CRS:84 */\n  substituteCRS84?: boolean;\n  /** Default WMS parameters. If not provided here, must be provided in the various request */\n  wmsParameters?: WMSParameters;\n  /** Any additional service specific parameters */\n  vendorParameters?: Record<string, unknown>;\n};\n\n/**\n * The WMSSource class provides\n * - provides type safe methods to form URLs to a WMS service\n * - provides type safe methods to query and parse results (and errors) from a WMS service\n * - implements the ImageService interface\n * @note Only the URL parameter conversion is supported. XML posts are not supported.\n */\nexport class WMSSource extends ImageSource<WMSSourceProps> {\n  /** Base URL to the service */\n  readonly url: string;\n  readonly data: string;\n\n  /** In WMS 1.3.0, replaces references to EPSG:4326 with CRS:84. But not always supported. Default: false */\n  substituteCRS84: boolean;\n  /** In WMS 1.3.0, flips x,y (lng, lat) coordinates for the supplied coordinate systems. Default: ['ESPG:4326'] */\n  flipCRS: string[];\n\n  /** Default static WMS parameters */\n  wmsParameters: Required<WMSParameters>;\n  /** Default static vendor parameters */\n  vendorParameters?: Record<string, unknown>;\n\n  capabilities: WMSCapabilities | null = null;\n\n  /** Create a WMSSource */\n  constructor(props: WMSSourceProps) {\n    super(props);\n\n    // TODO - defaults such as version, layers etc could be extracted from a base URL with parameters\n    // This would make pasting in any WMS URL more likely to make this class just work.\n    // const {baseUrl, parameters} = this._parseWMSUrl(props.url);\n\n    this.url = props.url;\n    this.data = props.url;\n\n    this.substituteCRS84 = props.substituteCRS84 ?? false;\n    this.flipCRS = ['EPSG:4326'];\n\n    this.wmsParameters = {\n      layers: undefined!,\n      query_layers: undefined!,\n      styles: undefined,\n      version: '1.3.0',\n      crs: 'EPSG:4326',\n      format: 'image/png',\n      info_format: 'text/plain',\n      transparent: undefined!,\n      time: undefined!,\n      elevation: undefined!,\n      ...props.wmsParameters\n    };\n\n    this.vendorParameters = props.vendorParameters || {};\n  }\n\n  // ImageService implementation\n  async getMetadata(): Promise<ImageSourceMetadata> {\n    const capabilities = await this.getCapabilities();\n    return this.normalizeMetadata(capabilities);\n  }\n\n  async getImage(parameters: GetImageParameters): Promise<ImageType> {\n    // @ts-expect-error\n    return await this.getMap(parameters);\n  }\n\n  normalizeMetadata(capabilities: WMSCapabilities): ImageSourceMetadata {\n    return capabilities;\n  }\n\n  // WMS Service API Stubs\n\n  /** Get Capabilities */\n  async getCapabilities(\n    wmsParameters?: WMSGetCapabilitiesParameters,\n    vendorParameters?: Record<string, unknown>\n  ): Promise<WMSCapabilities> {\n    const url = this.getCapabilitiesURL(wmsParameters, vendorParameters);\n    const response = await this.fetch(url);\n    const arrayBuffer = await response.arrayBuffer();\n    this._checkResponse(response, arrayBuffer);\n    const capabilities = await WMSCapabilitiesLoader.parse(arrayBuffer, this.loadOptions);\n    this.capabilities = capabilities;\n    return capabilities;\n  }\n\n  /** Get a map image */\n  async getMap(\n    wmsParameters: WMSGetMapParameters,\n    vendorParameters?: Record<string, unknown>\n  ): Promise<ImageType> {\n    const url = this.getMapURL(wmsParameters, vendorParameters);\n    const response = await this.fetch(url);\n    const arrayBuffer = await response.arrayBuffer();\n    this._checkResponse(response, arrayBuffer);\n    try {\n      return await ImageLoader.parse(arrayBuffer, this.loadOptions);\n    } catch {\n      throw this._parseError(arrayBuffer);\n    }\n  }\n\n  /** Get Feature Info for a coordinate */\n  async getFeatureInfo(\n    wmsParameters: WMSGetFeatureInfoParameters,\n    vendorParameters?: Record<string, unknown>\n  ): Promise<WMSFeatureInfo> {\n    const url = this.getFeatureInfoURL(wmsParameters, vendorParameters);\n    const response = await this.fetch(url);\n    const arrayBuffer = await response.arrayBuffer();\n    this._checkResponse(response, arrayBuffer);\n    return await WMSFeatureInfoLoader.parse(arrayBuffer, this.loadOptions);\n  }\n\n  /** Get Feature Info for a coordinate */\n  async getFeatureInfoText(\n    wmsParameters: WMSGetFeatureInfoParameters,\n    vendorParameters?: Record<string, unknown>\n  ): Promise<string> {\n    const url = this.getFeatureInfoURL(wmsParameters, vendorParameters);\n    const response = await this.fetch(url);\n    const arrayBuffer = await response.arrayBuffer();\n    this._checkResponse(response, arrayBuffer);\n    return new TextDecoder().decode(arrayBuffer);\n  }\n\n  /** Get more information about a layer */\n  async describeLayer(\n    wmsParameters: WMSDescribeLayerParameters,\n    vendorParameters?: Record<string, unknown>\n  ): Promise<WMSLayerDescription> {\n    const url = this.describeLayerURL(wmsParameters, vendorParameters);\n    const response = await this.fetch(url);\n    const arrayBuffer = await response.arrayBuffer();\n    this._checkResponse(response, arrayBuffer);\n    return await WMSLayerDescriptionLoader.parse(arrayBuffer, this.loadOptions);\n  }\n\n  /** Get an image with a semantic legend */\n  async getLegendGraphic(\n    wmsParameters: WMSGetLegendGraphicParameters,\n    vendorParameters?: Record<string, unknown>\n  ): Promise<ImageType> {\n    const url = this.getLegendGraphicURL(wmsParameters, vendorParameters);\n    const response = await this.fetch(url);\n    const arrayBuffer = await response.arrayBuffer();\n    this._checkResponse(response, arrayBuffer);\n    try {\n      return await ImageLoader.parse(arrayBuffer, this.loadOptions);\n    } catch {\n      throw this._parseError(arrayBuffer);\n    }\n  }\n\n  // Typed URL creators\n  // For applications that want full control of fetching and parsing\n\n  /** Generate a URL for the GetCapabilities request */\n  getCapabilitiesURL(\n    wmsParameters?: WMSGetCapabilitiesParameters,\n    vendorParameters?: Record<string, unknown>\n  ): string {\n    const options: Required<WMSGetCapabilitiesParameters> = {\n      version: this.wmsParameters.version,\n      ...wmsParameters\n    };\n    return this._getWMSUrl('GetCapabilities', options, vendorParameters);\n  }\n\n  /** Generate a URL for the GetMap request */\n  getMapURL(\n    wmsParameters: WMSGetMapParameters,\n    vendorParameters?: Record<string, unknown>\n  ): string {\n    wmsParameters = this._getWMS130Parameters(wmsParameters);\n    const options: Required<WMSGetMapParameters> = {\n      version: this.wmsParameters.version,\n      format: this.wmsParameters.format,\n      transparent: this.wmsParameters.transparent,\n      time: this.wmsParameters.time,\n      elevation: this.wmsParameters.elevation,\n      layers: this.wmsParameters.layers,\n      styles: this.wmsParameters.styles,\n      crs: this.wmsParameters.crs,\n      // bbox: [-77.87304, 40.78975, -77.85828, 40.80228],\n      // width: 1200,\n      // height: 900,\n      ...wmsParameters\n    };\n    return this._getWMSUrl('GetMap', options, vendorParameters);\n  }\n\n  /** Generate a URL for the GetFeatureInfo request */\n  getFeatureInfoURL(\n    wmsParameters: WMSGetFeatureInfoParameters,\n    vendorParameters?: Record<string, unknown>\n  ): string {\n    wmsParameters = this._getWMS130Parameters(wmsParameters);\n    const options: Required<WMSGetFeatureInfoParameters> = {\n      version: this.wmsParameters.version,\n      // query_layers: [],\n      // format: this.wmsParameters.format,\n      info_format: this.wmsParameters.info_format,\n      layers: this.wmsParameters.layers,\n      query_layers: this.wmsParameters.query_layers,\n      styles: this.wmsParameters.styles,\n      crs: this.wmsParameters.crs,\n      // bbox: [-77.87304, 40.78975, -77.85828, 40.80228],\n      // width: 1200,\n      // height: 900,\n      // x: undefined!,\n      // y: undefined!,\n      ...wmsParameters\n    };\n    return this._getWMSUrl('GetFeatureInfo', options, vendorParameters);\n  }\n\n  /** Generate a URL for the GetFeatureInfo request */\n  describeLayerURL(\n    wmsParameters: WMSDescribeLayerParameters,\n    vendorParameters?: Record<string, unknown>\n  ): string {\n    const options: Required<WMSDescribeLayerParameters> = {\n      version: this.wmsParameters.version,\n      ...wmsParameters\n    };\n    return this._getWMSUrl('DescribeLayer', options, vendorParameters);\n  }\n\n  getLegendGraphicURL(\n    wmsParameters: WMSGetLegendGraphicParameters,\n    vendorParameters?: Record<string, unknown>\n  ): string {\n    const options: Required<WMSGetLegendGraphicParameters> = {\n      version: this.wmsParameters.version,\n      // format?\n      ...wmsParameters\n    };\n    return this._getWMSUrl('GetLegendGraphic', options, vendorParameters);\n  }\n\n  // INTERNAL METHODS\n\n  _parseWMSUrl(url: string): {url: string; parameters: Record<string, unknown>} {\n    const [baseUrl, search] = url.split('?');\n    const searchParams = search.split('&');\n\n    const parameters: Record<string, unknown> = {};\n    for (const parameter of searchParams) {\n      const [key, value] = parameter.split('=');\n      parameters[key] = value;\n    }\n\n    return {url: baseUrl, parameters};\n  }\n\n  /**\n   * Generate a URL with parameters\n   * @note case _getWMSUrl may need to be overridden to handle certain backends?\n   * @note at the moment, only URLs with parameters are supported (no XML payloads)\n   * */\n  protected _getWMSUrl(\n    request: string,\n    wmsParameters: {version?: '1.3.0' | '1.1.1'; [key: string]: unknown},\n    vendorParameters?: Record<string, unknown>\n  ): string {\n    let url = this.url;\n    let first = true;\n\n    // Add any vendor searchParams\n    const allParameters = {\n      service: 'WMS',\n      version: wmsParameters.version,\n      request,\n      ...wmsParameters,\n      ...this.vendorParameters,\n      ...vendorParameters\n    };\n\n    // Encode the keys\n    const IGNORE_EMPTY_KEYS = ['transparent', 'time', 'elevation'];\n    for (const [key, value] of Object.entries(allParameters)) {\n      // hack to preserve test cases. Not super clear if keys should be included when values are undefined\n      if (!IGNORE_EMPTY_KEYS.includes(key) || value) {\n        url += first ? '?' : '&';\n        first = false;\n        url += this._getURLParameter(key, value, wmsParameters);\n      }\n    }\n\n    return encodeURI(url);\n  }\n\n  _getWMS130Parameters<ParametersT extends {crs?: string; srs?: string}>(\n    wmsParameters: ParametersT\n  ): ParametersT {\n    const newParameters = {...wmsParameters};\n    if (newParameters.srs) {\n      newParameters.crs = newParameters.crs || newParameters.srs;\n      delete newParameters.srs;\n    }\n    return newParameters;\n  }\n\n  // eslint-disable-next-line complexity\n  _getURLParameter(key: string, value: unknown, wmsParameters: WMSParameters): string {\n    // Substitute by key\n    switch (key) {\n      case 'crs':\n        // CRS was called SRS before WMS 1.3.0\n        if (wmsParameters.version !== '1.3.0') {\n          key = 'srs';\n        } else if (this.substituteCRS84 && value === 'EPSG:4326') {\n          /** In 1.3.0, replaces references to 'EPSG:4326' with the new backwards compatible CRS:84 */\n          // Substitute by value\n          value = 'CRS:84';\n        }\n        break;\n\n      case 'srs':\n        // CRS was called SRS before WMS 1.3.0\n        if (wmsParameters.version === '1.3.0') {\n          key = 'crs';\n        }\n        break;\n\n      case 'boundingBox':\n        // Coordinate order is flipped for certain CRS in WMS 1.3.0\n        const boundingBox = value as [[number, number], [number, number]];\n        let bbox2: number[] | null = [...boundingBox[0], ...boundingBox[1]];\n        bbox2 = this._flipBoundingBox(boundingBox, wmsParameters);\n        if (bbox2) {\n          value = bbox2;\n        }\n        break;\n\n      case 'bbox':\n        // Coordinate order is flipped for certain CRS in WMS 1.3.0\n        const bbox = this._flipBoundingBox(value, wmsParameters);\n        if (bbox) {\n          value = bbox;\n        }\n        break;\n\n      default:\n      // do nothing\n    }\n\n    key = key.toUpperCase();\n\n    return Array.isArray(value)\n      ? `${key}=${value.join(',')}`\n      : `${key}=${value ? String(value) : ''}`;\n  }\n\n  /** Coordinate order is flipped for certain CRS in WMS 1.3.0 */\n  _flipBoundingBox(\n    bboxValue: unknown,\n    wmsParameters: WMSParameters\n  ): [number, number, number, number] | null {\n    // Sanity checks\n    if (!Array.isArray(bboxValue) || bboxValue.length !== 4) {\n      return null;\n    }\n\n    const flipCoordinates =\n      // Only affects WMS 1.3.0\n      wmsParameters.version === '1.3.0' &&\n      // Flip if we are dealing with a CRS that was flipped in 1.3.0\n      this.flipCRS.includes(wmsParameters.crs || '') &&\n      // Don't flip if we are subsituting EPSG:4326 with CRS:84\n      !(this.substituteCRS84 && wmsParameters.crs === 'EPSG:4326');\n\n    const bbox = bboxValue as [number, number, number, number];\n    return flipCoordinates ? [bbox[1], bbox[0], bbox[3], bbox[2]] : bbox;\n  }\n\n  /** Fetches an array buffer and checks the response (boilerplate reduction) */\n  protected async _fetchArrayBuffer(url: string): Promise<ArrayBuffer> {\n    const response = await this.fetch(url);\n    const arrayBuffer = await response.arrayBuffer();\n    this._checkResponse(response, arrayBuffer);\n    return arrayBuffer;\n  }\n\n  /** Checks for and parses a WMS XML formatted ServiceError and throws an exception */\n  protected _checkResponse(response: Response, arrayBuffer: ArrayBuffer): void {\n    const contentType = response.headers['content-type'];\n    if (!response.ok || WMSErrorLoader.mimeTypes.includes(contentType)) {\n      // We want error responses to throw exceptions, the WMSErrorLoader can do this\n      const loadOptions = mergeLoaderOptions<WMSLoaderOptions>(this.loadOptions, {\n        wms: {throwOnError: true}\n      });\n      const error = WMSErrorLoader.parseSync?.(arrayBuffer, loadOptions);\n      throw new Error(error);\n    }\n  }\n\n  /** Error situation detected */\n  protected _parseError(arrayBuffer: ArrayBuffer): Error {\n    const error = WMSErrorLoader.parseSync?.(arrayBuffer, this.loadOptions);\n    return new Error(error);\n  }\n}\n"],"mappings":"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"}
+{"version":3,"file":"wms-service.js","names":["ImageLoader","mergeLoaderOptions","ImageSource","WMSCapabilitiesLoader","WMSFeatureInfoLoader","WMSLayerDescriptionLoader","WMSErrorLoader","WMSService","type","testURL","url","toLowerCase","includes","create","props","WMSSource","constructor","_props$substituteCRS","data","substituteCRS84","flipCRS","wmsParameters","vendorParameters","capabilities","layers","undefined","query_layers","styles","version","crs","format","info_format","transparent","time","elevation","getMetadata","getCapabilities","normalizeMetadata","getImage","parameters","boundingBox","rest","bbox","getMap","getCapabilitiesURL","response","fetch","arrayBuffer","_checkResponse","parse","loadOptions","getMapURL","_parseError","getFeatureInfo","getFeatureInfoURL","getFeatureInfoText","TextDecoder","decode","describeLayer","describeLayerURL","getLegendGraphic","getLegendGraphicURL","options","_getWMSUrl","_getWMS130Parameters","_parseWMSUrl","baseUrl","search","split","searchParams","parameter","key","value","request","first","allParameters","service","IGNORE_EMPTY_KEYS","Object","entries","_getURLParameter","encodeURI","newParameters","srs","_flipBoundingBox","toUpperCase","Array","isArray","join","String","bboxValue","length","flipCoordinates","_fetchArrayBuffer","contentType","headers","ok","mimeTypes","_WMSErrorLoader$parse","wms","throwOnError","error","parseSync","call","Error","_WMSErrorLoader$parse2"],"sources":["../../../src/services/ogc/wms-service.ts"],"sourcesContent":["// loaders.gl, MIT license\n// Copyright (c) vis.gl contributors\n\n/* eslint-disable camelcase */\nimport type {ImageType} from '@loaders.gl/images';\nimport {ImageLoader} from '@loaders.gl/images';\nimport {mergeLoaderOptions} from '@loaders.gl/loader-utils';\n\nimport type {Service, ImageSourceMetadata, GetImageParameters} from '@loaders.gl/loader-utils';\nimport {ImageSource} from '@loaders.gl/loader-utils';\nimport type {ImageServiceProps} from '../../lib/services/image-service';\n\nimport type {WMSCapabilities} from '../../wms-capabilities-loader';\nimport type {WMSFeatureInfo} from '../../wip/wms-feature-info-loader';\nimport type {WMSLayerDescription} from '../../wip/wms-layer-description-loader';\n\nimport {WMSCapabilitiesLoader} from '../../wms-capabilities-loader';\nimport {WMSFeatureInfoLoader} from '../../wip/wms-feature-info-loader';\nimport {WMSLayerDescriptionLoader} from '../../wip/wms-layer-description-loader';\n\nimport type {WMSLoaderOptions} from '../../wms-error-loader';\nimport {WMSErrorLoader} from '../../wms-error-loader';\n\nexport const WMSService: Service<WMSSource, WMSSourceProps> = {\n  type: 'wms',\n  testURL: (url: string): boolean => url.toLowerCase().includes('wms'),\n  create: (props: WMSSourceProps) => new WMSSource(props)\n};\n\n/**\n * \"Static\" WMS parameters (not viewport or selected pixel dependent)\n * These can be provided as defaults in the WMSSource constructor\n */\nexport type WMSParameters = {\n  /** WMS version (all requests) */\n  version?: '1.3.0' | '1.1.1';\n  /** Layers to render (GetMap, GetFeatureInfo) */\n  layers?: string[];\n  /** list of layers to query.. (GetFeatureInfo) */\n  query_layers?: string[];\n\n  /** Coordinate Reference System (CRS) for the image (not the bounding box) */\n  crs?: string;\n  /** Requested format for the return image (GetMap, GetLegendGraphic) */\n  format?: 'image/png';\n  /** Requested MIME type of returned feature info (GetFeatureInfo) */\n  info_format?: 'text/plain' | 'application/geojson' | 'application/vnd.ogc.gml';\n  /** Styling - Not yet supported */\n  styles?: unknown;\n  /** Any additional parameters specific to this WMSSource (GetMap) */\n  transparent?: boolean;\n  /** If layer supports time dimension */\n  time?: string;\n  /** If layer supports elevation dimension */\n  elevation?: string;\n};\n\n/** Parameters for GetCapabilities */\nexport type WMSGetCapabilitiesParameters = {\n  /** In case the endpoint supports multiple WMS versions */\n  version?: '1.3.0' | '1.1.1';\n};\n\n/** Parameters for GetMap */\nexport type WMSGetMapParameters = {\n  /** In case the endpoint supports multiple WMS versions */\n  version?: '1.3.0' | '1.1.1';\n  /** bounding box of the requested map image `[[w, s], [e, n]]`  */\n  // boundingBox: [min: [x: number, y: number], max: [x: number, y: number]];\n  /** bounding box of the requested map image @deprecated Use .boundingBox */\n  bbox: [number, number, number, number];\n  /** pixel width of returned image */\n  width: number;\n  /** pixels */\n  height: number;\n  /** requested format for the return image. can be provided in service constructor */\n  format?: 'image/png';\n  /** Layers to render - can be provided in service constructor */\n  layers?: string | string[];\n  /** Coordinate Reference System for the image (not bounding box). can be provided in service constructor. */\n  crs?: string;\n  /** Styling. can be provided in service constructor */\n  styles?: unknown;\n  /** Don't render background when no data. can be provided in service constructor */\n  transparent?: boolean;\n  /** If layer supports time dimension */\n  time?: string;\n  /** If layer supports elevation dimension */\n  elevation?: string;\n};\n\n// /** GetMap parameters that are specific to the current view */\n// export type WMSGetMapViewParameters = {\n//   /** pixel width of returned image */\n//   width: number;\n//   /** pixels */\n//   height: number;\n//   /** bounding box of the requested map image */\n//   bbox: [number, number, number, number];\n//   /** Coordinate Reference System for the image (not bounding box). can be provided in service constructor. */\n//   crs?: string;\n// };\n\n/**\n * Parameters for GetFeatureInfo\n * @see https://imagery.pasda.psu.edu/arcgis/services/pasda/UrbanTreeCanopy_Landcover/MapServer/WmsServer?SERVICE=WMS&\n */\nexport type WMSGetFeatureInfoParameters = {\n  /** In case the endpoint supports multiple WMS versions */\n  version?: '1.3.0' | '1.1.1';\n  /** x coordinate for the feature info request */\n  x: number;\n  /** y coordinate for the feature info request */\n  y: number;\n  /** MIME type of returned feature info. Can be specified in service constructor */\n  info_format?: 'text/plain' | 'application/geojson' | 'application/vnd.ogc.gml';\n  /** list of layers to query. Required but can be specified in service constructor. */\n  query_layers?: string[];\n  /** Layers to render. Required, but can be specified in service constructor */\n  layers?: string[];\n  /** Styling */\n  styles?: unknown;\n  /** bounding box of the requested map image */\n  bbox: [number, number, number, number];\n  /** pixel width of returned image */\n  width: number;\n  /** pixels */\n  height: number;\n  /** srs for the image (not the bounding box) */\n  crs?: string;\n};\n\n/** GetMap parameters that are specific to the current view */\nexport type WMSGetFeatureInfoViewParameters = {\n  /** x coordinate for the feature info request */\n  x: number;\n  /** y coordinate for the feature info request */\n  y: number;\n  /** pixel width of returned image */\n  width: number;\n  /** pixels */\n  height: number;\n  /** bounding box of the requested map image */\n  bbox: [number, number, number, number];\n  /** srs for the image (not the bounding box) */\n  crs?: string;\n};\n\n/** Parameters for DescribeLayer */\nexport type WMSDescribeLayerParameters = {\n  /** In case the endpoint supports multiple WMS versions */\n  version?: '1.3.0' | '1.1.1';\n};\n\n/** Parameters for GetLegendGraphic */\nexport type WMSGetLegendGraphicParameters = {\n  /** In case the endpoint supports multiple WMS versions */\n  version?: '1.3.0' | '1.1.1';\n};\n\n//\n\n/** Properties for creating a enw WMS service */\nexport type WMSSourceProps = ImageServiceProps & {\n  /** Base URL to the service */\n  url: string;\n  /** In 1.3.0, replaces references to EPSG:4326 with CRS:84 */\n  substituteCRS84?: boolean;\n  /** Default WMS parameters. If not provided here, must be provided in the various request */\n  wmsParameters?: WMSParameters;\n  /** Any additional service specific parameters */\n  vendorParameters?: Record<string, unknown>;\n};\n\n/**\n * The WMSSource class provides\n * - provides type safe methods to form URLs to a WMS service\n * - provides type safe methods to query and parse results (and errors) from a WMS service\n * - implements the ImageService interface\n * @note Only the URL parameter conversion is supported. XML posts are not supported.\n */\nexport class WMSSource extends ImageSource<WMSSourceProps> {\n  /** Base URL to the service */\n  readonly url: string;\n  readonly data: string;\n\n  /** In WMS 1.3.0, replaces references to EPSG:4326 with CRS:84. But not always supported. Default: false */\n  substituteCRS84: boolean;\n  /** In WMS 1.3.0, flips x,y (lng, lat) coordinates for the supplied coordinate systems. Default: ['ESPG:4326'] */\n  flipCRS: string[];\n\n  /** Default static WMS parameters */\n  wmsParameters: Required<WMSParameters>;\n  /** Default static vendor parameters */\n  vendorParameters?: Record<string, unknown>;\n\n  capabilities: WMSCapabilities | null = null;\n\n  /** Create a WMSSource */\n  constructor(props: WMSSourceProps) {\n    super(props);\n\n    // TODO - defaults such as version, layers etc could be extracted from a base URL with parameters\n    // This would make pasting in any WMS URL more likely to make this class just work.\n    // const {baseUrl, parameters} = this._parseWMSUrl(props.url);\n\n    this.url = props.url;\n    this.data = props.url;\n\n    this.substituteCRS84 = props.substituteCRS84 ?? false;\n    this.flipCRS = ['EPSG:4326'];\n\n    this.wmsParameters = {\n      layers: undefined!,\n      query_layers: undefined!,\n      styles: undefined,\n      version: '1.3.0',\n      crs: 'EPSG:4326',\n      format: 'image/png',\n      info_format: 'text/plain',\n      transparent: undefined!,\n      time: undefined!,\n      elevation: undefined!,\n      ...props.wmsParameters\n    };\n\n    this.vendorParameters = props.vendorParameters || {};\n  }\n\n  // ImageService implementation\n  async getMetadata(): Promise<ImageSourceMetadata> {\n    const capabilities = await this.getCapabilities();\n    return this.normalizeMetadata(capabilities);\n  }\n\n  async getImage(parameters: GetImageParameters): Promise<ImageType> {\n    // Replace the GetImage `boundingBox` parameter with the WMS flat `bbox` parameter.\n    const {boundingBox, ...rest} = parameters;\n    const wmsParameters: WMSGetMapParameters = {\n      bbox: [...boundingBox[0], ...boundingBox[1]],\n      ...rest\n    };\n    return await this.getMap(wmsParameters);\n  }\n\n  normalizeMetadata(capabilities: WMSCapabilities): ImageSourceMetadata {\n    return capabilities;\n  }\n\n  // WMS Service API Stubs\n\n  /** Get Capabilities */\n  async getCapabilities(\n    wmsParameters?: WMSGetCapabilitiesParameters,\n    vendorParameters?: Record<string, unknown>\n  ): Promise<WMSCapabilities> {\n    const url = this.getCapabilitiesURL(wmsParameters, vendorParameters);\n    const response = await this.fetch(url);\n    const arrayBuffer = await response.arrayBuffer();\n    this._checkResponse(response, arrayBuffer);\n    const capabilities = await WMSCapabilitiesLoader.parse(arrayBuffer, this.loadOptions);\n    this.capabilities = capabilities;\n    return capabilities;\n  }\n\n  /** Get a map image */\n  async getMap(\n    wmsParameters: WMSGetMapParameters,\n    vendorParameters?: Record<string, unknown>\n  ): Promise<ImageType> {\n    const url = this.getMapURL(wmsParameters, vendorParameters);\n    const response = await this.fetch(url);\n    const arrayBuffer = await response.arrayBuffer();\n    this._checkResponse(response, arrayBuffer);\n    try {\n      return await ImageLoader.parse(arrayBuffer, this.loadOptions);\n    } catch {\n      throw this._parseError(arrayBuffer);\n    }\n  }\n\n  /** Get Feature Info for a coordinate */\n  async getFeatureInfo(\n    wmsParameters: WMSGetFeatureInfoParameters,\n    vendorParameters?: Record<string, unknown>\n  ): Promise<WMSFeatureInfo> {\n    const url = this.getFeatureInfoURL(wmsParameters, vendorParameters);\n    const response = await this.fetch(url);\n    const arrayBuffer = await response.arrayBuffer();\n    this._checkResponse(response, arrayBuffer);\n    return await WMSFeatureInfoLoader.parse(arrayBuffer, this.loadOptions);\n  }\n\n  /** Get Feature Info for a coordinate */\n  async getFeatureInfoText(\n    wmsParameters: WMSGetFeatureInfoParameters,\n    vendorParameters?: Record<string, unknown>\n  ): Promise<string> {\n    const url = this.getFeatureInfoURL(wmsParameters, vendorParameters);\n    const response = await this.fetch(url);\n    const arrayBuffer = await response.arrayBuffer();\n    this._checkResponse(response, arrayBuffer);\n    return new TextDecoder().decode(arrayBuffer);\n  }\n\n  /** Get more information about a layer */\n  async describeLayer(\n    wmsParameters: WMSDescribeLayerParameters,\n    vendorParameters?: Record<string, unknown>\n  ): Promise<WMSLayerDescription> {\n    const url = this.describeLayerURL(wmsParameters, vendorParameters);\n    const response = await this.fetch(url);\n    const arrayBuffer = await response.arrayBuffer();\n    this._checkResponse(response, arrayBuffer);\n    return await WMSLayerDescriptionLoader.parse(arrayBuffer, this.loadOptions);\n  }\n\n  /** Get an image with a semantic legend */\n  async getLegendGraphic(\n    wmsParameters: WMSGetLegendGraphicParameters,\n    vendorParameters?: Record<string, unknown>\n  ): Promise<ImageType> {\n    const url = this.getLegendGraphicURL(wmsParameters, vendorParameters);\n    const response = await this.fetch(url);\n    const arrayBuffer = await response.arrayBuffer();\n    this._checkResponse(response, arrayBuffer);\n    try {\n      return await ImageLoader.parse(arrayBuffer, this.loadOptions);\n    } catch {\n      throw this._parseError(arrayBuffer);\n    }\n  }\n\n  // Typed URL creators\n  // For applications that want full control of fetching and parsing\n\n  /** Generate a URL for the GetCapabilities request */\n  getCapabilitiesURL(\n    wmsParameters?: WMSGetCapabilitiesParameters,\n    vendorParameters?: Record<string, unknown>\n  ): string {\n    const options: Required<WMSGetCapabilitiesParameters> = {\n      version: this.wmsParameters.version,\n      ...wmsParameters\n    };\n    return this._getWMSUrl('GetCapabilities', options, vendorParameters);\n  }\n\n  /** Generate a URL for the GetMap request */\n  getMapURL(\n    wmsParameters: WMSGetMapParameters,\n    vendorParameters?: Record<string, unknown>\n  ): string {\n    wmsParameters = this._getWMS130Parameters(wmsParameters);\n    const options: Required<WMSGetMapParameters> = {\n      version: this.wmsParameters.version,\n      format: this.wmsParameters.format,\n      transparent: this.wmsParameters.transparent,\n      time: this.wmsParameters.time,\n      elevation: this.wmsParameters.elevation,\n      layers: this.wmsParameters.layers,\n      styles: this.wmsParameters.styles,\n      crs: this.wmsParameters.crs,\n      // bbox: [-77.87304, 40.78975, -77.85828, 40.80228],\n      // width: 1200,\n      // height: 900,\n      ...wmsParameters\n    };\n    return this._getWMSUrl('GetMap', options, vendorParameters);\n  }\n\n  /** Generate a URL for the GetFeatureInfo request */\n  getFeatureInfoURL(\n    wmsParameters: WMSGetFeatureInfoParameters,\n    vendorParameters?: Record<string, unknown>\n  ): string {\n    wmsParameters = this._getWMS130Parameters(wmsParameters);\n    const options: Required<WMSGetFeatureInfoParameters> = {\n      version: this.wmsParameters.version,\n      // query_layers: [],\n      // format: this.wmsParameters.format,\n      info_format: this.wmsParameters.info_format,\n      layers: this.wmsParameters.layers,\n      query_layers: this.wmsParameters.query_layers,\n      styles: this.wmsParameters.styles,\n      crs: this.wmsParameters.crs,\n      // bbox: [-77.87304, 40.78975, -77.85828, 40.80228],\n      // width: 1200,\n      // height: 900,\n      // x: undefined!,\n      // y: undefined!,\n      ...wmsParameters\n    };\n    return this._getWMSUrl('GetFeatureInfo', options, vendorParameters);\n  }\n\n  /** Generate a URL for the GetFeatureInfo request */\n  describeLayerURL(\n    wmsParameters: WMSDescribeLayerParameters,\n    vendorParameters?: Record<string, unknown>\n  ): string {\n    const options: Required<WMSDescribeLayerParameters> = {\n      version: this.wmsParameters.version,\n      ...wmsParameters\n    };\n    return this._getWMSUrl('DescribeLayer', options, vendorParameters);\n  }\n\n  getLegendGraphicURL(\n    wmsParameters: WMSGetLegendGraphicParameters,\n    vendorParameters?: Record<string, unknown>\n  ): string {\n    const options: Required<WMSGetLegendGraphicParameters> = {\n      version: this.wmsParameters.version,\n      // format?\n      ...wmsParameters\n    };\n    return this._getWMSUrl('GetLegendGraphic', options, vendorParameters);\n  }\n\n  // INTERNAL METHODS\n\n  _parseWMSUrl(url: string): {url: string; parameters: Record<string, unknown>} {\n    const [baseUrl, search] = url.split('?');\n    const searchParams = search.split('&');\n\n    const parameters: Record<string, unknown> = {};\n    for (const parameter of searchParams) {\n      const [key, value] = parameter.split('=');\n      parameters[key] = value;\n    }\n\n    return {url: baseUrl, parameters};\n  }\n\n  /**\n   * Generate a URL with parameters\n   * @note case _getWMSUrl may need to be overridden to handle certain backends?\n   * @note at the moment, only URLs with parameters are supported (no XML payloads)\n   * */\n  protected _getWMSUrl(\n    request: string,\n    wmsParameters: {version?: '1.3.0' | '1.1.1'; [key: string]: unknown},\n    vendorParameters?: Record<string, unknown>\n  ): string {\n    let url = this.url;\n    let first = true;\n\n    // Add any vendor searchParams\n    const allParameters = {\n      service: 'WMS',\n      version: wmsParameters.version,\n      request,\n      ...wmsParameters,\n      ...this.vendorParameters,\n      ...vendorParameters\n    };\n\n    // Encode the keys\n    const IGNORE_EMPTY_KEYS = ['transparent', 'time', 'elevation'];\n    for (const [key, value] of Object.entries(allParameters)) {\n      // hack to preserve test cases. Not super clear if keys should be included when values are undefined\n      if (!IGNORE_EMPTY_KEYS.includes(key) || value) {\n        url += first ? '?' : '&';\n        first = false;\n        url += this._getURLParameter(key, value, wmsParameters);\n      }\n    }\n\n    return encodeURI(url);\n  }\n\n  _getWMS130Parameters<ParametersT extends {crs?: string; srs?: string}>(\n    wmsParameters: ParametersT\n  ): ParametersT {\n    const newParameters = {...wmsParameters};\n    if (newParameters.srs) {\n      newParameters.crs = newParameters.crs || newParameters.srs;\n      delete newParameters.srs;\n    }\n    return newParameters;\n  }\n\n  // eslint-disable-next-line complexity\n  _getURLParameter(key: string, value: unknown, wmsParameters: WMSParameters): string {\n    // Substitute by key\n    switch (key) {\n      case 'crs':\n        // CRS was called SRS before WMS 1.3.0\n        if (wmsParameters.version !== '1.3.0') {\n          key = 'srs';\n        } else if (this.substituteCRS84 && value === 'EPSG:4326') {\n          /** In 1.3.0, replaces references to 'EPSG:4326' with the new backwards compatible CRS:84 */\n          // Substitute by value\n          value = 'CRS:84';\n        }\n        break;\n\n      case 'srs':\n        // CRS was called SRS before WMS 1.3.0\n        if (wmsParameters.version === '1.3.0') {\n          key = 'crs';\n        }\n        break;\n\n      case 'bbox':\n        // Coordinate order is flipped for certain CRS in WMS 1.3.0\n        const bbox = this._flipBoundingBox(value, wmsParameters);\n        if (bbox) {\n          value = bbox;\n        }\n        break;\n\n      default:\n      // do nothing\n    }\n\n    key = key.toUpperCase();\n\n    return Array.isArray(value)\n      ? `${key}=${value.join(',')}`\n      : `${key}=${value ? String(value) : ''}`;\n  }\n\n  /** Coordinate order is flipped for certain CRS in WMS 1.3.0 */\n  _flipBoundingBox(\n    bboxValue: unknown,\n    wmsParameters: WMSParameters\n  ): [number, number, number, number] | null {\n    // Sanity checks\n    if (!Array.isArray(bboxValue) || bboxValue.length !== 4) {\n      return null;\n    }\n\n    const flipCoordinates =\n      // Only affects WMS 1.3.0\n      wmsParameters.version === '1.3.0' &&\n      // Flip if we are dealing with a CRS that was flipped in 1.3.0\n      this.flipCRS.includes(wmsParameters.crs || '') &&\n      // Don't flip if we are subsituting EPSG:4326 with CRS:84\n      !(this.substituteCRS84 && wmsParameters.crs === 'EPSG:4326');\n\n    const bbox = bboxValue as [number, number, number, number];\n    return flipCoordinates ? [bbox[1], bbox[0], bbox[3], bbox[2]] : bbox;\n  }\n\n  /** Fetches an array buffer and checks the response (boilerplate reduction) */\n  protected async _fetchArrayBuffer(url: string): Promise<ArrayBuffer> {\n    const response = await this.fetch(url);\n    const arrayBuffer = await response.arrayBuffer();\n    this._checkResponse(response, arrayBuffer);\n    return arrayBuffer;\n  }\n\n  /** Checks for and parses a WMS XML formatted ServiceError and throws an exception */\n  protected _checkResponse(response: Response, arrayBuffer: ArrayBuffer): void {\n    const contentType = response.headers['content-type'];\n    if (!response.ok || WMSErrorLoader.mimeTypes.includes(contentType)) {\n      // We want error responses to throw exceptions, the WMSErrorLoader can do this\n      const loadOptions = mergeLoaderOptions<WMSLoaderOptions>(this.loadOptions, {\n        wms: {throwOnError: true}\n      });\n      const error = WMSErrorLoader.parseSync?.(arrayBuffer, loadOptions);\n      throw new Error(error);\n    }\n  }\n\n  /** Error situation detected */\n  protected _parseError(arrayBuffer: ArrayBuffer): Error {\n    const error = WMSErrorLoader.parseSync?.(arrayBuffer, this.loadOptions);\n    return new Error(error);\n  }\n}\n"],"mappings":"AAKA,SAAQA,WAAW,QAAO,oBAAoB;AAC9C,SAAQC,kBAAkB,QAAO,0BAA0B;AAG3D,SAAQC,WAAW,QAAO,0BAA0B;AAAC,SAO7CC,qBAAqB;AAAA,SACrBC,oBAAoB;AAAA,SACpBC,yBAAyB;AAAA,SAGzBC,cAAc;AAEtB,OAAO,MAAMC,UAA8C,GAAG;EAC5DC,IAAI,EAAE,KAAK;EACXC,OAAO,EAAGC,GAAW,IAAcA,GAAG,CAACC,WAAW,CAAC,CAAC,CAACC,QAAQ,CAAC,KAAK,CAAC;EACpEC,MAAM,EAAGC,KAAqB,IAAK,IAAIC,SAAS,CAACD,KAAK;AACxD,CAAC;AA0JD,OAAO,MAAMC,SAAS,SAASb,WAAW,CAAiB;EAkBzDc,WAAWA,CAACF,KAAqB,EAAE;IAAA,IAAAG,oBAAA;IACjC,KAAK,CAACH,KAAK,CAAC;IAAC,KAjBNJ,GAAG;IAAA,KACHQ,IAAI;IAAA,KAGbC,eAAe;IAAA,KAEfC,OAAO;IAAA,KAGPC,aAAa;IAAA,KAEbC,gBAAgB;IAAA,KAEhBC,YAAY,GAA2B,IAAI;IAUzC,IAAI,CAACb,GAAG,GAAGI,KAAK,CAACJ,GAAG;IACpB,IAAI,CAACQ,IAAI,GAAGJ,KAAK,CAACJ,GAAG;IAErB,IAAI,CAACS,eAAe,IAAAF,oBAAA,GAAGH,KAAK,CAACK,eAAe,cAAAF,oBAAA,cAAAA,oBAAA,GAAI,KAAK;IACrD,IAAI,CAACG,OAAO,GAAG,CAAC,WAAW,CAAC;IAE5B,IAAI,CAACC,aAAa,GAAG;MACnBG,MAAM,EAAEC,SAAU;MAClBC,YAAY,EAAED,SAAU;MACxBE,MAAM,EAAEF,SAAS;MACjBG,OAAO,EAAE,OAAO;MAChBC,GAAG,EAAE,WAAW;MAChBC,MAAM,EAAE,WAAW;MACnBC,WAAW,EAAE,YAAY;MACzBC,WAAW,EAAEP,SAAU;MACvBQ,IAAI,EAAER,SAAU;MAChBS,SAAS,EAAET,SAAU;MACrB,GAAGX,KAAK,CAACO;IACX,CAAC;IAED,IAAI,CAACC,gBAAgB,GAAGR,KAAK,CAACQ,gBAAgB,IAAI,CAAC,CAAC;EACtD;EAGA,MAAMa,WAAWA,CAAA,EAAiC;IAChD,MAAMZ,YAAY,GAAG,MAAM,IAAI,CAACa,eAAe,CAAC,CAAC;IACjD,OAAO,IAAI,CAACC,iBAAiB,CAACd,YAAY,CAAC;EAC7C;EAEA,MAAMe,QAAQA,CAACC,UAA8B,EAAsB;IAEjE,MAAM;MAACC,WAAW;MAAE,GAAGC;IAAI,CAAC,GAAGF,UAAU;IACzC,MAAMlB,aAAkC,GAAG;MACzCqB,IAAI,EAAE,CAAC,GAAGF,WAAW,CAAC,CAAC,CAAC,EAAE,GAAGA,WAAW,CAAC,CAAC,CAAC,CAAC;MAC5C,GAAGC;IACL,CAAC;IACD,OAAO,MAAM,IAAI,CAACE,MAAM,CAACtB,aAAa,CAAC;EACzC;EAEAgB,iBAAiBA,CAACd,YAA6B,EAAuB;IACpE,OAAOA,YAAY;EACrB;EAKA,MAAMa,eAAeA,CACnBf,aAA4C,EAC5CC,gBAA0C,EAChB;IAC1B,MAAMZ,GAAG,GAAG,IAAI,CAACkC,kBAAkB,CAACvB,aAAa,EAAEC,gBAAgB,CAAC;IACpE,MAAMuB,QAAQ,GAAG,MAAM,IAAI,CAACC,KAAK,CAACpC,GAAG,CAAC;IACtC,MAAMqC,WAAW,GAAG,MAAMF,QAAQ,CAACE,WAAW,CAAC,CAAC;IAChD,IAAI,CAACC,cAAc,CAACH,QAAQ,EAAEE,WAAW,CAAC;IAC1C,MAAMxB,YAAY,GAAG,MAAMpB,qBAAqB,CAAC8C,KAAK,CAACF,WAAW,EAAE,IAAI,CAACG,WAAW,CAAC;IACrF,IAAI,CAAC3B,YAAY,GAAGA,YAAY;IAChC,OAAOA,YAAY;EACrB;EAGA,MAAMoB,MAAMA,CACVtB,aAAkC,EAClCC,gBAA0C,EACtB;IACpB,MAAMZ,GAAG,GAAG,IAAI,CAACyC,SAAS,CAAC9B,aAAa,EAAEC,gBAAgB,CAAC;IAC3D,MAAMuB,QAAQ,GAAG,MAAM,IAAI,CAACC,KAAK,CAACpC,GAAG,CAAC;IACtC,MAAMqC,WAAW,GAAG,MAAMF,QAAQ,CAACE,WAAW,CAAC,CAAC;IAChD,IAAI,CAACC,cAAc,CAACH,QAAQ,EAAEE,WAAW,CAAC;IAC1C,IAAI;MACF,OAAO,MAAM/C,WAAW,CAACiD,KAAK,CAACF,WAAW,EAAE,IAAI,CAACG,WAAW,CAAC;IAC/D,CAAC,CAAC,MAAM;MACN,MAAM,IAAI,CAACE,WAAW,CAACL,WAAW,CAAC;IACrC;EACF;EAGA,MAAMM,cAAcA,CAClBhC,aAA0C,EAC1CC,gBAA0C,EACjB;IACzB,MAAMZ,GAAG,GAAG,IAAI,CAAC4C,iBAAiB,CAACjC,aAAa,EAAEC,gBAAgB,CAAC;IACnE,MAAMuB,QAAQ,GAAG,MAAM,IAAI,CAACC,KAAK,CAACpC,GAAG,CAAC;IACtC,MAAMqC,WAAW,GAAG,MAAMF,QAAQ,CAACE,WAAW,CAAC,CAAC;IAChD,IAAI,CAACC,cAAc,CAACH,QAAQ,EAAEE,WAAW,CAAC;IAC1C,OAAO,MAAM3C,oBAAoB,CAAC6C,KAAK,CAACF,WAAW,EAAE,IAAI,CAACG,WAAW,CAAC;EACxE;EAGA,MAAMK,kBAAkBA,CACtBlC,aAA0C,EAC1CC,gBAA0C,EACzB;IACjB,MAAMZ,GAAG,GAAG,IAAI,CAAC4C,iBAAiB,CAACjC,aAAa,EAAEC,gBAAgB,CAAC;IACnE,MAAMuB,QAAQ,GAAG,MAAM,IAAI,CAACC,KAAK,CAACpC,GAAG,CAAC;IACtC,MAAMqC,WAAW,GAAG,MAAMF,QAAQ,CAACE,WAAW,CAAC,CAAC;IAChD,IAAI,CAACC,cAAc,CAACH,QAAQ,EAAEE,WAAW,CAAC;IAC1C,OAAO,IAAIS,WAAW,CAAC,CAAC,CAACC,MAAM,CAACV,WAAW,CAAC;EAC9C;EAGA,MAAMW,aAAaA,CACjBrC,aAAyC,EACzCC,gBAA0C,EACZ;IAC9B,MAAMZ,GAAG,GAAG,IAAI,CAACiD,gBAAgB,CAACtC,aAAa,EAAEC,gBAAgB,CAAC;IAClE,MAAMuB,QAAQ,GAAG,MAAM,IAAI,CAACC,KAAK,CAACpC,GAAG,CAAC;IACtC,MAAMqC,WAAW,GAAG,MAAMF,QAAQ,CAACE,WAAW,CAAC,CAAC;IAChD,IAAI,CAACC,cAAc,CAACH,QAAQ,EAAEE,WAAW,CAAC;IAC1C,OAAO,MAAM1C,yBAAyB,CAAC4C,KAAK,CAACF,WAAW,EAAE,IAAI,CAACG,WAAW,CAAC;EAC7E;EAGA,MAAMU,gBAAgBA,CACpBvC,aAA4C,EAC5CC,gBAA0C,EACtB;IACpB,MAAMZ,GAAG,GAAG,IAAI,CAACmD,mBAAmB,CAACxC,aAAa,EAAEC,gBAAgB,CAAC;IACrE,MAAMuB,QAAQ,GAAG,MAAM,IAAI,CAACC,KAAK,CAACpC,GAAG,CAAC;IACtC,MAAMqC,WAAW,GAAG,MAAMF,QAAQ,CAACE,WAAW,CAAC,CAAC;IAChD,IAAI,CAACC,cAAc,CAACH,QAAQ,EAAEE,WAAW,CAAC;IAC1C,IAAI;MACF,OAAO,MAAM/C,WAAW,CAACiD,KAAK,CAACF,WAAW,EAAE,IAAI,CAACG,WAAW,CAAC;IAC/D,CAAC,CAAC,MAAM;MACN,MAAM,IAAI,CAACE,WAAW,CAACL,WAAW,CAAC;IACrC;EACF;EAMAH,kBAAkBA,CAChBvB,aAA4C,EAC5CC,gBAA0C,EAClC;IACR,MAAMwC,OAA+C,GAAG;MACtDlC,OAAO,EAAE,IAAI,CAACP,aAAa,CAACO,OAAO;MACnC,GAAGP;IACL,CAAC;IACD,OAAO,IAAI,CAAC0C,UAAU,CAAC,iBAAiB,EAAED,OAAO,EAAExC,gBAAgB,CAAC;EACtE;EAGA6B,SAASA,CACP9B,aAAkC,EAClCC,gBAA0C,EAClC;IACRD,aAAa,GAAG,IAAI,CAAC2C,oBAAoB,CAAC3C,aAAa,CAAC;IACxD,MAAMyC,OAAsC,GAAG;MAC7ClC,OAAO,EAAE,IAAI,CAACP,aAAa,CAACO,OAAO;MACnCE,MAAM,EAAE,IAAI,CAACT,aAAa,CAACS,MAAM;MACjCE,WAAW,EAAE,IAAI,CAACX,aAAa,CAACW,WAAW;MAC3CC,IAAI,EAAE,IAAI,CAACZ,aAAa,CAACY,IAAI;MAC7BC,SAAS,EAAE,IAAI,CAACb,aAAa,CAACa,SAAS;MACvCV,MAAM,EAAE,IAAI,CAACH,aAAa,CAACG,MAAM;MACjCG,MAAM,EAAE,IAAI,CAACN,aAAa,CAACM,MAAM;MACjCE,GAAG,EAAE,IAAI,CAACR,aAAa,CAACQ,GAAG;MAI3B,GAAGR;IACL,CAAC;IACD,OAAO,IAAI,CAAC0C,UAAU,CAAC,QAAQ,EAAED,OAAO,EAAExC,gBAAgB,CAAC;EAC7D;EAGAgC,iBAAiBA,CACfjC,aAA0C,EAC1CC,gBAA0C,EAClC;IACRD,aAAa,GAAG,IAAI,CAAC2C,oBAAoB,CAAC3C,aAAa,CAAC;IACxD,MAAMyC,OAA8C,GAAG;MACrDlC,OAAO,EAAE,IAAI,CAACP,aAAa,CAACO,OAAO;MAGnCG,WAAW,EAAE,IAAI,CAACV,aAAa,CAACU,WAAW;MAC3CP,MAAM,EAAE,IAAI,CAACH,aAAa,CAACG,MAAM;MACjCE,YAAY,EAAE,IAAI,CAACL,aAAa,CAACK,YAAY;MAC7CC,MAAM,EAAE,IAAI,CAACN,aAAa,CAACM,MAAM;MACjCE,GAAG,EAAE,IAAI,CAACR,aAAa,CAACQ,GAAG;MAM3B,GAAGR;IACL,CAAC;IACD,OAAO,IAAI,CAAC0C,UAAU,CAAC,gBAAgB,EAAED,OAAO,EAAExC,gBAAgB,CAAC;EACrE;EAGAqC,gBAAgBA,CACdtC,aAAyC,EACzCC,gBAA0C,EAClC;IACR,MAAMwC,OAA6C,GAAG;MACpDlC,OAAO,EAAE,IAAI,CAACP,aAAa,CAACO,OAAO;MACnC,GAAGP;IACL,CAAC;IACD,OAAO,IAAI,CAAC0C,UAAU,CAAC,eAAe,EAAED,OAAO,EAAExC,gBAAgB,CAAC;EACpE;EAEAuC,mBAAmBA,CACjBxC,aAA4C,EAC5CC,gBAA0C,EAClC;IACR,MAAMwC,OAAgD,GAAG;MACvDlC,OAAO,EAAE,IAAI,CAACP,aAAa,CAACO,OAAO;MAEnC,GAAGP;IACL,CAAC;IACD,OAAO,IAAI,CAAC0C,UAAU,CAAC,kBAAkB,EAAED,OAAO,EAAExC,gBAAgB,CAAC;EACvE;EAIA2C,YAAYA,CAACvD,GAAW,EAAsD;IAC5E,MAAM,CAACwD,OAAO,EAAEC,MAAM,CAAC,GAAGzD,GAAG,CAAC0D,KAAK,CAAC,GAAG,CAAC;IACxC,MAAMC,YAAY,GAAGF,MAAM,CAACC,KAAK,CAAC,GAAG,CAAC;IAEtC,MAAM7B,UAAmC,GAAG,CAAC,CAAC;IAC9C,KAAK,MAAM+B,SAAS,IAAID,YAAY,EAAE;MACpC,MAAM,CAACE,GAAG,EAAEC,KAAK,CAAC,GAAGF,SAAS,CAACF,KAAK,CAAC,GAAG,CAAC;MACzC7B,UAAU,CAACgC,GAAG,CAAC,GAAGC,KAAK;IACzB;IAEA,OAAO;MAAC9D,GAAG,EAAEwD,OAAO;MAAE3B;IAAU,CAAC;EACnC;EAOUwB,UAAUA,CAClBU,OAAe,EACfpD,aAAoE,EACpEC,gBAA0C,EAClC;IACR,IAAIZ,GAAG,GAAG,IAAI,CAACA,GAAG;IAClB,IAAIgE,KAAK,GAAG,IAAI;IAGhB,MAAMC,aAAa,GAAG;MACpBC,OAAO,EAAE,KAAK;MACdhD,OAAO,EAAEP,aAAa,CAACO,OAAO;MAC9B6C,OAAO;MACP,GAAGpD,aAAa;MAChB,GAAG,IAAI,CAACC,gBAAgB;MACxB,GAAGA;IACL,CAAC;IAGD,MAAMuD,iBAAiB,GAAG,CAAC,aAAa,EAAE,MAAM,EAAE,WAAW,CAAC;IAC9D,KAAK,MAAM,CAACN,GAAG,EAAEC,KAAK,CAAC,IAAIM,MAAM,CAACC,OAAO,CAACJ,aAAa,CAAC,EAAE;MAExD,IAAI,CAACE,iBAAiB,CAACjE,QAAQ,CAAC2D,GAAG,CAAC,IAAIC,KAAK,EAAE;QAC7C9D,GAAG,IAAIgE,KAAK,GAAG,GAAG,GAAG,GAAG;QACxBA,KAAK,GAAG,KAAK;QACbhE,GAAG,IAAI,IAAI,CAACsE,gBAAgB,CAACT,GAAG,EAAEC,KAAK,EAAEnD,aAAa,CAAC;MACzD;IACF;IAEA,OAAO4D,SAAS,CAACvE,GAAG,CAAC;EACvB;EAEAsD,oBAAoBA,CAClB3C,aAA0B,EACb;IACb,MAAM6D,aAAa,GAAG;MAAC,GAAG7D;IAAa,CAAC;IACxC,IAAI6D,aAAa,CAACC,GAAG,EAAE;MACrBD,aAAa,CAACrD,GAAG,GAAGqD,aAAa,CAACrD,GAAG,IAAIqD,aAAa,CAACC,GAAG;MAC1D,OAAOD,aAAa,CAACC,GAAG;IAC1B;IACA,OAAOD,aAAa;EACtB;EAGAF,gBAAgBA,CAACT,GAAW,EAAEC,KAAc,EAAEnD,aAA4B,EAAU;IAElF,QAAQkD,GAAG;MACT,KAAK,KAAK;QAER,IAAIlD,aAAa,CAACO,OAAO,KAAK,OAAO,EAAE;UACrC2C,GAAG,GAAG,KAAK;QACb,CAAC,MAAM,IAAI,IAAI,CAACpD,eAAe,IAAIqD,KAAK,KAAK,WAAW,EAAE;UAGxDA,KAAK,GAAG,QAAQ;QAClB;QACA;MAEF,KAAK,KAAK;QAER,IAAInD,aAAa,CAACO,OAAO,KAAK,OAAO,EAAE;UACrC2C,GAAG,GAAG,KAAK;QACb;QACA;MAEF,KAAK,MAAM;QAET,MAAM7B,IAAI,GAAG,IAAI,CAAC0C,gBAAgB,CAACZ,KAAK,EAAEnD,aAAa,CAAC;QACxD,IAAIqB,IAAI,EAAE;UACR8B,KAAK,GAAG9B,IAAI;QACd;QACA;MAEF;IAEF;IAEA6B,GAAG,GAAGA,GAAG,CAACc,WAAW,CAAC,CAAC;IAEvB,OAAOC,KAAK,CAACC,OAAO,CAACf,KAAK,CAAC,GACtB,GAAED,GAAI,IAAGC,KAAK,CAACgB,IAAI,CAAC,GAAG,CAAE,EAAC,GAC1B,GAAEjB,GAAI,IAAGC,KAAK,GAAGiB,MAAM,CAACjB,KAAK,CAAC,GAAG,EAAG,EAAC;EAC5C;EAGAY,gBAAgBA,CACdM,SAAkB,EAClBrE,aAA4B,EACa;IAEzC,IAAI,CAACiE,KAAK,CAACC,OAAO,CAACG,SAAS,CAAC,IAAIA,SAAS,CAACC,MAAM,KAAK,CAAC,EAAE;MACvD,OAAO,IAAI;IACb;IAEA,MAAMC,eAAe,GAEnBvE,aAAa,CAACO,OAAO,KAAK,OAAO,IAEjC,IAAI,CAACR,OAAO,CAACR,QAAQ,CAACS,aAAa,CAACQ,GAAG,IAAI,EAAE,CAAC,IAE9C,EAAE,IAAI,CAACV,eAAe,IAAIE,aAAa,CAACQ,GAAG,KAAK,WAAW,CAAC;IAE9D,MAAMa,IAAI,GAAGgD,SAA6C;IAC1D,OAAOE,eAAe,GAAG,CAAClD,IAAI,CAAC,CAAC,CAAC,EAAEA,IAAI,CAAC,CAAC,CAAC,EAAEA,IAAI,CAAC,CAAC,CAAC,EAAEA,IAAI,CAAC,CAAC,CAAC,CAAC,GAAGA,IAAI;EACtE;EAGA,MAAgBmD,iBAAiBA,CAACnF,GAAW,EAAwB;IACnE,MAAMmC,QAAQ,GAAG,MAAM,IAAI,CAACC,KAAK,CAACpC,GAAG,CAAC;IACtC,MAAMqC,WAAW,GAAG,MAAMF,QAAQ,CAACE,WAAW,CAAC,CAAC;IAChD,IAAI,CAACC,cAAc,CAACH,QAAQ,EAAEE,WAAW,CAAC;IAC1C,OAAOA,WAAW;EACpB;EAGUC,cAAcA,CAACH,QAAkB,EAAEE,WAAwB,EAAQ;IAC3E,MAAM+C,WAAW,GAAGjD,QAAQ,CAACkD,OAAO,CAAC,cAAc,CAAC;IACpD,IAAI,CAAClD,QAAQ,CAACmD,EAAE,IAAI1F,cAAc,CAAC2F,SAAS,CAACrF,QAAQ,CAACkF,WAAW,CAAC,EAAE;MAAA,IAAAI,qBAAA;MAElE,MAAMhD,WAAW,GAAGjD,kBAAkB,CAAmB,IAAI,CAACiD,WAAW,EAAE;QACzEiD,GAAG,EAAE;UAACC,YAAY,EAAE;QAAI;MAC1B,CAAC,CAAC;MACF,MAAMC,KAAK,IAAAH,qBAAA,GAAG5F,cAAc,CAACgG,SAAS,cAAAJ,qBAAA,uBAAxBA,qBAAA,CAAAK,IAAA,CAAAjG,cAAc,EAAayC,WAAW,EAAEG,WAAW,CAAC;MAClE,MAAM,IAAIsD,KAAK,CAACH,KAAK,CAAC;IACxB;EACF;EAGUjD,WAAWA,CAACL,WAAwB,EAAS;IAAA,IAAA0D,sBAAA;IACrD,MAAMJ,KAAK,IAAAI,sBAAA,GAAGnG,cAAc,CAACgG,SAAS,cAAAG,sBAAA,uBAAxBA,sBAAA,CAAAF,IAAA,CAAAjG,cAAc,EAAayC,WAAW,EAAE,IAAI,CAACG,WAAW,CAAC;IACvE,OAAO,IAAIsD,KAAK,CAACH,KAAK,CAAC;EACzB;AACF"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@loaders.gl/wms",
-  "version": "4.0.4",
+  "version": "4.0.5",
   "description": "Framework-independent loaders for the WMS (Web Map Service) standard",
   "license": "MIT",
   "type": "module",
@@ -51,12 +51,12 @@
   },
   "dependencies": {
     "@babel/runtime": "^7.3.1",
-    "@loaders.gl/images": "4.0.4",
-    "@loaders.gl/loader-utils": "4.0.4",
-    "@loaders.gl/schema": "4.0.4",
-    "@loaders.gl/xml": "4.0.4",
+    "@loaders.gl/images": "4.0.5",
+    "@loaders.gl/loader-utils": "4.0.5",
+    "@loaders.gl/schema": "4.0.5",
+    "@loaders.gl/xml": "4.0.5",
     "@turf/rewind": "^5.1.5",
     "deep-strict-equal": "^0.2.0"
   },
-  "gitHead": "4dc810fa04bb400f4aedfef98a83c7ef882ed3d7"
+  "gitHead": "9cc48b95bdad8842ebfd9a19f487c534f32526e9"
 }

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

@@ -234,8 +234,13 @@ export class WMSSource extends ImageSource<WMSSourceProps> {
   }
 
   async getImage(parameters: GetImageParameters): Promise<ImageType> {
-    // @ts-expect-error
-    return await this.getMap(parameters);
+    // Replace the GetImage `boundingBox` parameter with the WMS flat `bbox` parameter.
+    const {boundingBox, ...rest} = parameters;
+    const wmsParameters: WMSGetMapParameters = {
+      bbox: [...boundingBox[0], ...boundingBox[1]],
+      ...rest
+    };
+    return await this.getMap(wmsParameters);
   }
 
   normalizeMetadata(capabilities: WMSCapabilities): ImageSourceMetadata {
@@ -498,16 +503,6 @@ export class WMSSource extends ImageSource<WMSSourceProps> {
         }
         break;
 
-      case 'boundingBox':
-        // Coordinate order is flipped for certain CRS in WMS 1.3.0
-        const boundingBox = value as [[number, number], [number, number]];
-        let bbox2: number[] | null = [...boundingBox[0], ...boundingBox[1]];
-        bbox2 = this._flipBoundingBox(boundingBox, wmsParameters);
-        if (bbox2) {
-          value = bbox2;
-        }
-        break;
-
       case 'bbox':
         // Coordinate order is flipped for certain CRS in WMS 1.3.0
         const bbox = this._flipBoundingBox(value, wmsParameters);