@loaders.gl/wms 3.3.0-alpha.13 → 3.3.0-alpha.14

package/dist/es5/wip/wcs-capabilities-loader.js

@@ -9,7 +9,7 @@ var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"))
 var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
 var _parseWcs = require("../lib/wcs/parse-wcs");
 
-var VERSION = typeof "3.3.0-alpha.13" !== 'undefined' ? "3.3.0-alpha.13" : 'latest';
+var VERSION = typeof "3.3.0-alpha.14" !== 'undefined' ? "3.3.0-alpha.14" : 'latest';
 var WCSCapabilitiesLoader = {
   id: 'wcs-capabilities',
   name: 'WFS Capabilities',

package/dist/es5/wip/wfs-capabilities-loader.js

@@ -9,7 +9,7 @@ var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"))
 var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
 var _parseWfs = require("../lib/wfs/parse-wfs");
 
-var VERSION = typeof "3.3.0-alpha.13" !== 'undefined' ? "3.3.0-alpha.13" : 'latest';
+var VERSION = typeof "3.3.0-alpha.14" !== 'undefined' ? "3.3.0-alpha.14" : 'latest';
 var WFSCapabilitiesLoader = {
   id: 'wfs-capabilities',
   name: 'WFS Capabilities',

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

@@ -9,7 +9,7 @@ var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"))
 var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
 var _parseWmts = require("../lib/wmts/parse-wmts");
 
-var VERSION = typeof "3.3.0-alpha.13" !== 'undefined' ? "3.3.0-alpha.13" : 'latest';
+var VERSION = typeof "3.3.0-alpha.14" !== 'undefined' ? "3.3.0-alpha.14" : 'latest';
 var WMTSCapabilitiesLoader = {
   id: 'wmts-capabilities',
   name: 'WMTS Capabilities',

package/dist/es5/wms-capabilities-loader.js

@@ -9,7 +9,7 @@ var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"))
 var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
 var _parseWms = require("./lib/wms/parse-wms");
 
-var VERSION = typeof "3.3.0-alpha.13" !== 'undefined' ? "3.3.0-alpha.13" : 'latest';
+var VERSION = typeof "3.3.0-alpha.14" !== 'undefined' ? "3.3.0-alpha.14" : 'latest';
 var WMSCapabilitiesLoader = {
   id: 'wms-capabilities',
   name: 'WMS Capabilities',

package/dist/es5/wms-error-loader.js

@@ -11,7 +11,7 @@ var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/
 var _parseWms = require("./lib/wms/parse-wms");
 function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
 function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { (0, _defineProperty2.default)(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
-var VERSION = typeof "3.3.0-alpha.13" !== 'undefined' ? "3.3.0-alpha.13" : 'latest';
+var VERSION = typeof "3.3.0-alpha.14" !== 'undefined' ? "3.3.0-alpha.14" : 'latest';
 var WMSErrorLoader = {
   id: 'wms-error',
   name: 'WMS Error',

package/dist/esm/index.js

@@ -2,10 +2,12 @@
 
 export { WMSErrorLoader } from './wms-error-loader';
 export { WMSCapabilitiesLoader } from './wms-capabilities-loader';
-export { WMSService } from './lib/data-sources/wms-service';
 
-export { ImageSource as _ImageSource } from './lib/data-sources/image-source';
-export { AdHocImageService as _AdHocImageService } from './lib/data-sources/adhoc-image-service';
+export { ImageSource } from './lib/data-sources/image-source';
+export { createImageSource } from './lib/data-sources/create-image-source';
+export { ImageService } from './lib/data-sources/image-services/image-service';
+export { WMSService } from './lib/data-sources/image-services/wms-service';
+export { ArcGISImageService as _ArcGISImageService } from './lib/data-sources/image-services/arcgis-image-service';
 
 export { WMSFeatureInfoLoader as _WMSFeatureInfoLoader } from './wip/wms-feature-info-loader';
 export { WMSLayerDescriptionLoader as _WMSLayerDescriptionLoader } from './wip/wms-layer-description-loader';
@@ -15,6 +17,4 @@ export { WMTSCapabilitiesLoader as _WMTSCapabilitiesLoader } from './wip/wmts-ca
 export { WFSCapabilitiesLoader as _WFSCapabilitiesLoader } from './wip/wfs-capabilities-loader';
 
 export { GMLLoader as _GMLLoader } from './wip/gml-loader';
-
-export { LERCLoader } from './lerc-loader';
 //# sourceMappingURL=index.js.map

package/dist/esm/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","names":["WMSErrorLoader","WMSCapabilitiesLoader","WMSService","ImageSource","_ImageSource","AdHocImageService","_AdHocImageService","WMSFeatureInfoLoader","_WMSFeatureInfoLoader","WMSLayerDescriptionLoader","_WMSLayerDescriptionLoader","WMTSCapabilitiesLoader","_WMTSCapabilitiesLoader","WFSCapabilitiesLoader","_WFSCapabilitiesLoader","GMLLoader","_GMLLoader","LERCLoader"],"sources":["../../src/index.ts"],"sourcesContent":["// loaders.gl, MIT license\n\n// WMS\n\nexport {WMSErrorLoader} from './wms-error-loader';\n\nexport type {WMSLoaderOptions} from './wms-capabilities-loader';\n\nexport type {WMSCapabilities} from './lib/wms/wms-types';\nexport {WMSCapabilitiesLoader} from './wms-capabilities-loader';\n\nexport type {WMSServiceProps} from './lib/data-sources/wms-service';\nexport {WMSService} from './lib/data-sources/wms-service';\n\n// NOTE: Will likely move to tiles module\nexport type {ImageSourceMetadata as _ImageSourceMetadata} from './lib/data-sources/image-source';\nexport {ImageSource as _ImageSource} from './lib/data-sources/image-source';\n\nexport {AdHocImageService as _AdHocImageService} from './lib/data-sources/adhoc-image-service';\n\n// WIP /////////////////////////////////////////////////////////////////\n// Plumbing set up but details of parsing and typing not yet completed\n\n// WMS\n\nexport type {WMSFeatureInfo as _WMSFeatureInfo} from './lib/wms/wms-types';\nexport {WMSFeatureInfoLoader as _WMSFeatureInfoLoader} from './wip/wms-feature-info-loader';\n\nexport type {WMSLayerDescription as _WMSLayerDescription} from './lib/wms/wms-types';\nexport {WMSLayerDescriptionLoader as _WMSLayerDescriptionLoader} from './wip/wms-layer-description-loader';\n\n// WMTS\n\nexport type {WMTSCapabilities as _WMTSCapabilities} from './lib/wmts/wmts-types';\nexport type {WMTSLoaderOptions as _WMTSLoaderOptions} from './wip/wmts-capabilities-loader';\nexport {WMTSCapabilitiesLoader as _WMTSCapabilitiesLoader} from './wip/wmts-capabilities-loader';\n\n// WFS\n\nexport type {WFSCapabilities as _WFSCapabilities} from './lib/wfs/wfs-types';\nexport type {WFSLoaderOptions as _WFSLoaderOptions} from './wip/wfs-capabilities-loader';\nexport {WFSCapabilitiesLoader as _WFSCapabilitiesLoader} from './wip/wfs-capabilities-loader';\n\n// GML\n\nexport type {GeoJSON as _GeoJSON} from '@loaders.gl/schema';\nexport type {GMLLoaderOptions as _GMLLoaderOptions} from './wip/gml-loader';\nexport {GMLLoader as _GMLLoader} from './wip/gml-loader';\n\n// LERC\n\nexport type {LERCData} from './lib/lerc/lerc-types';\nexport {LERCLoader} from './lerc-loader';\n"],"mappings":";;AAIA,SAAQA,cAAc,QAAO,oBAAoB;AAKjD,SAAQC,qBAAqB,QAAO,2BAA2B;AAG/D,SAAQC,UAAU,QAAO,gCAAgC;;AAIzD,SAAQC,WAAW,IAAIC,YAAY,QAAO,iCAAiC;AAE3E,SAAQC,iBAAiB,IAAIC,kBAAkB,QAAO,wCAAwC;;AAQ9F,SAAQC,oBAAoB,IAAIC,qBAAqB,QAAO,+BAA+B;AAG3F,SAAQC,yBAAyB,IAAIC,0BAA0B,QAAO,oCAAoC;;AAM1G,SAAQC,sBAAsB,IAAIC,uBAAuB,QAAO,gCAAgC;;AAMhG,SAAQC,qBAAqB,IAAIC,sBAAsB,QAAO,+BAA+B;;AAM7F,SAAQC,SAAS,IAAIC,UAAU,QAAO,kBAAkB;;AAKxD,SAAQC,UAAU,QAAO,eAAe"}
+{"version":3,"file":"index.js","names":["WMSErrorLoader","WMSCapabilitiesLoader","ImageSource","createImageSource","ImageService","WMSService","ArcGISImageService","_ArcGISImageService","WMSFeatureInfoLoader","_WMSFeatureInfoLoader","WMSLayerDescriptionLoader","_WMSLayerDescriptionLoader","WMTSCapabilitiesLoader","_WMTSCapabilitiesLoader","WFSCapabilitiesLoader","_WFSCapabilitiesLoader","GMLLoader","_GMLLoader"],"sources":["../../src/index.ts"],"sourcesContent":["// loaders.gl, MIT license\n\n// WMS\n\nexport {WMSErrorLoader} from './wms-error-loader';\n\nexport type {WMSLoaderOptions} from './wms-capabilities-loader';\n\nexport type {WMSCapabilities} from './lib/wms/wms-types';\nexport {WMSCapabilitiesLoader} from './wms-capabilities-loader';\n\n// NOTE: Will likely move to tiles module\nexport type {ImageSourceMetadata} from './lib/data-sources/image-source';\nexport type {ImageType} from '@loaders.gl/images';\nexport {ImageSource} from './lib/data-sources/image-source';\n\nexport type {ImageServiceType} from './lib/data-sources/create-image-source';\nexport {createImageSource} from './lib/data-sources/create-image-source';\n\nexport type {ImageServiceProps} from './lib/data-sources/image-services/image-service';\nexport {ImageService} from './lib/data-sources/image-services/image-service';\nexport {WMSService} from './lib/data-sources/image-services/wms-service';\nexport {ArcGISImageService as _ArcGISImageService} from './lib/data-sources/image-services/arcgis-image-service';\n\n// WIP /////////////////////////////////////////////////////////////////\n// Plumbing set up but details of parsing and typing not yet completed\n\n// WMS\n\nexport type {WMSFeatureInfo as _WMSFeatureInfo} from './lib/wms/wms-types';\nexport {WMSFeatureInfoLoader as _WMSFeatureInfoLoader} from './wip/wms-feature-info-loader';\n\nexport type {WMSLayerDescription as _WMSLayerDescription} from './lib/wms/wms-types';\nexport {WMSLayerDescriptionLoader as _WMSLayerDescriptionLoader} from './wip/wms-layer-description-loader';\n\n// WMTS\n\nexport type {WMTSCapabilities as _WMTSCapabilities} from './lib/wmts/wmts-types';\nexport type {WMTSLoaderOptions as _WMTSLoaderOptions} from './wip/wmts-capabilities-loader';\nexport {WMTSCapabilitiesLoader as _WMTSCapabilitiesLoader} from './wip/wmts-capabilities-loader';\n\n// WFS\n\nexport type {WFSCapabilities as _WFSCapabilities} from './lib/wfs/wfs-types';\nexport type {WFSLoaderOptions as _WFSLoaderOptions} from './wip/wfs-capabilities-loader';\nexport {WFSCapabilitiesLoader as _WFSCapabilitiesLoader} from './wip/wfs-capabilities-loader';\n\n// GML\n\nexport type {GeoJSON as _GeoJSON} from '@loaders.gl/schema';\nexport type {GMLLoaderOptions as _GMLLoaderOptions} from './wip/gml-loader';\nexport {GMLLoader as _GMLLoader} from './wip/gml-loader';\n\n// LERC\n\n// TODO - restore once esbuild bundling issues have been resolved\n// export type {LERCData} from './lib/lerc/lerc-types';\n// export {LERCLoader} from './lerc-loader';\n"],"mappings":";;AAIA,SAAQA,cAAc,QAAO,oBAAoB;AAKjD,SAAQC,qBAAqB,QAAO,2BAA2B;;AAK/D,SAAQC,WAAW,QAAO,iCAAiC;AAG3D,SAAQC,iBAAiB,QAAO,wCAAwC;AAGxE,SAAQC,YAAY,QAAO,iDAAiD;AAC5E,SAAQC,UAAU,QAAO,+CAA+C;AACxE,SAAQC,kBAAkB,IAAIC,mBAAmB,QAAO,wDAAwD;;AAQhH,SAAQC,oBAAoB,IAAIC,qBAAqB,QAAO,+BAA+B;AAG3F,SAAQC,yBAAyB,IAAIC,0BAA0B,QAAO,oCAAoC;;AAM1G,SAAQC,sBAAsB,IAAIC,uBAAuB,QAAO,gCAAgC;;AAMhG,SAAQC,qBAAqB,IAAIC,sBAAsB,QAAO,+BAA+B;;AAM7F,SAAQC,SAAS,IAAIC,UAAU,QAAO,kBAAkB"}

package/dist/esm/lerc-loader.js

@@ -2,7 +2,7 @@
 
 import * as Lerc from 'lerc';
 
-const VERSION = typeof "3.3.0-alpha.13" !== 'undefined' ? "3.3.0-alpha.13" : 'latest';
+const VERSION = typeof "3.3.0-alpha.14" !== 'undefined' ? "3.3.0-alpha.14" : 'latest';
 export const LERCLoader = {
   id: 'lerc',
   name: 'LERC',

package/dist/esm/lib/data-sources/adhoc-image-service.js

@@ -38,4 +38,6 @@ export class AdHocImageService extends ImageSource {
     return url;
   }
 }
+_defineProperty(AdHocImageService, "type", 'template');
+_defineProperty(AdHocImageService, "testURL", url => url.toLowerCase().includes('{'));
 //# sourceMappingURL=adhoc-image-service.js.map

package/dist/esm/lib/data-sources/adhoc-image-service.js.map

@@ -1 +1 @@
-{"version":3,"file":"adhoc-image-service.js","names":["ImageLoader","ImageSource","AdHocImageService","constructor","props","templateUrl","getMetadata","Error","getImage","parameters","granularParameters","getGranularParameters","url","getURLFromTemplate","response","fetch","arrayBuffer","parse","east","north","west","south","bbox","key","value","Object","entries","replace","String"],"sources":["../../../../src/lib/data-sources/adhoc-image-service.ts"],"sourcesContent":["// loaders.gl, MIT license\n\nimport type {ImageType} from '@loaders.gl/images';\nimport {ImageLoader} from '@loaders.gl/images';\n\nimport type {ImageSourceMetadata, GetImageParameters} from './image-source';\nimport {ImageSource} from './image-source';\n\nexport type AdHocImageServiceProps = {\n  /** Template URL string should contain `${width}` etc which will be substituted. */\n  templateUrl: string;\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 AdHocImageService extends ImageSource {\n  templateUrl: string;\n\n  constructor(props: AdHocImageServiceProps) {\n    super();\n    this.templateUrl = props.templateUrl;\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 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  protected getURLFromTemplate(parameters: Record<string, unknown>): string {\n    let url = this.templateUrl;\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    }\n    return url;\n  }\n}\n"],"mappings":";;AAGA,SAAQA,WAAW,QAAO,oBAAoB;AAG9C,SAAQC,WAAW,QAAO,gBAAgB;AAY1C,OAAO,MAAMC,iBAAiB,SAASD,WAAW,CAAC;EAGjDE,WAAW,CAACC,KAA6B,EAAE;IACzC,KAAK,EAAE;IAAC;IACR,IAAI,CAACC,WAAW,GAAGD,KAAK,CAACC,WAAW;EACtC;;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,MAAMC,KAAK,CAACH,GAAG,CAAC;IACjC,MAAMI,WAAW,GAAG,MAAMF,QAAQ,CAACE,WAAW,EAAE;IAChD,OAAO,MAAMhB,WAAW,CAACiB,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;EAEUP,kBAAkB,CAACJ,UAAmC,EAAU;IACxE,IAAIG,GAAG,GAAG,IAAI,CAACP,WAAW;IAC1B,KAAK,MAAM,CAACkB,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;IAChD;IACA,OAAOZ,GAAG;EACZ;AACF"}
+{"version":3,"file":"adhoc-image-service.js","names":["ImageLoader","ImageSource","AdHocImageService","constructor","props","templateUrl","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/data-sources/adhoc-image-service.ts"],"sourcesContent":["// loaders.gl, MIT license\n\nimport type {ImageType} from '@loaders.gl/images';\nimport {ImageLoader} from '@loaders.gl/images';\n\nimport type {ImageSourceMetadata, GetImageParameters} from './image-source';\nimport {ImageSource} from './image-source';\n\nexport type AdHocImageServiceProps = {\n  /** Template URL string should contain `${width}` etc which will be substituted. */\n  templateUrl: string;\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 AdHocImageService extends ImageSource {\n  static type: 'template' = 'template';\n  static testURL = (url: string): boolean => url.toLowerCase().includes('{');\n\n  templateUrl: string;\n\n  constructor(props: AdHocImageServiceProps) {\n    super();\n    this.templateUrl = props.templateUrl;\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 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  protected getURLFromTemplate(parameters: Record<string, unknown>): string {\n    let url = this.templateUrl;\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    }\n    return url;\n  }\n}\n"],"mappings":";;AAGA,SAAQA,WAAW,QAAO,oBAAoB;AAG9C,SAAQC,WAAW,QAAO,gBAAgB;AAY1C,OAAO,MAAMC,iBAAiB,SAASD,WAAW,CAAC;EAMjDE,WAAW,CAACC,KAA6B,EAAE;IACzC,KAAK,EAAE;IAAC;IACR,IAAI,CAACC,WAAW,GAAGD,KAAK,CAACC,WAAW;EACtC;;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,MAAMC,KAAK,CAACH,GAAG,CAAC;IACjC,MAAMI,WAAW,GAAG,MAAMF,QAAQ,CAACE,WAAW,EAAE;IAChD,OAAO,MAAMhB,WAAW,CAACiB,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;EAEUP,kBAAkB,CAACJ,UAAmC,EAAU;IACxE,IAAIG,GAAG,GAAG,IAAI,CAACP,WAAW;IAC1B,KAAK,MAAM,CAACkB,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;IAChD;IACA,OAAOZ,GAAG;EACZ;AACF;AAAC,gBA1CYV,iBAAiB,UACF,UAAU;AAAA,gBADzBA,iBAAiB,aAEVU,GAAW,IAAcA,GAAG,CAACiB,WAAW,EAAE,CAACC,QAAQ,CAAC,GAAG,CAAC"}

package/dist/esm/lib/data-sources/arcgis-image-service.js

@@ -0,0 +1,62 @@
+import _defineProperty from "@babel/runtime/helpers/esm/defineProperty";
+
+import { ImageSource } from './image-source';
+export class ArcGISImageService extends ImageSource {
+  constructor(props) {
+    super();
+    _defineProperty(this, "url", void 0);
+    _defineProperty(this, "loadOptions", void 0);
+    _defineProperty(this, "fetch", void 0);
+    this.url = props.url;
+    this.loadOptions = props.loadOptions || {};
+    this.fetch = props.fetch || fetch;
+  }
+
+  async getMetadata() {
+    return await this.info();
+  }
+
+  async getImage(parameters) {
+    throw new Error('not implemented');
+  }
+
+  async info() {
+    throw new Error('not implemented');
+  }
+
+  exportImage(options) {
+    throw new Error('not implemented');
+  }
+
+  infoURL(options) {
+    return this.url;
+  }
+
+  exportImageURL(options) {
+    return this.url;
+  }
+
+  getUrl(options, extra) {
+    let url = "".concat(this.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) : '');
+      }
+    }
+    return url;
+  }
+
+  async checkResponse(response) {
+    if (!response.ok) {
+      throw new Error('error');
+    }
+  }
+}
+_defineProperty(ArcGISImageService, "type", 'arcgis-image-server');
+_defineProperty(ArcGISImageService, "testURL", url => url.toLowerCase().includes('ImageServer'));
+//# sourceMappingURL=arcgis-image-service.js.map

package/dist/esm/lib/data-sources/arcgis-image-service.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"arcgis-image-service.js","names":["ImageSource","ArcGISImageService","constructor","props","url","loadOptions","fetch","getMetadata","info","getImage","parameters","Error","exportImage","options","infoURL","exportImageURL","getUrl","extra","first","key","value","Object","entries","Array","isArray","toUpperCase","join","String","checkResponse","response","ok","toLowerCase","includes"],"sources":["../../../../src/lib/data-sources/arcgis-image-service.ts"],"sourcesContent":["// loaders.gl, MIT license\n\nimport {LoaderOptions} from '@loaders.gl/loader-utils';\nimport {/* ImageLoader, */ ImageType} from '@loaders.gl/images';\nimport type {ImageSourceMetadata, GetImageParameters} from './image-source';\nimport {ImageSource} from './image-source';\n\ntype FetchLike = (url: string, options?: RequestInit) => Promise<Response>;\n\nexport type ArcGISImageServiceProps = {\n  url: string;\n  loadOptions?: LoaderOptions;\n  fetch?: typeof fetch | FetchLike;\n};\n\nexport class ArcGISImageService extends ImageSource {\n  static type: 'arcgis-image-server' = 'arcgis-image-server';\n  static testURL = (url: string): boolean => url.toLowerCase().includes('ImageServer');\n\n  url: string;\n  loadOptions: LoaderOptions;\n  fetch: typeof fetch | FetchLike;\n\n  constructor(props: ArcGISImageServiceProps) {\n    super();\n    this.url = props.url;\n    this.loadOptions = props.loadOptions || {};\n    this.fetch = props.fetch || fetch;\n  }\n\n  // ImageSource (normalized endpoints)\n\n  async getMetadata(): Promise<ImageSourceMetadata> {\n    return (await this.info()) as ImageSourceMetadata;\n    // TODO - normalize metadata\n  }\n\n  async getImage(parameters: GetImageParameters): Promise<ImageType> {\n    throw new Error('not implemented');\n    // TODO - Map generic parameters to ArcGIS specific parameters\n    // return await this.exportImage(parameters);\n  }\n\n  // ImageServer endpoints\n\n  async info(): Promise<unknown> {\n    // We just need a JSON parsing...\n    // return this.getUrl({path: '', ...options});\n    throw new Error('not implemented');\n  }\n\n  /** \n   * Form a URL to an ESRI ImageServer\n   // https://sampleserver6.arcgisonline.com/arcgis/rest/services/NLCDLandCover2001/ImageServer/exportImage?bbox=${bounds[0]},${bounds[1]},${bounds[2]},${bounds[3]}&bboxSR=4326&size=${width},${height}&imageSR=102100&time=&format=jpgpng&pixelType=U8&noData=&noDataInterpretation=esriNoDataMatchAny&interpolation=+RSP_NearestNeighbor&compression=&compressionQuality=&bandIds=&mosaicRule=&renderingRule=&f=image`,\n   */\n  exportImage(options: {\n    boundingBox: [number, number, number, number];\n    boundingBoxSR?: string;\n    width: number;\n    height: number;\n    imageSR?: string;\n    time?: never;\n    format?: 'jpgpng';\n    pixelType?: 'U8';\n    noData?: never;\n    noDataInterpretation?: 'esriNoDataMatchAny';\n    interpolation?: '+RSP_NearestNeighbor';\n    compression?: never;\n    compressionQuality?: never;\n    bandIds?: never;\n    mosaicRule?: never;\n    renderingRule?: never;\n    f?: 'image';\n  }): Promise<ImageType> {\n    // See WMSService.getMap()\n    throw new Error('not implemented');\n  }\n\n  // URL creators\n\n  infoURL(options: {parameters?: Record<string, unknown>}): string {\n    return this.url;\n    // return this.getUrl({path: '', ...options});\n  }\n\n  /** \n   * Form a URL to an ESRI ImageServer\n   // https://sampleserver6.arcgisonline.com/arcgis/rest/services/NLCDLandCover2001/ImageServer/exportImage?bbox=${bounds[0]},${bounds[1]},${bounds[2]},${bounds[3]}&bboxSR=4326&size=${width},${height}&imageSR=102100&time=&format=jpgpng&pixelType=U8&noData=&noDataInterpretation=esriNoDataMatchAny&interpolation=+RSP_NearestNeighbor&compression=&compressionQuality=&bandIds=&mosaicRule=&renderingRule=&f=image`,\n   */\n  exportImageURL(options: {\n    boundingBox: [number, number, number, number];\n    boundingBoxSR?: string;\n    width: number;\n    height: number;\n    imageSR?: string;\n    time?: never;\n    format?: 'jpgpng';\n    pixelType?: 'U8';\n    noData?: never;\n    noDataInterpretation?: 'esriNoDataMatchAny';\n    interpolation?: '+RSP_NearestNeighbor';\n    compression?: never;\n    compressionQuality?: never;\n    bandIds?: never;\n    mosaicRule?: never;\n    renderingRule?: never;\n    f?: 'image';\n  }): string {\n    // const {boundingBox} = options;\n    // const bbox = `bbox=${boundingBox[0]},${boundingBox[1]},${boundingBox[2]},${boundingBox[3]}`;\n    // const size = `size=${width},${height}`;\n    // return this.getUrl({path: 'exportImage'});\n    return this.url;\n  }\n\n  // INTERNAL METHODS\n\n  /**\n   * @note protected, since perhaps getWMSUrl may need to be overridden to handle certain backends?\n   * @note if override is common, maybe add a callback prop?\n   * */\n  protected getUrl(options: Record<string, unknown>, extra?: Record<string, unknown>): string {\n    let url = `${this.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 url;\n  }\n\n  /** Checks for and parses a WMS XML formatted ServiceError and throws an exception */\n  protected async checkResponse(response: Response) {\n    if (!response.ok) {\n      // } || response.headers['content-type'] === WMSErrorLoader.mimeTypes[0]) {\n      // const arrayBuffer = await response.arrayBuffer();\n      // const error = await WMSErrorLoader.parse(arrayBuffer, this.loadOptions);\n      throw new Error('error');\n    }\n  }\n}\n"],"mappings":";;AAKA,SAAQA,WAAW,QAAO,gBAAgB;AAU1C,OAAO,MAAMC,kBAAkB,SAASD,WAAW,CAAC;EAQlDE,WAAW,CAACC,KAA8B,EAAE;IAC1C,KAAK,EAAE;IAAC;IAAA;IAAA;IACR,IAAI,CAACC,GAAG,GAAGD,KAAK,CAACC,GAAG;IACpB,IAAI,CAACC,WAAW,GAAGF,KAAK,CAACE,WAAW,IAAI,CAAC,CAAC;IAC1C,IAAI,CAACC,KAAK,GAAGH,KAAK,CAACG,KAAK,IAAIA,KAAK;EACnC;;EAIA,MAAMC,WAAW,GAAiC;IAChD,OAAQ,MAAM,IAAI,CAACC,IAAI,EAAE;EAE3B;;EAEA,MAAMC,QAAQ,CAACC,UAA8B,EAAsB;IACjE,MAAM,IAAIC,KAAK,CAAC,iBAAiB,CAAC;EAGpC;;EAIA,MAAMH,IAAI,GAAqB;IAG7B,MAAM,IAAIG,KAAK,CAAC,iBAAiB,CAAC;EACpC;;EAMAC,WAAW,CAACC,OAkBX,EAAsB;IAErB,MAAM,IAAIF,KAAK,CAAC,iBAAiB,CAAC;EACpC;;EAIAG,OAAO,CAACD,OAA+C,EAAU;IAC/D,OAAO,IAAI,CAACT,GAAG;EAEjB;;EAMAW,cAAc,CAACF,OAkBd,EAAU;IAKT,OAAO,IAAI,CAACT,GAAG;EACjB;;EAQUY,MAAM,CAACH,OAAgC,EAAEI,KAA+B,EAAU;IAC1F,IAAIb,GAAG,aAAM,IAAI,CAACA,GAAG,CAAE;IACvB,IAAIc,KAAK,GAAG,IAAI;IAChB,KAAK,MAAM,CAACC,GAAG,EAAEC,KAAK,CAAC,IAAIC,MAAM,CAACC,OAAO,CAACT,OAAO,CAAC,EAAE;MAClDT,GAAG,IAAIc,KAAK,GAAG,GAAG,GAAG,GAAG;MACxBA,KAAK,GAAG,KAAK;MACb,IAAIK,KAAK,CAACC,OAAO,CAACJ,KAAK,CAAC,EAAE;QACxBhB,GAAG,cAAOe,GAAG,CAACM,WAAW,EAAE,cAAIL,KAAK,CAACM,IAAI,CAAC,GAAG,CAAC,CAAE;MAClD,CAAC,MAAM;QACLtB,GAAG,cAAOe,GAAG,CAACM,WAAW,EAAE,cAAIL,KAAK,GAAGO,MAAM,CAACP,KAAK,CAAC,GAAG,EAAE,CAAE;MAC7D;IACF;IACA,OAAOhB,GAAG;EACZ;;EAGA,MAAgBwB,aAAa,CAACC,QAAkB,EAAE;IAChD,IAAI,CAACA,QAAQ,CAACC,EAAE,EAAE;MAIhB,MAAM,IAAInB,KAAK,CAAC,OAAO,CAAC;IAC1B;EACF;AACF;AAAC,gBAlIYV,kBAAkB,UACQ,qBAAqB;AAAA,gBAD/CA,kBAAkB,aAEXG,GAAW,IAAcA,GAAG,CAAC2B,WAAW,EAAE,CAACC,QAAQ,CAAC,aAAa,CAAC"}

package/dist/esm/lib/data-sources/create-image-source.js

@@ -0,0 +1,30 @@
+
+
+import { ImageService } from './image-services/image-service';
+import { WMSService } from './image-services/wms-service';
+import { ArcGISImageService } from './image-services/arcgis-image-service';
+const SERVICES = [WMSService, ArcGISImageService, ImageService];
+export function createImageSource(props) {
+  const {
+    type = 'auto'
+  } = props;
+  const serviceType = type === 'auto' ? guessServiceType(props.url) : type;
+  switch (serviceType) {
+    case 'template':
+      return new ImageService(props);
+    case 'wms':
+      return new WMSService(props);
+    default:
+      throw new Error('Not a valid image source type');
+  }
+}
+
+function guessServiceType(url) {
+  for (const Service of SERVICES) {
+    if (Service.testURL && Service.testURL(url)) {
+      return Service.type;
+    }
+  }
+  return 'wms';
+}
+//# sourceMappingURL=create-image-source.js.map

package/dist/esm/lib/data-sources/create-image-source.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"create-image-source.js","names":["ImageService","WMSService","ArcGISImageService","SERVICES","createImageSource","props","type","serviceType","guessServiceType","url","Error","Service","testURL"],"sources":["../../../../src/lib/data-sources/create-image-source.ts"],"sourcesContent":["// loaders.gl, MIT license\n\nimport {ImageSource} from './image-source';\nimport {ImageService, ImageServiceProps} from './image-services/image-service';\nimport {WMSService} from './image-services/wms-service';\nimport {ArcGISImageService} from './image-services/arcgis-image-service';\n\nexport type ImageServiceType = 'wms' | 'arcgis-image-server' | 'template';\n\nconst SERVICES = [WMSService, ArcGISImageService, ImageService];\n\ntype Props = ImageServiceProps & {\n  type?: ImageServiceType | 'auto';\n};\n\n/**\n * Creates an image source\n * If type is not supplied, will try to automatically detec the the\n * @param url URL to the image source\n * @param type type of source. if not known, set to 'auto'\n * @returns an ImageSource instance\n */\nexport function createImageSource(props: Props): ImageSource {\n  const {type = 'auto'} = props;\n  const serviceType = type === 'auto' ? guessServiceType(props.url) : type;\n  switch (serviceType) {\n    case 'template':\n      return new ImageService(props);\n    case 'wms':\n      return new WMSService(props);\n    default:\n      // currently only wms service supported\n      throw new Error('Not a valid image source type');\n  }\n}\n\n/** Guess service type from URL */\nfunction guessServiceType(url: string): ImageServiceType {\n  for (const Service of SERVICES) {\n    if (Service.testURL && Service.testURL(url)) {\n      return Service.type;\n    }\n  }\n  // If all else fails, guess that this is MS service\n  return 'wms';\n}\n"],"mappings":";;AAGA,SAAQA,YAAY,QAA0B,gCAAgC;AAC9E,SAAQC,UAAU,QAAO,8BAA8B;AACvD,SAAQC,kBAAkB,QAAO,uCAAuC;AAIxE,MAAMC,QAAQ,GAAG,CAACF,UAAU,EAAEC,kBAAkB,EAAEF,YAAY,CAAC;AAa/D,OAAO,SAASI,iBAAiB,CAACC,KAAY,EAAe;EAC3D,MAAM;IAACC,IAAI,GAAG;EAAM,CAAC,GAAGD,KAAK;EAC7B,MAAME,WAAW,GAAGD,IAAI,KAAK,MAAM,GAAGE,gBAAgB,CAACH,KAAK,CAACI,GAAG,CAAC,GAAGH,IAAI;EACxE,QAAQC,WAAW;IACjB,KAAK,UAAU;MACb,OAAO,IAAIP,YAAY,CAACK,KAAK,CAAC;IAChC,KAAK,KAAK;MACR,OAAO,IAAIJ,UAAU,CAACI,KAAK,CAAC;IAC9B;MAEE,MAAM,IAAIK,KAAK,CAAC,+BAA+B,CAAC;EAAC;AAEvD;;AAGA,SAASF,gBAAgB,CAACC,GAAW,EAAoB;EACvD,KAAK,MAAME,OAAO,IAAIR,QAAQ,EAAE;IAC9B,IAAIQ,OAAO,CAACC,OAAO,IAAID,OAAO,CAACC,OAAO,CAACH,GAAG,CAAC,EAAE;MAC3C,OAAOE,OAAO,CAACL,IAAI;IACrB;EACF;EAEA,OAAO,KAAK;AACd"}

package/dist/esm/lib/data-sources/image-services/arcgis-image-service.js

@@ -0,0 +1,61 @@
+import _defineProperty from "@babel/runtime/helpers/esm/defineProperty";
+
+import { ImageSource } from '../image-source';
+import { mergeImageServiceProps, getFetchFunction } from './image-service';
+export class ArcGISImageService extends ImageSource {
+  constructor(props) {
+    super();
+    _defineProperty(this, "props", void 0);
+    _defineProperty(this, "fetch", void 0);
+    this.props = mergeImageServiceProps(props);
+    this.fetch = getFetchFunction(this.props);
+  }
+
+  async getMetadata() {
+    return await this.info();
+  }
+
+  async getImage(parameters) {
+    throw new Error('not implemented');
+  }
+
+  async info() {
+    throw new Error('not implemented');
+  }
+
+  exportImage(options) {
+    throw new Error('not implemented');
+  }
+
+  infoURL(options) {
+    return this.props.url;
+  }
+
+  exportImageURL(options) {
+    return this.props.url;
+  }
+
+  getUrl(options, extra) {
+    let url = "".concat(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) : '');
+      }
+    }
+    return url;
+  }
+
+  async checkResponse(response) {
+    if (!response.ok) {
+      throw new Error('error');
+    }
+  }
+}
+_defineProperty(ArcGISImageService, "type", 'arcgis-image-server');
+_defineProperty(ArcGISImageService, "testURL", url => url.toLowerCase().includes('ImageServer'));
+//# sourceMappingURL=arcgis-image-service.js.map

package/dist/esm/lib/data-sources/image-services/arcgis-image-service.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"arcgis-image-service.js","names":["ImageSource","mergeImageServiceProps","getFetchFunction","ArcGISImageService","constructor","props","fetch","getMetadata","info","getImage","parameters","Error","exportImage","options","infoURL","url","exportImageURL","getUrl","extra","first","key","value","Object","entries","Array","isArray","toUpperCase","join","String","checkResponse","response","ok","toLowerCase","includes"],"sources":["../../../../../src/lib/data-sources/image-services/arcgis-image-service.ts"],"sourcesContent":["// loaders.gl, MIT license\n\nimport {ImageType} from '@loaders.gl/images';\nimport type {ImageSourceMetadata, GetImageParameters} from '../image-source';\nimport {ImageSource} from '../image-source';\nimport {ImageServiceProps, mergeImageServiceProps, getFetchFunction} from './image-service';\n\nexport class ArcGISImageService extends ImageSource {\n  static type: 'arcgis-image-server' = 'arcgis-image-server';\n  static testURL = (url: string): boolean => url.toLowerCase().includes('ImageServer');\n\n  props: Required<ImageServiceProps>;\n  fetch: (url: string, options?: RequestInit) => Promise<Response>;\n\n  constructor(props: ImageServiceProps) {\n    super();\n    this.props = mergeImageServiceProps(props);\n    this.fetch = getFetchFunction(this.props);\n  }\n\n  // ImageSource (normalized endpoints)\n\n  async getMetadata(): Promise<ImageSourceMetadata> {\n    return (await this.info()) as ImageSourceMetadata;\n    // TODO - normalize metadata\n  }\n\n  async getImage(parameters: GetImageParameters): Promise<ImageType> {\n    throw new Error('not implemented');\n    // TODO - Map generic parameters to ArcGIS specific parameters\n    // return await this.exportImage(parameters);\n  }\n\n  // ImageServer endpoints\n\n  async info(): Promise<unknown> {\n    // We just need a JSON parsing...\n    // return this.getUrl({path: '', ...options});\n    throw new Error('not implemented');\n  }\n\n  /** \n   * Form a URL to an ESRI ImageServer\n   // https://sampleserver6.arcgisonline.com/arcgis/rest/services/NLCDLandCover2001/ImageServer/exportImage?bbox=${bounds[0]},${bounds[1]},${bounds[2]},${bounds[3]}&bboxSR=4326&size=${width},${height}&imageSR=102100&time=&format=jpgpng&pixelType=U8&noData=&noDataInterpretation=esriNoDataMatchAny&interpolation=+RSP_NearestNeighbor&compression=&compressionQuality=&bandIds=&mosaicRule=&renderingRule=&f=image`,\n   */\n  exportImage(options: {\n    boundingBox: [number, number, number, number];\n    boundingBoxSR?: string;\n    width: number;\n    height: number;\n    imageSR?: string;\n    time?: never;\n    format?: 'jpgpng';\n    pixelType?: 'U8';\n    noData?: never;\n    noDataInterpretation?: 'esriNoDataMatchAny';\n    interpolation?: '+RSP_NearestNeighbor';\n    compression?: never;\n    compressionQuality?: never;\n    bandIds?: never;\n    mosaicRule?: never;\n    renderingRule?: never;\n    f?: 'image';\n  }): Promise<ImageType> {\n    // See WMSService.getMap()\n    throw new Error('not implemented');\n  }\n\n  // URL creators\n\n  infoURL(options: {parameters?: Record<string, unknown>}): string {\n    return this.props.url;\n    // return this.getUrl({path: '', ...options});\n  }\n\n  /** \n   * Form a URL to an ESRI ImageServer\n   // https://sampleserver6.arcgisonline.com/arcgis/rest/services/NLCDLandCover2001/ImageServer/exportImage?bbox=${bounds[0]},${bounds[1]},${bounds[2]},${bounds[3]}&bboxSR=4326&size=${width},${height}&imageSR=102100&time=&format=jpgpng&pixelType=U8&noData=&noDataInterpretation=esriNoDataMatchAny&interpolation=+RSP_NearestNeighbor&compression=&compressionQuality=&bandIds=&mosaicRule=&renderingRule=&f=image`,\n   */\n  exportImageURL(options: {\n    boundingBox: [number, number, number, number];\n    boundingBoxSR?: string;\n    width: number;\n    height: number;\n    imageSR?: string;\n    time?: never;\n    format?: 'jpgpng';\n    pixelType?: 'U8';\n    noData?: never;\n    noDataInterpretation?: 'esriNoDataMatchAny';\n    interpolation?: '+RSP_NearestNeighbor';\n    compression?: never;\n    compressionQuality?: never;\n    bandIds?: never;\n    mosaicRule?: never;\n    renderingRule?: never;\n    f?: 'image';\n  }): string {\n    // const {boundingBox} = options;\n    // const bbox = `bbox=${boundingBox[0]},${boundingBox[1]},${boundingBox[2]},${boundingBox[3]}`;\n    // const size = `size=${width},${height}`;\n    // return this.getUrl({path: 'exportImage'});\n    return this.props.url;\n  }\n\n  // INTERNAL METHODS\n\n  /**\n   * @note protected, since perhaps getWMSUrl may need to be overridden to handle certain backends?\n   * @note if override is common, maybe add a callback prop?\n   * */\n  protected getUrl(options: Record<string, unknown>, extra?: Record<string, unknown>): 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 url;\n  }\n\n  /** Checks for and parses a WMS XML formatted ServiceError and throws an exception */\n  protected async checkResponse(response: Response) {\n    if (!response.ok) {\n      // } || response.headers['content-type'] === WMSErrorLoader.mimeTypes[0]) {\n      // const arrayBuffer = await response.arrayBuffer();\n      // const error = await WMSErrorLoader.parse(arrayBuffer, this.loadOptions);\n      throw new Error('error');\n    }\n  }\n}\n"],"mappings":";;AAIA,SAAQA,WAAW,QAAO,iBAAiB;AAC3C,SAA2BC,sBAAsB,EAAEC,gBAAgB,QAAO,iBAAiB;AAE3F,OAAO,MAAMC,kBAAkB,SAASH,WAAW,CAAC;EAOlDI,WAAW,CAACC,KAAwB,EAAE;IACpC,KAAK,EAAE;IAAC;IAAA;IACR,IAAI,CAACA,KAAK,GAAGJ,sBAAsB,CAACI,KAAK,CAAC;IAC1C,IAAI,CAACC,KAAK,GAAGJ,gBAAgB,CAAC,IAAI,CAACG,KAAK,CAAC;EAC3C;;EAIA,MAAME,WAAW,GAAiC;IAChD,OAAQ,MAAM,IAAI,CAACC,IAAI,EAAE;EAE3B;;EAEA,MAAMC,QAAQ,CAACC,UAA8B,EAAsB;IACjE,MAAM,IAAIC,KAAK,CAAC,iBAAiB,CAAC;EAGpC;;EAIA,MAAMH,IAAI,GAAqB;IAG7B,MAAM,IAAIG,KAAK,CAAC,iBAAiB,CAAC;EACpC;;EAMAC,WAAW,CAACC,OAkBX,EAAsB;IAErB,MAAM,IAAIF,KAAK,CAAC,iBAAiB,CAAC;EACpC;;EAIAG,OAAO,CAACD,OAA+C,EAAU;IAC/D,OAAO,IAAI,CAACR,KAAK,CAACU,GAAG;EAEvB;;EAMAC,cAAc,CAACH,OAkBd,EAAU;IAKT,OAAO,IAAI,CAACR,KAAK,CAACU,GAAG;EACvB;;EAQUE,MAAM,CAACJ,OAAgC,EAAEK,KAA+B,EAAU;IAC1F,IAAIH,GAAG,aAAM,IAAI,CAACV,KAAK,CAACU,GAAG,CAAE;IAC7B,IAAII,KAAK,GAAG,IAAI;IAChB,KAAK,MAAM,CAACC,GAAG,EAAEC,KAAK,CAAC,IAAIC,MAAM,CAACC,OAAO,CAACV,OAAO,CAAC,EAAE;MAClDE,GAAG,IAAII,KAAK,GAAG,GAAG,GAAG,GAAG;MACxBA,KAAK,GAAG,KAAK;MACb,IAAIK,KAAK,CAACC,OAAO,CAACJ,KAAK,CAAC,EAAE;QACxBN,GAAG,cAAOK,GAAG,CAACM,WAAW,EAAE,cAAIL,KAAK,CAACM,IAAI,CAAC,GAAG,CAAC,CAAE;MAClD,CAAC,MAAM;QACLZ,GAAG,cAAOK,GAAG,CAACM,WAAW,EAAE,cAAIL,KAAK,GAAGO,MAAM,CAACP,KAAK,CAAC,GAAG,EAAE,CAAE;MAC7D;IACF;IACA,OAAON,GAAG;EACZ;;EAGA,MAAgBc,aAAa,CAACC,QAAkB,EAAE;IAChD,IAAI,CAACA,QAAQ,CAACC,EAAE,EAAE;MAIhB,MAAM,IAAIpB,KAAK,CAAC,OAAO,CAAC;IAC1B;EACF;AACF;AAAC,gBAhIYR,kBAAkB,UACQ,qBAAqB;AAAA,gBAD/CA,kBAAkB,aAEXY,GAAW,IAAcA,GAAG,CAACiB,WAAW,EAAE,CAACC,QAAQ,CAAC,aAAa,CAAC"}

package/dist/esm/lib/data-sources/image-services/image-service.js

@@ -0,0 +1,72 @@
+import _defineProperty from "@babel/runtime/helpers/esm/defineProperty";
+
+import { ImageLoader } from '@loaders.gl/images';
+import { ImageSource } from '../image-source';
+
+export class ImageService extends ImageSource {
+  constructor(props) {
+    super();
+    _defineProperty(this, "props", void 0);
+    _defineProperty(this, "fetch", void 0);
+    this.props = mergeImageServiceProps(props);
+    this.fetch = getFetchFunction(props);
+  }
+
+  async getMetadata() {
+    throw new Error('ImageSource.getMetadata not implemented');
+  }
+  async getImage(parameters) {
+    const granularParameters = this.getGranularParameters(parameters);
+    const url = this.getURLFromTemplate(granularParameters);
+    const response = await this.fetch(url);
+    const arrayBuffer = await response.arrayBuffer();
+    return await ImageLoader.parse(arrayBuffer);
+  }
+
+  getGranularParameters(parameters) {
+    const [east, north, west, south] = parameters.bbox;
+    return {
+      ...parameters,
+      east,
+      north,
+      south,
+      west
+    };
+  }
+
+  getURLFromTemplate(parameters) {
+    let url = this.props.url;
+    for (const [key, value] of Object.entries(parameters)) {
+      url = url.replace("${".concat(key, "}"), String(value));
+      url = url.replace("{".concat(key, "}"), String(value));
+    }
+    return url;
+  }
+}
+
+_defineProperty(ImageService, "type", 'template');
+_defineProperty(ImageService, "testURL", url => url.toLowerCase().includes('{'));
+export function getFetchFunction(options) {
+  const fetchFunction = options === null || options === void 0 ? void 0 : options.fetch;
+
+  if (fetchFunction && typeof fetchFunction === 'function') {
+    return (url, fetchOptions) => fetchFunction(url, fetchOptions);
+  }
+
+  const fetchOptions = options === null || options === void 0 ? void 0 : options.fetch;
+  if (fetchOptions && typeof fetchOptions !== 'function') {
+    return url => fetch(url, fetchOptions);
+  }
+
+  return url => fetch(url);
+}
+export function mergeImageServiceProps(props) {
+  return {
+    ...props,
+    loadOptions: {
+      ...props.loadOptions,
+      fetch: getFetchFunction(props.loadOptions)
+    }
+  };
+}
+//# sourceMappingURL=image-service.js.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"image-service.js","names":["ImageLoader","ImageSource","ImageService","constructor","props","mergeImageServiceProps","fetch","getFetchFunction","getMetadata","Error","getImage","parameters","granularParameters","getGranularParameters","url","getURLFromTemplate","response","arrayBuffer","parse","east","north","west","south","bbox","key","value","Object","entries","replace","String","toLowerCase","includes","options","fetchFunction","fetchOptions","loadOptions"],"sources":["../../../../../src/lib/data-sources/image-services/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 '../image-source';\nimport {ImageSource} from '../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: Required<ImageServiceProps>;\n  fetch: (url: string, options?: RequestInit) => Promise<Response>;\n\n  constructor(props: ImageServiceProps) {\n    super();\n    this.props = mergeImageServiceProps(props);\n    this.fetch = getFetchFunction(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\n/**\n * Gets the current fetch function from options\n * @todo - move to loader-utils module\n * @todo - use in core module counterpart\n * @param options\n * @param context\n */\nexport function getFetchFunction(options?: LoaderOptions) {\n  const fetchFunction = options?.fetch;\n\n  // options.fetch can be a function\n  if (fetchFunction && typeof fetchFunction === 'function') {\n    return (url: string, fetchOptions?: RequestInit) => fetchFunction(url, fetchOptions);\n  }\n\n  // options.fetch can be an options object, use global fetch with those options\n  const fetchOptions = options?.fetch;\n  if (fetchOptions && typeof fetchOptions !== 'function') {\n    return (url) => fetch(url, fetchOptions);\n  }\n\n  // else return the global fetch function\n  return (url) => fetch(url);\n}\n\nexport function mergeImageServiceProps(props: ImageServiceProps): Required<ImageServiceProps> {\n  return {\n    // Default fetch\n    ...props,\n    loadOptions: {\n      ...props.loadOptions,\n      fetch: getFetchFunction(props.loadOptions)\n    }\n  };\n}\n"],"mappings":";;AAIA,SAAQA,WAAW,QAAO,oBAAoB;AAG9C,SAAQC,WAAW,QAAO,iBAAiB;;AAe3C,OAAO,MAAMC,YAAY,SAASD,WAAW,CAAC;EAO5CE,WAAW,CAACC,KAAwB,EAAE;IACpC,KAAK,EAAE;IAAC;IAAA;IACR,IAAI,CAACA,KAAK,GAAGC,sBAAsB,CAACD,KAAK,CAAC;IAC1C,IAAI,CAACE,KAAK,GAAGC,gBAAgB,CAACH,KAAK,CAAC;EACtC;;EAIA,MAAMI,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,CAACV,KAAK,CAACQ,GAAG,CAAC;IACtC,MAAMG,WAAW,GAAG,MAAMD,QAAQ,CAACC,WAAW,EAAE;IAChD,OAAO,MAAMjB,WAAW,CAACkB,KAAK,CAACD,WAAW,CAAC;EAC7C;;EAKUJ,qBAAqB,CAACF,UAA8B,EAA2B;IACvF,MAAM,CAACQ,IAAI,EAAEC,KAAK,EAAEC,IAAI,EAAEC,KAAK,CAAC,GAAGX,UAAU,CAACY,IAAI;IAClD,OAAO;MAAC,GAAGZ,UAAU;MAAEQ,IAAI;MAAEC,KAAK;MAAEE,KAAK;MAAED;IAAI,CAAC;EAClD;;EAGUN,kBAAkB,CAACJ,UAAmC,EAAU;IACxE,IAAIG,GAAG,GAAG,IAAI,CAACV,KAAK,CAACU,GAAG;IACxB,KAAK,MAAM,CAACU,GAAG,EAAEC,KAAK,CAAC,IAAIC,MAAM,CAACC,OAAO,CAAChB,UAAU,CAAC,EAAE;MAGrDG,GAAG,GAAGA,GAAG,CAACc,OAAO,aAAOJ,GAAG,QAAKK,MAAM,CAACJ,KAAK,CAAC,CAAC;MAC9CX,GAAG,GAAGA,GAAG,CAACc,OAAO,YAAKJ,GAAG,QAAKK,MAAM,CAACJ,KAAK,CAAC,CAAC;IAC9C;IACA,OAAOX,GAAG;EACZ;AACF;;AAAC,gBA9CYZ,YAAY,UACG,UAAU;AAAA,gBADzBA,YAAY,aAELY,GAAW,IAAcA,GAAG,CAACgB,WAAW,EAAE,CAACC,QAAQ,CAAC,GAAG,CAAC;AAqD5E,OAAO,SAASxB,gBAAgB,CAACyB,OAAuB,EAAE;EACxD,MAAMC,aAAa,GAAGD,OAAO,aAAPA,OAAO,uBAAPA,OAAO,CAAE1B,KAAK;;EAGpC,IAAI2B,aAAa,IAAI,OAAOA,aAAa,KAAK,UAAU,EAAE;IACxD,OAAO,CAACnB,GAAW,EAAEoB,YAA0B,KAAKD,aAAa,CAACnB,GAAG,EAAEoB,YAAY,CAAC;EACtF;;EAGA,MAAMA,YAAY,GAAGF,OAAO,aAAPA,OAAO,uBAAPA,OAAO,CAAE1B,KAAK;EACnC,IAAI4B,YAAY,IAAI,OAAOA,YAAY,KAAK,UAAU,EAAE;IACtD,OAAQpB,GAAG,IAAKR,KAAK,CAACQ,GAAG,EAAEoB,YAAY,CAAC;EAC1C;;EAGA,OAAQpB,GAAG,IAAKR,KAAK,CAACQ,GAAG,CAAC;AAC5B;AAEA,OAAO,SAAST,sBAAsB,CAACD,KAAwB,EAA+B;EAC5F,OAAO;IAEL,GAAGA,KAAK;IACR+B,WAAW,EAAE;MACX,GAAG/B,KAAK,CAAC+B,WAAW;MACpB7B,KAAK,EAAEC,gBAAgB,CAACH,KAAK,CAAC+B,WAAW;IAC3C;EACF,CAAC;AACH"}

package/dist/esm/lib/data-sources/{wms-service.js → image-services/wms-service.js}

@@ -1,26 +1,30 @@
 import _defineProperty from "@babel/runtime/helpers/esm/defineProperty";
 
 import { ImageLoader } from '@loaders.gl/images';
-import { ImageSource } from './image-source';
-import { WMSCapabilitiesLoader } from '../../wms-capabilities-loader';
-import { WMSFeatureInfoLoader } from '../../wip/wms-feature-info-loader';
-import { WMSLayerDescriptionLoader } from '../../wip/wms-layer-description-loader';
-import { WMSErrorLoader } from '../../wms-error-loader';
+import { ImageSource } from '../image-source';
+import { getFetchFunction, mergeImageServiceProps } from './image-service';
+import { WMSCapabilitiesLoader } from '../../../wms-capabilities-loader';
+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 _this$props$loadOptio;
     super();
-    _defineProperty(this, "serviceUrl", void 0);
-    _defineProperty(this, "loadOptions", {
+    _defineProperty(this, "props", void 0);
+    _defineProperty(this, "fetch", void 0);
+    _defineProperty(this, "capabilities", null);
+    _defineProperty(this, "loaders", [ImageLoader, WMSErrorLoader, WMSCapabilitiesLoader, WMSFeatureInfoLoader, WMSLayerDescriptionLoader]);
+    this.props = mergeImageServiceProps(props);
+    this.fetch = getFetchFunction(this.props);
+    this.props.loadOptions = {
+      ...this.props.loadOptions,
       wms: {
+        ...((_this$props$loadOptio = this.props.loadOptions) === null || _this$props$loadOptio === void 0 ? void 0 : _this$props$loadOptio.wms),
         throwOnError: true
       }
-    });
-    _defineProperty(this, "fetch", void 0);
-    _defineProperty(this, "loaders", [ImageLoader, WMSErrorLoader, WMSCapabilitiesLoader, WMSFeatureInfoLoader, WMSLayerDescriptionLoader]);
-    this.serviceUrl = props.serviceUrl;
-    Object.assign(this.loadOptions, props.loadOptions);
-    this.fetch = props.fetch || fetch;
+    };
   }
 
   getMetadata() {
@@ -32,25 +36,21 @@ export class WMSService extends ImageSource {
 
   async getCapabilities(wmsParameters, vendorParameters) {
     const url = this.getCapabilitiesURL(wmsParameters, vendorParameters);
-    const {
-      fetch
-    } = this;
-    const response = await fetch(url, this.loadOptions);
+    const response = await this.fetch(url);
     const arrayBuffer = await response.arrayBuffer();
     this._checkResponse(response, arrayBuffer);
-    return await WMSCapabilitiesLoader.parse(arrayBuffer, this.loadOptions);
+    const capabilities = await WMSCapabilitiesLoader.parse(arrayBuffer, this.props.loadOptions);
+    this.capabilities = capabilities;
+    return capabilities;
   }
 
   async getMap(options, vendorParameters) {
     const url = this.getMapURL(options, vendorParameters);
-    const {
-      fetch
-    } = this;
-    const response = await fetch(url, this.loadOptions);
+    const response = await this.fetch(url);
     const arrayBuffer = await response.arrayBuffer();
     this._checkResponse(response, arrayBuffer);
     try {
-      return await ImageLoader.parse(arrayBuffer, this.loadOptions);
+      return await ImageLoader.parse(arrayBuffer, this.props.loadOptions);
     } catch {
       throw this._parseError(arrayBuffer);
     }
@@ -58,27 +58,39 @@ export class WMSService extends ImageSource {
 
   async getFeatureInfo(options, vendorParameters) {
     const url = this.getFeatureInfoURL(options, vendorParameters);
-    const response = await this.fetch(url, this.loadOptions);
+    const response = await this.fetch(url);
+    const arrayBuffer = await response.arrayBuffer();
+    this._checkResponse(response, arrayBuffer);
+    return await WMSFeatureInfoLoader.parse(arrayBuffer, this.props.loadOptions);
+  }
+
+  async getFeatureInfoText(options, vendorParameters) {
+    options = {
+      ...options,
+      info_format: 'text/plain'
+    };
+    const url = this.getFeatureInfoURL(options, vendorParameters);
+    const response = await this.fetch(url);
     const arrayBuffer = await response.arrayBuffer();
     this._checkResponse(response, arrayBuffer);
-    return await WMSFeatureInfoLoader.parse(arrayBuffer, this.loadOptions);
+    return new TextDecoder().decode(arrayBuffer);
   }
 
   async describeLayer(options, vendorParameters) {
     const url = this.describeLayerURL(options, vendorParameters);
-    const response = await this.fetch(url, this.loadOptions);
+    const response = await this.fetch(url);
     const arrayBuffer = await response.arrayBuffer();
     this._checkResponse(response, arrayBuffer);
-    return await WMSLayerDescriptionLoader.parse(arrayBuffer, this.loadOptions);
+    return await WMSLayerDescriptionLoader.parse(arrayBuffer, this.props.loadOptions);
   }
 
   async getLegendGraphic(options, vendorParameters) {
     const url = this.getLegendGraphicURL(options, vendorParameters);
-    const response = await this.fetch(url, this.loadOptions);
+    const response = await this.fetch(url);
     const arrayBuffer = await response.arrayBuffer();
     this._checkResponse(response, arrayBuffer);
     try {
-      return await ImageLoader.parse(arrayBuffer, this.loadOptions);
+      return await ImageLoader.parse(arrayBuffer, this.props.loadOptions);
     } catch {
       throw this._parseError(arrayBuffer);
     }
@@ -146,7 +158,7 @@ export class WMSService extends ImageSource {
   }
 
   _getWMSUrl(options, vendorParameters) {
-    let url = "".concat(this.serviceUrl);
+    let url = this.props.url;
     let first = true;
     for (const [key, value] of Object.entries(options)) {
       url += first ? '?' : '&';
@@ -163,14 +175,16 @@ export class WMSService extends ImageSource {
   _checkResponse(response, arrayBuffer) {
     const contentType = response.headers['content-type'];
     if (!response.ok || WMSErrorLoader.mimeTypes.includes(contentType)) {
-      const error = WMSErrorLoader.parseSync(arrayBuffer, this.loadOptions);
+      const error = WMSErrorLoader.parseSync(arrayBuffer, this.props.loadOptions);
       throw new Error(error);
     }
   }
 
   _parseError(arrayBuffer) {
-    const error = WMSErrorLoader.parseSync(arrayBuffer, this.loadOptions);
+    const error = WMSErrorLoader.parseSync(arrayBuffer, this.props.loadOptions);
     return new Error(error);
   }
 }
+_defineProperty(WMSService, "type", 'wms');
+_defineProperty(WMSService, "testURL", url => url.toLowerCase().includes('wms'));
 //# sourceMappingURL=wms-service.js.map