@loaders.gl/wms 4.0.0-alpha.9 → 4.0.0-beta.2

package/dist/csw-capabilities-loader.d.ts

@@ -9,21 +9,5 @@ export type CSWLoaderOptions = XMLLoaderOptions & {
 /**
  * Loader for the response to the CSW GetCapability request
  */
-export declare const CSWCapabilitiesLoader: {
-    id: string;
-    name: string;
-    module: string;
-    version: any;
-    worker: boolean;
-    extensions: string[];
-    mimeTypes: string[];
-    testText: typeof testXMLFile;
-    options: {
-        csw: {};
-    };
-    parse: (arrayBuffer: ArrayBuffer, options?: CSWLoaderOptions) => Promise<CSWCapabilities>;
-    parseTextSync: (text: string, options?: CSWLoaderOptions) => CSWCapabilities;
-};
-declare function testXMLFile(text: string): boolean;
-export declare const _typecheckCSWCapabilitiesLoader: LoaderWithParser;
+export declare const CSWCapabilitiesLoader: LoaderWithParser<CSWCapabilities, never, CSWLoaderOptions>;
 //# sourceMappingURL=csw-capabilities-loader.d.ts.map

package/dist/csw-capabilities-loader.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"csw-capabilities-loader.d.ts","sourceRoot":"","sources":["../src/csw-capabilities-loader.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAC,gBAAgB,EAAC,MAAM,0BAA0B,CAAC;AAC/D,OAAO,KAAK,EAAC,gBAAgB,EAAC,MAAM,iBAAiB,CAAC;AACtD,OAAO,KAAK,EAAC,eAAe,EAAC,MAAM,0CAA0C,CAAC;AAQ9E,YAAY,EAAC,eAAe,EAAC,CAAC;AAE9B,yBAAyB;AACzB,MAAM,MAAM,gBAAgB,GAAG,gBAAgB,GAAG;IAChD,GAAG,CAAC,EAAE,EAAE,CAAC;CACV,CAAC;AAEF;;GAEG;AACH,eAAO,MAAM,qBAAqB;;;;;;;;;;;;yBAaL,WAAW,YAAY,gBAAgB;0BAE5C,MAAM,YAAY,gBAAgB;CACzD,CAAC;AAEF,iBAAS,WAAW,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAG1C;AAED,eAAO,MAAM,+BAA+B,EAAE,gBAAwC,CAAC"}
+{"version":3,"file":"csw-capabilities-loader.d.ts","sourceRoot":"","sources":["../src/csw-capabilities-loader.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAC,gBAAgB,EAAC,MAAM,0BAA0B,CAAC;AAC/D,OAAO,KAAK,EAAC,gBAAgB,EAAC,MAAM,iBAAiB,CAAC;AACtD,OAAO,KAAK,EAAC,eAAe,EAAC,MAAM,0CAA0C,CAAC;AAQ9E,YAAY,EAAC,eAAe,EAAC,CAAC;AAE9B,yBAAyB;AACzB,MAAM,MAAM,gBAAgB,GAAG,gBAAgB,GAAG;IAChD,GAAG,CAAC,EAAE,EAAE,CAAC;CACV,CAAC;AAEF;;GAEG;AACH,eAAO,MAAM,qBAAqB,EAAE,gBAAgB,CAAC,eAAe,EAAE,KAAK,EAAE,gBAAgB,CAe5F,CAAC"}

package/dist/csw-domain-loader.d.ts

@@ -8,21 +8,5 @@ export type CSWLoaderOptions = XMLLoaderOptions & {
 /**
  * Loader for the response to the CSW GetCapability request
  */
-export declare const CSWDomainLoader: {
-    id: string;
-    name: string;
-    module: string;
-    version: any;
-    worker: boolean;
-    extensions: string[];
-    mimeTypes: string[];
-    testText: typeof testXMLFile;
-    options: {
-        csw: {};
-    };
-    parse: (arrayBuffer: ArrayBuffer, options?: CSWLoaderOptions) => Promise<CSWDomain>;
-    parseTextSync: (text: string, options?: CSWLoaderOptions) => CSWDomain;
-};
-declare function testXMLFile(text: string): boolean;
-export declare const _typecheckCSWDomainLoader: LoaderWithParser;
+export declare const CSWDomainLoader: LoaderWithParser<CSWDomain, never, CSWLoaderOptions>;
 //# sourceMappingURL=csw-domain-loader.d.ts.map

package/dist/csw-domain-loader.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"csw-domain-loader.d.ts","sourceRoot":"","sources":["../src/csw-domain-loader.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAC,gBAAgB,EAAC,MAAM,0BAA0B,CAAC;AAC/D,OAAO,KAAK,EAAC,gBAAgB,EAAC,MAAM,iBAAiB,CAAC;AACtD,OAAO,KAAK,EAAC,SAAS,EAAC,MAAM,oCAAoC,CAAC;AAOlE,YAAY,EAAC,SAAS,EAAC,CAAC;AAExB,MAAM,MAAM,gBAAgB,GAAG,gBAAgB,GAAG;IAChD,GAAG,CAAC,EAAE,EAAE,CAAC;CACV,CAAC;AAEF;;GAEG;AACH,eAAO,MAAM,eAAe;;;;;;;;;;;;yBAaC,WAAW,YAAY,gBAAgB;0BAE5C,MAAM,YAAY,gBAAgB;CACzD,CAAC;AAEF,iBAAS,WAAW,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAG1C;AAED,eAAO,MAAM,yBAAyB,EAAE,gBAAkC,CAAC"}
+{"version":3,"file":"csw-domain-loader.d.ts","sourceRoot":"","sources":["../src/csw-domain-loader.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAC,gBAAgB,EAAC,MAAM,0BAA0B,CAAC;AAC/D,OAAO,KAAK,EAAC,gBAAgB,EAAC,MAAM,iBAAiB,CAAC;AACtD,OAAO,KAAK,EAAC,SAAS,EAAC,MAAM,oCAAoC,CAAC;AAOlE,YAAY,EAAC,SAAS,EAAC,CAAC;AAExB,MAAM,MAAM,gBAAgB,GAAG,gBAAgB,GAAG;IAChD,GAAG,CAAC,EAAE,EAAE,CAAC;CACV,CAAC;AAEF;;GAEG;AACH,eAAO,MAAM,eAAe,EAAE,gBAAgB,CAAC,SAAS,EAAE,KAAK,EAAE,gBAAgB,CAgBhF,CAAC"}

package/dist/csw-records-loader.d.ts

@@ -8,5 +8,5 @@ export type CSWLoaderOptions = XMLLoaderOptions & {
 /**
  * Loader for the response to the CSW GetCapability request
  */
-export declare const CSWRecordsLoader: LoaderWithParser;
+export declare const CSWRecordsLoader: LoaderWithParser<CSWRecords, never, CSWLoaderOptions>;
 //# sourceMappingURL=csw-records-loader.d.ts.map

package/dist/csw-records-loader.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"csw-records-loader.d.ts","sourceRoot":"","sources":["../src/csw-records-loader.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAC,gBAAgB,EAAC,MAAM,0BAA0B,CAAC;AAC/D,OAAO,KAAK,EAAC,gBAAgB,EAAC,MAAM,iBAAiB,CAAC;AACtD,OAAO,KAAK,EAAC,UAAU,EAAC,MAAM,qCAAqC,CAAC;AAOpE,OAAO,EAAC,UAAU,EAAC,CAAC;AAEpB,MAAM,MAAM,gBAAgB,GAAG,gBAAgB,GAAG;IAChD,GAAG,CAAC,EAAE,EAAE,CAAC;CACV,CAAC;AAEF;;GAEG;AACH,eAAO,MAAM,gBAAgB,EAAE,gBAgB9B,CAAC"}
+{"version":3,"file":"csw-records-loader.d.ts","sourceRoot":"","sources":["../src/csw-records-loader.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAC,gBAAgB,EAAC,MAAM,0BAA0B,CAAC;AAC/D,OAAO,KAAK,EAAC,gBAAgB,EAAC,MAAM,iBAAiB,CAAC;AACtD,OAAO,KAAK,EAAC,UAAU,EAAC,MAAM,qCAAqC,CAAC;AAOpE,OAAO,EAAC,UAAU,EAAC,CAAC;AAEpB,MAAM,MAAM,gBAAgB,GAAG,gBAAgB,GAAG;IAChD,GAAG,CAAC,EAAE,EAAE,CAAC;CACV,CAAC;AAEF;;GAEG;AACH,eAAO,MAAM,gBAAgB,EAAE,gBAAgB,CAAC,UAAU,EAAE,KAAK,EAAE,gBAAgB,CAelF,CAAC"}

package/dist/dist.min.js

@@ -51,9 +51,9 @@
     }
   });
 
-  // ../xml/node_modules/fast-xml-parser/src/util.js
+  // ../../node_modules/fast-xml-parser/src/util.js
   var require_util = __commonJS({
-    "../xml/node_modules/fast-xml-parser/src/util.js"(exports) {
+    "../../node_modules/fast-xml-parser/src/util.js"(exports) {
       "use strict";
       var nameStartChar = ":A-Za-z_\\u00C0-\\u00D6\\u00D8-\\u00F6\\u00F8-\\u02FF\\u0370-\\u037D\\u037F-\\u1FFF\\u200C-\\u200D\\u2070-\\u218F\\u2C00-\\u2FEF\\u3001-\\uD7FF\\uF900-\\uFDCF\\uFDF0-\\uFFFD";
       var nameChar = nameStartChar + "\\-.\\d\\u00B7\\u0300-\\u036F\\u203F-\\u2040";
@@ -110,9 +110,9 @@
     }
   });
 
-  // ../xml/node_modules/fast-xml-parser/src/validator.js
+  // ../../node_modules/fast-xml-parser/src/validator.js
   var require_validator = __commonJS({
-    "../xml/node_modules/fast-xml-parser/src/validator.js"(exports) {
+    "../../node_modules/fast-xml-parser/src/validator.js"(exports) {
       "use strict";
       var util = require_util();
       var defaultOptions = {
@@ -416,9 +416,9 @@
     }
   });
 
-  // ../xml/node_modules/fast-xml-parser/src/xmlparser/OptionsBuilder.js
+  // ../../node_modules/fast-xml-parser/src/xmlparser/OptionsBuilder.js
   var require_OptionsBuilder = __commonJS({
-    "../xml/node_modules/fast-xml-parser/src/xmlparser/OptionsBuilder.js"(exports) {
+    "../../node_modules/fast-xml-parser/src/xmlparser/OptionsBuilder.js"(exports) {
       var defaultOptions = {
         preserveOrder: false,
         attributeNamePrefix: "@_",
@@ -465,9 +465,9 @@
     }
   });
 
-  // ../xml/node_modules/fast-xml-parser/src/xmlparser/xmlNode.js
+  // ../../node_modules/fast-xml-parser/src/xmlparser/xmlNode.js
   var require_xmlNode = __commonJS({
-    "../xml/node_modules/fast-xml-parser/src/xmlparser/xmlNode.js"(exports, module) {
+    "../../node_modules/fast-xml-parser/src/xmlparser/xmlNode.js"(exports, module) {
       "use strict";
       var XmlNode = class {
         constructor(tagname) {
@@ -494,9 +494,10 @@
     }
   });
 
-  // ../xml/node_modules/fast-xml-parser/src/xmlparser/DocTypeReader.js
+  // ../../node_modules/fast-xml-parser/src/xmlparser/DocTypeReader.js
   var require_DocTypeReader = __commonJS({
-    "../xml/node_modules/fast-xml-parser/src/xmlparser/DocTypeReader.js"(exports, module) {
+    "../../node_modules/fast-xml-parser/src/xmlparser/DocTypeReader.js"(exports, module) {
+      var util = require_util();
       function readDocType(xmlData, i) {
         const entities = {};
         if (xmlData[i + 3] === "O" && xmlData[i + 4] === "C" && xmlData[i + 5] === "T" && xmlData[i + 6] === "Y" && xmlData[i + 7] === "P" && xmlData[i + 8] === "E") {
@@ -510,7 +511,7 @@
                 i += 7;
                 [entityName, val, i] = readEntityExp(xmlData, i + 1);
                 if (val.indexOf("&") === -1)
-                  entities[entityName] = {
+                  entities[validateEntityName(entityName)] = {
                     regx: RegExp(`&${entityName};`, "g"),
                     val
                   };
@@ -592,6 +593,12 @@
           return true;
         return false;
       }
+      function validateEntityName(name) {
+        if (util.isName(name))
+          return name;
+        else
+          throw new Error(`Invalid entity name ${name}`);
+      }
       module.exports = readDocType;
     }
   });
@@ -692,9 +699,9 @@
     }
   });
 
-  // ../xml/node_modules/fast-xml-parser/src/xmlparser/OrderedObjParser.js
+  // ../../node_modules/fast-xml-parser/src/xmlparser/OrderedObjParser.js
   var require_OrderedObjParser = __commonJS({
-    "../xml/node_modules/fast-xml-parser/src/xmlparser/OrderedObjParser.js"(exports, module) {
+    "../../node_modules/fast-xml-parser/src/xmlparser/OrderedObjParser.js"(exports, module) {
       "use strict";
       var util = require_util();
       var xmlNode = require_xmlNode();
@@ -1166,9 +1173,9 @@
     }
   });
 
-  // ../xml/node_modules/fast-xml-parser/src/xmlparser/node2json.js
+  // ../../node_modules/fast-xml-parser/src/xmlparser/node2json.js
   var require_node2json = __commonJS({
-    "../xml/node_modules/fast-xml-parser/src/xmlparser/node2json.js"(exports) {
+    "../../node_modules/fast-xml-parser/src/xmlparser/node2json.js"(exports) {
       "use strict";
       function prettify(node, options) {
         return compress(node, options);
@@ -1262,9 +1269,9 @@
     }
   });
 
-  // ../xml/node_modules/fast-xml-parser/src/xmlparser/XMLParser.js
+  // ../../node_modules/fast-xml-parser/src/xmlparser/XMLParser.js
   var require_XMLParser = __commonJS({
-    "../xml/node_modules/fast-xml-parser/src/xmlparser/XMLParser.js"(exports, module) {
+    "../../node_modules/fast-xml-parser/src/xmlparser/XMLParser.js"(exports, module) {
       var { buildOptions } = require_OptionsBuilder();
       var OrderedObjParser = require_OrderedObjParser();
       var { prettify } = require_node2json();
@@ -1313,9 +1320,9 @@
     }
   });
 
-  // ../xml/node_modules/fast-xml-parser/src/xmlbuilder/orderedJs2Xml.js
+  // ../../node_modules/fast-xml-parser/src/xmlbuilder/orderedJs2Xml.js
   var require_orderedJs2Xml = __commonJS({
-    "../xml/node_modules/fast-xml-parser/src/xmlbuilder/orderedJs2Xml.js"(exports, module) {
+    "../../node_modules/fast-xml-parser/src/xmlbuilder/orderedJs2Xml.js"(exports, module) {
       var EOL = "\n";
       function toXml(jArray, options) {
         let indentation = "";
@@ -1441,9 +1448,9 @@
     }
   });
 
-  // ../xml/node_modules/fast-xml-parser/src/xmlbuilder/json2xml.js
+  // ../../node_modules/fast-xml-parser/src/xmlbuilder/json2xml.js
   var require_json2xml = __commonJS({
-    "../xml/node_modules/fast-xml-parser/src/xmlbuilder/json2xml.js"(exports, module) {
+    "../../node_modules/fast-xml-parser/src/xmlbuilder/json2xml.js"(exports, module) {
       "use strict";
       var buildFromOrderedJs = require_orderedJs2Xml();
       var defaultOptions = {
@@ -1666,9 +1673,9 @@
     }
   });
 
-  // ../xml/node_modules/fast-xml-parser/src/fxp.js
+  // ../../node_modules/fast-xml-parser/src/fxp.js
   var require_fxp = __commonJS({
-    "../xml/node_modules/fast-xml-parser/src/fxp.js"(exports, module) {
+    "../../node_modules/fast-xml-parser/src/fxp.js"(exports, module) {
       "use strict";
       var validator = require_validator();
       var XMLParser = require_XMLParser();
@@ -1791,7 +1798,7 @@
   function mergeOptionsRecursively(baseOptions, newOptions) {
     const options = { ...baseOptions };
     for (const [key, newValue] of Object.entries(newOptions)) {
-      if (newValue && typeof newValue === "object") {
+      if (newValue && typeof newValue === "object" && !Array.isArray(newValue)) {
         options[key] = mergeOptionsRecursively(options[key] || {}, newOptions[key]);
       } else {
         options[key] = newOptions[key];
@@ -1804,12 +1811,66 @@
     }
   });
 
+  // ../loader-utils/src/lib/sources/data-source.ts
+  function getFetchFunction(options) {
+    const fetchFunction = options?.fetch;
+    if (fetchFunction && typeof fetchFunction === "function") {
+      return (url, fetchOptions2) => fetchFunction(url, fetchOptions2);
+    }
+    const fetchOptions = options?.fetch;
+    if (fetchOptions && typeof fetchOptions !== "function") {
+      return (url) => fetch(url, fetchOptions);
+    }
+    return (url) => fetch(url);
+  }
+  var DataSource;
+  var init_data_source = __esm({
+    "../loader-utils/src/lib/sources/data-source.ts"() {
+      DataSource = class {
+        constructor(props) {
+          this._needsRefresh = true;
+          this.props = { ...props };
+          this.loadOptions = { ...props.loadOptions };
+          this.fetch = getFetchFunction(this.loadOptions);
+        }
+        setProps(props) {
+          this.props = Object.assign(this.props, props);
+          this.setNeedsRefresh();
+        }
+        setNeedsRefresh() {
+          this._needsRefresh = true;
+        }
+        getNeedsRefresh(clear = true) {
+          const needsRefresh = this._needsRefresh;
+          if (clear) {
+            this._needsRefresh = false;
+          }
+          return needsRefresh;
+        }
+      };
+    }
+  });
+
+  // ../loader-utils/src/lib/sources/image-source.ts
+  var ImageSource;
+  var init_image_source = __esm({
+    "../loader-utils/src/lib/sources/image-source.ts"() {
+      init_data_source();
+      ImageSource = class extends DataSource {
+      };
+      ImageSource.type = "template";
+      ImageSource.testURL = (url) => false;
+    }
+  });
+
   // ../loader-utils/src/index.ts
   var init_src = __esm({
     "../loader-utils/src/index.ts"() {
       init_assert();
       init_globals();
       init_merge_loader_options();
+      init_data_source();
+      init_image_source();
     }
   });
 
@@ -2017,7 +2078,7 @@
       VERSION4 = typeof __VERSION__ !== "undefined" ? __VERSION__ : "latest";
       CSWRecordsLoader = {
         id: "csw-records",
-        name: "CSW Domain",
+        name: "CSW Records",
         module: "wms",
         version: VERSION4,
         worker: false,
@@ -2467,7 +2528,7 @@
         mimeTypes: ["application/vnd.ogc.wfs_xml", "application/xml", "text/xml"],
         testText: testXMLFile7,
         options: {
-          wms: {}
+          wfs: {}
         },
         parse: async (arrayBuffer, options) => parseWFSCapabilities(new TextDecoder().decode(arrayBuffer), options),
         parseTextSync: (text, options) => parseWFSCapabilities(text, options)
@@ -3269,53 +3330,33 @@
     }
   });
 
-  // src/lib/sources/data-source.ts
-  function getFetchFunction(options) {
-    const fetchFunction = options?.fetch;
-    if (fetchFunction && typeof fetchFunction === "function") {
-      return (url, fetchOptions2) => fetchFunction(url, fetchOptions2);
+  // src/lib/services/create-image-service.ts
+  function createImageService(props, services) {
+    const { type = "auto" } = props;
+    const service = type === "auto" ? guessServiceType(props.url, services) : getServiceOfType(type, services);
+    if (!service) {
+      throw new Error("Not a valid image source type");
     }
-    const fetchOptions = options?.fetch;
-    if (fetchOptions && typeof fetchOptions !== "function") {
-      return (url) => fetch(url, fetchOptions);
+    return service.create(props);
+  }
+  function getServiceOfType(type, services) {
+    for (const service of services) {
+      if (service.type === type) {
+        return service;
+      }
     }
-    return (url) => fetch(url);
+    return null;
   }
-  var DataSource;
-  var init_data_source = __esm({
-    "src/lib/sources/data-source.ts"() {
-      DataSource = class {
-        constructor(props) {
-          this._needsRefresh = true;
-          this.props = { ...props };
-          this.loadOptions = { ...props.loadOptions };
-          this.fetch = getFetchFunction(this.loadOptions);
-        }
-        setProps(props) {
-          this.props = Object.assign(this.props, props);
-          this.setNeedsRefresh();
-        }
-        setNeedsRefresh() {
-          this._needsRefresh = true;
-        }
-        getNeedsRefresh(clear = true) {
-          const needsRefresh = this._needsRefresh;
-          if (clear) {
-            this._needsRefresh = false;
-          }
-          return needsRefresh;
-        }
-      };
+  function guessServiceType(url, services) {
+    for (const service of services) {
+      if (service.testURL && service.testURL(url)) {
+        return service;
+      }
     }
-  });
-
-  // src/lib/sources/image-source.ts
-  var ImageSource;
-  var init_image_source = __esm({
-    "src/lib/sources/image-source.ts"() {
-      init_data_source();
-      ImageSource = class extends DataSource {
-      };
+    return null;
+  }
+  var init_create_image_service = __esm({
+    "src/lib/services/create-image-service.ts"() {
     }
   });
 
@@ -3789,66 +3830,26 @@
     }
   });
 
-  // src/lib/services/generic/image-service.ts
-  var ImageService;
-  var init_image_service = __esm({
-    "src/lib/services/generic/image-service.ts"() {
-      init_src3();
-      init_image_source();
-      ImageService = class extends ImageSource {
-        constructor(props) {
-          super(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(`\${${key}}`, String(value));
-            url = url.replace(`{${key}}`, String(value));
-          }
-          return url;
-        }
-      };
-      ImageService.type = "template";
-      ImageService.testURL = (url) => url.toLowerCase().includes("{");
-    }
-  });
-
-  // src/lib/services/ogc/wms-service.ts
-  var WMSService;
+  // src/services/ogc/wms-service.ts
+  var WMSService, WMSSource;
   var init_wms_service = __esm({
-    "src/lib/services/ogc/wms-service.ts"() {
+    "src/services/ogc/wms-service.ts"() {
       init_src3();
       init_src();
-      init_image_source();
+      init_src();
       init_wms_capabilities_loader();
       init_wms_feature_info_loader();
       init_wms_layer_description_loader();
       init_wms_error_loader();
-      WMSService = class extends ImageSource {
+      WMSService = {
+        type: "wms",
+        testURL: (url) => url.toLowerCase().includes("wms"),
+        create: (props) => new WMSSource(props)
+      };
+      WMSSource = class extends ImageSource {
         constructor(props) {
           super(props);
           this.capabilities = null;
-          this.loaders = [
-            ImageLoader,
-            WMSErrorLoader,
-            WMSCapabilitiesLoader,
-            WMSFeatureInfoLoader,
-            WMSLayerDescriptionLoader
-          ];
           this.url = props.url;
           this.substituteCRS84 = props.substituteCRS84 ?? false;
           this.flipCRS = ["EPSG:4326"];
@@ -4061,26 +4062,62 @@
             const loadOptions = mergeLoaderOptions(this.loadOptions, {
               wms: { throwOnError: true }
             });
-            const error = WMSErrorLoader.parseSync(arrayBuffer, loadOptions);
+            const error = WMSErrorLoader.parseSync?.(arrayBuffer, loadOptions);
             throw new Error(error);
           }
         }
         _parseError(arrayBuffer) {
-          const error = WMSErrorLoader.parseSync(arrayBuffer, this.loadOptions);
+          const error = WMSErrorLoader.parseSync?.(arrayBuffer, this.loadOptions);
           return new Error(error);
         }
       };
-      WMSService.type = "wms";
-      WMSService.testURL = (url) => url.toLowerCase().includes("wms");
     }
   });
 
-  // src/lib/services/arcgis/arcgis-image-service.ts
-  var ArcGISImageServer;
+  // src/lib/services/image-service.ts
+  var ImageService;
+  var init_image_service = __esm({
+    "src/lib/services/image-service.ts"() {
+      init_src3();
+      init_src();
+      ImageService = class extends ImageSource {
+        constructor(props) {
+          super(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(`\${${key}}`, String(value));
+            url = url.replace(`{${key}}`, String(value));
+          }
+          return url;
+        }
+      };
+      ImageService.type = "template";
+      ImageService.testURL = (url) => url.toLowerCase().includes("{");
+    }
+  });
+
+  // src/services/arcgis/arcgis-image-service.ts
+  var ArcGISImageSource, ArcGISImageService;
   var init_arcgis_image_service = __esm({
-    "src/lib/services/arcgis/arcgis-image-service.ts"() {
-      init_image_source();
-      ArcGISImageServer = class extends ImageSource {
+    "src/services/arcgis/arcgis-image-service.ts"() {
+      init_image_service();
+      ArcGISImageSource = class extends ImageService {
         constructor(props) {
           super(props);
         }
@@ -4127,47 +4164,33 @@
           }
         }
       };
-      ArcGISImageServer.type = "arcgis-image-server";
-      ArcGISImageServer.testURL = (url) => url.toLowerCase().includes("ImageServer");
+      ArcGISImageService = {
+        type: "arcgis-image-server",
+        testURL: (url) => url.toLowerCase().includes("ImageServer"),
+        create: (props) => new ArcGISImageSource(props)
+      };
     }
   });
 
-  // src/lib/create-image-source.ts
+  // src/services/create-image-source.ts
   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";
+    return createImageService(props, SERVICES);
   }
   var SERVICES;
   var init_create_image_source = __esm({
-    "src/lib/create-image-source.ts"() {
-      init_image_service();
+    "src/services/create-image-source.ts"() {
+      init_create_image_service();
       init_wms_service();
       init_arcgis_image_service();
-      SERVICES = [WMSService, ArcGISImageServer, ImageService];
+      SERVICES = [WMSService, ArcGISImageService];
     }
   });
 
-  // src/lib/services/ogc/csw-service.ts
+  // src/services/ogc/csw-service.ts
   var CSWService;
   var init_csw_service = __esm({
-    "src/lib/services/ogc/csw-service.ts"() {
-      init_data_source();
+    "src/services/ogc/csw-service.ts"() {
+      init_src();
       init_csw_capabilities_loader();
       init_csw_records_loader();
       init_csw_domain_loader();
@@ -4295,12 +4318,12 @@
         _checkResponse(response, arrayBuffer) {
           const contentType = response.headers["content-type"];
           if (!response.ok || WMSErrorLoader.mimeTypes.includes(contentType)) {
-            const error = WMSErrorLoader.parseSync(arrayBuffer, this.props.loadOptions);
+            const error = WMSErrorLoader.parseSync?.(arrayBuffer, this.props.loadOptions);
             throw new Error(error);
           }
         }
         _parseError(arrayBuffer) {
-          const error = WMSErrorLoader.parseSync(arrayBuffer, this.props.loadOptions);
+          const error = WMSErrorLoader.parseSync?.(arrayBuffer, this.props.loadOptions);
           return new Error(error);
         }
       };
@@ -4309,7 +4332,7 @@
     }
   });
 
-  // src/lib/services/arcgis/arcgis-server.ts
+  // src/services/arcgis/arcgis-server.ts
   async function getArcGISServices(url, fetchFile = fetch) {
     if (url.includes("rest/services")) {
       const serverUrl = url.replace(/rest\/services.*$/i, "rest/services");
@@ -4342,7 +4365,7 @@
     return services;
   }
   var init_arcgis_server = __esm({
-    "src/lib/services/arcgis/arcgis-server.ts"() {
+    "src/services/arcgis/arcgis-server.ts"() {
     }
   });
 
@@ -4358,12 +4381,14 @@
     WMSCapabilitiesLoader: () => WMSCapabilitiesLoader,
     WMSErrorLoader: () => WMSErrorLoader,
     WMSService: () => WMSService,
-    _ArcGISImageServer: () => ArcGISImageServer,
+    WMSSource: () => WMSSource,
+    _ArcGISImageService: () => ArcGISImageService,
     _GMLLoader: () => GMLLoader,
     _WFSCapabilitiesLoader: () => WFSCapabilitiesLoader,
     _WMSFeatureInfoLoader: () => WMSFeatureInfoLoader,
     _WMSLayerDescriptionLoader: () => WMSLayerDescriptionLoader,
     _getArcGISServices: () => getArcGISServices,
+    createImageService: () => createImageService,
     createImageSource: () => createImageSource
   });
   var init_src4 = __esm({
@@ -4377,13 +4402,14 @@
       init_wms_layer_description_loader();
       init_wfs_capabilities_loader();
       init_gml_loader();
-      init_image_source();
+      init_create_image_service();
       init_create_image_source();
       init_image_service();
       init_csw_service();
       init_wms_service();
       init_arcgis_server();
       init_arcgis_image_service();
+      init_src();
     }
   });