@loaders.gl/wms 4.2.0-alpha.6 → 4.2.0-beta.2

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

@@ -1,4 +1,3 @@
-import type { LoaderWithParser } from '@loaders.gl/loader-utils';
 import type { XMLLoaderOptions } from '@loaders.gl/xml';
 import type { CSWCapabilities } from "./lib/parsers/csw/parse-csw-capabilities.js";
 export type { CSWCapabilities };
@@ -9,5 +8,22 @@ export type CSWLoaderOptions = XMLLoaderOptions & {
 /**
  * Loader for the response to the CSW GetCapability request
  */
-export declare const CSWCapabilitiesLoader: LoaderWithParser<CSWCapabilities, never, CSWLoaderOptions>;
+export declare const CSWCapabilitiesLoader: {
+    readonly dataType: CSWCapabilities;
+    readonly batchType: never;
+    readonly id: "csw-capabilities";
+    readonly name: "CSW Capabilities";
+    readonly module: "wms";
+    readonly version: any;
+    readonly worker: false;
+    readonly extensions: ["xml"];
+    readonly mimeTypes: ["application/vnd.ogc.csw_xml", "application/xml", "text/xml"];
+    readonly testText: typeof testXMLFile;
+    readonly options: {
+        readonly csw: {};
+    };
+    readonly parse: (arrayBuffer: ArrayBuffer, options?: CSWLoaderOptions) => Promise<CSWCapabilities>;
+    readonly parseTextSync: (text: string, options?: CSWLoaderOptions) => CSWCapabilities;
+};
+declare function testXMLFile(text: string): boolean;
 //# 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":"AAIA,OAAO,KAAK,EAAC,gBAAgB,EAAC,MAAM,0BAA0B,CAAC;AAC/D,OAAO,KAAK,EAAC,gBAAgB,EAAC,MAAM,iBAAiB,CAAC;AACtD,OAAO,KAAK,EAAC,eAAe,EAAC,oDAAiD;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"}
+{"version":3,"file":"csw-capabilities-loader.d.ts","sourceRoot":"","sources":["../src/csw-capabilities-loader.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EAAC,gBAAgB,EAAC,MAAM,iBAAiB,CAAC;AACtD,OAAO,KAAK,EAAC,eAAe,EAAC,oDAAiD;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;;;;;;;;;;;;;;kCAeL,WAAW,YAAY,gBAAgB;mCAE5C,MAAM,YAAY,gBAAgB;CACqB,CAAC;AAEhF,iBAAS,WAAW,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAG1C"}

package/dist/csw-capabilities-loader.js

@@ -4,11 +4,13 @@
 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.2.0-alpha.5" !== 'undefined' ? "4.2.0-alpha.5" : 'latest';
+const VERSION = typeof "4.2.0-beta.1" !== 'undefined' ? "4.2.0-beta.1" : 'latest';
 /**
  * Loader for the response to the CSW GetCapability request
  */
 export const CSWCapabilitiesLoader = {
+    dataType: null,
+    batchType: null,
     id: 'csw-capabilities',
     name: 'CSW Capabilities',
     module: 'wms',

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

@@ -1,4 +1,3 @@
-import type { LoaderWithParser } from '@loaders.gl/loader-utils';
 import type { XMLLoaderOptions } from '@loaders.gl/xml';
 import type { CSWDomain } from "./lib/parsers/csw/parse-csw-domain.js";
 export type { CSWDomain };
@@ -8,5 +7,22 @@ export type CSWLoaderOptions = XMLLoaderOptions & {
 /**
  * Loader for the response to the CSW GetCapability request
  */
-export declare const CSWDomainLoader: LoaderWithParser<CSWDomain, never, CSWLoaderOptions>;
+export declare const CSWDomainLoader: {
+    readonly dataType: CSWDomain;
+    readonly batchType: never;
+    readonly id: "csw-domain";
+    readonly name: "CSW Domain";
+    readonly module: "wms";
+    readonly version: any;
+    readonly worker: false;
+    readonly extensions: ["xml"];
+    readonly mimeTypes: ["application/vnd.ogc.csw_xml", "application/xml", "text/xml"];
+    readonly testText: typeof testXMLFile;
+    readonly options: {
+        readonly csw: {};
+    };
+    readonly parse: (arrayBuffer: ArrayBuffer, options?: CSWLoaderOptions) => Promise<CSWDomain>;
+    readonly parseTextSync: (text: string, options?: CSWLoaderOptions) => CSWDomain;
+};
+declare function testXMLFile(text: string): boolean;
 //# 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":"AAIA,OAAO,KAAK,EAAC,gBAAgB,EAAC,MAAM,0BAA0B,CAAC;AAC/D,OAAO,KAAK,EAAC,gBAAgB,EAAC,MAAM,iBAAiB,CAAC;AACtD,OAAO,KAAK,EAAC,SAAS,EAAC,8CAA2C;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"}
+{"version":3,"file":"csw-domain-loader.d.ts","sourceRoot":"","sources":["../src/csw-domain-loader.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EAAC,gBAAgB,EAAC,MAAM,iBAAiB,CAAC;AACtD,OAAO,KAAK,EAAC,SAAS,EAAC,8CAA2C;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;;;;;;;;;;;;;;kCAgBC,WAAW,YAAY,gBAAgB;mCAE5C,MAAM,YAAY,gBAAgB;CACe,CAAC;AAE1E,iBAAS,WAAW,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAG1C"}

package/dist/csw-domain-loader.js

@@ -4,11 +4,13 @@
 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.2.0-alpha.5" !== 'undefined' ? "4.2.0-alpha.5" : 'latest';
+const VERSION = typeof "4.2.0-beta.1" !== 'undefined' ? "4.2.0-beta.1" : 'latest';
 /**
  * Loader for the response to the CSW GetCapability request
  */
 export const CSWDomainLoader = {
+    dataType: null,
+    batchType: null,
     id: 'csw-domain',
     name: 'CSW Domain',
     module: 'wms',

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

@@ -1,4 +1,3 @@
-import type { LoaderWithParser } from '@loaders.gl/loader-utils';
 import type { XMLLoaderOptions } from '@loaders.gl/xml';
 import type { CSWRecords } from "./lib/parsers/csw/parse-csw-records.js";
 export { CSWRecords };
@@ -8,5 +7,22 @@ export type CSWLoaderOptions = XMLLoaderOptions & {
 /**
  * Loader for the response to the CSW GetCapability request
  */
-export declare const CSWRecordsLoader: LoaderWithParser<CSWRecords, never, CSWLoaderOptions>;
+export declare const CSWRecordsLoader: {
+    readonly dataType: CSWRecords;
+    readonly batchType: never;
+    readonly id: "csw-records";
+    readonly name: "CSW Records";
+    readonly module: "wms";
+    readonly version: any;
+    readonly worker: false;
+    readonly extensions: ["xml"];
+    readonly mimeTypes: ["application/vnd.ogc.csw_xml", "application/xml", "text/xml"];
+    readonly testText: typeof testXMLFile;
+    readonly options: {
+        readonly csw: {};
+    };
+    readonly parse: (arrayBuffer: ArrayBuffer, options?: CSWLoaderOptions) => Promise<CSWRecords>;
+    readonly parseTextSync: (text: string, options?: CSWLoaderOptions) => CSWRecords;
+};
+declare function testXMLFile(text: string): boolean;
 //# 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":"AAIA,OAAO,KAAK,EAAC,gBAAgB,EAAC,MAAM,0BAA0B,CAAC;AAC/D,OAAO,KAAK,EAAC,gBAAgB,EAAC,MAAM,iBAAiB,CAAC;AACtD,OAAO,KAAK,EAAC,UAAU,EAAC,+CAA4C;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"}
+{"version":3,"file":"csw-records-loader.d.ts","sourceRoot":"","sources":["../src/csw-records-loader.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EAAC,gBAAgB,EAAC,MAAM,iBAAiB,CAAC;AACtD,OAAO,KAAK,EAAC,UAAU,EAAC,+CAA4C;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;;;;;;;;;;;;;;kCAeA,WAAW,YAAY,gBAAgB;mCAE5C,MAAM,YAAY,gBAAgB;CACgB,CAAC;AAE3E,iBAAS,WAAW,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAG1C"}

package/dist/csw-records-loader.js

@@ -4,11 +4,13 @@
 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.2.0-alpha.5" !== 'undefined' ? "4.2.0-alpha.5" : 'latest';
+const VERSION = typeof "4.2.0-beta.1" !== 'undefined' ? "4.2.0-beta.1" : 'latest';
 /**
  * Loader for the response to the CSW GetCapability request
  */
 export const CSWRecordsLoader = {
+    dataType: null,
+    batchType: null,
     id: 'csw-records',
     name: 'CSW Records',
     module: 'wms',

package/dist/gml-loader.d.ts

@@ -1,4 +1,4 @@
-import type { LoaderWithParser, LoaderOptions } from '@loaders.gl/loader-utils';
+import type { LoaderOptions } from '@loaders.gl/loader-utils';
 import type { Geometry } from "./lib/parsers/gml/parse-gml.js";
 export type GMLLoaderOptions = LoaderOptions & {
     gml?: {};
@@ -6,5 +6,23 @@ export type GMLLoaderOptions = LoaderOptions & {
 /**
  * Loader for the response to the GML GetCapability request
  */
-export declare const GMLLoader: LoaderWithParser<Geometry | null, never, GMLLoaderOptions>;
+export declare const GMLLoader: {
+    readonly dataType: Geometry | null;
+    readonly batchType: never;
+    readonly name: "GML";
+    readonly id: "gml";
+    readonly module: "wms";
+    readonly version: any;
+    readonly worker: false;
+    readonly extensions: ["xml"];
+    readonly mimeTypes: ["application/vnd.ogc.gml", "application/xml", "text/xml"];
+    readonly testText: typeof testXMLFile;
+    readonly options: {
+        readonly gml: {};
+    };
+    readonly parse: (arrayBuffer: ArrayBuffer, options?: GMLLoaderOptions) => Promise<Geometry | null>;
+    readonly parseTextSync: (text: string, options?: GMLLoaderOptions) => Geometry | null;
+};
+declare function testXMLFile(text: string): boolean;
+export {};
 //# sourceMappingURL=gml-loader.d.ts.map

package/dist/gml-loader.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"gml-loader.d.ts","sourceRoot":"","sources":["../src/gml-loader.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAC,gBAAgB,EAAE,aAAa,EAAC,MAAM,0BAA0B,CAAC;AAC9E,OAAO,KAAK,EAAC,QAAQ,EAAC,uCAAoC;AAO1D,MAAM,MAAM,gBAAgB,GAAG,aAAa,GAAG;IAC7C,GAAG,CAAC,EAAE,EAAE,CAAC;CACV,CAAC;AAEF;;GAEG;AACH,eAAO,MAAM,SAAS,EAAE,gBAAgB,CAAC,QAAQ,GAAG,IAAI,EAAE,KAAK,EAAE,gBAAgB,CAgBhF,CAAC"}
+{"version":3,"file":"gml-loader.d.ts","sourceRoot":"","sources":["../src/gml-loader.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAmB,aAAa,EAAC,MAAM,0BAA0B,CAAC;AAC9E,OAAO,KAAK,EAAC,QAAQ,EAAC,uCAAoC;AAO1D,MAAM,MAAM,gBAAgB,GAAG,aAAa,GAAG;IAC7C,GAAG,CAAC,EAAE,EAAE,CAAC;CACV,CAAC;AAEF;;GAEG;AACH,eAAO,MAAM,SAAS;;;;;;;;;;;;;;kCAgBO,WAAW,YAAY,gBAAgB;mCAE5C,MAAM,YAAY,gBAAgB;CACqB,CAAC;AAEhF,iBAAS,WAAW,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAG1C"}

package/dist/gml-loader.js

@@ -4,11 +4,13 @@
 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.2.0-alpha.5" !== 'undefined' ? "4.2.0-alpha.5" : 'latest';
+const VERSION = typeof "4.2.0-beta.1" !== 'undefined' ? "4.2.0-beta.1" : 'latest';
 /**
  * Loader for the response to the GML GetCapability request
  */
 export const GMLLoader = {
+    dataType: null,
+    batchType: null,
     name: 'GML',
     id: 'gml',
     module: 'wms',

package/dist/index.cjs

@@ -87,8 +87,10 @@ function parseCSWCapabilities(text, options) {
 }
 
 // dist/csw-capabilities-loader.js
-var VERSION = true ? "4.2.0-alpha.5" : "latest";
+var VERSION = true ? "4.2.0-beta.1" : "latest";
 var CSWCapabilitiesLoader = {
+  dataType: null,
+  batchType: null,
   id: "csw-capabilities",
   name: "CSW Capabilities",
   module: "wms",
@@ -133,8 +135,10 @@ function parseCSWDomain(text, options) {
 }
 
 // dist/csw-domain-loader.js
-var VERSION2 = true ? "4.2.0-alpha.5" : "latest";
+var VERSION2 = true ? "4.2.0-beta.1" : "latest";
 var CSWDomainLoader = {
+  dataType: null,
+  batchType: null,
   id: "csw-domain",
   name: "CSW Domain",
   module: "wms",
@@ -197,8 +201,10 @@ function parseCSWRecords(text, options) {
 }
 
 // dist/csw-records-loader.js
-var VERSION3 = true ? "4.2.0-alpha.5" : "latest";
+var VERSION3 = true ? "4.2.0-beta.1" : "latest";
 var CSWRecordsLoader = {
+  dataType: null,
+  batchType: null,
   id: "csw-records",
   name: "CSW Records",
   module: "wms",
@@ -228,8 +234,10 @@ function parseWMSError(text, options) {
 }
 
 // dist/wms-error-loader.js
-var VERSION4 = true ? "4.2.0-alpha.5" : "latest";
+var VERSION4 = true ? "4.2.0-beta.1" : "latest";
 var WMSErrorLoader = {
+  dataType: null,
+  batchType: null,
   id: "wms-error",
   name: "WMS Error",
   module: "wms",
@@ -511,8 +519,10 @@ function addInheritedLayerProps(layer, parent) {
 }
 
 // dist/wms-capabilities-loader.js
-var VERSION5 = true ? "4.2.0-alpha.5" : "latest";
+var VERSION5 = true ? "4.2.0-beta.1" : "latest";
 var WMSCapabilitiesLoader = {
+  dataType: null,
+  batchType: null,
   id: "wms-capabilities",
   name: "WMS Capabilities",
   module: "wms",
@@ -560,6 +570,7 @@ function extractFeature(xmlFeature) {
 // dist/wip/wms-feature-info-loader.js
 var WMSFeatureInfoLoader = {
   ...WMSCapabilitiesLoader,
+  dataType: null,
   id: "wms-feature-info",
   name: "WMS FeatureInfo",
   parse: async (arrayBuffer, options) => parseWMSFeatureInfo(new TextDecoder().decode(arrayBuffer), options),
@@ -577,6 +588,7 @@ function parseWMSLayerDescription(text, options) {
 // dist/wip/wms-layer-description-loader.js
 var WMSLayerDescriptionLoader = {
   ...WMSCapabilitiesLoader,
+  dataType: null,
   id: "wms-layer-description",
   name: "WMS DescribeLayer",
   parse: async (arrayBuffer, options) => parseWMSLayerDescription(new TextDecoder().decode(arrayBuffer), options),
@@ -597,8 +609,10 @@ function parseWFSCapabilities(text, options) {
 }
 
 // dist/wip/wfs-capabilities-loader.js
-var VERSION6 = true ? "4.2.0-alpha.5" : "latest";
+var VERSION6 = true ? "4.2.0-beta.1" : "latest";
 var WFSCapabilitiesLoader = {
+  dataType: null,
+  batchType: null,
   id: "wfs-capabilities",
   name: "WFS Capabilities",
   module: "wms",
@@ -999,8 +1013,10 @@ function createChildContext(xml, options, context) {
 }
 
 // dist/gml-loader.js
-var VERSION7 = true ? "4.2.0-alpha.5" : "latest";
+var VERSION7 = true ? "4.2.0-beta.1" : "latest";
 var GMLLoader = {
+  dataType: null,
+  batchType: null,
   name: "GML",
   id: "gml",
   module: "wms",
@@ -1199,6 +1215,8 @@ var WMSSource = class extends import_loader_utils2.ImageSource {
   /** Generate a URL for the GetFeatureInfo request */
   getFeatureInfoURL(wmsParameters, vendorParameters) {
     wmsParameters = this._getWMS130Parameters(wmsParameters);
+    const { boundingBox, bbox } = wmsParameters;
+    wmsParameters.bbox = boundingBox ? [...boundingBox[0], ...boundingBox[1]] : bbox;
     const options = {
       version: this.wmsParameters.version,
       // query_layers: [],
@@ -1299,6 +1317,16 @@ var WMSSource = class extends import_loader_utils2.ImageSource {
           value = bbox;
         }
         break;
+      case "x":
+        if (wmsParameters.version === "1.3.0") {
+          key = "i";
+        }
+        break;
+      case "y":
+        if (wmsParameters.version === "1.3.0") {
+          key = "j";
+        }
+        break;
       default:
     }
     key = key.toUpperCase();