@loaders.gl/wms - npm Package Compare versions

Comparing version 4.2.0-alpha.6 to 4.2.0-beta.1

dist/csw-capabilities-loader.d.ts

@@ -1,2 +0,1 @@
-import type { LoaderWithParser } from '@loaders.gl/loader-utils';
 import type { XMLLoaderOptions } from '@loaders.gl/xml';
@@ -12,3 +11,20 @@ import type { CSWCapabilities } from "./lib/parsers/csw/parse-csw-capabilities.js";
  */
-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

dist/csw-capabilities-loader.js

@@ -7,3 +7,3 @@ // loaders.gl
 // @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-alpha.6" !== 'undefined' ? "4.2.0-alpha.6" : 'latest';
 /**
@@ -13,2 +13,4 @@ * Loader for the response to the CSW GetCapability request
 export const CSWCapabilitiesLoader = {
+    dataType: null,
+    batchType: null,
     id: 'csw-capabilities',
@@ -15,0 +17,0 @@ name: 'CSW Capabilities',

dist/csw-domain-loader.d.ts

@@ -1,2 +0,1 @@
-import type { LoaderWithParser } from '@loaders.gl/loader-utils';
 import type { XMLLoaderOptions } from '@loaders.gl/xml';
@@ -11,3 +10,20 @@ import type { CSWDomain } from "./lib/parsers/csw/parse-csw-domain.js";
  */
-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

dist/csw-domain-loader.js

@@ -7,3 +7,3 @@ // loaders.gl
 // @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-alpha.6" !== 'undefined' ? "4.2.0-alpha.6" : 'latest';
 /**
@@ -13,2 +13,4 @@ * Loader for the response to the CSW GetCapability request
 export const CSWDomainLoader = {
+    dataType: null,
+    batchType: null,
     id: 'csw-domain',
@@ -15,0 +17,0 @@ name: 'CSW Domain',

dist/csw-records-loader.d.ts

@@ -1,2 +0,1 @@
-import type { LoaderWithParser } from '@loaders.gl/loader-utils';
 import type { XMLLoaderOptions } from '@loaders.gl/xml';
@@ -11,3 +10,20 @@ import type { CSWRecords } from "./lib/parsers/csw/parse-csw-records.js";
  */
-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

dist/csw-records-loader.js

@@ -7,3 +7,3 @@ // loaders.gl
 // @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-alpha.6" !== 'undefined' ? "4.2.0-alpha.6" : 'latest';
 /**
@@ -13,2 +13,4 @@ * Loader for the response to the CSW GetCapability request
 export const CSWRecordsLoader = {
+    dataType: null,
+    batchType: null,
     id: 'csw-records',
@@ -15,0 +17,0 @@ name: 'CSW Records',

dist/gml-loader.d.ts

@@ -1,2 +0,2 @@
-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";
@@ -9,3 +9,21 @@ export type GMLLoaderOptions = LoaderOptions & {
  */
-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

dist/gml-loader.js

@@ -7,3 +7,3 @@ // loaders.gl
 // @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-alpha.6" !== 'undefined' ? "4.2.0-alpha.6" : 'latest';
 /**
@@ -13,2 +13,4 @@ * Loader for the response to the GML GetCapability request
 export const GMLLoader = {
+    dataType: null,
+    batchType: null,
     name: 'GML',
@@ -15,0 +17,0 @@ id: 'gml',

dist/services/ogc/csw-service.d.ts

@@ -52,3 +52,38 @@ import type { DataSourceProps } from '@loaders.gl/loader-utils';
     /** A list of loaders used by the CSWService methods */
-    readonly loaders: (import("@loaders.gl/loader-utils").LoaderWithParser<CSWCapabilities, never, import("../../csw-capabilities-loader").CSWLoaderOptions> | import("@loaders.gl/loader-utils").LoaderWithParser<string, never, import("../../wms-error-loader").WMSLoaderOptions>)[];
+    readonly loaders: ({
+        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: (text: string) => boolean;
+        readonly options: {
+            readonly csw: {};
+        };
+        readonly parse: (arrayBuffer: ArrayBuffer, options?: import("../../csw-capabilities-loader").CSWLoaderOptions | undefined) => Promise<CSWCapabilities>;
+        readonly parseTextSync: (text: string, options?: import("../../csw-capabilities-loader").CSWLoaderOptions | undefined) => CSWCapabilities;
+    } | {
+        readonly dataType: string;
+        readonly batchType: never;
+        readonly id: "wms-error";
+        readonly name: "WMS Error";
+        readonly module: "wms";
+        readonly version: any;
+        readonly worker: false;
+        readonly extensions: ["xml"];
+        readonly mimeTypes: ["application/vnd.ogc.se_xml", "application/xml", "text/xml"];
+        readonly testText: (text: string) => boolean;
+        readonly options: {
+            readonly wms: {
+                readonly throwOnError: false;
+            };
+        };
+        readonly parse: (arrayBuffer: ArrayBuffer, options?: import("../../wms-error-loader").WMSLoaderOptions | undefined) => Promise<string>;
+        readonly parseSync: (arrayBuffer: ArrayBuffer, options?: import("../../wms-error-loader").WMSLoaderOptions | undefined) => string;
+        readonly parseTextSync: (text: string, options?: import("../../wms-error-loader").WMSLoaderOptions | undefined) => string;
+    })[];
     /** Create a CSWService */
@@ -55,0 +90,0 @@ constructor(props: CSWServiceProps);

dist/services/ogc/wms-service.js

@@ -171,2 +171,5 @@ // loaders.gl
         wmsParameters = this._getWMS130Parameters(wmsParameters);
+        // Replace the GetImage `boundingBox` parameter with the WMS flat `bbox` parameter.
+        const { boundingBox, bbox } = wmsParameters;
+        wmsParameters.bbox = boundingBox ? [...boundingBox[0], ...boundingBox[1]] : bbox;
         const options = {
@@ -282,2 +285,16 @@ version: this.wmsParameters.version,
                 break;
+            case 'x':
+                // i is the parameter used in WMS 1.3
+                // TODO - change parameter to `i` and convert to `x` if not 1.3
+                if (wmsParameters.version === '1.3.0') {
+                    key = 'i';
+                }
+                break;
+            case 'y':
+                // j is the parameter used in WMS 1.3
+                // TODO - change parameter to `j` and convert to `y` if not 1.3
+                if (wmsParameters.version === '1.3.0') {
+                    key = 'j';
+                }
+                break;
             default:
@@ -284,0 +301,0 @@ // do nothing

dist/wip/wcs-capabilities-loader.d.ts

@@ -11,15 +11,17 @@ import type { LoaderWithParser, LoaderOptions } from '@loaders.gl/loader-utils';
 export declare const WCSCapabilitiesLoader: {
-    id: string;
-    name: string;
-    module: string;
-    version: any;
-    worker: boolean;
-    extensions: string[];
-    mimeTypes: string[];
-    testText: typeof testXMLFile;
-    options: {
-        wms: {};
+    readonly dataType: WCSCapabilities;
+    readonly batchType: never;
+    readonly id: "wcs-capabilities";
+    readonly name: "WFS Capabilities";
+    readonly module: "wms";
+    readonly version: any;
+    readonly worker: false;
+    readonly extensions: ["xml"];
+    readonly mimeTypes: ["application/vnd.ogc.wcs_xml", "application/xml", "text/xml"];
+    readonly testText: typeof testXMLFile;
+    readonly options: {
+        readonly wms: {};
     };
-    parse: (arrayBuffer: ArrayBuffer, options?: WCSLoaderOptions) => Promise<WCSCapabilities>;
-    parseTextSync: (text: string, options?: WCSLoaderOptions) => WCSCapabilities;
+    readonly parse: (arrayBuffer: ArrayBuffer, options?: WCSLoaderOptions) => Promise<WCSCapabilities>;
+    readonly parseTextSync: (text: string, options?: WCSLoaderOptions) => WCSCapabilities;
 };
@@ -26,0 +28,0 @@ declare function testXMLFile(text: string): boolean;

dist/wip/wcs-capabilities-loader.js

@@ -5,3 +5,3 @@ // loaders.gl, MIT license
 // @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-alpha.6" !== 'undefined' ? "4.2.0-alpha.6" : 'latest';
 /**
@@ -11,2 +11,4 @@ * Loader for the response to the WCS GetCapability request
 export const WCSCapabilitiesLoader = {
+    dataType: null,
+    batchType: null,
     id: 'wcs-capabilities',
@@ -13,0 +15,0 @@ name: 'WFS Capabilities',

dist/wip/wfs-capabilities-loader.d.ts

@@ -10,4 +10,21 @@ import type { LoaderWithParser, LoaderOptions } from '@loaders.gl/loader-utils';
  */
-export declare const WFSCapabilitiesLoader: LoaderWithParser<WFSCapabilities, never, WFSLoaderOptions>;
+export declare const WFSCapabilitiesLoader: {
+    readonly dataType: WFSCapabilities;
+    readonly batchType: never;
+    readonly id: "wfs-capabilities";
+    readonly name: "WFS Capabilities";
+    readonly module: "wms";
+    readonly version: any;
+    readonly worker: false;
+    readonly extensions: ["xml"];
+    readonly mimeTypes: ["application/vnd.ogc.wfs_xml", "application/xml", "text/xml"];
+    readonly testText: typeof testXMLFile;
+    readonly options: {
+        readonly wfs: {};
+    };
+    readonly parse: (arrayBuffer: ArrayBuffer, options?: WFSLoaderOptions) => Promise<WFSCapabilities>;
+    readonly parseTextSync: (text: string, options?: WFSLoaderOptions) => WFSCapabilities;
+};
+declare function testXMLFile(text: string): boolean;
 export declare const _typecheckWFSCapabilitiesLoader: LoaderWithParser;
 //# sourceMappingURL=wfs-capabilities-loader.d.ts.map

dist/wip/wfs-capabilities-loader.js

@@ -5,3 +5,3 @@ // loaders.gl, MIT license
 // @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-alpha.6" !== 'undefined' ? "4.2.0-alpha.6" : 'latest';
 /**
@@ -11,2 +11,4 @@ * Loader for the response to the WFS GetCapability request
 export const WFSCapabilitiesLoader = {
+    dataType: null,
+    batchType: null,
     id: 'wfs-capabilities',
@@ -13,0 +15,0 @@ name: 'WFS Capabilities',

dist/wip/wms-feature-info-loader.d.ts

@@ -1,2 +0,1 @@
-import type { LoaderWithParser } from '@loaders.gl/loader-utils';
 import type { XMLLoaderOptions } from '@loaders.gl/xml';
@@ -8,4 +7,19 @@ import type { WMSFeatureInfo } from "../lib/parsers/wms/parse-wms-features.js";
  */
-export declare const WMSFeatureInfoLoader: LoaderWithParser<WMSFeatureInfo, never, XMLLoaderOptions>;
-export declare const _typecheckWMSFeatureInfoLoader: LoaderWithParser;
+export declare const WMSFeatureInfoLoader: {
+    readonly dataType: WMSFeatureInfo;
+    readonly id: "wms-feature-info";
+    readonly name: "WMS FeatureInfo";
+    readonly parse: (arrayBuffer: ArrayBuffer, options?: XMLLoaderOptions) => Promise<WMSFeatureInfo>;
+    readonly parseTextSync: (text: string, options?: XMLLoaderOptions) => WMSFeatureInfo;
+    readonly batchType: never;
+    readonly module: "wms";
+    readonly version: any;
+    readonly worker: false;
+    readonly extensions: ["xml"];
+    readonly mimeTypes: ["application/vnd.ogc.wms_xml", "application/xml", "text/xml"];
+    readonly testText: (text: string) => boolean;
+    readonly options: {
+        readonly wms: {};
+    };
+};
 //# sourceMappingURL=wms-feature-info-loader.d.ts.map

dist/wip/wms-feature-info-loader.js

@@ -1,2 +0,4 @@
-// loaders.gl, MIT license
+// loaders.gl
+// SPDX-License-Identifier: MIT
+// Copyright vis.gl contributors
 import { WMSCapabilitiesLoader } from "../wms-capabilities-loader.js";
@@ -7,5 +9,5 @@ import { parseWMSFeatureInfo } from "../lib/parsers/wms/parse-wms-features.js";
  */
-// @ts-expect-error
 export const WMSFeatureInfoLoader = {
     ...WMSCapabilitiesLoader,
+    dataType: null,
     id: 'wms-feature-info',
@@ -16,2 +18,1 @@ name: 'WMS FeatureInfo',
 };
-export const _typecheckWMSFeatureInfoLoader = WMSFeatureInfoLoader;

dist/wip/wms-layer-description-loader.d.ts

@@ -1,2 +0,1 @@
-import type { LoaderWithParser } from '@loaders.gl/loader-utils';
 import type { XMLLoaderOptions } from '@loaders.gl/xml';
@@ -9,31 +8,18 @@ import type { WMSLayerDescription } from "../lib/parsers/wms/parse-wms-layer-description.js";
 export declare const WMSLayerDescriptionLoader: {
-    id: string;
-    name: string;
-    parse: (arrayBuffer: ArrayBuffer, options?: XMLLoaderOptions) => Promise<WMSLayerDescription>;
-    parseTextSync: (text: string, options?: XMLLoaderOptions) => WMSLayerDescription;
-    dataType?: import("../wms-capabilities-loader").WMSCapabilities | undefined;
-    batchType?: undefined;
-    options: import("../wms-capabilities-loader").WMSCapabilitiesLoaderOptions;
-    deprecatedOptions?: Record<string, string | Record<string, string>> | undefined;
-    module: string;
-    version: string;
-    worker?: string | boolean | undefined;
-    category?: string | undefined;
-    extensions: string[];
-    mimeTypes: string[];
-    binary?: boolean | undefined;
-    text?: boolean | undefined;
-    tests?: (string | ArrayBuffer | ((ArrayBuffer: ArrayBuffer) => boolean))[] | undefined;
-    supported?: boolean | undefined;
-    testText?: ((string: string) => boolean) | undefined;
-    preload?: ((url: string, options?: {
-        [key: string]: unknown;
-    } | undefined) => any) | undefined;
-    parseFile?: ((file: import("@loaders.gl/loader-utils").ReadableFile, options?: import("../wms-capabilities-loader").WMSCapabilitiesLoaderOptions | undefined, context?: import("@loaders.gl/loader-utils").LoaderContext | undefined) => Promise<import("../wms-capabilities-loader").WMSCapabilities>) | undefined;
-    parseSync?: ((arrayBuffer: ArrayBuffer, options?: import("../wms-capabilities-loader").WMSCapabilitiesLoaderOptions | undefined, context?: import("@loaders.gl/loader-utils").LoaderContext | undefined) => import("../wms-capabilities-loader").WMSCapabilities) | undefined;
-    parseInBatches?: ((iterator: AsyncIterable<ArrayBuffer> | Iterable<ArrayBuffer>, options?: import("../wms-capabilities-loader").WMSCapabilitiesLoaderOptions | undefined, context?: import("@loaders.gl/loader-utils").LoaderContext | undefined) => AsyncIterable<never>) | undefined;
-    parseFileInBatches?: ((file: import("@loaders.gl/loader-utils").ReadableFile, options?: import("../wms-capabilities-loader").WMSCapabilitiesLoaderOptions | undefined, context?: import("@loaders.gl/loader-utils").LoaderContext | undefined) => AsyncIterable<never>) | undefined;
-    parseText?: ((text: string, options?: import("../wms-capabilities-loader").WMSCapabilitiesLoaderOptions | undefined, context?: import("@loaders.gl/loader-utils").LoaderContext | undefined) => Promise<import("../wms-capabilities-loader").WMSCapabilities>) | undefined;
+    readonly dataType: WMSLayerDescription;
+    readonly id: "wms-layer-description";
+    readonly name: "WMS DescribeLayer";
+    readonly parse: (arrayBuffer: ArrayBuffer, options?: XMLLoaderOptions) => Promise<WMSLayerDescription>;
+    readonly parseTextSync: (text: string, options?: XMLLoaderOptions) => WMSLayerDescription;
+    readonly batchType: never;
+    readonly module: "wms";
+    readonly version: any;
+    readonly worker: false;
+    readonly extensions: ["xml"];
+    readonly mimeTypes: ["application/vnd.ogc.wms_xml", "application/xml", "text/xml"];
+    readonly testText: (text: string) => boolean;
+    readonly options: {
+        readonly wms: {};
+    };
 };
-export declare const _typecheckWMSFeatureInfoLoader: LoaderWithParser;
 //# sourceMappingURL=wms-layer-description-loader.d.ts.map

dist/wip/wms-layer-description-loader.js

@@ -9,2 +9,3 @@ // loaders.gl, MIT license
     ...WMSCapabilitiesLoader,
+    dataType: null,
     id: 'wms-layer-description',
@@ -15,2 +16,1 @@ name: 'WMS DescribeLayer',
 };
-export const _typecheckWMSFeatureInfoLoader = WMSLayerDescriptionLoader;

dist/wip/wmts-capabilities-loader.d.ts

 import type { LoaderWithParser } from '@loaders.gl/loader-utils';
 import type { XMLLoaderOptions } from '@loaders.gl/xml';
+import { WMTSCapabilities } from "./lib/wmts/parse-wmts-capabilities.js";
 export type WMTSLoaderOptions = XMLLoaderOptions & {
@@ -10,15 +11,17 @@ wmts?: {};
 export declare const WMTSCapabilitiesLoader: {
-    id: string;
-    name: string;
-    module: string;
-    version: any;
-    worker: boolean;
-    extensions: string[];
-    mimeTypes: string[];
-    testText: typeof testXMLFile;
-    options: {
-        wms: {};
+    readonly dataType: WMTSCapabilities;
+    readonly batchType: never;
+    readonly id: "wmts-capabilities";
+    readonly name: "WMTS Capabilities";
+    readonly module: "wms";
+    readonly version: any;
+    readonly worker: false;
+    readonly extensions: ["xml"];
+    readonly mimeTypes: ["application/vnd.ogc.wmts_xml", "application/xml", "text/xml"];
+    readonly testText: typeof testXMLFile;
+    readonly options: {
+        readonly wms: {};
     };
-    parse: (arrayBuffer: ArrayBuffer, options?: WMTSLoaderOptions) => Promise<import("./lib/wmts/parse-wmts-capabilities").WMTSCapabilities>;
-    parseTextSync: (text: string, options?: WMTSLoaderOptions) => import("./lib/wmts/parse-wmts-capabilities").WMTSCapabilities;
+    readonly parse: (arrayBuffer: ArrayBuffer, options?: WMTSLoaderOptions) => Promise<WMTSCapabilities>;
+    readonly parseTextSync: (text: string, options?: WMTSLoaderOptions) => WMTSCapabilities;
 };
@@ -25,0 +28,0 @@ declare function testXMLFile(text: string): boolean;

dist/wip/wmts-capabilities-loader.js

@@ -6,3 +6,3 @@ // loaders.gl, MIT license
 // @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-alpha.6" !== 'undefined' ? "4.2.0-alpha.6" : 'latest';
 /**
@@ -12,2 +12,4 @@ * Loader for the response to the WMTS GetCapability request
 export const WMTSCapabilitiesLoader = {
+    dataType: null,
+    batchType: null,
     id: 'wmts-capabilities',
@@ -14,0 +16,0 @@ name: 'WMTS Capabilities',

dist/wms-capabilities-loader.d.ts

@@ -1,2 +0,1 @@
-import type { LoaderWithParser } from '@loaders.gl/loader-utils';
 import type { XMLLoaderOptions } from '@loaders.gl/xml';
@@ -18,3 +17,20 @@ import { WMSCapabilities } from "./lib/parsers/wms/parse-wms-capabilities.js";
  */
-export declare const WMSCapabilitiesLoader: LoaderWithParser<WMSCapabilities, never, WMSCapabilitiesLoaderOptions>;
+export declare const WMSCapabilitiesLoader: {
+    readonly dataType: WMSCapabilities;
+    readonly batchType: never;
+    readonly id: "wms-capabilities";
+    readonly name: "WMS Capabilities";
+    readonly module: "wms";
+    readonly version: any;
+    readonly worker: false;
+    readonly extensions: ["xml"];
+    readonly mimeTypes: ["application/vnd.ogc.wms_xml", "application/xml", "text/xml"];
+    readonly testText: typeof testXMLFile;
+    readonly options: {
+        readonly wms: {};
+    };
+    readonly parse: (arrayBuffer: ArrayBuffer, options?: WMSCapabilitiesLoaderOptions) => Promise<WMSCapabilities>;
+    readonly parseTextSync: (text: string, options?: WMSCapabilitiesLoaderOptions) => WMSCapabilities;
+};
+declare function testXMLFile(text: string): boolean;
 //# sourceMappingURL=wms-capabilities-loader.d.ts.map

dist/wms-capabilities-loader.js

@@ -7,3 +7,3 @@ // loaders.gl
 // @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-alpha.6" !== 'undefined' ? "4.2.0-alpha.6" : 'latest';
 /**
@@ -13,2 +13,4 @@ * Loader for the response to the WMS GetCapability request
 export const WMSCapabilitiesLoader = {
+    dataType: null,
+    batchType: null,
     id: 'wms-capabilities',
@@ -15,0 +17,0 @@ name: 'WMS Capabilities',

dist/wms-error-loader.d.ts

@@ -1,2 +0,2 @@
-import type { LoaderWithParser, LoaderOptions } from '@loaders.gl/loader-utils';
+import type { LoaderOptions } from '@loaders.gl/loader-utils';
 export type WMSLoaderOptions = LoaderOptions & {
@@ -13,3 +13,24 @@ wms?: {
  */
-export declare const WMSErrorLoader: LoaderWithParser<string, never, WMSLoaderOptions>;
+export declare const WMSErrorLoader: {
+    readonly dataType: string;
+    readonly batchType: never;
+    readonly id: "wms-error";
+    readonly name: "WMS Error";
+    readonly module: "wms";
+    readonly version: any;
+    readonly worker: false;
+    readonly extensions: ["xml"];
+    readonly mimeTypes: ["application/vnd.ogc.se_xml", "application/xml", "text/xml"];
+    readonly testText: typeof testXMLFile;
+    readonly options: {
+        readonly wms: {
+            readonly throwOnError: false;
+        };
+    };
+    readonly parse: (arrayBuffer: ArrayBuffer, options?: WMSLoaderOptions) => Promise<string>;
+    readonly parseSync: (arrayBuffer: ArrayBuffer, options?: WMSLoaderOptions) => string;
+    readonly parseTextSync: (text: string, options?: WMSLoaderOptions) => string;
+};
+declare function testXMLFile(text: string): boolean;
+export {};
 //# sourceMappingURL=wms-error-loader.d.ts.map

dist/wms-error-loader.js

@@ -7,3 +7,3 @@ // loaders.gl
 // @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-alpha.6" !== 'undefined' ? "4.2.0-alpha.6" : 'latest';
 /**
@@ -13,2 +13,4 @@ * Loader for the response to the WMS GetCapability request
 export const WMSErrorLoader = {
+    dataType: null,
+    batchType: null,
     id: 'wms-error',
@@ -15,0 +17,0 @@ name: 'WMS Error',

package.json

 {
   "name": "@loaders.gl/wms",
-  "version": "4.2.0-alpha.6",
+  "version": "4.2.0-beta.1",
   "description": "Framework-independent loaders for the WMS (Web Map Service) standard",
@@ -53,6 +53,6 @@ "license": "MIT",
   "dependencies": {
-    "@loaders.gl/images": "4.2.0-alpha.6",
-    "@loaders.gl/loader-utils": "4.2.0-alpha.6",
-    "@loaders.gl/schema": "4.2.0-alpha.6",
-    "@loaders.gl/xml": "4.2.0-alpha.6",
+    "@loaders.gl/images": "4.2.0-beta.1",
+    "@loaders.gl/loader-utils": "4.2.0-beta.1",
+    "@loaders.gl/schema": "4.2.0-beta.1",
+    "@loaders.gl/xml": "4.2.0-beta.1",
     "@turf/rewind": "^5.1.5",
@@ -64,3 +64,3 @@ "deep-strict-equal": "^0.2.0"
   },
-  "gitHead": "37bd8ca71763529f18727ee4bf29dd176aa914ca"
+  "gitHead": "c386a9196516fe3ff24847b40e6c77be039cf905"
 }

src/csw-capabilities-loader.ts

@@ -25,3 +25,6 @@ // loaders.gl
  */
-export const CSWCapabilitiesLoader: LoaderWithParser<CSWCapabilities, never, CSWLoaderOptions> = {
+export const CSWCapabilitiesLoader = {
+  dataType: null as unknown as CSWCapabilities,
+  batchType: null as never,
+
   id: 'csw-capabilities',
@@ -41,3 +44,3 @@ name: 'CSW Capabilities',
   parseTextSync: (text: string, options?: CSWLoaderOptions) => parseCSWCapabilities(text, options)
-};
+} as const satisfies LoaderWithParser<CSWCapabilities, never, CSWLoaderOptions>;
 
@@ -44,0 +47,0 @@ function testXMLFile(text: string): boolean {

src/csw-domain-loader.ts

@@ -23,3 +23,6 @@ // loaders.gl
  */
-export const CSWDomainLoader: LoaderWithParser<CSWDomain, never, CSWLoaderOptions> = {
+export const CSWDomainLoader = {
+  dataType: null as unknown as CSWDomain,
+  batchType: null as never,
+
   id: 'csw-domain',
@@ -40,3 +43,3 @@ name: 'CSW Domain',
   parseTextSync: (text: string, options?: CSWLoaderOptions) => parseCSWDomain(text, options)
-};
+} as const satisfies LoaderWithParser<CSWDomain, never, CSWLoaderOptions>;
 
@@ -43,0 +46,0 @@ function testXMLFile(text: string): boolean {

src/csw-records-loader.ts

@@ -23,3 +23,6 @@ // loaders.gl
  */
-export const CSWRecordsLoader: LoaderWithParser<CSWRecords, never, CSWLoaderOptions> = {
+export const CSWRecordsLoader = {
+  dataType: null as unknown as CSWRecords,
+  batchType: null as never,
+
   id: 'csw-records',
@@ -39,3 +42,3 @@ name: 'CSW Records',
   parseTextSync: (text: string, options?: CSWLoaderOptions) => parseCSWRecords(text, options)
-};
+} as const satisfies LoaderWithParser<CSWRecords, never, CSWLoaderOptions>;
 
@@ -42,0 +45,0 @@ function testXMLFile(text: string): boolean {

src/gml-loader.ts

@@ -20,3 +20,6 @@ // loaders.gl
  */
-export const GMLLoader: LoaderWithParser<Geometry | null, never, GMLLoaderOptions> = {
+export const GMLLoader = {
+  dataType: null as unknown as Geometry | null,
+  batchType: null as never,
+
   name: 'GML',
@@ -37,3 +40,3 @@ id: 'gml',
   parseTextSync: (text: string, options?: GMLLoaderOptions) => parseGML(text, options)
-};
+} as const satisfies LoaderWithParser<Geometry | null, never, GMLLoaderOptions>;
 
@@ -40,0 +43,0 @@ function testXMLFile(text: string): boolean {

src/services/ogc/wms-service.ts

@@ -379,2 +379,7 @@ // loaders.gl
     wmsParameters = this._getWMS130Parameters(wmsParameters);
+
+    // Replace the GetImage `boundingBox` parameter with the WMS flat `bbox` parameter.
+    const {boundingBox, bbox} = wmsParameters as any;
+    wmsParameters.bbox = boundingBox ? [...boundingBox[0], ...boundingBox[1]] : bbox!;
+
     const options: Required<WMSGetFeatureInfoParameters> = {
@@ -516,2 +521,18 @@ version: this.wmsParameters.version,
 
+      case 'x':
+        // i is the parameter used in WMS 1.3
+        // TODO - change parameter to `i` and convert to `x` if not 1.3
+        if (wmsParameters.version === '1.3.0') {
+          key = 'i';
+        }
+        break;
+
+      case 'y':
+        // j is the parameter used in WMS 1.3
+        // TODO - change parameter to `j` and convert to `y` if not 1.3
+        if (wmsParameters.version === '1.3.0') {
+          key = 'j';
+        }
+        break;
+
       default:
@@ -518,0 +539,0 @@ // do nothing

src/wip/wcs-capabilities-loader.ts

@@ -21,2 +21,5 @@ // loaders.gl, MIT license
 export const WCSCapabilitiesLoader = {
+  dataType: null as unknown as WCSCapabilities,
+  batchType: null as never,
+
   id: 'wcs-capabilities',
@@ -37,3 +40,3 @@ name: 'WFS Capabilities',
   parseTextSync: (text: string, options?: WCSLoaderOptions) => parseWCSCapabilities(text, options)
-};
+} as const satisfies LoaderWithParser<WCSCapabilities, never, WCSLoaderOptions>;
 
@@ -40,0 +43,0 @@ function testXMLFile(text: string): boolean {

src/wip/wfs-capabilities-loader.ts

@@ -20,3 +20,6 @@ // loaders.gl, MIT license
  */
-export const WFSCapabilitiesLoader: LoaderWithParser<WFSCapabilities, never, WFSLoaderOptions> = {
+export const WFSCapabilitiesLoader = {
+  dataType: null as unknown as WFSCapabilities,
+  batchType: null as never,
+
   id: 'wfs-capabilities',
@@ -37,3 +40,3 @@ name: 'WFS Capabilities',
   parseTextSync: (text: string, options?: WFSLoaderOptions) => parseWFSCapabilities(text, options)
-};
+} as const satisfies LoaderWithParser<WFSCapabilities, never, WFSLoaderOptions>;
 
@@ -40,0 +43,0 @@ function testXMLFile(text: string): boolean {

src/wip/wms-feature-info-loader.ts

@@ -1,2 +0,4 @@
-// loaders.gl, MIT license
+// loaders.gl
+// SPDX-License-Identifier: MIT
+// Copyright vis.gl contributors
 
@@ -15,5 +17,5 @@ import type {LoaderWithParser} from '@loaders.gl/loader-utils';
  */
-// @ts-expect-error
-export const WMSFeatureInfoLoader: LoaderWithParser<WMSFeatureInfo, never, XMLLoaderOptions> = {
+export const WMSFeatureInfoLoader = {
   ...WMSCapabilitiesLoader,
+  dataType: null as unknown as WMSFeatureInfo,
 
@@ -26,4 +28,2 @@ id: 'wms-feature-info',
   parseTextSync: (text: string, options?: XMLLoaderOptions) => parseWMSFeatureInfo(text, options)
-};
-
-export const _typecheckWMSFeatureInfoLoader: LoaderWithParser = WMSFeatureInfoLoader;
+} as const satisfies LoaderWithParser<WMSFeatureInfo, never, XMLLoaderOptions>;

src/wip/wms-layer-description-loader.ts

@@ -17,2 +17,3 @@ // loaders.gl, MIT license
   ...WMSCapabilitiesLoader,
+  dataType: null as unknown as WMSLayerDescription,
 
@@ -25,4 +26,2 @@ id: 'wms-layer-description',
   parseTextSync: (text: string, options?: XMLLoaderOptions) => parseWMSLayerDescription(text, options)
-};
-
-export const _typecheckWMSFeatureInfoLoader: LoaderWithParser = WMSLayerDescriptionLoader;
+} as const satisfies LoaderWithParser<WMSLayerDescription, never, XMLLoaderOptions>;

src/wip/wmts-capabilities-loader.ts

@@ -6,3 +6,3 @@ // loaders.gl, MIT license
 // import type {WMTSCapabilities} from './lib/wmts/parse-wmts-capabilities';
-import {parseWMTSCapabilities} from './lib/wmts/parse-wmts-capabilities';
+import {parseWMTSCapabilities, WMTSCapabilities} from './lib/wmts/parse-wmts-capabilities';
 
@@ -23,2 +23,5 @@ // __VERSION__ is injected by babel-plugin-version-inline
 export const WMTSCapabilitiesLoader = {
+  dataType: null as unknown as WMTSCapabilities,
+  batchType: null as never,
+
   id: 'wmts-capabilities',
@@ -39,3 +42,3 @@ name: 'WMTS Capabilities',
   parseTextSync: (text: string, options?: WMTSLoaderOptions) => parseWMTSCapabilities(text, options)
-};
+} as const satisfies LoaderWithParser<WMTSCapabilities, never, WMTSLoaderOptions>;
 
@@ -42,0 +45,0 @@ function testXMLFile(text: string): boolean {

src/wms-capabilities-loader.ts

@@ -37,7 +37,6 @@ // loaders.gl
  */
-export const WMSCapabilitiesLoader: LoaderWithParser<
-  WMSCapabilities,
-  never,
-  WMSCapabilitiesLoaderOptions
-> = {
+export const WMSCapabilitiesLoader = {
+  dataType: null as unknown as WMSCapabilities,
+  batchType: null as never,
+
   id: 'wms-capabilities',
@@ -61,3 +60,3 @@ name: 'WMS Capabilities',
     parseWMSCapabilities(text, options?.wms)
-};
+} as const satisfies LoaderWithParser<WMSCapabilities, never, WMSCapabilitiesLoaderOptions>;
 
@@ -64,0 +63,0 @@ function testXMLFile(text: string): boolean {

src/wms-error-loader.ts

@@ -24,3 +24,6 @@ // loaders.gl
  */
-export const WMSErrorLoader: LoaderWithParser<string, never, WMSLoaderOptions> = {
+export const WMSErrorLoader = {
+  dataType: null as unknown as string,
+  batchType: null as never,
+
   id: 'wms-error',
@@ -45,3 +48,3 @@ name: 'WMS Error',
   parseTextSync: (text: string, options?: WMSLoaderOptions): string => parseTextSync(text, options)
-};
+} as const satisfies LoaderWithParser<string, never, WMSLoaderOptions>;
 
@@ -48,0 +51,0 @@ function testXMLFile(text: string): boolean {

No alert changes

Improved metrics

Total package byte prevSize

500249

increased by2.05%

Lines of code

8791

increased by2.95%

Dependency changes

• + [e-mail]/images@4.2.0-beta.1(transitive)

• + [e-mail]/loader-utils@4.2.0-beta.1(transitive)

• + [e-mail]/schema@4.2.0-beta.1(transitive)

• + [e-mail]/worker-utils@4.2.0-beta.1(transitive)

• + [e-mail]/xml@4.2.0-beta.1(transitive)

• - [e-mail]/images@4.2.0-alpha.6(transitive)

• - [e-mail]/loader-utils@4.2.0-alpha.6(transitive)

• - [e-mail]/schema@4.2.0-alpha.6(transitive)

• - [e-mail]/worker-utils@4.2.0-alpha.6(transitive)

• - [e-mail]/xml@4.2.0-alpha.6(transitive)

• [e-mail]/images@4.2.0-beta.1

• [e-mail]/loader-utils@4.2.0-beta.1

• [e-mail]/schema@4.2.0-beta.1

• [e-mail]/xml@4.2.0-beta.1