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

package/dist/csw-capabilities-loader.js

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

package/dist/csw-domain-loader.js

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

package/dist/csw-records-loader.js

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

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.0-alpha.1" !== 'undefined' ? "4.3.0-alpha.1" : 'latest';
+const VERSION = typeof "4.3.0-alpha.3" !== 'undefined' ? "4.3.0-alpha.3" : 'latest';
 /**
  * Loader for the response to the GML GetCapability request
  */

package/dist/index.cjs

@@ -5,7 +5,6 @@ var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
 var __getOwnPropNames = Object.getOwnPropertyNames;
 var __getProtoOf = Object.getPrototypeOf;
 var __hasOwnProp = Object.prototype.hasOwnProperty;
-var __defNormalProp = (obj, key, value) => key in obj ? __defProp(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
 var __export = (target, all) => {
   for (var name in all)
     __defProp(target, name, { get: all[name], enumerable: true });
@@ -27,10 +26,6 @@ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__ge
   mod
 ));
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
-var __publicField = (obj, key, value) => {
-  __defNormalProp(obj, typeof key !== "symbol" ? key + "" : key, value);
-  return value;
-};
 
 // dist/index.js
 var dist_exports = {};
@@ -38,20 +33,17 @@ __export(dist_exports, {
   CSWCapabilitiesLoader: () => CSWCapabilitiesLoader,
   CSWDomainLoader: () => CSWDomainLoader,
   CSWRecordsLoader: () => CSWRecordsLoader,
-  CSWService: () => CSWService,
-  ImageService: () => ImageService,
-  ImageSource: () => import_loader_utils5.ImageSource,
+  ImageSource: () => import_loader_utils4.ImageSource,
   WMSCapabilitiesLoader: () => WMSCapabilitiesLoader,
   WMSErrorLoader: () => WMSErrorLoader,
-  WMSService: () => WMSService,
+  WMSImageSource: () => WMSImageSource,
   WMSSource: () => WMSSource,
-  _ArcGISImageService: () => ArcGISImageService,
+  _ArcGISImageServerSource: () => ArcGISImageServerSource,
   _GMLLoader: () => GMLLoader,
   _WFSCapabilitiesLoader: () => WFSCapabilitiesLoader,
   _WMSFeatureInfoLoader: () => WMSFeatureInfoLoader,
   _WMSLayerDescriptionLoader: () => WMSLayerDescriptionLoader,
   _getArcGISServices: () => getArcGISServices,
-  createImageService: () => createImageService,
   createImageSource: () => createImageSource
 });
 module.exports = __toCommonJS(dist_exports);
@@ -87,7 +79,7 @@ function parseCSWCapabilities(text, options) {
 }
 
 // dist/csw-capabilities-loader.js
-var VERSION = true ? "4.3.0-alpha.1" : "latest";
+var VERSION = true ? "4.3.0-alpha.3" : "latest";
 var CSWCapabilitiesLoader = {
   dataType: null,
   batchType: null,
@@ -135,7 +127,7 @@ function parseCSWDomain(text, options) {
 }
 
 // dist/csw-domain-loader.js
-var VERSION2 = true ? "4.3.0-alpha.1" : "latest";
+var VERSION2 = true ? "4.3.0-alpha.3" : "latest";
 var CSWDomainLoader = {
   dataType: null,
   batchType: null,
@@ -201,7 +193,7 @@ function parseCSWRecords(text, options) {
 }
 
 // dist/csw-records-loader.js
-var VERSION3 = true ? "4.3.0-alpha.1" : "latest";
+var VERSION3 = true ? "4.3.0-alpha.3" : "latest";
 var CSWRecordsLoader = {
   dataType: null,
   batchType: null,
@@ -234,7 +226,7 @@ function parseWMSError(text, options) {
 }
 
 // dist/wms-error-loader.js
-var VERSION4 = true ? "4.3.0-alpha.1" : "latest";
+var VERSION4 = true ? "4.3.0-alpha.3" : "latest";
 var WMSErrorLoader = {
   dataType: null,
   batchType: null,
@@ -519,7 +511,7 @@ function addInheritedLayerProps(layer, parent) {
 }
 
 // dist/wms-capabilities-loader.js
-var VERSION5 = true ? "4.3.0-alpha.1" : "latest";
+var VERSION5 = true ? "4.3.0-alpha.3" : "latest";
 var WMSCapabilitiesLoader = {
   dataType: null,
   batchType: null,
@@ -595,21 +587,24 @@ var WMSLayerDescriptionLoader = {
   parseTextSync: (text, options) => parseWMSLayerDescription(text, options)
 };
 
-// dist/wip/lib/wfs/parse-wfs-capabilities.js
+// dist/lib/parsers/wfs/parse-wfs-capabilities.js
 var import_xml9 = require("@loaders.gl/xml");
 function parseWFSCapabilities(text, options) {
   var _a, _b;
-  const parsedXML = (_b = (_a = import_xml9.XMLLoader).parseTextSync) == null ? void 0 : _b.call(_a, text, { ...options, xml: {
-    ...options == null ? void 0 : options.xml,
-    removeNSPrefix: true,
-    uncapitalizeKeys: true
-  } });
+  const parsedXML = (_b = (_a = import_xml9.XMLLoader).parseTextSync) == null ? void 0 : _b.call(_a, text, {
+    ...options,
+    xml: {
+      ...options == null ? void 0 : options.xml,
+      removeNSPrefix: true,
+      uncapitalizeKeys: true
+    }
+  });
   const xmlCapabilities = parsedXML.Capabilities || parsedXML;
   return xmlCapabilities;
 }
 
-// dist/wip/wfs-capabilities-loader.js
-var VERSION6 = true ? "4.3.0-alpha.1" : "latest";
+// dist/wfs-capabilities-loader.js
+var VERSION6 = true ? "4.3.0-alpha.3" : "latest";
 var WFSCapabilitiesLoader = {
   dataType: null,
   batchType: null,
@@ -1013,7 +1008,7 @@ function createChildContext(xml, options, context) {
 }
 
 // dist/gml-loader.js
-var VERSION7 = true ? "4.3.0-alpha.1" : "latest";
+var VERSION7 = true ? "4.3.0-alpha.3" : "latest";
 var GMLLoader = {
   dataType: null,
   batchType: null,
@@ -1035,45 +1030,29 @@ function testXMLFile7(text) {
   return text.startsWith("<?xml");
 }
 
-// dist/index.js
-var import_loader_utils5 = require("@loaders.gl/loader-utils");
-
-// dist/lib/services/create-image-service.js
-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");
-  }
-  return service.create(props);
-}
-function getServiceOfType(type, services) {
-  for (const service of services) {
-    if (service.type === type) {
-      return service;
-    }
-  }
-  return null;
-}
-function guessServiceType(url, services) {
-  for (const service of services) {
-    if (service.testURL && service.testURL(url)) {
-      return service;
-    }
-  }
-  return null;
-}
-
 // dist/services/ogc/wms-service.js
 var import_images = require("@loaders.gl/images");
 var import_loader_utils = require("@loaders.gl/loader-utils");
 var import_loader_utils2 = require("@loaders.gl/loader-utils");
-var WMSService = {
+var WMSSource = {
+  name: "Web Map Service (OGC WMS)",
+  id: "wms",
+  module: "wms",
+  version: "0.0.0",
+  extensions: [],
+  mimeTypes: [],
+  options: {
+    wms: {
+      // TODO - add options here
+    }
+  },
   type: "wms",
+  fromUrl: true,
+  fromBlob: false,
   testURL: (url) => url.toLowerCase().includes("wms"),
-  create: (props) => new WMSSource(props)
+  createDataSource: (url, props) => new WMSImageSource(url, props)
 };
-var WMSSource = class extends import_loader_utils2.ImageSource {
+var WMSImageSource = class extends import_loader_utils2.ImageSource {
   /** Base URL to the service */
   url;
   data;
@@ -1086,12 +1065,13 @@ var WMSSource = class extends import_loader_utils2.ImageSource {
   /** Default static vendor parameters */
   vendorParameters;
   capabilities = null;
-  /** Create a WMSSource */
-  constructor(props) {
+  /** Create a WMSImageSource */
+  constructor(url, props) {
+    var _a, _b, _c;
     super(props);
-    this.url = props.url;
-    this.data = props.url;
-    this.substituteCRS84 = props.substituteCRS84 ?? false;
+    this.url = url;
+    this.data = url;
+    this.substituteCRS84 = ((_a = props.wms) == null ? void 0 : _a.substituteCRS84) ?? props.substituteCRS84 ?? false;
     this.flipCRS = ["EPSG:4326"];
     this.wmsParameters = {
       layers: void 0,
@@ -1104,11 +1084,13 @@ var WMSSource = class extends import_loader_utils2.ImageSource {
       transparent: void 0,
       time: void 0,
       elevation: void 0,
-      ...props.wmsParameters
+      ...props.wmsParameters,
+      // deprecated
+      ...(_b = props.wms) == null ? void 0 : _b.wmsParameters
     };
-    this.vendorParameters = props.vendorParameters || {};
+    this.vendorParameters = ((_c = props.wms) == null ? void 0 : _c.vendorParameters) || props.vendorParameters || {};
   }
-  // ImageService implementation
+  // ImageSource implementation
   async getMetadata() {
     const capabilities = await this.getCapabilities();
     return this.normalizeMetadata(capabilities);
@@ -1373,49 +1355,66 @@ var WMSSource = class extends import_loader_utils2.ImageSource {
   }
 };
 
-// dist/lib/services/image-service.js
-var import_images2 = require("@loaders.gl/images");
-var import_loader_utils3 = require("@loaders.gl/loader-utils");
-var ImageService = class extends import_loader_utils3.ImageSource {
-  constructor(props) {
-    super(props);
+// dist/services/arcgis/arcgis-server.js
+async function getArcGISServices(url, fetchFile = fetch) {
+  if (url.includes("rest/services")) {
+    const serverUrl = url.replace(/rest\/services.*$/i, "rest/services");
+    return loadServiceDirectory(serverUrl, fetchFile, []);
   }
-  // IMAGE SOURCE API
-  async getMetadata() {
-    throw new Error("ImageSource.getMetadata not implemented");
+  return null;
+}
+async function loadServiceDirectory(serverUrl, fetch2, path) {
+  const serviceUrl = `${serverUrl}/${path.join("/")}`;
+  const response = await fetch2(`${serviceUrl}?f=pjson`);
+  const directory = await response.json();
+  const services = extractServices(directory, serviceUrl);
+  const folders = directory.folders || [];
+  const promises = folders.map((folder) => loadServiceDirectory(`${serverUrl}`, fetch2, [...path, folder]));
+  for (const folderServices of await Promise.all(promises)) {
+    services.push(...folderServices);
   }
-  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 import_images2.ImageLoader.parse(arrayBuffer);
-  }
-  // HELPERS
-  /** Break up bounding box in east, north, south, west */
-  getGranularParameters(parameters) {
-    const [[east, north], [west, south]] = parameters.boundingBox;
-    return { ...parameters, east, north, south, west };
-  }
-  /** Supports both ${} and {} notations */
-  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;
+  return services;
+}
+function extractServices(directory, url) {
+  const arcgisServices = directory.services || [];
+  const services = [];
+  for (const service of arcgisServices) {
+    services.push({
+      name: service.name,
+      type: `arcgis-${service.type.toLocaleLowerCase().replace("server", "-server")}`,
+      url: `${url}${service.name}/${service.type}`
+    });
   }
-};
-__publicField(ImageService, "type", "template");
-__publicField(ImageService, "testURL", (url) => url.toLowerCase().includes("{"));
+  return services;
+}
 
-// dist/services/arcgis/arcgis-image-service.js
-var ArcGISImageSource = class extends ImageService {
+// dist/services/arcgis/arcgis-image-server.js
+var import_loader_utils3 = require("@loaders.gl/loader-utils");
+var ArcGISImageServerSource = {
+  name: "ArcGISImageServer",
+  id: "arcgis-image-server",
+  module: "wms",
+  version: "0.0.0",
+  extensions: [],
+  mimeTypes: [],
+  options: {
+    "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_utils3.ImageSource {
+  url;
   data;
-  constructor(props) {
+  constructor(url, props) {
     super(props);
-    this.data = props.url;
+    this.url = url;
+    this.data = url;
   }
   // ImageSource (normalized endpoints)
   async getMetadata() {
@@ -1437,7 +1436,7 @@ var ArcGISImageSource = class extends ImageService {
   }
   // URL creators
   metadataURL(options) {
-    return `${this.props.url}?f=pjson`;
+    return `${this.url}?f=pjson`;
   }
   /**
    * Form a URL to an ESRI ImageServer
@@ -1462,7 +1461,7 @@ var ArcGISImageSource = class extends ImageService {
    * @note if override is common, maybe add a callback prop?
    * */
   getUrl(path, options, extra) {
-    let url = `${this.props.url}/${path}`;
+    let url = `${this.url}/${path}`;
     let first = true;
     for (const [key, value] of Object.entries(options)) {
       url += first ? "?" : "&";
@@ -1482,208 +1481,34 @@ var ArcGISImageSource = class extends ImageService {
     }
   }
 };
-var ArcGISImageService = {
-  type: "arcgis-image-server",
-  testURL: (url) => url.toLowerCase().includes("ImageServer"),
-  create: (props) => new ArcGISImageSource(props)
-};
 
-// dist/services/create-image-source.js
-var SERVICES = [WMSService, ArcGISImageService];
-function createImageSource(props) {
-  return createImageService(props, SERVICES);
-}
-
-// dist/services/ogc/csw-service.js
+// dist/index.js
 var import_loader_utils4 = require("@loaders.gl/loader-utils");
-var CSWService = class extends import_loader_utils4.DataSource {
-  capabilities = null;
-  data;
-  url;
-  /** A list of loaders used by the CSWService methods */
-  loaders = [WMSErrorLoader, CSWCapabilitiesLoader];
-  /** Create a CSWService */
-  constructor(props) {
-    super(props);
-    this.url = props.url;
-    this.data = props.url;
-  }
-  async getMetadata() {
-    const capabilities = await this.getCapabilities();
-    return this.normalizeMetadata(capabilities);
-  }
-  normalizeMetadata(capabilities) {
-    return capabilities;
-  }
-  async getServiceDirectory(options) {
-    const services = [];
-    const unknownServices = [];
-    const records = await this.getRecords();
-    for (const record of records.records) {
-      for (const reference of record.references) {
-        const url = reference.value;
-        switch (reference.scheme) {
-          case "OGC:WMS":
-            services.push({ name: record.title, type: "ogc-wms-service", ...this._parseOGCUrl(url) });
-            break;
-          case "OGC:WMTS":
-            services.push({
-              name: record.title,
-              type: "ogc-wmts-service",
-              ...this._parseOGCUrl(url)
-            });
-            break;
-          case "OGC:WFS":
-            services.push({ name: record.title, type: "ogc-wfs-service", ...this._parseOGCUrl(url) });
-            break;
-          default:
-            unknownServices.push({
-              name: record.title,
-              type: "unknown",
-              url: reference.value,
-              scheme: reference.scheme
-            });
-        }
-      }
-    }
-    return (options == null ? void 0 : options.includeUnknown) ? services.concat(unknownServices) : services;
-  }
-  _parseOGCUrl(url) {
-    const parts = url.split("?");
-    return {
-      url: parts[0],
-      params: parts[1] || ""
-    };
-  }
-  // CSW Service API Stubs
-  /** Get Capabilities */
-  async getCapabilities(wmsParameters, vendorParameters) {
-    const url = this.getCapabilitiesURL(wmsParameters, vendorParameters);
-    const response = await this.fetch(url);
-    const arrayBuffer = await response.arrayBuffer();
-    this._checkResponse(response, arrayBuffer);
-    const capabilities = await CSWCapabilitiesLoader.parse(arrayBuffer, this.props.loadOptions);
-    return capabilities;
-  }
-  /** Get Records */
-  async getRecords(wmsParameters, vendorParameters) {
-    const url = this.getRecordsURL(wmsParameters, vendorParameters);
-    const response = await this.fetch(url);
-    const arrayBuffer = await response.arrayBuffer();
-    this._checkResponse(response, arrayBuffer);
-    return await CSWRecordsLoader.parse(arrayBuffer, this.props.loadOptions);
-  }
-  /** Get Domain */
-  async getDomain(wmsParameters, vendorParameters) {
-    const url = this.getDomainURL(wmsParameters, vendorParameters);
-    const response = await this.fetch(url);
-    const arrayBuffer = await response.arrayBuffer();
-    this._checkResponse(response, arrayBuffer);
-    return await CSWDomainLoader.parse(arrayBuffer, this.props.loadOptions);
-  }
-  // Typed URL creators
-  // For applications that want full control of fetching and parsing
-  /** Generate a URL for the GetCapabilities request */
-  getCapabilitiesURL(wmsParameters, vendorParameters) {
-    const options = {
-      version: "3.0.0",
-      ...wmsParameters,
-      ...vendorParameters,
-      service: "CSW",
-      request: "GetCapabilities"
-    };
-    return this._getCSWUrl(options, vendorParameters);
-  }
-  /** Generate a URL for the GetCapabilities request */
-  getRecordsURL(wmsParameters, vendorParameters) {
-    const options = {
-      version: "3.0.0",
-      typenames: "csw:Record",
-      ...wmsParameters,
-      ...vendorParameters,
-      service: "CSW",
-      request: "GetRecords"
-    };
-    return this._getCSWUrl(options, vendorParameters);
-  }
-  /** Generate a URL for the GetCapabilities request */
-  getDomainURL(wmsParameters, vendorParameters) {
-    const options = {
-      version: "3.0.0",
-      ...wmsParameters,
-      ...vendorParameters,
-      service: "CSW",
-      request: "GetDomain"
-    };
-    return this._getCSWUrl(options, vendorParameters);
-  }
-  // INTERNAL METHODS
-  /**
-   * @note case _getCSWUrl may need to be overridden to handle certain backends?
-   * */
-  _getCSWUrl(options, vendorParameters) {
-    let url = this.props.url;
-    let first = true;
-    for (const [key, value] of Object.entries(options)) {
-      url += first ? "?" : "&";
-      first = false;
-      if (Array.isArray(value)) {
-        url += `${key.toUpperCase()}=${value.join(",")}`;
-      } else {
-        url += `${key.toUpperCase()}=${value ? String(value) : ""}`;
-      }
-    }
-    return encodeURI(url);
-  }
-  /** Checks for and parses a CSW XML formatted ServiceError and throws an exception */
-  _checkResponse(response, arrayBuffer) {
-    var _a, _b;
-    const contentType = response.headers["content-type"];
-    if (!response.ok || WMSErrorLoader.mimeTypes.includes(contentType)) {
-      const error = (_b = (_a = WMSErrorLoader).parseSync) == null ? void 0 : _b.call(_a, arrayBuffer, this.props.loadOptions);
-      throw new Error(error);
-    }
-  }
-  /** Error situation detected */
-  _parseError(arrayBuffer) {
-    var _a, _b;
-    const error = (_b = (_a = WMSErrorLoader).parseSync) == null ? void 0 : _b.call(_a, arrayBuffer, this.props.loadOptions);
-    return new Error(error);
-  }
-};
-__publicField(CSWService, "type", "csw");
-__publicField(CSWService, "testURL", (url) => url.toLowerCase().includes("csw"));
 
-// dist/services/arcgis/arcgis-server.js
-async function getArcGISServices(url, fetchFile = fetch) {
-  if (url.includes("rest/services")) {
-    const serverUrl = url.replace(/rest\/services.*$/i, "rest/services");
-    return loadServiceDirectory(serverUrl, fetchFile, []);
+// dist/lib/deprecated/create-image-source.js
+var SOURCES = [WMSSource, ArcGISImageServerSource];
+function createImageSource(url, props, sources = SOURCES) {
+  const { type = "auto" } = props;
+  const source = type === "auto" ? guessSourceType(url, sources) : getSourceOfType(type, sources);
+  if (!source) {
+    throw new Error("Not a valid image source type");
   }
-  return null;
+  return source.createDataSource(url, props);
 }
-async function loadServiceDirectory(serverUrl, fetch2, path) {
-  const serviceUrl = `${serverUrl}/${path.join("/")}`;
-  const response = await fetch2(`${serviceUrl}?f=pjson`);
-  const directory = await response.json();
-  const services = extractServices(directory, serviceUrl);
-  const folders = directory.folders || [];
-  const promises = folders.map((folder) => loadServiceDirectory(`${serverUrl}`, fetch2, [...path, folder]));
-  for (const folderServices of await Promise.all(promises)) {
-    services.push(...folderServices);
+function getSourceOfType(type, sources) {
+  for (const source of sources) {
+    if (source.type === type) {
+      return source;
+    }
   }
-  return services;
+  return null;
 }
-function extractServices(directory, url) {
-  const arcgisServices = directory.services || [];
-  const services = [];
-  for (const service of arcgisServices) {
-    services.push({
-      name: service.name,
-      type: `arcgis-${service.type.toLocaleLowerCase().replace("server", "-server")}`,
-      url: `${url}${service.name}/${service.type}`
-    });
+function guessSourceType(url, sources) {
+  for (const source of sources) {
+    if (source.testURL && source.testURL(url)) {
+      return source;
+    }
   }
-  return services;
+  return null;
 }
 //# sourceMappingURL=index.cjs.map