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

package/src/lib/sources/image-source.ts

@@ -15,21 +15,15 @@ export type ImageSourceMetadata = {
   title?: string;
   abstract?: string;
   keywords: string[];
-  layer: {
-    name: string;
-    title?: string;
-    srs?: string[];
-    boundingBox?: [number, number, number, number];
-    layers: ImageSourceLayer[];
-  };
+  layers: ImageSourceLayer[];
 };
 
 export type ImageSourceLayer = {
-  name: string;
+  name?: string;
   title?: string;
-  srs?: string[];
+  crs?: string[];
   boundingBox?: [number, number, number, number];
-  layers: ImageSourceLayer[];
+  layers?: ImageSourceLayer[];
 };
 
 export type GetImageParameters = {
@@ -43,8 +37,8 @@ export type GetImageParameters = {
   width: number;
   /** pixels */
   height: number;
-  /** srs for the image (not the bounding box) */
-  srs?: string;
+  /** crs for the image (not the bounding box) */
+  crs?: string;
   /** requested format for the return image */
   format?: 'image/png';
 };
@@ -67,8 +61,8 @@ export type ImageFormat = {
   width: number;
   /** pixels */
   height: number;
-  /** srs for the image (not the bounding box) */
-  srs?: string;
+  /** crs for the image (not the bounding box) */
+  crs?: string;
   /** requested format for the return image */
   format?: 'image/png';
 };
@@ -80,7 +74,7 @@ export type ImageSourceProps = DataSourceProps;
  * @note
  * - If geospatial, bounding box is expected to be in web mercator coordinates
  */
-export abstract class ImageSource extends DataSource {
+export abstract class ImageSource<PropsT extends ImageSourceProps> extends DataSource<PropsT> {
   abstract getMetadata(): Promise<ImageSourceMetadata>;
   abstract getImage(parameters: GetImageParameters): Promise<ImageType>;
 }

package/src/lib/sources/tile-source.ts

@@ -1,7 +1,7 @@
 // loaders.gl, MIT license
 
 import type {ImageType} from '@loaders.gl/images';
-import {DataSource} from './data-source';
+import {DataSource, DataSourceProps} from './data-source';
 
 /**
  * Normalized capabilities of an Image service
@@ -48,12 +48,14 @@ export type GetTileParameters = {
   format?: 'image/png';
 };
 
+type TileSourceProps = DataSourceProps;
+
 /**
  * MapTileSource - data sources that allow data to be queried by (geospatial) extents
  * @note
  * - If geospatial, bounding box is expected to be in web mercator coordinates
  */
-export abstract class TileSource extends DataSource {
+export abstract class TileSource<PropsT extends TileSourceProps> extends DataSource<PropsT> {
   abstract getMetadata(): Promise<TileSourceMetadata>;
   abstract getTile(parameters: GetTileParameters): Promise<ImageType>;
 }

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

@@ -1,14 +1,14 @@
 // loaders.gl, MIT license
 
 import type {LoaderWithParser, LoaderOptions} from '@loaders.gl/loader-utils';
-import {WMTSCapabilities} from './lib/wmts/parse-wmts-capabilities';
+// import type {WMTSCapabilities} from './lib/wmts/parse-wmts-capabilities';
 import {parseWMTSCapabilities} from './lib/wmts/parse-wmts-capabilities';
 
 // __VERSION__ is injected by babel-plugin-version-inline
 // @ts-ignore TS2304: Cannot find name '__VERSION__'.
 const VERSION = typeof __VERSION__ !== 'undefined' ? __VERSION__ : 'latest';
 
-export {WMTSCapabilities};
+// export type {WMTSCapabilities};
 
 export type WMTSLoaderOptions = LoaderOptions & {
   wmts?: {};

package/src/wms-capabilities-loader.ts

@@ -12,7 +12,12 @@ const VERSION = typeof __VERSION__ !== 'undefined' ? __VERSION__ : 'latest';
 export type {WMSCapabilities};
 
 export type WMSLoaderOptions = LoaderOptions & {
-  wms?: {};
+  wms?: {
+    /** Add inherited layer information to sub layers */
+    inheritedLayerProps?: boolean;
+    /** Whether to include "raw" XML-derived JSON */
+    raw?: boolean;
+  };
 };
 
 /**
@@ -32,8 +37,9 @@ export const WMSCapabilitiesLoader = {
     wms: {}
   },
   parse: async (arrayBuffer: ArrayBuffer, options?: WMSLoaderOptions) =>
-    parseWMSCapabilities(new TextDecoder().decode(arrayBuffer), options),
-  parseTextSync: (text: string, options?: WMSLoaderOptions) => parseWMSCapabilities(text, options)
+    parseWMSCapabilities(new TextDecoder().decode(arrayBuffer), options?.wms),
+  parseTextSync: (text: string, options?: WMSLoaderOptions) =>
+    parseWMSCapabilities(text, options?.wms)
 };
 
 function testXMLFile(text: string): boolean {

package/dist/es5/lib/services/generic/tile-service.js

@@ -1,2 +0,0 @@
-"use strict";
-//# sourceMappingURL=tile-service.js.map

package/dist/es5/lib/services/generic/tile-service.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"tile-service.js","names":[],"sources":["../../../../../src/lib/services/generic/tile-service.ts"],"sourcesContent":[""],"mappings":""}

package/dist/esm/lib/services/generic/tile-service.js

@@ -1,2 +0,0 @@
-
-//# sourceMappingURL=tile-service.js.map

package/dist/esm/lib/services/generic/tile-service.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"tile-service.js","names":[],"sources":["../../../../../src/lib/services/generic/tile-service.ts"],"sourcesContent":[""],"mappings":""}

package/dist/lib/services/generic/tile-service.d.ts

@@ -1 +0,0 @@
-//# sourceMappingURL=tile-service.d.ts.map

package/dist/lib/services/generic/tile-service.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"tile-service.d.ts","sourceRoot":"","sources":["../../../../src/lib/services/generic/tile-service.ts"],"names":[],"mappings":""}

package/dist/lib/services/generic/tile-service.js

@@ -1 +0,0 @@
-"use strict";