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

package/dist/esm/lib/services/arcgis/arcgis-server.js

@@ -1,5 +1,3 @@
-
-
 export async function getArcGISServices(url) {
   let fetchFile = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : fetch;
   if (url.includes('rest/services')) {

package/dist/esm/lib/services/arcgis/arcgis-server.js.map

@@ -1 +1 @@
-{"version":3,"file":"arcgis-server.js","names":["getArcGISServices","url","fetchFile","fetch","includes","serverUrl","replace","loadServiceDirectory","path","serviceUrl","join","response","directory","json","services","extractServices","folders","promises","map","folder","folderServices","Promise","all","push","arcgisServices","service","name","type","toLocaleLowerCase"],"sources":["../../../../../src/lib/services/arcgis/arcgis-server.ts"],"sourcesContent":["// loaders.gl, MIT license\n\nexport type Service = {name: string; type: string; url: string};\n\ntype FetchLike = typeof fetch;\n\n/**\n * (Recursively) load the service directory from an ArcGIS Server URL\n * @param url\n * @param fetchFile= Optional fetch function override\n * @returns\n */\nexport async function getArcGISServices(\n  url: string,\n  fetchFile: FetchLike = fetch\n): Promise<Service[] | null> {\n  if (url.includes('rest/services')) {\n    const serverUrl = url.replace(/rest\\/services.*$/i, 'rest/services');\n    return loadServiceDirectory(serverUrl, fetchFile, []);\n  }\n  return null;\n}\n\nasync function loadServiceDirectory(\n  serverUrl: string,\n  fetch: FetchLike,\n  path: string[]\n): Promise<Service[]> {\n  const serviceUrl = `${serverUrl}/${path.join('/')}`;\n\n  const response = await fetch(`${serviceUrl}?f=pjson`);\n  const directory = await response.json();\n\n  const services = extractServices(directory, serviceUrl);\n\n  const folders = (directory.folders || []) as string[];\n  const promises = folders.map((folder) =>\n    loadServiceDirectory(`${serverUrl}`, fetch, [...path, folder])\n  );\n\n  for (const folderServices of await Promise.all(promises)) {\n    services.push(...folderServices);\n  }\n\n  return services;\n}\n\nfunction extractServices(directory: unknown, url: string): Service[] {\n  const arcgisServices = ((directory as any).services || []) as {name: string; type: string}[];\n  const services: Service[] = [];\n  for (const service of arcgisServices) {\n    services.push({\n      name: service.name,\n      type: `arcgis-${service.type.toLocaleLowerCase().replace('server', '-server')}`,\n      url: `${url}${service.name}/${service.type}`\n    });\n  }\n  return services;\n}\n"],"mappings":";;AAYA,OAAO,eAAeA,iBAAiB,CACrCC,GAAW,EAEgB;EAAA,IAD3BC,SAAoB,uEAAGC,KAAK;EAE5B,IAAIF,GAAG,CAACG,QAAQ,CAAC,eAAe,CAAC,EAAE;IACjC,MAAMC,SAAS,GAAGJ,GAAG,CAACK,OAAO,CAAC,oBAAoB,EAAE,eAAe,CAAC;IACpE,OAAOC,oBAAoB,CAACF,SAAS,EAAEH,SAAS,EAAE,EAAE,CAAC;EACvD;EACA,OAAO,IAAI;AACb;AAEA,eAAeK,oBAAoB,CACjCF,SAAiB,EACjBF,KAAgB,EAChBK,IAAc,EACM;EACpB,MAAMC,UAAU,aAAMJ,SAAS,cAAIG,IAAI,CAACE,IAAI,CAAC,GAAG,CAAC,CAAE;EAEnD,MAAMC,QAAQ,GAAG,MAAMR,KAAK,WAAIM,UAAU,cAAW;EACrD,MAAMG,SAAS,GAAG,MAAMD,QAAQ,CAACE,IAAI,EAAE;EAEvC,MAAMC,QAAQ,GAAGC,eAAe,CAACH,SAAS,EAAEH,UAAU,CAAC;EAEvD,MAAMO,OAAO,GAAIJ,SAAS,CAACI,OAAO,IAAI,EAAe;EACrD,MAAMC,QAAQ,GAAGD,OAAO,CAACE,GAAG,CAAEC,MAAM,IAClCZ,oBAAoB,WAAIF,SAAS,GAAIF,KAAK,EAAE,CAAC,GAAGK,IAAI,EAAEW,MAAM,CAAC,CAAC,CAC/D;EAED,KAAK,MAAMC,cAAc,IAAI,MAAMC,OAAO,CAACC,GAAG,CAACL,QAAQ,CAAC,EAAE;IACxDH,QAAQ,CAACS,IAAI,CAAC,GAAGH,cAAc,CAAC;EAClC;EAEA,OAAON,QAAQ;AACjB;AAEA,SAASC,eAAe,CAACH,SAAkB,EAAEX,GAAW,EAAa;EACnE,MAAMuB,cAAc,GAAKZ,SAAS,CAASE,QAAQ,IAAI,EAAqC;EAC5F,MAAMA,QAAmB,GAAG,EAAE;EAC9B,KAAK,MAAMW,OAAO,IAAID,cAAc,EAAE;IACpCV,QAAQ,CAACS,IAAI,CAAC;MACZG,IAAI,EAAED,OAAO,CAACC,IAAI;MAClBC,IAAI,mBAAYF,OAAO,CAACE,IAAI,CAACC,iBAAiB,EAAE,CAACtB,OAAO,CAAC,QAAQ,EAAE,SAAS,CAAC,CAAE;MAC/EL,GAAG,YAAKA,GAAG,SAAGwB,OAAO,CAACC,IAAI,cAAID,OAAO,CAACE,IAAI;IAC5C,CAAC,CAAC;EACJ;EACA,OAAOb,QAAQ;AACjB"}
+{"version":3,"file":"arcgis-server.js","names":["getArcGISServices","url","fetchFile","arguments","length","undefined","fetch","includes","serverUrl","replace","loadServiceDirectory","path","serviceUrl","concat","join","response","directory","json","services","extractServices","folders","promises","map","folder","folderServices","Promise","all","push","arcgisServices","service","name","type","toLocaleLowerCase"],"sources":["../../../../../src/lib/services/arcgis/arcgis-server.ts"],"sourcesContent":["// loaders.gl, MIT license\n\nexport type Service = {name: string; type: string; url: string};\n\ntype FetchLike = typeof fetch;\n\n/**\n * (Recursively) load the service directory from an ArcGIS Server URL\n * @param url\n * @param fetchFile= Optional fetch function override\n * @returns\n */\nexport async function getArcGISServices(\n  url: string,\n  fetchFile: FetchLike = fetch\n): Promise<Service[] | null> {\n  if (url.includes('rest/services')) {\n    const serverUrl = url.replace(/rest\\/services.*$/i, 'rest/services');\n    return loadServiceDirectory(serverUrl, fetchFile, []);\n  }\n  return null;\n}\n\nasync function loadServiceDirectory(\n  serverUrl: string,\n  fetch: FetchLike,\n  path: string[]\n): Promise<Service[]> {\n  const serviceUrl = `${serverUrl}/${path.join('/')}`;\n\n  const response = await fetch(`${serviceUrl}?f=pjson`);\n  const directory = await response.json();\n\n  const services = extractServices(directory, serviceUrl);\n\n  const folders = (directory.folders || []) as string[];\n  const promises = folders.map((folder) =>\n    loadServiceDirectory(`${serverUrl}`, fetch, [...path, folder])\n  );\n\n  for (const folderServices of await Promise.all(promises)) {\n    services.push(...folderServices);\n  }\n\n  return services;\n}\n\nfunction extractServices(directory: unknown, url: string): Service[] {\n  const arcgisServices = ((directory as any).services || []) as {name: string; type: string}[];\n  const services: Service[] = [];\n  for (const service of arcgisServices) {\n    services.push({\n      name: service.name,\n      type: `arcgis-${service.type.toLocaleLowerCase().replace('server', '-server')}`,\n      url: `${url}${service.name}/${service.type}`\n    });\n  }\n  return services;\n}\n"],"mappings":"AAYA,OAAO,eAAeA,iBAAiBA,CACrCC,GAAW,EAEgB;EAAA,IAD3BC,SAAoB,GAAAC,SAAA,CAAAC,MAAA,QAAAD,SAAA,QAAAE,SAAA,GAAAF,SAAA,MAAGG,KAAK;EAE5B,IAAIL,GAAG,CAACM,QAAQ,CAAC,eAAe,CAAC,EAAE;IACjC,MAAMC,SAAS,GAAGP,GAAG,CAACQ,OAAO,CAAC,oBAAoB,EAAE,eAAe,CAAC;IACpE,OAAOC,oBAAoB,CAACF,SAAS,EAAEN,SAAS,EAAE,EAAE,CAAC;EACvD;EACA,OAAO,IAAI;AACb;AAEA,eAAeQ,oBAAoBA,CACjCF,SAAiB,EACjBF,KAAgB,EAChBK,IAAc,EACM;EACpB,MAAMC,UAAU,MAAAC,MAAA,CAAML,SAAS,OAAAK,MAAA,CAAIF,IAAI,CAACG,IAAI,CAAC,GAAG,CAAC,CAAE;EAEnD,MAAMC,QAAQ,GAAG,MAAMT,KAAK,IAAAO,MAAA,CAAID,UAAU,aAAU,CAAC;EACrD,MAAMI,SAAS,GAAG,MAAMD,QAAQ,CAACE,IAAI,CAAC,CAAC;EAEvC,MAAMC,QAAQ,GAAGC,eAAe,CAACH,SAAS,EAAEJ,UAAU,CAAC;EAEvD,MAAMQ,OAAO,GAAIJ,SAAS,CAACI,OAAO,IAAI,EAAe;EACrD,MAAMC,QAAQ,GAAGD,OAAO,CAACE,GAAG,CAAEC,MAAM,IAClCb,oBAAoB,IAAAG,MAAA,CAAIL,SAAS,GAAIF,KAAK,EAAE,CAAC,GAAGK,IAAI,EAAEY,MAAM,CAAC,CAC/D,CAAC;EAED,KAAK,MAAMC,cAAc,IAAI,MAAMC,OAAO,CAACC,GAAG,CAACL,QAAQ,CAAC,EAAE;IACxDH,QAAQ,CAACS,IAAI,CAAC,GAAGH,cAAc,CAAC;EAClC;EAEA,OAAON,QAAQ;AACjB;AAEA,SAASC,eAAeA,CAACH,SAAkB,EAAEf,GAAW,EAAa;EACnE,MAAM2B,cAAc,GAAKZ,SAAS,CAASE,QAAQ,IAAI,EAAqC;EAC5F,MAAMA,QAAmB,GAAG,EAAE;EAC9B,KAAK,MAAMW,OAAO,IAAID,cAAc,EAAE;IACpCV,QAAQ,CAACS,IAAI,CAAC;MACZG,IAAI,EAAED,OAAO,CAACC,IAAI;MAClBC,IAAI,YAAAlB,MAAA,CAAYgB,OAAO,CAACE,IAAI,CAACC,iBAAiB,CAAC,CAAC,CAACvB,OAAO,CAAC,QAAQ,EAAE,SAAS,CAAC,CAAE;MAC/ER,GAAG,KAAAY,MAAA,CAAKZ,GAAG,EAAAY,MAAA,CAAGgB,OAAO,CAACC,IAAI,OAAAjB,MAAA,CAAIgB,OAAO,CAACE,IAAI;IAC5C,CAAC,CAAC;EACJ;EACA,OAAOb,QAAQ;AACjB"}

package/dist/esm/lib/services/generic/image-service.js

@@ -1,15 +1,10 @@
 import _defineProperty from "@babel/runtime/helpers/esm/defineProperty";
-
 import { ImageLoader } from '@loaders.gl/images';
 import { ImageSource } from '../../sources/image-source';
-
 export class ImageService extends ImageSource {
   constructor(props) {
     super(props);
-    _defineProperty(this, "props", void 0);
-    this.props = props;
   }
-
   async getMetadata() {
     throw new Error('ImageSource.getMetadata not implemented');
   }
@@ -20,7 +15,6 @@ export class ImageService extends ImageSource {
     const arrayBuffer = await response.arrayBuffer();
     return await ImageLoader.parse(arrayBuffer);
   }
-
   getGranularParameters(parameters) {
     const [east, north, west, south] = parameters.bbox;
     return {
@@ -31,7 +25,6 @@ export class ImageService extends ImageSource {
       west
     };
   }
-
   getURLFromTemplate(parameters) {
     let url = this.props.url;
     for (const [key, value] of Object.entries(parameters)) {

package/dist/esm/lib/services/generic/image-service.js.map

@@ -1 +1 @@
-{"version":3,"file":"image-service.js","names":["ImageLoader","ImageSource","ImageService","constructor","props","getMetadata","Error","getImage","parameters","granularParameters","getGranularParameters","url","getURLFromTemplate","response","fetch","arrayBuffer","parse","east","north","west","south","bbox","key","value","Object","entries","replace","String","toLowerCase","includes"],"sources":["../../../../../src/lib/services/generic/image-service.ts"],"sourcesContent":["// loaders.gl, MIT license\n\nimport {LoaderOptions} from '@loaders.gl/loader-utils';\nimport type {ImageType} from '@loaders.gl/images';\nimport {ImageLoader} from '@loaders.gl/images';\n\nimport type {ImageSourceMetadata, GetImageParameters} from '../../sources/image-source';\nimport {ImageSource} from '../../sources/image-source';\n\n/** Template URL string should contain `${width}` etc which will be substituted. */\nexport type ImageServiceProps = {\n  /** Base URL to the service */\n  url: string;\n  /** Any load options to the loaders.gl Loaders used by the WMSService methods */\n  loadOptions?: LoaderOptions;\n};\n\n/**\n * Quickly connect to \"ad hoc\" image sources without subclassing ImageSource.\n * ImageSource allows template url strings to be used to ad hoc connect to arbitrary image data sources\n * Accepts a template url string and builds requests URLs\n */\nexport class ImageService extends ImageSource {\n  static type: 'template' = 'template';\n  static testURL = (url: string): boolean => url.toLowerCase().includes('{');\n\n  props: ImageServiceProps;\n\n  constructor(props: ImageServiceProps) {\n    super(props);\n    this.props = props;\n  }\n\n  // IMAGE SOURCE API\n\n  async getMetadata(): Promise<ImageSourceMetadata> {\n    throw new Error('ImageSource.getMetadata not implemented');\n  }\n\n  async getImage(parameters: GetImageParameters): Promise<ImageType> {\n    const granularParameters = this.getGranularParameters(parameters);\n    const url = this.getURLFromTemplate(granularParameters);\n    const response = await this.fetch(url);\n    const arrayBuffer = await response.arrayBuffer();\n    return await ImageLoader.parse(arrayBuffer);\n  }\n\n  // HELPERS\n\n  /** Break up bounding box in east, north, south, west */\n  protected getGranularParameters(parameters: GetImageParameters): Record<string, unknown> {\n    const [east, north, west, south] = parameters.bbox;\n    return {...parameters, east, north, south, west};\n  }\n\n  /** Supports both ${} and {} notations */\n  protected getURLFromTemplate(parameters: Record<string, unknown>): string {\n    let url = this.props.url;\n    for (const [key, value] of Object.entries(parameters)) {\n      // TODO - parameter could be repeated\n      // const regex = new RegExp(`\\${${key}}`, 'g');\n      url = url.replace(`\\${${key}}`, String(value));\n      url = url.replace(`{${key}}`, String(value));\n    }\n    return url;\n  }\n}\n"],"mappings":";;AAIA,SAAQA,WAAW,QAAO,oBAAoB;AAG9C,SAAQC,WAAW,QAAO,4BAA4B;;AAetD,OAAO,MAAMC,YAAY,SAASD,WAAW,CAAC;EAM5CE,WAAW,CAACC,KAAwB,EAAE;IACpC,KAAK,CAACA,KAAK,CAAC;IAAC;IACb,IAAI,CAACA,KAAK,GAAGA,KAAK;EACpB;;EAIA,MAAMC,WAAW,GAAiC;IAChD,MAAM,IAAIC,KAAK,CAAC,yCAAyC,CAAC;EAC5D;EAEA,MAAMC,QAAQ,CAACC,UAA8B,EAAsB;IACjE,MAAMC,kBAAkB,GAAG,IAAI,CAACC,qBAAqB,CAACF,UAAU,CAAC;IACjE,MAAMG,GAAG,GAAG,IAAI,CAACC,kBAAkB,CAACH,kBAAkB,CAAC;IACvD,MAAMI,QAAQ,GAAG,MAAM,IAAI,CAACC,KAAK,CAACH,GAAG,CAAC;IACtC,MAAMI,WAAW,GAAG,MAAMF,QAAQ,CAACE,WAAW,EAAE;IAChD,OAAO,MAAMf,WAAW,CAACgB,KAAK,CAACD,WAAW,CAAC;EAC7C;;EAKUL,qBAAqB,CAACF,UAA8B,EAA2B;IACvF,MAAM,CAACS,IAAI,EAAEC,KAAK,EAAEC,IAAI,EAAEC,KAAK,CAAC,GAAGZ,UAAU,CAACa,IAAI;IAClD,OAAO;MAAC,GAAGb,UAAU;MAAES,IAAI;MAAEC,KAAK;MAAEE,KAAK;MAAED;IAAI,CAAC;EAClD;;EAGUP,kBAAkB,CAACJ,UAAmC,EAAU;IACxE,IAAIG,GAAG,GAAG,IAAI,CAACP,KAAK,CAACO,GAAG;IACxB,KAAK,MAAM,CAACW,GAAG,EAAEC,KAAK,CAAC,IAAIC,MAAM,CAACC,OAAO,CAACjB,UAAU,CAAC,EAAE;MAGrDG,GAAG,GAAGA,GAAG,CAACe,OAAO,aAAOJ,GAAG,QAAKK,MAAM,CAACJ,KAAK,CAAC,CAAC;MAC9CZ,GAAG,GAAGA,GAAG,CAACe,OAAO,YAAKJ,GAAG,QAAKK,MAAM,CAACJ,KAAK,CAAC,CAAC;IAC9C;IACA,OAAOZ,GAAG;EACZ;AACF;AAAC,gBA5CYT,YAAY,UACG,UAAU;AAAA,gBADzBA,YAAY,aAELS,GAAW,IAAcA,GAAG,CAACiB,WAAW,EAAE,CAACC,QAAQ,CAAC,GAAG,CAAC"}
+{"version":3,"file":"image-service.js","names":["ImageLoader","ImageSource","ImageService","constructor","props","getMetadata","Error","getImage","parameters","granularParameters","getGranularParameters","url","getURLFromTemplate","response","fetch","arrayBuffer","parse","east","north","west","south","bbox","key","value","Object","entries","replace","concat","String","_defineProperty","toLowerCase","includes"],"sources":["../../../../../src/lib/services/generic/image-service.ts"],"sourcesContent":["// loaders.gl, MIT license\n\nimport {LoaderOptions} from '@loaders.gl/loader-utils';\nimport type {ImageType} from '@loaders.gl/images';\nimport {ImageLoader} from '@loaders.gl/images';\n\nimport type {ImageSourceMetadata, GetImageParameters} from '../../sources/image-source';\nimport {ImageSource} from '../../sources/image-source';\n\n/** Template URL string should contain `${width}` etc which will be substituted. */\nexport type ImageServiceProps = {\n  /** Base URL to the service */\n  url: string;\n  /** Any load options to the loaders.gl Loaders used by the WMSService methods */\n  loadOptions?: LoaderOptions;\n};\n\n/**\n * Quickly connect to \"ad hoc\" image sources without subclassing ImageSource.\n * ImageSource allows template url strings to be used to ad hoc connect to arbitrary image data sources\n * Accepts a template url string and builds requests URLs\n */\nexport class ImageService<PropsT extends ImageServiceProps> extends ImageSource<PropsT> {\n  static type: 'template' = 'template';\n  static testURL = (url: string): boolean => url.toLowerCase().includes('{');\n\n  constructor(props: PropsT) {\n    super(props);\n  }\n\n  // IMAGE SOURCE API\n\n  async getMetadata(): Promise<ImageSourceMetadata> {\n    throw new Error('ImageSource.getMetadata not implemented');\n  }\n\n  async getImage(parameters: GetImageParameters): Promise<ImageType> {\n    const granularParameters = this.getGranularParameters(parameters);\n    const url = this.getURLFromTemplate(granularParameters);\n    const response = await this.fetch(url);\n    const arrayBuffer = await response.arrayBuffer();\n    return await ImageLoader.parse(arrayBuffer);\n  }\n\n  // HELPERS\n\n  /** Break up bounding box in east, north, south, west */\n  protected getGranularParameters(parameters: GetImageParameters): Record<string, unknown> {\n    const [east, north, west, south] = parameters.bbox;\n    return {...parameters, east, north, south, west};\n  }\n\n  /** Supports both ${} and {} notations */\n  protected getURLFromTemplate(parameters: Record<string, unknown>): string {\n    let url = this.props.url;\n    for (const [key, value] of Object.entries(parameters)) {\n      // TODO - parameter could be repeated\n      // const regex = new RegExp(`\\${${key}}`, 'g');\n      url = url.replace(`\\${${key}}`, String(value));\n      url = url.replace(`{${key}}`, String(value));\n    }\n    return url;\n  }\n}\n"],"mappings":";AAIA,SAAQA,WAAW,QAAO,oBAAoB;AAG9C,SAAQC,WAAW,QAAO,4BAA4B;AAetD,OAAO,MAAMC,YAAY,SAA2CD,WAAW,CAAS;EAItFE,WAAWA,CAACC,KAAa,EAAE;IACzB,KAAK,CAACA,KAAK,CAAC;EACd;EAIA,MAAMC,WAAWA,CAAA,EAAiC;IAChD,MAAM,IAAIC,KAAK,CAAC,yCAAyC,CAAC;EAC5D;EAEA,MAAMC,QAAQA,CAACC,UAA8B,EAAsB;IACjE,MAAMC,kBAAkB,GAAG,IAAI,CAACC,qBAAqB,CAACF,UAAU,CAAC;IACjE,MAAMG,GAAG,GAAG,IAAI,CAACC,kBAAkB,CAACH,kBAAkB,CAAC;IACvD,MAAMI,QAAQ,GAAG,MAAM,IAAI,CAACC,KAAK,CAACH,GAAG,CAAC;IACtC,MAAMI,WAAW,GAAG,MAAMF,QAAQ,CAACE,WAAW,CAAC,CAAC;IAChD,OAAO,MAAMf,WAAW,CAACgB,KAAK,CAACD,WAAW,CAAC;EAC7C;EAKUL,qBAAqBA,CAACF,UAA8B,EAA2B;IACvF,MAAM,CAACS,IAAI,EAAEC,KAAK,EAAEC,IAAI,EAAEC,KAAK,CAAC,GAAGZ,UAAU,CAACa,IAAI;IAClD,OAAO;MAAC,GAAGb,UAAU;MAAES,IAAI;MAAEC,KAAK;MAAEE,KAAK;MAAED;IAAI,CAAC;EAClD;EAGUP,kBAAkBA,CAACJ,UAAmC,EAAU;IACxE,IAAIG,GAAG,GAAG,IAAI,CAACP,KAAK,CAACO,GAAG;IACxB,KAAK,MAAM,CAACW,GAAG,EAAEC,KAAK,CAAC,IAAIC,MAAM,CAACC,OAAO,CAACjB,UAAU,CAAC,EAAE;MAGrDG,GAAG,GAAGA,GAAG,CAACe,OAAO,MAAAC,MAAA,CAAOL,GAAG,QAAKM,MAAM,CAACL,KAAK,CAAC,CAAC;MAC9CZ,GAAG,GAAGA,GAAG,CAACe,OAAO,KAAAC,MAAA,CAAKL,GAAG,QAAKM,MAAM,CAACL,KAAK,CAAC,CAAC;IAC9C;IACA,OAAOZ,GAAG;EACZ;AACF;AAACkB,eAAA,CAzCY3B,YAAY,UACG,UAAU;AAAA2B,eAAA,CADzB3B,YAAY,aAELS,GAAW,IAAcA,GAAG,CAACmB,WAAW,CAAC,CAAC,CAACC,QAAQ,CAAC,GAAG,CAAC"}

package/dist/esm/lib/services/ogc/csw-service.js

@@ -1,18 +1,14 @@
 import _defineProperty from "@babel/runtime/helpers/esm/defineProperty";
-
 import { DataSource } from '../../sources/data-source';
 import { CSWCapabilitiesLoader } from '../../../csw-capabilities-loader';
 import { CSWRecordsLoader } from '../../../csw-records-loader';
 import { CSWDomainLoader } from '../../../csw-domain-loader';
 import { WMSErrorLoader as CSWErrorLoader } from '../../../wms-error-loader';
 export class CSWService extends DataSource {
-
   constructor(props) {
     super(props);
-    _defineProperty(this, "props", void 0);
     _defineProperty(this, "capabilities", null);
     _defineProperty(this, "loaders", [CSWErrorLoader, CSWCapabilitiesLoader]);
-    this.props = props;
   }
   async getMetadata() {
     const capabilities = await this.getCapabilities();
@@ -69,7 +65,6 @@ export class CSWService extends DataSource {
       params: parts[1] || ''
     };
   }
-
   async getCapabilities(wmsParameters, vendorParameters) {
     const url = this.getCapabilitiesURL(wmsParameters, vendorParameters);
     const response = await this.fetch(url);
@@ -78,7 +73,6 @@ export class CSWService extends DataSource {
     const capabilities = await CSWCapabilitiesLoader.parse(arrayBuffer, this.props.loadOptions);
     return capabilities;
   }
-
   async getRecords(wmsParameters, vendorParameters) {
     const url = this.getRecordsURL(wmsParameters, vendorParameters);
     const response = await this.fetch(url);
@@ -86,7 +80,6 @@ export class CSWService extends DataSource {
     this._checkResponse(response, arrayBuffer);
     return await CSWRecordsLoader.parse(arrayBuffer, this.props.loadOptions);
   }
-
   async getDomain(wmsParameters, vendorParameters) {
     const url = this.getDomainURL(wmsParameters, vendorParameters);
     const response = await this.fetch(url);
@@ -94,7 +87,6 @@ export class CSWService extends DataSource {
     this._checkResponse(response, arrayBuffer);
     return await CSWDomainLoader.parse(arrayBuffer, this.props.loadOptions);
   }
-
   getCapabilitiesURL(wmsParameters, vendorParameters) {
     const options = {
       version: '3.0.0',
@@ -105,7 +97,6 @@ export class CSWService extends DataSource {
     };
     return this._getCSWUrl(options, vendorParameters);
   }
-
   getRecordsURL(wmsParameters, vendorParameters) {
     const options = {
       version: '3.0.0',
@@ -117,7 +108,6 @@ export class CSWService extends DataSource {
     };
     return this._getCSWUrl(options, vendorParameters);
   }
-
   getDomainURL(wmsParameters, vendorParameters) {
     const options = {
       version: '3.0.0',
@@ -128,7 +118,6 @@ export class CSWService extends DataSource {
     };
     return this._getCSWUrl(options, vendorParameters);
   }
-
   _getCSWUrl(options, vendorParameters) {
     let url = this.props.url;
     let first = true;
@@ -143,7 +132,6 @@ export class CSWService extends DataSource {
     }
     return encodeURI(url);
   }
-
   _checkResponse(response, arrayBuffer) {
     const contentType = response.headers['content-type'];
     if (!response.ok || CSWErrorLoader.mimeTypes.includes(contentType)) {
@@ -151,7 +139,6 @@ export class CSWService extends DataSource {
       throw new Error(error);
     }
   }
-
   _parseError(arrayBuffer) {
     const error = CSWErrorLoader.parseSync(arrayBuffer, this.props.loadOptions);
     return new Error(error);

package/dist/esm/lib/services/ogc/csw-service.js.map

@@ -1 +1 @@
-{"version":3,"file":"csw-service.js","names":["DataSource","CSWCapabilitiesLoader","CSWRecordsLoader","CSWDomainLoader","WMSErrorLoader","CSWErrorLoader","CSWService","constructor","props","getMetadata","capabilities","getCapabilities","normalizeMetadata","getServiceDirectory","options","services","unknownServices","records","getRecords","record","reference","references","url","value","scheme","push","name","title","type","_parseOGCUrl","includeUnknown","concat","parts","split","params","wmsParameters","vendorParameters","getCapabilitiesURL","response","fetch","arrayBuffer","_checkResponse","parse","loadOptions","getRecordsURL","getDomain","getDomainURL","version","service","request","_getCSWUrl","typenames","first","key","Object","entries","Array","isArray","toUpperCase","join","String","encodeURI","contentType","headers","ok","mimeTypes","includes","error","parseSync","Error","_parseError","toLowerCase"],"sources":["../../../../../src/lib/services/ogc/csw-service.ts"],"sourcesContent":["// loaders.gl, MIT license\n\n/* eslint-disable camelcase */\n\nimport type {DataSourceProps} from '../../sources/data-source';\nimport {DataSource} from '../../sources/data-source';\n\nimport type {CSWCapabilities} from '../../../csw-capabilities-loader';\nimport {CSWCapabilitiesLoader} from '../../../csw-capabilities-loader';\n\nimport type {CSWRecords} from '../../../csw-records-loader';\nimport {CSWRecordsLoader} from '../../../csw-records-loader';\n\nimport type {CSWDomain} from '../../../csw-domain-loader';\nimport {CSWDomainLoader} from '../../../csw-domain-loader';\n\nimport {WMSErrorLoader as CSWErrorLoader} from '../../../wms-error-loader';\n\ntype CSWCommonParameters = {\n  /** In case the endpoint supports multiple services */\n  service?: 'CSW';\n  /** In case the endpoint supports multiple CSW versions */\n  version?: '1.1.1' | '2.0.0' | '2.0.1' | '3.0.0' | '3.0.0';\n};\n\nexport type CSWGetCapabilitiesParameters = CSWCommonParameters & {\n  /** Request type */\n  request?: 'GetCapabilities';\n};\n\nexport type CSWGetRecordsParameters = CSWCommonParameters & {\n  /** Request type */\n  request?: 'GetRecords';\n  /** type of records */\n  typenames: 'csw:Record';\n};\n\nexport type CSWGetDomainParameters = CSWCommonParameters & {\n  /** Request type */\n  request?: 'GetDomain';\n  // TBA\n};\n\nexport type Service = {name: string; type: string; url: string; params?: string; scheme?: string};\n\nexport type CSWServiceProps = DataSourceProps & {\n  url: string;\n};\n\n/**\n * The CSWService class provides\n * - provides type safe methods to form URLs to a CSW service\n * - provides type safe methods to query and parse results (and errors) from a CSW service\n * - implements the ImageService interface\n * @note Only the URL parameter conversion is supported. XML posts are not supported.\n */\nexport class CSWService extends DataSource {\n  static type: 'csw' = 'csw';\n  static testURL = (url: string): boolean => url.toLowerCase().includes('csw');\n\n  props: CSWServiceProps;\n  capabilities: CSWCapabilities | null = null;\n\n  /** A list of loaders used by the CSWService methods */\n  readonly loaders = [CSWErrorLoader, CSWCapabilitiesLoader];\n\n  /** Create a CSWService */\n  constructor(props: CSWServiceProps) {\n    super(props);\n    this.props = props;\n  }\n\n  async getMetadata(): Promise<CSWCapabilities> {\n    const capabilities = await this.getCapabilities();\n    return this.normalizeMetadata(capabilities);\n  }\n\n  normalizeMetadata(capabilities: CSWCapabilities): CSWCapabilities {\n    return capabilities;\n  }\n\n  async getServiceDirectory(options: {includeUnknown?: boolean}): Promise<Service[]> {\n    const services: Service[] = [];\n    const unknownServices: Service[] = [];\n\n    const records = await this.getRecords();\n    for (const record of records.records) {\n      for (const reference of record.references) {\n        const url = reference.value;\n        switch (reference.scheme) {\n          case 'OGC:WMS':\n            services.push({name: record.title, type: 'ogc-wms-service', ...this._parseOGCUrl(url)});\n            break;\n          case 'OGC:WMTS':\n            services.push({\n              name: record.title,\n              type: 'ogc-wmts-service',\n              ...this._parseOGCUrl(url)\n            });\n            break;\n          case 'OGC:WFS':\n            services.push({name: record.title, type: 'ogc-wfs-service', ...this._parseOGCUrl(url)});\n            break;\n          default:\n            unknownServices.push({\n              name: record.title,\n              type: 'unknown',\n              url: reference.value,\n              scheme: reference.scheme\n            });\n        }\n      }\n    }\n\n    return options?.includeUnknown ? services.concat(unknownServices) : services;\n  }\n\n  _parseOGCUrl(url: string): {url: string; params: string} {\n    const parts = url.split('?');\n    return {\n      url: parts[0],\n      params: parts[1] || ''\n    };\n  }\n\n  // CSW Service API Stubs\n\n  /** Get Capabilities */\n  async getCapabilities(\n    wmsParameters?: CSWGetCapabilitiesParameters,\n    vendorParameters?: Record<string, unknown>\n  ): Promise<CSWCapabilities> {\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 CSWCapabilitiesLoader.parse(arrayBuffer, this.props.loadOptions);\n    return capabilities;\n  }\n\n  /** Get Records */\n  async getRecords(\n    wmsParameters?: CSWGetRecordsParameters,\n    vendorParameters?: Record<string, unknown>\n  ): Promise<CSWRecords> {\n    const url = this.getRecordsURL(wmsParameters, vendorParameters);\n    const response = await this.fetch(url);\n    const arrayBuffer = await response.arrayBuffer();\n    this._checkResponse(response, arrayBuffer);\n    return await CSWRecordsLoader.parse(arrayBuffer, this.props.loadOptions);\n  }\n\n  /** Get Domain */\n  async getDomain(\n    wmsParameters?: CSWGetDomainParameters,\n    vendorParameters?: Record<string, unknown>\n  ): Promise<CSWDomain> {\n    const url = this.getDomainURL(wmsParameters, vendorParameters);\n    const response = await this.fetch(url);\n    const arrayBuffer = await response.arrayBuffer();\n    this._checkResponse(response, arrayBuffer);\n    return await CSWDomainLoader.parse(arrayBuffer, this.props.loadOptions);\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?: CSWGetCapabilitiesParameters,\n    vendorParameters?: Record<string, unknown>\n  ): string {\n    const options: Required<CSWGetCapabilitiesParameters> = {\n      version: '3.0.0',\n      ...wmsParameters,\n      ...vendorParameters,\n      service: 'CSW',\n      request: 'GetCapabilities'\n    };\n    return this._getCSWUrl(options, vendorParameters);\n  }\n\n  /** Generate a URL for the GetCapabilities request */\n  getRecordsURL(\n    wmsParameters?: CSWGetRecordsParameters,\n    vendorParameters?: Record<string, unknown>\n  ): string {\n    const options: Required<CSWGetRecordsParameters> = {\n      version: '3.0.0',\n      typenames: 'csw:Record',\n      ...wmsParameters,\n      ...vendorParameters,\n      service: 'CSW',\n      request: 'GetRecords'\n    };\n    return this._getCSWUrl(options, vendorParameters);\n  }\n\n  /** Generate a URL for the GetCapabilities request */\n  getDomainURL(\n    wmsParameters?: CSWGetDomainParameters,\n    vendorParameters?: Record<string, unknown>\n  ): string {\n    const options: Required<CSWGetDomainParameters> = {\n      version: '3.0.0',\n      ...wmsParameters,\n      ...vendorParameters,\n      service: 'CSW',\n      request: 'GetDomain'\n    };\n    return this._getCSWUrl(options, vendorParameters);\n  }\n\n  // INTERNAL METHODS\n\n  /**\n   * @note case _getCSWUrl may need to be overridden to handle certain backends?\n   * */\n  protected _getCSWUrl(\n    options: Record<string, unknown>,\n    vendorParameters?: Record<string, unknown>\n  ): string {\n    let url = this.props.url;\n    let first = true;\n    for (const [key, value] of Object.entries(options)) {\n      url += first ? '?' : '&';\n      first = false;\n      if (Array.isArray(value)) {\n        url += `${key.toUpperCase()}=${value.join(',')}`;\n      } else {\n        url += `${key.toUpperCase()}=${value ? String(value) : ''}`;\n      }\n    }\n    return encodeURI(url);\n  }\n\n  /** Checks for and parses a CSW 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 || CSWErrorLoader.mimeTypes.includes(contentType)) {\n      const error = CSWErrorLoader.parseSync(arrayBuffer, this.props.loadOptions);\n      throw new Error(error);\n    }\n  }\n\n  /** Error situation detected */\n  protected _parseError(arrayBuffer: ArrayBuffer): Error {\n    const error = CSWErrorLoader.parseSync(arrayBuffer, this.props.loadOptions);\n    return new Error(error);\n  }\n}\n"],"mappings":"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"}
+{"version":3,"file":"csw-service.js","names":["DataSource","CSWCapabilitiesLoader","CSWRecordsLoader","CSWDomainLoader","WMSErrorLoader","CSWErrorLoader","CSWService","constructor","props","_defineProperty","getMetadata","capabilities","getCapabilities","normalizeMetadata","getServiceDirectory","options","services","unknownServices","records","getRecords","record","reference","references","url","value","scheme","push","name","title","type","_parseOGCUrl","includeUnknown","concat","parts","split","params","wmsParameters","vendorParameters","getCapabilitiesURL","response","fetch","arrayBuffer","_checkResponse","parse","loadOptions","getRecordsURL","getDomain","getDomainURL","version","service","request","_getCSWUrl","typenames","first","key","Object","entries","Array","isArray","toUpperCase","join","String","encodeURI","contentType","headers","ok","mimeTypes","includes","error","parseSync","Error","_parseError","toLowerCase"],"sources":["../../../../../src/lib/services/ogc/csw-service.ts"],"sourcesContent":["// loaders.gl, MIT license\n\n/* eslint-disable camelcase */\n\nimport type {DataSourceProps} from '../../sources/data-source';\nimport {DataSource} from '../../sources/data-source';\n\nimport type {CSWCapabilities} from '../../../csw-capabilities-loader';\nimport {CSWCapabilitiesLoader} from '../../../csw-capabilities-loader';\n\nimport type {CSWRecords} from '../../../csw-records-loader';\nimport {CSWRecordsLoader} from '../../../csw-records-loader';\n\nimport type {CSWDomain} from '../../../csw-domain-loader';\nimport {CSWDomainLoader} from '../../../csw-domain-loader';\n\nimport {WMSErrorLoader as CSWErrorLoader} from '../../../wms-error-loader';\n\ntype CSWCommonParameters = {\n  /** In case the endpoint supports multiple services */\n  service?: 'CSW';\n  /** In case the endpoint supports multiple CSW versions */\n  version?: '1.1.1' | '2.0.0' | '2.0.1' | '3.0.0' | '3.0.0';\n};\n\nexport type CSWGetCapabilitiesParameters = CSWCommonParameters & {\n  /** Request type */\n  request?: 'GetCapabilities';\n};\n\nexport type CSWGetRecordsParameters = CSWCommonParameters & {\n  /** Request type */\n  request?: 'GetRecords';\n  /** type of records */\n  typenames: 'csw:Record';\n};\n\nexport type CSWGetDomainParameters = CSWCommonParameters & {\n  /** Request type */\n  request?: 'GetDomain';\n  // TBA\n};\n\nexport type Service = {name: string; type: string; url: string; params?: string; scheme?: string};\n\nexport type CSWServiceProps = DataSourceProps & {\n  url: string;\n};\n\n/**\n * The CSWService class provides\n * - provides type safe methods to form URLs to a CSW service\n * - provides type safe methods to query and parse results (and errors) from a CSW service\n * - implements the ImageService interface\n * @note Only the URL parameter conversion is supported. XML posts are not supported.\n */\nexport class CSWService extends DataSource<CSWServiceProps> {\n  static type: 'csw' = 'csw';\n  static testURL = (url: string): boolean => url.toLowerCase().includes('csw');\n\n  capabilities: CSWCapabilities | null = null;\n\n  /** A list of loaders used by the CSWService methods */\n  readonly loaders = [CSWErrorLoader, CSWCapabilitiesLoader];\n\n  /** Create a CSWService */\n  constructor(props: CSWServiceProps) {\n    super(props);\n  }\n\n  async getMetadata(): Promise<CSWCapabilities> {\n    const capabilities = await this.getCapabilities();\n    return this.normalizeMetadata(capabilities);\n  }\n\n  normalizeMetadata(capabilities: CSWCapabilities): CSWCapabilities {\n    return capabilities;\n  }\n\n  async getServiceDirectory(options?: {includeUnknown?: boolean}): Promise<Service[]> {\n    const services: Service[] = [];\n    const unknownServices: Service[] = [];\n\n    const records = await this.getRecords();\n    for (const record of records.records) {\n      for (const reference of record.references) {\n        const url = reference.value;\n        switch (reference.scheme) {\n          case 'OGC:WMS':\n            services.push({name: record.title, type: 'ogc-wms-service', ...this._parseOGCUrl(url)});\n            break;\n          case 'OGC:WMTS':\n            services.push({\n              name: record.title,\n              type: 'ogc-wmts-service',\n              ...this._parseOGCUrl(url)\n            });\n            break;\n          case 'OGC:WFS':\n            services.push({name: record.title, type: 'ogc-wfs-service', ...this._parseOGCUrl(url)});\n            break;\n          default:\n            unknownServices.push({\n              name: record.title,\n              type: 'unknown',\n              url: reference.value,\n              scheme: reference.scheme\n            });\n        }\n      }\n    }\n\n    return options?.includeUnknown ? services.concat(unknownServices) : services;\n  }\n\n  _parseOGCUrl(url: string): {url: string; params: string} {\n    const parts = url.split('?');\n    return {\n      url: parts[0],\n      params: parts[1] || ''\n    };\n  }\n\n  // CSW Service API Stubs\n\n  /** Get Capabilities */\n  async getCapabilities(\n    wmsParameters?: CSWGetCapabilitiesParameters,\n    vendorParameters?: Record<string, unknown>\n  ): Promise<CSWCapabilities> {\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 CSWCapabilitiesLoader.parse(arrayBuffer, this.props.loadOptions);\n    return capabilities;\n  }\n\n  /** Get Records */\n  async getRecords(\n    wmsParameters?: CSWGetRecordsParameters,\n    vendorParameters?: Record<string, unknown>\n  ): Promise<CSWRecords> {\n    const url = this.getRecordsURL(wmsParameters, vendorParameters);\n    const response = await this.fetch(url);\n    const arrayBuffer = await response.arrayBuffer();\n    this._checkResponse(response, arrayBuffer);\n    return await CSWRecordsLoader.parse(arrayBuffer, this.props.loadOptions);\n  }\n\n  /** Get Domain */\n  async getDomain(\n    wmsParameters?: CSWGetDomainParameters,\n    vendorParameters?: Record<string, unknown>\n  ): Promise<CSWDomain> {\n    const url = this.getDomainURL(wmsParameters, vendorParameters);\n    const response = await this.fetch(url);\n    const arrayBuffer = await response.arrayBuffer();\n    this._checkResponse(response, arrayBuffer);\n    return await CSWDomainLoader.parse(arrayBuffer, this.props.loadOptions);\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?: CSWGetCapabilitiesParameters,\n    vendorParameters?: Record<string, unknown>\n  ): string {\n    const options: Required<CSWGetCapabilitiesParameters> = {\n      version: '3.0.0',\n      ...wmsParameters,\n      ...vendorParameters,\n      service: 'CSW',\n      request: 'GetCapabilities'\n    };\n    return this._getCSWUrl(options, vendorParameters);\n  }\n\n  /** Generate a URL for the GetCapabilities request */\n  getRecordsURL(\n    wmsParameters?: CSWGetRecordsParameters,\n    vendorParameters?: Record<string, unknown>\n  ): string {\n    const options: Required<CSWGetRecordsParameters> = {\n      version: '3.0.0',\n      typenames: 'csw:Record',\n      ...wmsParameters,\n      ...vendorParameters,\n      service: 'CSW',\n      request: 'GetRecords'\n    };\n    return this._getCSWUrl(options, vendorParameters);\n  }\n\n  /** Generate a URL for the GetCapabilities request */\n  getDomainURL(\n    wmsParameters?: CSWGetDomainParameters,\n    vendorParameters?: Record<string, unknown>\n  ): string {\n    const options: Required<CSWGetDomainParameters> = {\n      version: '3.0.0',\n      ...wmsParameters,\n      ...vendorParameters,\n      service: 'CSW',\n      request: 'GetDomain'\n    };\n    return this._getCSWUrl(options, vendorParameters);\n  }\n\n  // INTERNAL METHODS\n\n  /**\n   * @note case _getCSWUrl may need to be overridden to handle certain backends?\n   * */\n  protected _getCSWUrl(\n    options: Record<string, unknown>,\n    vendorParameters?: Record<string, unknown>\n  ): string {\n    let url = this.props.url;\n    let first = true;\n    for (const [key, value] of Object.entries(options)) {\n      url += first ? '?' : '&';\n      first = false;\n      if (Array.isArray(value)) {\n        url += `${key.toUpperCase()}=${value.join(',')}`;\n      } else {\n        url += `${key.toUpperCase()}=${value ? String(value) : ''}`;\n      }\n    }\n    return encodeURI(url);\n  }\n\n  /** Checks for and parses a CSW 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 || CSWErrorLoader.mimeTypes.includes(contentType)) {\n      const error = CSWErrorLoader.parseSync(arrayBuffer, this.props.loadOptions);\n      throw new Error(error);\n    }\n  }\n\n  /** Error situation detected */\n  protected _parseError(arrayBuffer: ArrayBuffer): Error {\n    const error = CSWErrorLoader.parseSync(arrayBuffer, this.props.loadOptions);\n    return new Error(error);\n  }\n}\n"],"mappings":"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"}

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

@@ -1,5 +1,4 @@
 import _defineProperty from "@babel/runtime/helpers/esm/defineProperty";
-
 import { ImageLoader } from '@loaders.gl/images';
 import { mergeLoaderOptions } from '@loaders.gl/loader-utils';
 import { ImageSource } from '../../sources/image-source';
@@ -8,26 +7,32 @@ import { WMSFeatureInfoLoader } from '../../../wip/wms-feature-info-loader';
 import { WMSLayerDescriptionLoader } from '../../../wip/wms-layer-description-loader';
 import { WMSErrorLoader } from '../../../wms-error-loader';
 export class WMSService extends ImageSource {
-
   constructor(props) {
+    var _props$substituteCRS;
     super(props);
-
-    _defineProperty(this, "props", void 0);
+    _defineProperty(this, "url", void 0);
+    _defineProperty(this, "substituteCRS84", void 0);
+    _defineProperty(this, "flipCRS", void 0);
+    _defineProperty(this, "wmsParameters", void 0);
+    _defineProperty(this, "vendorParameters", void 0);
     _defineProperty(this, "capabilities", null);
     _defineProperty(this, "loaders", [ImageLoader, WMSErrorLoader, WMSCapabilitiesLoader, WMSFeatureInfoLoader, WMSLayerDescriptionLoader]);
-
-    this.props = {
-      loadOptions: undefined,
+    this.url = props.url;
+    this.substituteCRS84 = (_props$substituteCRS = props.substituteCRS84) !== null && _props$substituteCRS !== void 0 ? _props$substituteCRS : false;
+    this.flipCRS = ['EPSG:4326'];
+    this.wmsParameters = {
       layers: undefined,
+      query_layers: undefined,
       styles: undefined,
-      version: '1.1.1',
-      srs: 'EPSG:4326',
+      version: '1.3.0',
+      crs: 'EPSG:4326',
       format: 'image/png',
       info_format: 'text/plain',
-      ...props
+      transparent: undefined,
+      ...props.wmsParameters
     };
+    this.vendorParameters = props.vendorParameters || {};
   }
-
   async getMetadata() {
     const capabilities = await this.getCapabilities();
     return this.normalizeMetadata(capabilities);
@@ -38,145 +43,190 @@ export class WMSService extends ImageSource {
   normalizeMetadata(capabilities) {
     return capabilities;
   }
-
   async getCapabilities(wmsParameters, vendorParameters) {
     const url = this.getCapabilitiesURL(wmsParameters, vendorParameters);
     const response = await this.fetch(url);
     const arrayBuffer = await response.arrayBuffer();
     this._checkResponse(response, arrayBuffer);
-    const capabilities = await WMSCapabilitiesLoader.parse(arrayBuffer, this.props.loadOptions);
+    const capabilities = await WMSCapabilitiesLoader.parse(arrayBuffer, this.loadOptions);
     this.capabilities = capabilities;
     return capabilities;
   }
-
-  async getMap(options, vendorParameters) {
-    const url = this.getMapURL(options, vendorParameters);
+  async getMap(wmsParameters, vendorParameters) {
+    const url = this.getMapURL(wmsParameters, vendorParameters);
     const response = await this.fetch(url);
     const arrayBuffer = await response.arrayBuffer();
     this._checkResponse(response, arrayBuffer);
     try {
-      return await ImageLoader.parse(arrayBuffer, this.props.loadOptions);
+      return await ImageLoader.parse(arrayBuffer, this.loadOptions);
     } catch {
       throw this._parseError(arrayBuffer);
     }
   }
-
-  async getFeatureInfo(options, vendorParameters) {
-    const url = this.getFeatureInfoURL(options, vendorParameters);
+  async getFeatureInfo(wmsParameters, vendorParameters) {
+    const url = this.getFeatureInfoURL(wmsParameters, vendorParameters);
     const response = await this.fetch(url);
     const arrayBuffer = await response.arrayBuffer();
     this._checkResponse(response, arrayBuffer);
-    return await WMSFeatureInfoLoader.parse(arrayBuffer, this.props.loadOptions);
+    return await WMSFeatureInfoLoader.parse(arrayBuffer, this.loadOptions);
   }
-
-  async getFeatureInfoText(options, vendorParameters) {
-    const url = this.getFeatureInfoURL(options, vendorParameters);
+  async getFeatureInfoText(wmsParameters, vendorParameters) {
+    const url = this.getFeatureInfoURL(wmsParameters, vendorParameters);
     const response = await this.fetch(url);
     const arrayBuffer = await response.arrayBuffer();
     this._checkResponse(response, arrayBuffer);
     return new TextDecoder().decode(arrayBuffer);
   }
-
-  async describeLayer(options, vendorParameters) {
-    const url = this.describeLayerURL(options, vendorParameters);
+  async describeLayer(wmsParameters, vendorParameters) {
+    const url = this.describeLayerURL(wmsParameters, vendorParameters);
     const response = await this.fetch(url);
     const arrayBuffer = await response.arrayBuffer();
     this._checkResponse(response, arrayBuffer);
-    return await WMSLayerDescriptionLoader.parse(arrayBuffer, this.props.loadOptions);
+    return await WMSLayerDescriptionLoader.parse(arrayBuffer, this.loadOptions);
   }
-
-  async getLegendGraphic(options, vendorParameters) {
-    const url = this.getLegendGraphicURL(options, vendorParameters);
+  async getLegendGraphic(wmsParameters, vendorParameters) {
+    const url = this.getLegendGraphicURL(wmsParameters, vendorParameters);
     const response = await this.fetch(url);
     const arrayBuffer = await response.arrayBuffer();
     this._checkResponse(response, arrayBuffer);
     try {
-      return await ImageLoader.parse(arrayBuffer, this.props.loadOptions);
+      return await ImageLoader.parse(arrayBuffer, this.loadOptions);
     } catch {
       throw this._parseError(arrayBuffer);
     }
   }
-
   getCapabilitiesURL(wmsParameters, vendorParameters) {
     const options = {
-      service: 'WMS',
-      version: this.props.version,
-      request: 'GetCapabilities',
-      ...wmsParameters,
-      ...vendorParameters
+      version: this.wmsParameters.version,
+      ...wmsParameters
     };
-    return this._getWMSUrl(options, vendorParameters);
+    return this._getWMSUrl('GetCapabilities', options, vendorParameters);
   }
-
   getMapURL(wmsParameters, vendorParameters) {
+    wmsParameters = this._getWMS130Parameters(wmsParameters);
     const options = {
-      service: 'WMS',
-      version: this.props.version,
-      request: 'GetMap',
-      styles: this.props.styles,
-      srs: this.props.srs,
-      format: this.props.format,
-      ...wmsParameters,
-      ...vendorParameters
+      version: this.wmsParameters.version,
+      format: this.wmsParameters.format,
+      transparent: this.wmsParameters.transparent,
+      layers: this.wmsParameters.layers,
+      styles: this.wmsParameters.styles,
+      crs: this.wmsParameters.crs,
+      ...wmsParameters
     };
-    return this._getWMSUrl(options, vendorParameters);
+    return this._getWMSUrl('GetMap', options, vendorParameters);
   }
-
   getFeatureInfoURL(wmsParameters, vendorParameters) {
     const options = {
-      service: 'WMS',
-      version: this.props.version,
-      request: 'GetFeatureInfo',
-      srs: this.props.srs,
-      format: this.props.format,
-      info_format: this.props.info_format,
-      styles: this.props.styles,
-      ...wmsParameters,
-      ...vendorParameters
+      version: this.wmsParameters.version,
+      info_format: this.wmsParameters.info_format,
+      layers: this.wmsParameters.layers,
+      query_layers: this.wmsParameters.query_layers,
+      styles: this.wmsParameters.styles,
+      crs: this.wmsParameters.crs,
+      ...wmsParameters
     };
-    return this._getWMSUrl(options, vendorParameters);
+    return this._getWMSUrl('GetFeatureInfo', options, vendorParameters);
   }
-
   describeLayerURL(wmsParameters, vendorParameters) {
     const options = {
-      service: 'WMS',
-      version: this.props.version,
-      request: 'DescribeLayer',
-      ...wmsParameters,
-      ...vendorParameters
+      version: this.wmsParameters.version,
+      ...wmsParameters
     };
-    return this._getWMSUrl(options, vendorParameters);
+    return this._getWMSUrl('DescribeLayer', options, vendorParameters);
   }
   getLegendGraphicURL(wmsParameters, vendorParameters) {
     const options = {
+      version: this.wmsParameters.version,
+      ...wmsParameters
+    };
+    return this._getWMSUrl('GetLegendGraphic', options, vendorParameters);
+  }
+  _parseWMSUrl(url) {
+    const [baseUrl, search] = url.split('?');
+    const searchParams = search.split('&');
+    const parameters = {};
+    for (const parameter of searchParams) {
+      const [key, value] = parameter.split('=');
+      parameters[key] = value;
+    }
+    return {
+      url: baseUrl,
+      parameters
+    };
+  }
+  _getWMSUrl(request, wmsParameters, vendorParameters) {
+    let url = this.url;
+    let first = true;
+    const allParameters = {
       service: 'WMS',
-      version: this.props.version,
-      request: 'GetLegendGraphic',
+      version: wmsParameters.version,
+      request,
       ...wmsParameters,
+      ...this.vendorParameters,
       ...vendorParameters
     };
-    return this._getWMSUrl(options, vendorParameters);
-  }
-
-  _getWMSUrl(options, vendorParameters) {
-    let url = this.props.url;
-    let first = true;
-    for (const [key, value] of Object.entries(options)) {
-      url += first ? '?' : '&';
-      first = false;
-      if (Array.isArray(value)) {
-        url += "".concat(key.toUpperCase(), "=").concat(value.join(','));
-      } else {
-        url += "".concat(key.toUpperCase(), "=").concat(value ? String(value) : '');
+    for (const [key, value] of Object.entries(allParameters)) {
+      if (key !== 'transparent' || value) {
+        url += first ? '?' : '&';
+        first = false;
+        url += this._getURLParameter(key, value, wmsParameters);
       }
     }
     return encodeURI(url);
   }
-
+  _getWMS130Parameters(wmsParameters) {
+    const newParameters = {
+      ...wmsParameters
+    };
+    if (newParameters.srs) {
+      newParameters.crs = newParameters.crs || newParameters.srs;
+      delete newParameters.srs;
+    }
+    return newParameters;
+  }
+  _getURLParameter(key, value, wmsParameters) {
+    switch (key) {
+      case 'crs':
+        if (wmsParameters.version !== '1.3.0') {
+          key = 'srs';
+        } else if (this.substituteCRS84 && value === 'EPSG:4326') {
+          value = 'CRS:84';
+        }
+        break;
+      case 'srs':
+        if (wmsParameters.version === '1.3.0') {
+          key = 'crs';
+        }
+        break;
+      case 'bbox':
+        const bbox = this._flipBoundingBox(value, wmsParameters);
+        if (bbox) {
+          value = bbox;
+        }
+        break;
+      default:
+    }
+    key = key.toUpperCase();
+    return Array.isArray(value) ? "".concat(key, "=").concat(value.join(',')) : "".concat(key, "=").concat(value ? String(value) : '');
+  }
+  _flipBoundingBox(bboxValue, wmsParameters) {
+    if (!Array.isArray(bboxValue) || bboxValue.length !== 4) {
+      return null;
+    }
+    const flipCoordinates = wmsParameters.version === '1.3.0' && this.flipCRS.includes(wmsParameters.crs || '') && !(this.substituteCRS84 && wmsParameters.crs === 'EPSG:4326');
+    const bbox = bboxValue;
+    return flipCoordinates ? [bbox[1], bbox[0], bbox[3], bbox[2]] : bbox;
+  }
+  async _fetchArrayBuffer(url) {
+    const response = await this.fetch(url);
+    const arrayBuffer = await response.arrayBuffer();
+    this._checkResponse(response, arrayBuffer);
+    return arrayBuffer;
+  }
   _checkResponse(response, arrayBuffer) {
     const contentType = response.headers['content-type'];
     if (!response.ok || WMSErrorLoader.mimeTypes.includes(contentType)) {
-      const loadOptions = mergeLoaderOptions(this.props.loadOptions, {
+      const loadOptions = mergeLoaderOptions(this.loadOptions, {
         wms: {
           throwOnError: true
         }
@@ -185,9 +235,8 @@ export class WMSService extends ImageSource {
       throw new Error(error);
     }
   }
-
   _parseError(arrayBuffer) {
-    const error = WMSErrorLoader.parseSync(arrayBuffer, this.props.loadOptions);
+    const error = WMSErrorLoader.parseSync(arrayBuffer, this.loadOptions);
     return new Error(error);
   }
 }