@loaders.gl/wms 4.3.2 → 4.4.0-alpha.2

package/dist/{services/ogc/csw-service.js → csw-source.js}

@@ -2,29 +2,41 @@
 // SPDX-License-Identifier: MIT
 // Copyright (c) vis.gl contributors
 import { DataSource } from '@loaders.gl/loader-utils';
-import { CSWCapabilitiesLoader } from "../../csw-capabilities-loader.js";
-import { CSWRecordsLoader } from "../../csw-records-loader.js";
-import { CSWDomainLoader } from "../../csw-domain-loader.js";
-import { WMSErrorLoader as CSWErrorLoader } from "../../wms-error-loader.js";
+import { CSWCapabilitiesLoader } from "./csw-capabilities-loader.js";
+import { CSWRecordsLoader } from "./csw-records-loader.js";
+import { CSWDomainLoader } from "./csw-domain-loader.js";
+import { WMSErrorLoader as CSWErrorLoader } from "./wms-error-loader.js";
+export const CSWSource = {
+    name: 'CSW',
+    id: 'csw',
+    module: 'wms',
+    version: '0.0.0',
+    extensions: [],
+    mimeTypes: [],
+    type: 'csw',
+    fromUrl: true,
+    fromBlob: false,
+    defaultOptions: {
+        wfs: {}
+    },
+    testURL: (url) => url.toLowerCase().includes('wfs'),
+    createDataSource: (url, options) => new CSWCatalogSource(url, options)
+};
 /**
- * The CSWService class
+ * The CSWCatalogSource class
  * - provides type safe methods to form URLs to a CSW service
  * - provides type safe methods to query and parse results (and errors) from a CSW service
  * @note Only the URL parameter conversion is supported. XML posts are not supported.
  */
-export class CSWService extends DataSource {
+export class CSWCatalogSource extends DataSource {
     static type = 'csw';
     static testURL = (url) => url.toLowerCase().includes('csw');
     capabilities = null;
-    data;
-    url;
-    /** A list of loaders used by the CSWService methods */
+    /** A list of loaders used by the CSWCatalogSource methods */
     loaders = [CSWErrorLoader, CSWCapabilitiesLoader];
-    /** Create a CSWService */
-    constructor(props) {
-        super(props);
-        this.url = props.url;
-        this.data = props.url;
+    /** Create a CSWCatalogSource */
+    constructor(url, options) {
+        super(url, options, CSWSource.defaultOptions);
     }
     async getMetadata() {
         const capabilities = await this.getCapabilities();
@@ -75,37 +87,37 @@ export class CSWService extends DataSource {
     }
     // CSW Service API Stubs
     /** Get Capabilities */
-    async getCapabilities(wmsParameters, vendorParameters) {
-        const url = this.getCapabilitiesURL(wmsParameters, vendorParameters);
+    async getCapabilities(cswParameters, vendorParameters) {
+        const url = this.getCapabilitiesURL(cswParameters, vendorParameters);
         const response = await this.fetch(url);
         const arrayBuffer = await response.arrayBuffer();
         this._checkResponse(response, arrayBuffer);
-        const capabilities = await CSWCapabilitiesLoader.parse(arrayBuffer, this.props.loadOptions);
+        const capabilities = await CSWCapabilitiesLoader.parse(arrayBuffer, this.options.loadOptions);
         return capabilities;
     }
     /** Get Records */
-    async getRecords(wmsParameters, vendorParameters) {
-        const url = this.getRecordsURL(wmsParameters, vendorParameters);
+    async getRecords(cswParameters, vendorParameters) {
+        const url = this.getRecordsURL(cswParameters, vendorParameters);
         const response = await this.fetch(url);
         const arrayBuffer = await response.arrayBuffer();
         this._checkResponse(response, arrayBuffer);
-        return await CSWRecordsLoader.parse(arrayBuffer, this.props.loadOptions);
+        return await CSWRecordsLoader.parse(arrayBuffer, this.options.loadOptions);
     }
     /** Get Domain */
-    async getDomain(wmsParameters, vendorParameters) {
-        const url = this.getDomainURL(wmsParameters, vendorParameters);
+    async getDomain(cswParameters, vendorParameters) {
+        const url = this.getDomainURL(cswParameters, vendorParameters);
         const response = await this.fetch(url);
         const arrayBuffer = await response.arrayBuffer();
         this._checkResponse(response, arrayBuffer);
-        return await CSWDomainLoader.parse(arrayBuffer, this.props.loadOptions);
+        return await CSWDomainLoader.parse(arrayBuffer, this.options.loadOptions);
     }
     // Typed URL creators
     // For applications that want full control of fetching and parsing
     /** Generate a URL for the GetCapabilities request */
-    getCapabilitiesURL(wmsParameters, vendorParameters) {
+    getCapabilitiesURL(cswParameters, vendorParameters) {
         const options = {
             version: '3.0.0',
-            ...wmsParameters,
+            ...cswParameters,
             ...vendorParameters,
             service: 'CSW',
             request: 'GetCapabilities'
@@ -113,11 +125,11 @@ export class CSWService extends DataSource {
         return this._getCSWUrl(options, vendorParameters);
     }
     /** Generate a URL for the GetCapabilities request */
-    getRecordsURL(wmsParameters, vendorParameters) {
+    getRecordsURL(cswParameters, vendorParameters) {
         const options = {
             version: '3.0.0',
             typenames: 'csw:Record',
-            ...wmsParameters,
+            ...cswParameters,
             ...vendorParameters,
             service: 'CSW',
             request: 'GetRecords'
@@ -125,10 +137,10 @@ export class CSWService extends DataSource {
         return this._getCSWUrl(options, vendorParameters);
     }
     /** Generate a URL for the GetCapabilities request */
-    getDomainURL(wmsParameters, vendorParameters) {
+    getDomainURL(cswParameters, vendorParameters) {
         const options = {
             version: '3.0.0',
-            ...wmsParameters,
+            ...cswParameters,
             ...vendorParameters,
             service: 'CSW',
             request: 'GetDomain'
@@ -140,7 +152,7 @@ export class CSWService extends DataSource {
      * @note case _getCSWUrl may need to be overridden to handle certain backends?
      * */
     _getCSWUrl(options, vendorParameters) {
-        let url = this.props.url;
+        let url = this.url;
         let first = true;
         for (const [key, value] of Object.entries(options)) {
             url += first ? '?' : '&';
@@ -158,13 +170,13 @@ export class CSWService extends DataSource {
     _checkResponse(response, arrayBuffer) {
         const contentType = response.headers['content-type'];
         if (!response.ok || CSWErrorLoader.mimeTypes.includes(contentType)) {
-            const error = CSWErrorLoader.parseSync?.(arrayBuffer, this.props.loadOptions);
+            const error = CSWErrorLoader.parseSync?.(arrayBuffer, this.options.loadOptions);
             throw new Error(error);
         }
     }
     /** Error situation detected */
     _parseError(arrayBuffer) {
-        const error = CSWErrorLoader.parseSync?.(arrayBuffer, this.props.loadOptions);
+        const error = CSWErrorLoader.parseSync?.(arrayBuffer, this.options.loadOptions);
         return new Error(error);
     }
 }

package/dist/gml-loader.js

@@ -4,7 +4,7 @@
 import { parseGML } from "./lib/parsers/gml/parse-gml.js";
 // __VERSION__ is injected by babel-plugin-version-inline
 // @ts-ignore TS2304: Cannot find name '__VERSION__'.
-const VERSION = typeof "4.3.1" !== 'undefined' ? "4.3.1" : 'latest';
+const VERSION = typeof "4.4.0-alpha.1" !== 'undefined' ? "4.4.0-alpha.1" : 'latest';
 /**
  * Loader for the response to the GML GetCapability request
  */

package/dist/index.cjs

@@ -79,7 +79,7 @@ function parseCSWCapabilities(text, options) {
 }
 
 // dist/csw-capabilities-loader.js
-var VERSION = true ? "4.3.1" : "latest";
+var VERSION = true ? "4.4.0-alpha.1" : "latest";
 var CSWCapabilitiesLoader = {
   dataType: null,
   batchType: null,
@@ -127,7 +127,7 @@ function parseCSWDomain(text, options) {
 }
 
 // dist/csw-domain-loader.js
-var VERSION2 = true ? "4.3.1" : "latest";
+var VERSION2 = true ? "4.4.0-alpha.1" : "latest";
 var CSWDomainLoader = {
   dataType: null,
   batchType: null,
@@ -192,7 +192,7 @@ function parseCSWRecords(text, options) {
 }
 
 // dist/csw-records-loader.js
-var VERSION3 = true ? "4.3.1" : "latest";
+var VERSION3 = true ? "4.4.0-alpha.1" : "latest";
 var CSWRecordsLoader = {
   dataType: null,
   batchType: null,
@@ -225,7 +225,7 @@ function parseWMSError(text, options) {
 }
 
 // dist/wms-error-loader.js
-var VERSION4 = true ? "4.3.1" : "latest";
+var VERSION4 = true ? "4.4.0-alpha.1" : "latest";
 var WMSErrorLoader = {
   dataType: null,
   batchType: null,
@@ -510,7 +510,7 @@ function addInheritedLayerProps(layer, parent) {
 }
 
 // dist/wms-capabilities-loader.js
-var VERSION5 = true ? "4.3.1" : "latest";
+var VERSION5 = true ? "4.4.0-alpha.1" : "latest";
 var WMSCapabilitiesLoader = {
   dataType: null,
   batchType: null,
@@ -603,7 +603,7 @@ function parseWFSCapabilities(text, options) {
 }
 
 // dist/wfs-capabilities-loader.js
-var VERSION6 = true ? "4.3.1" : "latest";
+var VERSION6 = true ? "4.4.0-alpha.1" : "latest";
 var WFSCapabilitiesLoader = {
   dataType: null,
   batchType: null,
@@ -1007,7 +1007,7 @@ function createChildContext(xml, options, context) {
 }
 
 // dist/gml-loader.js
-var VERSION7 = true ? "4.3.1" : "latest";
+var VERSION7 = true ? "4.4.0-alpha.1" : "latest";
 var GMLLoader = {
   dataType: null,
   batchType: null,
@@ -1029,9 +1029,9 @@ function testXMLFile7(text) {
   return text.startsWith("<?xml");
 }
 
-// dist/services/ogc/wms-service.js
-var import_images = require("@loaders.gl/images");
+// dist/wms-source.js
 var import_loader_utils = require("@loaders.gl/loader-utils");
+var import_images = require("@loaders.gl/images");
 var WMSSource = {
   name: "Web Map Service (OGC WMS)",
   id: "wms",
@@ -1039,21 +1039,18 @@ var WMSSource = {
   version: "0.0.0",
   extensions: [],
   mimeTypes: [],
-  options: {
+  type: "wms",
+  fromUrl: true,
+  fromBlob: false,
+  defaultOptions: {
     wms: {
       // TODO - add options here
     }
   },
-  type: "wms",
-  fromUrl: true,
-  fromBlob: false,
   testURL: (url) => url.toLowerCase().includes("wms"),
-  createDataSource: (url, props) => new WMSImageSource(url, props)
+  createDataSource: (url, options) => new WMSImageSource(url, options)
 };
-var WMSImageSource = class extends import_loader_utils.ImageSource {
-  /** Base URL to the service */
-  url;
-  data;
+var WMSImageSource = class extends import_loader_utils.DataSource {
   /** In WMS 1.3.0, replaces references to EPSG:4326 with CRS:84. But not always supported. Default: false */
   substituteCRS84;
   /** In WMS 1.3.0, flips x,y (lng, lat) coordinates for the supplied coordinate systems. Default: ['ESPG:4326'] */
@@ -1064,12 +1061,10 @@ var WMSImageSource = class extends import_loader_utils.ImageSource {
   vendorParameters;
   capabilities = null;
   /** Create a WMSImageSource */
-  constructor(url, props) {
+  constructor(url, options) {
     var _a, _b, _c;
-    super(props);
-    this.url = url;
-    this.data = url;
-    this.substituteCRS84 = ((_a = props.wms) == null ? void 0 : _a.substituteCRS84) ?? props.substituteCRS84 ?? false;
+    super(url, options, WMSSource.defaultOptions);
+    this.substituteCRS84 = ((_a = options.wms) == null ? void 0 : _a.substituteCRS84) ?? false;
     this.flipCRS = ["EPSG:4326"];
     this.wmsParameters = {
       layers: void 0,
@@ -1082,11 +1077,11 @@ var WMSImageSource = class extends import_loader_utils.ImageSource {
       transparent: void 0,
       time: void 0,
       elevation: void 0,
-      ...props.wmsParameters,
+      ...options.wmsParameters,
       // deprecated
-      ...(_b = props.wms) == null ? void 0 : _b.wmsParameters
+      ...(_b = options.wms) == null ? void 0 : _b.wmsParameters
     };
-    this.vendorParameters = ((_c = props.wms) == null ? void 0 : _c.vendorParameters) || props.vendorParameters || {};
+    this.vendorParameters = ((_c = options.wms) == null ? void 0 : _c.vendorParameters) || options.vendorParameters || {};
   }
   // ImageSource implementation
   async getMetadata() {
@@ -1338,7 +1333,7 @@ var WMSImageSource = class extends import_loader_utils.ImageSource {
     var _a, _b;
     const contentType = response.headers["content-type"];
     if (!response.ok || WMSErrorLoader.mimeTypes.includes(contentType)) {
-      const loadOptions = (0, import_loader_utils.mergeLoaderOptions)(this.loadOptions, {
+      const loadOptions = (0, import_loader_utils.mergeOptions)(this.loadOptions, {
         wms: { throwOnError: true }
       });
       const error = (_b = (_a = WMSErrorLoader).parseSync) == null ? void 0 : _b.call(_a, arrayBuffer, loadOptions);
@@ -1347,13 +1342,13 @@ var WMSImageSource = class extends import_loader_utils.ImageSource {
   }
   /** Error situation detected */
   _parseError(arrayBuffer) {
-    var _a, _b;
-    const error = (_b = (_a = WMSErrorLoader).parseSync) == null ? void 0 : _b.call(_a, arrayBuffer, this.loadOptions);
+    var _a, _b, _c;
+    const error = (_c = (_b = WMSErrorLoader).parseSync) == null ? void 0 : _c.call(_b, arrayBuffer, (_a = this.options.core) == null ? void 0 : _a.loadOptions);
     return new Error(error);
   }
 };
 
-// dist/services/arcgis/arcgis-server.js
+// dist/arcgis/arcgis-server.js
 async function getArcGISServices(url, fetchFile = fetch) {
   if (url.includes("rest/services")) {
     const serverUrl = url.replace(/rest\/services.*$/i, "rest/services");
@@ -1386,7 +1381,7 @@ function extractServices(directory, url) {
   return services;
 }
 
-// dist/services/arcgis/arcgis-image-server.js
+// dist/arcgis/arcgis-image-source.js
 var import_loader_utils2 = require("@loaders.gl/loader-utils");
 var ArcGISImageServerSource = {
   name: "ArcGISImageServer",
@@ -1395,24 +1390,20 @@ var ArcGISImageServerSource = {
   version: "0.0.0",
   extensions: [],
   mimeTypes: [],
-  options: {
+  type: "arcgis-image-server",
+  fromUrl: true,
+  fromBlob: false,
+  defaultOptions: {
     "arcgis-image-server": {
       // TODO - add options here
     }
   },
-  type: "arcgis-image-server",
-  fromUrl: true,
-  fromBlob: false,
   testURL: (url) => url.toLowerCase().includes("ImageServer"),
   createDataSource: (url, props) => new ArcGISImageSource(url, props)
 };
-var ArcGISImageSource = class extends import_loader_utils2.ImageSource {
-  url;
-  data;
+var ArcGISImageSource = class extends import_loader_utils2.DataSource {
   constructor(url, props) {
-    super(props);
-    this.url = url;
-    this.data = url;
+    super(url, props, ArcGISImageServerSource.defaultOptions);
   }
   // ImageSource (normalized endpoints)
   async getMetadata() {
@@ -1485,13 +1476,13 @@ var import_loader_utils3 = require("@loaders.gl/loader-utils");
 
 // dist/lib/deprecated/create-image-source.js
 var SOURCES = [WMSSource, ArcGISImageServerSource];
-function createImageSource(props, sources = SOURCES) {
-  const { type = "auto" } = props;
-  const source = type === "auto" ? guessSourceType(props.url, sources) : getSourceOfType(type, sources);
+function createImageSource(options) {
+  const { type = "auto", url, sources = SOURCES, loadOptions } = options;
+  const source = type === "auto" ? guessSourceType(url, sources) : getSourceOfType(type, sources);
   if (!source) {
     throw new Error("Not a valid image source type");
   }
-  return source.createDataSource(props.url, props);
+  return source.createDataSource(url, { core: { loadOptions } });
 }
 function getSourceOfType(type, sources) {
   for (const source of sources) {