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

package/src/csw-records-loader.ts

@@ -20,7 +20,10 @@ export type CSWLoaderOptions = XMLLoaderOptions & {
 /**
  * Loader for the response to the CSW GetCapability request
  */
-export const CSWRecordsLoader: LoaderWithParser<CSWRecords, never, CSWLoaderOptions> = {
+export const CSWRecordsLoader = {
+  dataType: null as unknown as CSWRecords,
+  batchType: null as never,
+
   id: 'csw-records',
   name: 'CSW Records',
   module: 'wms',
@@ -35,7 +38,7 @@ export const CSWRecordsLoader: LoaderWithParser<CSWRecords, never, CSWLoaderOpti
   parse: async (arrayBuffer: ArrayBuffer, options?: CSWLoaderOptions) =>
     parseCSWRecords(new TextDecoder().decode(arrayBuffer), options),
   parseTextSync: (text: string, options?: CSWLoaderOptions) => parseCSWRecords(text, options)
-};
+} as const satisfies LoaderWithParser<CSWRecords, never, CSWLoaderOptions>;
 
 function testXMLFile(text: string): boolean {
   // TODO - There could be space first.

package/src/gml-loader.ts

@@ -17,7 +17,10 @@ export type GMLLoaderOptions = LoaderOptions & {
 /**
  * Loader for the response to the GML GetCapability request
  */
-export const GMLLoader: LoaderWithParser<Geometry | null, never, GMLLoaderOptions> = {
+export const GMLLoader = {
+  dataType: null as unknown as Geometry | null,
+  batchType: null as never,
+
   name: 'GML',
   id: 'gml',
 
@@ -33,7 +36,7 @@ export const GMLLoader: LoaderWithParser<Geometry | null, never, GMLLoaderOption
   parse: async (arrayBuffer: ArrayBuffer, options?: GMLLoaderOptions) =>
     parseGML(new TextDecoder().decode(arrayBuffer), options),
   parseTextSync: (text: string, options?: GMLLoaderOptions) => parseGML(text, options)
-};
+} as const satisfies LoaderWithParser<Geometry | null, never, GMLLoaderOptions>;
 
 function testXMLFile(text: string): boolean {
   // TODO - There could be space first.

package/src/services/ogc/wms-service.ts

@@ -376,6 +376,11 @@ export class WMSSource extends ImageSource<WMSSourceProps> {
     vendorParameters?: Record<string, unknown>
   ): string {
     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> = {
       version: this.wmsParameters.version,
       // query_layers: [],
@@ -512,6 +517,22 @@ export class WMSSource extends ImageSource<WMSSourceProps> {
         }
         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:
       // do nothing
     }

package/src/wip/wcs-capabilities-loader.ts

@@ -18,6 +18,9 @@ export type WCSLoaderOptions = LoaderOptions & {
  * Loader for the response to the WCS GetCapability request
  */
 export const WCSCapabilitiesLoader = {
+  dataType: null as unknown as WCSCapabilities,
+  batchType: null as never,
+
   id: 'wcs-capabilities',
   name: 'WFS Capabilities',
 
@@ -33,7 +36,7 @@ export const WCSCapabilitiesLoader = {
   parse: async (arrayBuffer: ArrayBuffer, options?: WCSLoaderOptions) =>
     parseWCSCapabilities(new TextDecoder().decode(arrayBuffer), options),
   parseTextSync: (text: string, options?: WCSLoaderOptions) => parseWCSCapabilities(text, options)
-};
+} as const satisfies LoaderWithParser<WCSCapabilities, never, WCSLoaderOptions>;
 
 function testXMLFile(text: string): boolean {
   // TODO - There could be space first.

package/src/wip/wfs-capabilities-loader.ts

@@ -17,7 +17,10 @@ export type WFSLoaderOptions = LoaderOptions & {
 /**
  * Loader for the response to the WFS GetCapability request
  */
-export const WFSCapabilitiesLoader: LoaderWithParser<WFSCapabilities, never, WFSLoaderOptions> = {
+export const WFSCapabilitiesLoader = {
+  dataType: null as unknown as WFSCapabilities,
+  batchType: null as never,
+
   id: 'wfs-capabilities',
   name: 'WFS Capabilities',
 
@@ -33,7 +36,7 @@ export const WFSCapabilitiesLoader: LoaderWithParser<WFSCapabilities, never, WFS
   parse: async (arrayBuffer: ArrayBuffer, options?: WFSLoaderOptions) =>
     parseWFSCapabilities(new TextDecoder().decode(arrayBuffer), options),
   parseTextSync: (text: string, options?: WFSLoaderOptions) => parseWFSCapabilities(text, options)
-};
+} as const satisfies LoaderWithParser<WFSCapabilities, never, WFSLoaderOptions>;
 
 function testXMLFile(text: string): boolean {
   // TODO - There could be space first.

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

@@ -1,4 +1,6 @@
-// loaders.gl, MIT license
+// loaders.gl
+// SPDX-License-Identifier: MIT
+// Copyright vis.gl contributors
 
 import type {LoaderWithParser} from '@loaders.gl/loader-utils';
 import type {XMLLoaderOptions} from '@loaders.gl/xml';
@@ -12,9 +14,9 @@ export {WMSFeatureInfo};
 /**
  * Loader for the response to the WMS GetFeatureInfo request
  */
-// @ts-expect-error
-export const WMSFeatureInfoLoader: LoaderWithParser<WMSFeatureInfo, never, XMLLoaderOptions> = {
+export const WMSFeatureInfoLoader = {
   ...WMSCapabilitiesLoader,
+  dataType: null as unknown as WMSFeatureInfo,
 
   id: 'wms-feature-info',
   name: 'WMS FeatureInfo',
@@ -22,6 +24,4 @@ export const WMSFeatureInfoLoader: LoaderWithParser<WMSFeatureInfo, never, XMLLo
   parse: async (arrayBuffer: ArrayBuffer, options?: XMLLoaderOptions) =>
     parseWMSFeatureInfo(new TextDecoder().decode(arrayBuffer), options),
   parseTextSync: (text: string, options?: XMLLoaderOptions) => parseWMSFeatureInfo(text, options)
-};
-
-export const _typecheckWMSFeatureInfoLoader: LoaderWithParser = WMSFeatureInfoLoader;
+} as const satisfies LoaderWithParser<WMSFeatureInfo, never, XMLLoaderOptions>;

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

@@ -14,6 +14,7 @@ export {WMSLayerDescription};
  */
 export const WMSLayerDescriptionLoader = {
   ...WMSCapabilitiesLoader,
+  dataType: null as unknown as WMSLayerDescription,
 
   id: 'wms-layer-description',
   name: 'WMS DescribeLayer',
@@ -21,6 +22,4 @@ export const WMSLayerDescriptionLoader = {
   parse: async (arrayBuffer: ArrayBuffer, options?: XMLLoaderOptions) =>
     parseWMSLayerDescription(new TextDecoder().decode(arrayBuffer), options),
   parseTextSync: (text: string, options?: XMLLoaderOptions) => parseWMSLayerDescription(text, options)
-};
-
-export const _typecheckWMSFeatureInfoLoader: LoaderWithParser = WMSLayerDescriptionLoader;
+} as const satisfies LoaderWithParser<WMSLayerDescription, never, XMLLoaderOptions>;

package/src/wip/wmts-capabilities-loader.ts

@@ -3,7 +3,7 @@
 import type {LoaderWithParser} from '@loaders.gl/loader-utils';
 import type {XMLLoaderOptions} from '@loaders.gl/xml';
 // 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';
 
 // __VERSION__ is injected by babel-plugin-version-inline
 // @ts-ignore TS2304: Cannot find name '__VERSION__'.
@@ -19,6 +19,9 @@ export type WMTSLoaderOptions = XMLLoaderOptions & {
  * Loader for the response to the WMTS GetCapability request
  */
 export const WMTSCapabilitiesLoader = {
+  dataType: null as unknown as WMTSCapabilities,
+  batchType: null as never,
+
   id: 'wmts-capabilities',
   name: 'WMTS Capabilities',
 
@@ -34,7 +37,7 @@ export const WMTSCapabilitiesLoader = {
   parse: async (arrayBuffer: ArrayBuffer, options?: WMTSLoaderOptions) =>
     parseWMTSCapabilities(new TextDecoder().decode(arrayBuffer), options),
   parseTextSync: (text: string, options?: WMTSLoaderOptions) => parseWMTSCapabilities(text, options)
-};
+} as const satisfies LoaderWithParser<WMTSCapabilities, never, WMTSLoaderOptions>;
 
 function testXMLFile(text: string): boolean {
   // TODO - There could be space first.

package/src/wms-capabilities-loader.ts

@@ -34,11 +34,10 @@ export type WMSCapabilitiesLoaderOptions = XMLLoaderOptions & {
 /**
  * Loader for the response to the WMS GetCapability request
  */
-export const WMSCapabilitiesLoader: LoaderWithParser<
-  WMSCapabilities,
-  never,
-  WMSCapabilitiesLoaderOptions
-> = {
+export const WMSCapabilitiesLoader = {
+  dataType: null as unknown as WMSCapabilities,
+  batchType: null as never,
+
   id: 'wms-capabilities',
   name: 'WMS Capabilities',
 
@@ -57,7 +56,7 @@ export const WMSCapabilitiesLoader: LoaderWithParser<
   parseTextSync: (text: string, options?: WMSCapabilitiesLoaderOptions) =>
     // TODO pass in XML options
     parseWMSCapabilities(text, options?.wms)
-};
+} as const satisfies LoaderWithParser<WMSCapabilities, never, WMSCapabilitiesLoaderOptions>;
 
 function testXMLFile(text: string): boolean {
   // TODO - There could be space first.

package/src/wms-error-loader.ts

@@ -21,7 +21,10 @@ export type WMSLoaderOptions = LoaderOptions & {
 /**
  * Loader for the response to the WMS GetCapability request
  */
-export const WMSErrorLoader: LoaderWithParser<string, never, WMSLoaderOptions> = {
+export const WMSErrorLoader = {
+  dataType: null as unknown as string,
+  batchType: null as never,
+
   id: 'wms-error',
   name: 'WMS Error',
 
@@ -41,7 +44,7 @@ export const WMSErrorLoader: LoaderWithParser<string, never, WMSLoaderOptions> =
   parseSync: (arrayBuffer: ArrayBuffer, options?: WMSLoaderOptions): string =>
     parseTextSync(new TextDecoder().decode(arrayBuffer), options),
   parseTextSync: (text: string, options?: WMSLoaderOptions): string => parseTextSync(text, options)
-};
+} as const satisfies LoaderWithParser<string, never, WMSLoaderOptions>;
 
 function testXMLFile(text: string): boolean {
   // TODO - There could be space first.