@deck.gl/geo-layers 8.9.0-beta.2 → 8.9.0-beta.4

package/package.json

@@ -2,7 +2,7 @@
   "name": "@deck.gl/geo-layers",
   "description": "deck.gl layers supporting geospatial use cases and GIS formats",
   "license": "MIT",
-  "version": "8.9.0-beta.2",
+  "version": "8.9.0-beta.4",
   "publishConfig": {
     "access": "public"
   },
@@ -37,10 +37,12 @@
     "@loaders.gl/schema": "^3.3.1",
     "@loaders.gl/terrain": "^3.3.1",
     "@loaders.gl/tiles": "^3.3.1",
+    "@loaders.gl/wms": "^3.3.1",
     "@luma.gl/constants": "^8.5.16",
     "@luma.gl/experimental": "^8.5.16",
     "@math.gl/core": "^3.6.2",
     "@math.gl/culling": "^3.6.2",
+    "@math.gl/proj4": "^3.6.3",
     "@math.gl/web-mercator": "^3.6.2",
     "@types/geojson": "^7946.0.8",
     "h3-js": "^3.7.0",
@@ -51,8 +53,8 @@
     "@deck.gl/extensions": "^8.0.0",
     "@deck.gl/layers": "^8.0.0",
     "@deck.gl/mesh-layers": "^8.0.0",
-    "@loaders.gl/core": "^3.0.0",
+    "@loaders.gl/core": "^3.3.0",
     "@luma.gl/core": "^8.0.0"
   },
-  "gitHead": "5dae086e4f3eb46c30d8e761f9d600be4f68e949"
+  "gitHead": "f7c0eeaed1e62b0ae44ee45136b444f647e6cbd9"
 }

package/src/geo-cell-layer/GeoCellLayer.ts

@@ -1,4 +1,4 @@
-import {CompositeLayer, CompositeLayerProps, Layer, LayersList, DefaultProps} from '@deck.gl/core';
+import {CompositeLayer, Layer, LayersList, DefaultProps} from '@deck.gl/core';
 import {PolygonLayer, PolygonLayerProps} from '@deck.gl/layers';
 
 const defaultProps: DefaultProps<GeoCellLayerProps> = {
@@ -6,7 +6,7 @@ const defaultProps: DefaultProps<GeoCellLayerProps> = {
 };
 
 /** All properties supported by GeoCellLayer. */
-export type GeoCellLayerProps<DataT = any> = PolygonLayerProps<DataT> & CompositeLayerProps<DataT>;
+export type GeoCellLayerProps<DataT = any> = PolygonLayerProps<DataT>;
 
 export default class GeoCellLayer<DataT = any, ExtraProps extends {} = {}> extends CompositeLayer<
   Required<GeoCellLayerProps<DataT>> & ExtraProps

package/src/h3-layers/h3-hexagon-layer.ts

@@ -12,7 +12,6 @@ import {lerp} from '@math.gl/core';
 import {
   AccessorFunction,
   CompositeLayer,
-  CompositeLayerProps,
   createIterable,
   Layer,
   LayersList,
@@ -110,8 +109,7 @@ const defaultProps: DefaultProps<H3HexagonLayerProps> = {
 
 /** All properties supported by H3HexagonLayer */
 export type H3HexagonLayerProps<DataT = any> = _H3HexagonLayerProps<DataT> &
-  PolygonLayerProps<DataT> &
-  CompositeLayerProps<DataT>;
+  PolygonLayerProps<DataT>;
 
 /** Props added by the H3HexagonLayer */
 type _H3HexagonLayerProps<DataT> = {
@@ -148,9 +146,7 @@ type _H3HexagonLayerProps<DataT> = {
 export default class H3HexagonLayer<
   DataT = any,
   ExtraPropsT extends {} = {}
-> extends CompositeLayer<
-  ExtraPropsT & Required<_H3HexagonLayerProps<DataT> & Required<PolygonLayerProps<DataT>>>
-> {
+> extends CompositeLayer<ExtraPropsT & Required<H3HexagonLayerProps<DataT>>> {
   static defaultProps = defaultProps;
   static layerName = 'H3HexagonLayer';
 

package/src/index.ts

@@ -19,6 +19,7 @@
 // THE SOFTWARE.
 /* eslint-disable max-len */
 
+export {WMSLayer as _WMSLayer} from './wms-layer/wms-layer';
 export {default as GreatCircleLayer} from './great-circle-layer/great-circle-layer';
 export {default as S2Layer} from './s2-layer/s2-layer';
 export {default as QuadkeyLayer} from './quadkey-layer/quadkey-layer';
@@ -34,6 +35,7 @@ export {default as GeohashLayer} from './geohash-layer/geohash-layer';
 export {default as _GeoCellLayer} from './geo-cell-layer/GeoCellLayer';
 
 // Types
+export type {WMSLayerProps} from './wms-layer/wms-layer';
 export type {H3ClusterLayerProps} from './h3-layers/h3-cluster-layer';
 export type {H3HexagonLayerProps} from './h3-layers/h3-hexagon-layer';
 export type {GreatCircleLayerProps} from './great-circle-layer/great-circle-layer';

package/src/mesh-layer/mesh-layer.ts

@@ -27,10 +27,10 @@ const defaultProps: DefaultProps<MeshLayerProps> = {
 };
 
 /** All properties supported by MeshLayer. */
-export type MeshLayerProps<DataT = any> = _MeshLayerProps<DataT> & SimpleMeshLayerProps<DataT>;
+export type MeshLayerProps<DataT = any> = _MeshLayerProps & SimpleMeshLayerProps<DataT>;
 
 /** Properties added by MeshLayer. */
-type _MeshLayerProps<DataT> = {
+type _MeshLayerProps = {
   /**
    * PBR material object. _lighting must be pbr for this to work
    */
@@ -44,7 +44,7 @@ type _MeshLayerProps<DataT> = {
 
 export default class MeshLayer<DataT = any, ExtraProps extends {} = {}> extends SimpleMeshLayer<
   DataT,
-  Required<_MeshLayerProps<DataT>> & ExtraProps
+  Required<_MeshLayerProps> & ExtraProps
 > {
   static layerName = 'MeshLayer';
   static defaultProps = defaultProps;

package/src/mvt-layer/mvt-layer.ts

@@ -27,6 +27,7 @@ import TileLayer, {TiledPickingInfo, TileLayerProps} from '../tile-layer/tile-la
 
 import type {Tileset2DProps, TileLoadProps, GeoBoundingBox} from '../tileset-2d';
 import {
+  urlType,
   Tileset2D,
   Tile2DHeader,
   getURLFromTemplate,
@@ -38,6 +39,7 @@ const WORLD_SIZE = 512;
 
 const defaultProps: DefaultProps<MVTLayerProps> = {
   ...GeoJsonLayer.defaultProps,
+  data: urlType,
   onDataLoad: {type: 'function', value: null, optional: true, compare: false},
   uniqueIdProperty: '',
   highlightedFeatureId: null,
@@ -60,8 +62,8 @@ export type TileJson = {
 type ParsedMvtTile = Feature[] | BinaryFeatures;
 
 /** All props supported by the MVTLayer */
-export type MVTLayerProps<DataT extends Feature = Feature> = _MVTLayerProps &
-  GeoJsonLayerProps<DataT> &
+export type MVTLayerProps = _MVTLayerProps &
+  Omit<GeoJsonLayerProps, 'data'> &
   TileLayerProps<ParsedMvtTile>;
 
 /** Props added by the MVTLayer  */
@@ -93,10 +95,10 @@ export type _MVTLayerProps = {
 type ContentWGS84Cache = {_contentWGS84?: Feature[]};
 
 /** Render data formatted as [Mapbox Vector Tiles](https://docs.mapbox.com/vector-tiles/specification/). */
-export default class MVTLayer<
-  DataT extends Feature = Feature,
-  ExtraProps extends {} = {}
-> extends TileLayer<ParsedMvtTile, Required<_MVTLayerProps> & ExtraProps> {
+export default class MVTLayer<ExtraProps extends {} = {}> extends TileLayer<
+  ParsedMvtTile,
+  Required<_MVTLayerProps> & ExtraProps
+> {
   static layerName = 'MVTLayer';
   static defaultProps = defaultProps;
 
@@ -287,7 +289,9 @@ export default class MVTLayer<
 
     if (this.state.binary && info.index !== -1) {
       const {data} = params.sourceLayer!.props;
-      info.object = binaryToGeojson(data as BinaryFeatures, {globalFeatureId: info.index}) as DataT;
+      info.object = binaryToGeojson(data as BinaryFeatures, {
+        globalFeatureId: info.index
+      }) as Feature;
     }
     if (info.object && !isWGS84) {
       info.object = transformTileCoordsToWGS84(
@@ -355,21 +359,21 @@ export default class MVTLayer<
   }
 
   /** Get the rendered features in the current viewport. */
-  getRenderedFeatures(maxFeatures: number | null = null): DataT[] {
+  getRenderedFeatures(maxFeatures: number | null = null): Feature[] {
     const features = this._pickObjects(maxFeatures);
     const featureCache = new Set();
-    const renderedFeatures: DataT[] = [];
+    const renderedFeatures: Feature[] = [];
 
     for (const f of features) {
       const featureId = getFeatureUniqueId(f.object, this.props.uniqueIdProperty);
 
       if (featureId === undefined) {
         // we have no id for the feature, we just add to the list
-        renderedFeatures.push(f.object as DataT);
+        renderedFeatures.push(f.object as Feature);
       } else if (!featureCache.has(featureId)) {
         // Add removing duplicates
         featureCache.add(featureId);
-        renderedFeatures.push(f.object as DataT);
+        renderedFeatures.push(f.object as Feature);
       }
     }
 

package/src/tile-3d-layer/tile-3d-layer.ts

@@ -32,22 +32,23 @@ const defaultProps: DefaultProps<Tile3DLayerProps> = {
   getPointColor: {type: 'accessor', value: [0, 0, 0, 255]},
   pointSize: 1.0,
 
-  // @ts-expect-error Disable async data loading (handling it in _loadTileSet)
-  data: null,
+  // Disable async data loading (handling it in _loadTileSet)
+  data: '',
   loader: Tiles3DLoader,
 
-  onTilesetLoad: {type: 'function', value: tileset3d => {}, compare: false},
-  onTileLoad: {type: 'function', value: tileHeader => {}, compare: false},
-  onTileUnload: {type: 'function', value: tileHeader => {}, compare: false},
-  onTileError: {type: 'function', value: (tile, message, url) => {}, compare: false},
-  _getMeshColor: {type: 'function', value: tileHeader => [255, 255, 255], compare: false}
+  onTilesetLoad: {type: 'function', value: tileset3d => {}},
+  onTileLoad: {type: 'function', value: tileHeader => {}},
+  onTileUnload: {type: 'function', value: tileHeader => {}},
+  onTileError: {type: 'function', value: (tile, message, url) => {}},
+  _getMeshColor: {type: 'function', value: tileHeader => [255, 255, 255]}
 };
 
 /** All properties supported by Tile3DLayer */
-export type Tile3DLayerProps<DataT = any> = _Tile3DLayerProps<DataT> & CompositeLayerProps<DataT>;
+export type Tile3DLayerProps<DataT = any> = _Tile3DLayerProps<DataT> & CompositeLayerProps;
 
 /** Props added by the Tile3DLayer */
 type _Tile3DLayerProps<DataT> = {
+  data: string;
   /** Color Accessor for point clouds. **/
   getPointColor?: Accessor<DataT, Color>;
 

package/src/tile-layer/tile-layer.ts

@@ -21,20 +21,20 @@ import {
   STRATEGY_DEFAULT,
   Tileset2DProps
 } from '../tileset-2d';
-import {urlType, getURLFromTemplate} from '../tileset-2d';
+import {urlType, URLTemplate, getURLFromTemplate} from '../tileset-2d';
 
 const defaultProps: DefaultProps<TileLayerProps> = {
   TilesetClass: Tileset2D,
   data: {type: 'data', value: []},
   dataComparator: urlType.equal,
-  renderSubLayers: {type: 'function', value: props => new GeoJsonLayer(props), compare: false},
-  getTileData: {type: 'function', optional: true, value: null, compare: false},
+  renderSubLayers: {type: 'function', value: props => new GeoJsonLayer(props)},
+  getTileData: {type: 'function', optional: true, value: null},
   // TODO - change to onViewportLoad to align with Tile3DLayer
-  onViewportLoad: {type: 'function', optional: true, value: null, compare: false},
-  onTileLoad: {type: 'function', value: tile => {}, compare: false},
-  onTileUnload: {type: 'function', value: tile => {}, compare: false},
+  onViewportLoad: {type: 'function', optional: true, value: null},
+  onTileLoad: {type: 'function', value: tile => {}},
+  onTileUnload: {type: 'function', value: tile => {}},
   // eslint-disable-next-line
-  onTileError: {type: 'function', value: err => console.error(err), compare: false},
+  onTileError: {type: 'function', value: err => console.error(err)},
   extent: {type: 'array', optional: true, value: null, compare: true},
   tileSize: 512,
   maxZoom: null,
@@ -48,14 +48,15 @@ const defaultProps: DefaultProps<TileLayerProps> = {
 };
 
 /** All props supported by the TileLayer */
-export type TileLayerProps<DataT = any> = CompositeLayerProps<any> & _TileLayerProps<DataT>;
+export type TileLayerProps<DataT = any> = CompositeLayerProps & _TileLayerProps<DataT>;
 
 /** Props added by the TileLayer */
 type _TileLayerProps<DataT> = {
+  data: URLTemplate;
   /**
    * Optionally implement a custom indexing scheme.
    */
-  TilesetClass: typeof Tileset2D;
+  TilesetClass?: typeof Tileset2D;
   /**
    * Renders one or an array of Layer instances.
    */

package/src/tileset-2d/tileset-2d.ts

@@ -277,6 +277,7 @@ export class Tileset2D {
     return this._frameNumber;
   }
 
+  // eslint-disable-next-line complexity
   isTileVisible(
     tile: Tile2DHeader,
     cullRect?: {x: number; y: number; width: number; height: number}

package/src/wms-layer/wms-layer.ts

@@ -0,0 +1,247 @@
+// deck.gl, MIT license
+// Attributions:
+// Copyright 2022 Foursquare Labs, Inc.
+
+/* eslint-disable camelcase */ // Some WMS parameters are not in camel case
+/* global setTimeout, clearTimeout */
+
+import {
+  Layer,
+  CompositeLayer,
+  CompositeLayerProps,
+  UpdateParameters,
+  DefaultProps,
+  Viewport,
+  COORDINATE_SYSTEM,
+  _deepEqual as deepEqual
+} from '@deck.gl/core';
+import {BitmapLayer} from '@deck.gl/layers';
+import type {ImageSourceMetadata, ImageType, ImageServiceType} from '@loaders.gl/wms';
+import {ImageSource, createImageSource} from '@loaders.gl/wms';
+import {Proj4Projection} from '@math.gl/proj4';
+
+/** All props supported by the TileLayer */
+export type WMSLayerProps = CompositeLayerProps & _WMSLayerProps;
+
+/** Props added by the TileLayer */
+type _WMSLayerProps = {
+  data: string | ImageSource;
+  serviceType?: ImageServiceType | 'auto';
+  layers?: string[];
+  srs?: 'EPSG:4326' | 'EPSG:3857' | 'auto';
+  onMetadataLoad?: (metadata: ImageSourceMetadata) => void;
+  onMetadataLoadError?: (error: Error) => void;
+  onImageLoadStart?: (requestId: unknown) => void;
+  onImageLoad?: (requestId: unknown) => void;
+  onImageLoadError?: (requestId: unknown, error: Error) => void;
+};
+
+const defaultProps: DefaultProps<WMSLayerProps> = {
+  id: 'imagery-layer',
+  data: '',
+  serviceType: 'auto',
+  srs: 'auto',
+  layers: {type: 'array', compare: true, value: []},
+  onMetadataLoad: {type: 'function', value: () => {}},
+  // eslint-disable-next-line
+  onMetadataLoadError: {type: 'function', value: console.error},
+  onImageLoadStart: {type: 'function', value: () => {}},
+  onImageLoad: {type: 'function', value: () => {}},
+  onImageLoadError: {
+    type: 'function',
+    compare: false,
+    // eslint-disable-next-line
+    value: (requestId: unknown, error: Error) => console.error(error, requestId)
+  }
+};
+
+const projConverter = new Proj4Projection({from: 'EPSG:4326', to: 'EPSG:3857'});
+
+/**
+ * The layer is used in Hex Tile layer in order to properly discard invisible elements during animation
+ */
+export class WMSLayer<ExtraPropsT extends {} = {}> extends CompositeLayer<
+  ExtraPropsT & Required<_WMSLayerProps>
+> {
+  static layerName = 'WMSLayer';
+  static defaultProps: DefaultProps = defaultProps;
+
+  state!: {
+    imageSource: ImageSource;
+    image: ImageType;
+    bounds: [number, number, number, number];
+    lastRequestParameters: {
+      bbox: [number, number, number, number];
+      layers: string[];
+      srs: 'EPSG:4326' | 'EPSG:3857';
+      width: number;
+      height: number;
+    };
+    lastRequestId: number;
+
+    _nextRequestId: number;
+    _timeoutId: any;
+  };
+
+  /** Lets deck.gl know that we want viewport change events */
+  override shouldUpdateState(): boolean {
+    return true;
+  }
+
+  override initializeState(): void {
+    // intentionally empty, initialization is done in updateState
+    this.state._nextRequestId = 0;
+    this.state.lastRequestId = -1;
+  }
+
+  override updateState({changeFlags, props, oldProps}: UpdateParameters<this>): void {
+    const {viewport} = this.context;
+
+    // Check if data source has changed
+    if (changeFlags.dataChanged || props.serviceType !== oldProps.serviceType) {
+      this.state.imageSource = this._createImageSource(props);
+      // eslint-disable-next-line @typescript-eslint/no-floating-promises
+      this._loadMetadata();
+      this.debounce(() => this.loadImage(viewport, 'image source changed'), 0);
+    } else if (!deepEqual(props.layers, oldProps.layers, 1)) {
+      this.debounce(() => this.loadImage(viewport, 'layers changed'), 0);
+    } else if (changeFlags.viewportChanged) {
+      this.debounce(() => this.loadImage(viewport, 'viewport changed'));
+    }
+  }
+
+  override finalizeState(): void {
+    // TODO - we could cancel outstanding requests
+  }
+
+  override renderLayers(): Layer {
+    // TODO - which bitmap layer is rendered should depend on the current viewport
+    // Currently Studio only uses one viewport
+    const {bounds, image, lastRequestParameters} = this.state;
+
+    return (
+      image &&
+      new BitmapLayer({
+        ...this.getSubLayerProps({id: 'bitmap'}),
+        _imageCoordinateSystem:
+          lastRequestParameters.srs === 'EPSG:4326'
+            ? COORDINATE_SYSTEM.LNGLAT
+            : COORDINATE_SYSTEM.CARTESIAN,
+        bounds,
+        image
+      })
+    );
+  }
+
+  async getFeatureInfoText(x: number, y: number): Promise<string | null> {
+    const {lastRequestParameters} = this.state;
+    if (lastRequestParameters) {
+      // @ts-expect-error Undocumented method
+      const featureInfo = await this.state.imageSource.getFeatureInfoText?.({
+        ...lastRequestParameters,
+        query_layers: lastRequestParameters.layers,
+        x,
+        y,
+        info_format: 'application/vnd.ogc.gml'
+      });
+      return featureInfo;
+    }
+    return '';
+  }
+
+  _createImageSource(props: WMSLayerProps): ImageSource {
+    if (props.data instanceof ImageSource) {
+      return props.data;
+    }
+
+    if (typeof props.data === 'string') {
+      return createImageSource({
+        url: props.data,
+        loadOptions: props.loadOptions,
+        type: props.serviceType
+      });
+    }
+
+    throw new Error('invalid image source in props.data');
+  }
+
+  /** Run a getMetadata on the image service */
+  async _loadMetadata(): Promise<void> {
+    const {imageSource} = this.state;
+    try {
+      const metadata = await imageSource.getMetadata();
+
+      // If a request takes a long time, it may no longer be expected
+      if (this.state.imageSource === imageSource) {
+        this.getCurrentLayer()?.props.onMetadataLoad(metadata);
+      }
+    } catch (error) {
+      this.getCurrentLayer()?.props.onMetadataLoadError(error as Error);
+    }
+  }
+
+  /** Load an image */
+  async loadImage(viewport: Viewport, reason: string): Promise<void> {
+    const {layers, serviceType} = this.props;
+
+    // TODO - move to ImageSource?
+    if (serviceType === 'wms' && layers.length === 0) {
+      return;
+    }
+
+    const bounds = viewport.getBounds();
+    const {width, height} = viewport;
+    const requestId = this.getRequestId();
+    let {srs} = this.props;
+    if (srs === 'auto') {
+      // BitmapLayer only supports LNGLAT or CARTESIAN (Web-Mercator)
+      srs = viewport.resolution ? 'EPSG:4326' : 'EPSG:3857';
+    }
+    const requestParams = {
+      width,
+      height,
+      bbox: bounds,
+      layers,
+      srs
+    };
+    if (srs === 'EPSG:3857') {
+      const [minX, minY] = projConverter.project([bounds[0], bounds[1]]);
+      const [maxX, maxY] = projConverter.project([bounds[2], bounds[3]]);
+      requestParams.bbox = [minX, minY, maxX, maxY];
+    }
+
+    try {
+      this.props.onImageLoadStart(requestId);
+
+      const image = await this.state.imageSource.getImage(requestParams);
+
+      // If a request takes a long time, later requests may have already loaded.
+      if (this.state.lastRequestId < requestId) {
+        this.getCurrentLayer()?.props.onImageLoad(requestId);
+        // Not type safe...
+        this.setState({
+          image,
+          bounds,
+          lastRequestParameters: requestParams,
+          lastRequestId: requestId
+        });
+      }
+    } catch (error) {
+      this.raiseError(error as Error, 'Load image');
+      this.getCurrentLayer()?.props.onImageLoadError(requestId, error as Error);
+    }
+  }
+
+  // HELPERS
+
+  /** Global counter for issuing unique request ids */
+  private getRequestId(): number {
+    return this.state._nextRequestId++;
+  }
+
+  /** Runs an action in the future, cancels it if the new action is issued before it executes */
+  private debounce(fn: Function, ms = 500): void {
+    clearTimeout(this.state._timeoutId);
+    this.state._timeoutId = setTimeout(() => fn(), ms);
+  }
+}

package/typed/geo-cell-layer/GeoCellLayer.d.ts

@@ -1,7 +1,7 @@
-import { CompositeLayer, CompositeLayerProps, Layer, LayersList, DefaultProps } from '@deck.gl/core/typed';
+import { CompositeLayer, Layer, LayersList, DefaultProps } from '@deck.gl/core/typed';
 import { PolygonLayerProps } from '@deck.gl/layers/typed';
 /** All properties supported by GeoCellLayer. */
-export declare type GeoCellLayerProps<DataT = any> = PolygonLayerProps<DataT> & CompositeLayerProps<DataT>;
+export declare type GeoCellLayerProps<DataT = any> = PolygonLayerProps<DataT>;
 export default class GeoCellLayer<DataT = any, ExtraProps extends {} = {}> extends CompositeLayer<Required<GeoCellLayerProps<DataT>> & ExtraProps> {
     static layerName: string;
     static defaultProps: DefaultProps;

package/typed/geo-cell-layer/GeoCellLayer.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"GeoCellLayer.d.ts","sourceRoot":"","sources":["../../src/geo-cell-layer/GeoCellLayer.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,cAAc,EAAE,mBAAmB,EAAE,KAAK,EAAE,UAAU,EAAE,YAAY,EAAC,MAAM,eAAe,CAAC;AACnG,OAAO,EAAe,iBAAiB,EAAC,MAAM,iBAAiB,CAAC;AAMhE,gDAAgD;AAChD,oBAAY,iBAAiB,CAAC,KAAK,GAAG,GAAG,IAAI,iBAAiB,CAAC,KAAK,CAAC,GAAG,mBAAmB,CAAC,KAAK,CAAC,CAAC;AAEnG,MAAM,CAAC,OAAO,OAAO,YAAY,CAAC,KAAK,GAAG,GAAG,EAAE,UAAU,SAAS,EAAE,GAAG,EAAE,CAAE,SAAQ,cAAc,CAC/F,QAAQ,CAAC,iBAAiB,CAAC,KAAK,CAAC,CAAC,GAAG,UAAU,CAChD;IACC,MAAM,CAAC,SAAS,SAAkB;IAClC,MAAM,CAAC,YAAY,EAAE,YAAY,CAAgB;IAEjD,sDAAsD;IACtD,aAAa,IAAI,OAAO,CAAC,YAAY,CAAC,OAAO,CAAC,CAAC,GAAG,IAAI;IAItD,YAAY,IAAI,KAAK,GAAG,IAAI,GAAG,UAAU;CA+D1C"}
+{"version":3,"file":"GeoCellLayer.d.ts","sourceRoot":"","sources":["../../src/geo-cell-layer/GeoCellLayer.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,cAAc,EAAE,KAAK,EAAE,UAAU,EAAE,YAAY,EAAC,MAAM,eAAe,CAAC;AAC9E,OAAO,EAAe,iBAAiB,EAAC,MAAM,iBAAiB,CAAC;AAMhE,gDAAgD;AAChD,oBAAY,iBAAiB,CAAC,KAAK,GAAG,GAAG,IAAI,iBAAiB,CAAC,KAAK,CAAC,CAAC;AAEtE,MAAM,CAAC,OAAO,OAAO,YAAY,CAAC,KAAK,GAAG,GAAG,EAAE,UAAU,SAAS,EAAE,GAAG,EAAE,CAAE,SAAQ,cAAc,CAC/F,QAAQ,CAAC,iBAAiB,CAAC,KAAK,CAAC,CAAC,GAAG,UAAU,CAChD;IACC,MAAM,CAAC,SAAS,SAAkB;IAClC,MAAM,CAAC,YAAY,EAAE,YAAY,CAAgB;IAEjD,sDAAsD;IACtD,aAAa,IAAI,OAAO,CAAC,YAAY,CAAC,OAAO,CAAC,CAAC,GAAG,IAAI;IAItD,YAAY,IAAI,KAAK,GAAG,IAAI,GAAG,UAAU;CA+D1C"}

package/typed/h3-layers/h3-hexagon-layer.d.ts

@@ -1,10 +1,10 @@
 import { H3Index } from 'h3-js';
-import { AccessorFunction, CompositeLayer, CompositeLayerProps, Layer, LayersList, UpdateParameters, DefaultProps } from '@deck.gl/core/typed';
+import { AccessorFunction, CompositeLayer, Layer, LayersList, UpdateParameters, DefaultProps } from '@deck.gl/core/typed';
 import { PolygonLayerProps } from '@deck.gl/layers/typed';
 export declare function normalizeLongitudes(vertices: number[][], refLng?: number): void;
 export declare function scalePolygon(hexId: H3Index, vertices: number[][], factor: number): void;
 /** All properties supported by H3HexagonLayer */
-export declare type H3HexagonLayerProps<DataT = any> = _H3HexagonLayerProps<DataT> & PolygonLayerProps<DataT> & CompositeLayerProps<DataT>;
+export declare type H3HexagonLayerProps<DataT = any> = _H3HexagonLayerProps<DataT> & PolygonLayerProps<DataT>;
 /** Props added by the H3HexagonLayer */
 declare type _H3HexagonLayerProps<DataT> = {
     /**
@@ -36,7 +36,7 @@ declare type _H3HexagonLayerProps<DataT> = {
 /**
  * Render hexagons from the [H3](https://h3geo.org/) geospatial indexing system.
  */
-export default class H3HexagonLayer<DataT = any, ExtraPropsT extends {} = {}> extends CompositeLayer<ExtraPropsT & Required<_H3HexagonLayerProps<DataT> & Required<PolygonLayerProps<DataT>>>> {
+export default class H3HexagonLayer<DataT = any, ExtraPropsT extends {} = {}> extends CompositeLayer<ExtraPropsT & Required<H3HexagonLayerProps<DataT>>> {
     static defaultProps: DefaultProps<H3HexagonLayerProps<any>>;
     static layerName: string;
     static _checkH3Lib: () => void;

package/typed/h3-layers/h3-hexagon-layer.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"h3-hexagon-layer.d.ts","sourceRoot":"","sources":["../../src/h3-layers/h3-hexagon-layer.ts"],"names":[],"mappings":"AAAA,OAAO,EAQL,OAAO,EACR,MAAM,OAAO,CAAC;AAEf,OAAO,EACL,gBAAgB,EAChB,cAAc,EACd,mBAAmB,EAEnB,KAAK,EACL,UAAU,EACV,gBAAgB,EAEhB,YAAY,EACb,MAAM,eAAe,CAAC;AACvB,OAAO,EAA4B,iBAAiB,EAAC,MAAM,iBAAiB,CAAC;AAQ7E,wBAAgB,mBAAmB,CAAC,QAAQ,EAAE,MAAM,EAAE,EAAE,EAAE,MAAM,CAAC,EAAE,MAAM,GAAG,IAAI,CAU/E;AAGD,wBAAgB,YAAY,CAAC,KAAK,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,EAAE,EAAE,EAAE,MAAM,EAAE,MAAM,GAAG,IAAI,CAcvF;AAqDD,iDAAiD;AACjD,oBAAY,mBAAmB,CAAC,KAAK,GAAG,GAAG,IAAI,oBAAoB,CAAC,KAAK,CAAC,GACxE,iBAAiB,CAAC,KAAK,CAAC,GACxB,mBAAmB,CAAC,KAAK,CAAC,CAAC;AAE7B,wCAAwC;AACxC,aAAK,oBAAoB,CAAC,KAAK,IAAI;IACjC;;;OAGG;IACH,aAAa,CAAC,EAAE,OAAO,GAAG,MAAM,CAAC;IACjC;;;OAGG;IACH,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB;;OAEG;IACH,aAAa,CAAC,EAAE,OAAO,GAAG,IAAI,CAAC;IAC/B;;;;OAIG;IACH,UAAU,CAAC,EAAE,gBAAgB,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC;IAC7C;;;OAGG;IACH,QAAQ,CAAC,EAAE,OAAO,CAAC;CACpB,CAAC;AAEF;;GAEG;AACH,MAAM,CAAC,OAAO,OAAO,cAAc,CACjC,KAAK,GAAG,GAAG,EACX,WAAW,SAAS,EAAE,GAAG,EAAE,CAC3B,SAAQ,cAAc,CACtB,WAAW,GAAG,QAAQ,CAAC,oBAAoB,CAAC,KAAK,CAAC,GAAG,QAAQ,CAAC,iBAAiB,CAAC,KAAK,CAAC,CAAC,CAAC,CACzF;IACC,MAAM,CAAC,YAAY,yCAAgB;IACnC,MAAM,CAAC,SAAS,SAAoB;IAGpC,MAAM,CAAC,WAAW,aAAY;IAE9B,eAAe;IAQf,KAAK,EAAG;QACN,SAAS,CAAC,EAAE,OAAO,CAAC;QACpB,YAAY,EAAE,MAAM,CAAC;QACrB,cAAc,CAAC,EAAE,OAAO,CAAC;QACzB,WAAW,CAAC,EAAE,OAAO,CAAC;QACtB,UAAU,EAAE,MAAM,CAAC;QACnB,QAAQ,CAAC,EAAE,MAAM,EAAE,EAAE,CAAC;KACvB,CAAC;IAEF,iBAAiB,CAAC,EAAC,WAAW,EAAC,EAAE,gBAAgB,CAAC,IAAI,CAAC,GAAG,OAAO;IAMjE,WAAW,CAAC,EAAC,KAAK,EAAE,WAAW,EAAC,EAAE,gBAAgB,CAAC,IAAI,CAAC,GAAG,IAAI;IAa/D,OAAO,CAAC,qBAAqB;IAgC7B,OAAO,CAAC,uBAAuB;IAe/B,OAAO,CAAC,eAAe;IAuCvB,YAAY,IAAI,KAAK,GAAG,IAAI,GAAG,UAAU;IAIzC,OAAO,CAAC,gBAAgB;IAsDxB,OAAO,CAAC,mBAAmB;IA0B3B,OAAO,CAAC,kBAAkB;CAuB3B"}
+{"version":3,"file":"h3-hexagon-layer.d.ts","sourceRoot":"","sources":["../../src/h3-layers/h3-hexagon-layer.ts"],"names":[],"mappings":"AAAA,OAAO,EAQL,OAAO,EACR,MAAM,OAAO,CAAC;AAEf,OAAO,EACL,gBAAgB,EAChB,cAAc,EAEd,KAAK,EACL,UAAU,EACV,gBAAgB,EAEhB,YAAY,EACb,MAAM,eAAe,CAAC;AACvB,OAAO,EAA4B,iBAAiB,EAAC,MAAM,iBAAiB,CAAC;AAQ7E,wBAAgB,mBAAmB,CAAC,QAAQ,EAAE,MAAM,EAAE,EAAE,EAAE,MAAM,CAAC,EAAE,MAAM,GAAG,IAAI,CAU/E;AAGD,wBAAgB,YAAY,CAAC,KAAK,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,EAAE,EAAE,EAAE,MAAM,EAAE,MAAM,GAAG,IAAI,CAcvF;AAqDD,iDAAiD;AACjD,oBAAY,mBAAmB,CAAC,KAAK,GAAG,GAAG,IAAI,oBAAoB,CAAC,KAAK,CAAC,GACxE,iBAAiB,CAAC,KAAK,CAAC,CAAC;AAE3B,wCAAwC;AACxC,aAAK,oBAAoB,CAAC,KAAK,IAAI;IACjC;;;OAGG;IACH,aAAa,CAAC,EAAE,OAAO,GAAG,MAAM,CAAC;IACjC;;;OAGG;IACH,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB;;OAEG;IACH,aAAa,CAAC,EAAE,OAAO,GAAG,IAAI,CAAC;IAC/B;;;;OAIG;IACH,UAAU,CAAC,EAAE,gBAAgB,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC;IAC7C;;;OAGG;IACH,QAAQ,CAAC,EAAE,OAAO,CAAC;CACpB,CAAC;AAEF;;GAEG;AACH,MAAM,CAAC,OAAO,OAAO,cAAc,CACjC,KAAK,GAAG,GAAG,EACX,WAAW,SAAS,EAAE,GAAG,EAAE,CAC3B,SAAQ,cAAc,CAAC,WAAW,GAAG,QAAQ,CAAC,mBAAmB,CAAC,KAAK,CAAC,CAAC,CAAC;IAC1E,MAAM,CAAC,YAAY,yCAAgB;IACnC,MAAM,CAAC,SAAS,SAAoB;IAGpC,MAAM,CAAC,WAAW,aAAY;IAE9B,eAAe;IAQf,KAAK,EAAG;QACN,SAAS,CAAC,EAAE,OAAO,CAAC;QACpB,YAAY,EAAE,MAAM,CAAC;QACrB,cAAc,CAAC,EAAE,OAAO,CAAC;QACzB,WAAW,CAAC,EAAE,OAAO,CAAC;QACtB,UAAU,EAAE,MAAM,CAAC;QACnB,QAAQ,CAAC,EAAE,MAAM,EAAE,EAAE,CAAC;KACvB,CAAC;IAEF,iBAAiB,CAAC,EAAC,WAAW,EAAC,EAAE,gBAAgB,CAAC,IAAI,CAAC,GAAG,OAAO;IAMjE,WAAW,CAAC,EAAC,KAAK,EAAE,WAAW,EAAC,EAAE,gBAAgB,CAAC,IAAI,CAAC,GAAG,IAAI;IAa/D,OAAO,CAAC,qBAAqB;IAgC7B,OAAO,CAAC,uBAAuB;IAe/B,OAAO,CAAC,eAAe;IAuCvB,YAAY,IAAI,KAAK,GAAG,IAAI,GAAG,UAAU;IAIzC,OAAO,CAAC,gBAAgB;IAsDxB,OAAO,CAAC,mBAAmB;IA0B3B,OAAO,CAAC,kBAAkB;CAuB3B"}

package/typed/imagery-layer/imagery-layer.d.ts

@@ -0,0 +1,53 @@
+import { Layer, CompositeLayer, CompositeLayerProps, UpdateParameters, DefaultProps, Viewport } from '@deck.gl/core/typed';
+import type { ImageSourceMetadata, ImageType, ImageServiceType } from '@loaders.gl/wms';
+import { ImageSource } from '@loaders.gl/wms';
+/** All props supported by the TileLayer */
+export declare type ImageryLayerProps = CompositeLayerProps<any> & _ImageryLayerProps;
+/** Props added by the TileLayer */
+declare type _ImageryLayerProps = {
+    serviceType?: ImageServiceType | 'auto';
+    layers?: string[];
+    srs?: 'EPSG:4326' | 'EPSG:3857' | 'auto';
+    onMetadataLoadStart?: () => void;
+    onMetadataLoadComplete?: (metadata: ImageSourceMetadata) => void;
+    onMetadataLoadError?: (error: Error) => void;
+    onImageLoadStart?: (requestId: unknown) => void;
+    onImageLoadComplete?: (requestId: unknown) => void;
+    onImageLoadError?: (requestId: unknown, error: Error) => void;
+};
+/**
+ * The layer is used in Hex Tile layer in order to properly discard invisible elements during animation
+ */
+export declare class ImageryLayer<ExtraPropsT extends {} = {}> extends CompositeLayer<ExtraPropsT & Required<_ImageryLayerProps>> {
+    static layerName: string;
+    static defaultProps: DefaultProps;
+    state: {
+        imageSource: ImageSource;
+        image: ImageType;
+        srs: 'EPSG:4326' | 'EPSG:3857';
+        bounds: [number, number, number, number];
+        width: number;
+        height: number;
+        lastLoadedId: number;
+        _nextRequestId: number;
+        _timeoutId: any;
+    };
+    /** Lets deck.gl know that we want viewport change events */
+    shouldUpdateState(): boolean;
+    initializeState(): void;
+    updateState({ changeFlags, props, oldProps }: UpdateParameters<this>): void;
+    finalizeState(): void;
+    renderLayers(): Layer;
+    getFeatureInfoText(x: number, y: number): Promise<string | null>;
+    _createImageSource(props: ImageryLayerProps): ImageSource;
+    /** Run a getMetadata on the image service */
+    _loadMetadata(): Promise<void>;
+    /** Load an image */
+    loadImage(viewport: Viewport, reason: string): Promise<void>;
+    /** Global counter for issuing unique request ids */
+    private getRequestId;
+    /** Runs an action in the future, cancels it if the new action is issued before it executes */
+    private debounce;
+}
+export {};
+//# sourceMappingURL=imagery-layer.d.ts.map

package/typed/imagery-layer/imagery-layer.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"imagery-layer.d.ts","sourceRoot":"","sources":["../../src/imagery-layer/imagery-layer.ts"],"names":[],"mappings":"AAOA,OAAO,EACL,KAAK,EACL,cAAc,EACd,mBAAmB,EACnB,gBAAgB,EAChB,YAAY,EACZ,QAAQ,EAGT,MAAM,eAAe,CAAC;AAEvB,OAAO,KAAK,EAAC,mBAAmB,EAAE,SAAS,EAAE,gBAAgB,EAAC,MAAM,iBAAiB,CAAC;AACtF,OAAO,EAAC,WAAW,EAAoB,MAAM,iBAAiB,CAAC;AAG/D,2CAA2C;AAC3C,oBAAY,iBAAiB,GAAG,mBAAmB,CAAC,GAAG,CAAC,GAAG,kBAAkB,CAAC;AAE9E,mCAAmC;AACnC,aAAK,kBAAkB,GAAG;IACxB,WAAW,CAAC,EAAE,gBAAgB,GAAG,MAAM,CAAC;IACxC,MAAM,CAAC,EAAE,MAAM,EAAE,CAAC;IAClB,GAAG,CAAC,EAAE,WAAW,GAAG,WAAW,GAAG,MAAM,CAAC;IACzC,mBAAmB,CAAC,EAAE,MAAM,IAAI,CAAC;IACjC,sBAAsB,CAAC,EAAE,CAAC,QAAQ,EAAE,mBAAmB,KAAK,IAAI,CAAC;IACjE,mBAAmB,CAAC,EAAE,CAAC,KAAK,EAAE,KAAK,KAAK,IAAI,CAAC;IAC7C,gBAAgB,CAAC,EAAE,CAAC,SAAS,EAAE,OAAO,KAAK,IAAI,CAAC;IAChD,mBAAmB,CAAC,EAAE,CAAC,SAAS,EAAE,OAAO,KAAK,IAAI,CAAC;IACnD,gBAAgB,CAAC,EAAE,CAAC,SAAS,EAAE,OAAO,EAAE,KAAK,EAAE,KAAK,KAAK,IAAI,CAAC;CAC/D,CAAC;AAwBF;;GAEG;AACH,qBAAa,YAAY,CAAC,WAAW,SAAS,EAAE,GAAG,EAAE,CAAE,SAAQ,cAAc,CAC3E,WAAW,GAAG,QAAQ,CAAC,kBAAkB,CAAC,CAC3C;IACC,MAAM,CAAC,SAAS,SAAkB;IAClC,MAAM,CAAC,YAAY,EAAE,YAAY,CAAgB;IAEjD,KAAK,EAAG;QACN,WAAW,EAAE,WAAW,CAAC;QACzB,KAAK,EAAE,SAAS,CAAC;QACjB,GAAG,EAAE,WAAW,GAAG,WAAW,CAAC;QAC/B,MAAM,EAAE,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,CAAC,CAAC;QACzC,KAAK,EAAE,MAAM,CAAC;QACd,MAAM,EAAE,MAAM,CAAC;QACf,YAAY,EAAE,MAAM,CAAC;QAErB,cAAc,EAAE,MAAM,CAAC;QACvB,UAAU,EAAE,GAAG,CAAC;KACjB,CAAC;IAEF,4DAA4D;IACnD,iBAAiB,IAAI,OAAO;IAI5B,eAAe,IAAI,IAAI;IAMvB,WAAW,CAAC,EAAC,WAAW,EAAE,KAAK,EAAE,QAAQ,EAAC,EAAE,gBAAgB,CAAC,IAAI,CAAC,GAAG,IAAI;IAgBzE,aAAa,IAAI,IAAI;IAIrB,YAAY,IAAI,KAAK;IAiBxB,kBAAkB,CAAC,CAAC,EAAE,MAAM,EAAE,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC;IAsBtE,kBAAkB,CAAC,KAAK,EAAE,iBAAiB,GAAG,WAAW;IAgBzD,6CAA6C;IACvC,aAAa,IAAI,OAAO,CAAC,IAAI,CAAC;IAepC,oBAAoB;IACd,SAAS,CAAC,QAAQ,EAAE,QAAQ,EAAE,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IA+ClE,oDAAoD;IACpD,OAAO,CAAC,YAAY;IAIpB,8FAA8F;IAC9F,OAAO,CAAC,QAAQ;CAIjB"}

package/typed/index.d.ts

@@ -1,3 +1,4 @@
+export { WMSLayer as _WMSLayer } from './wms-layer/wms-layer';
 export { default as GreatCircleLayer } from './great-circle-layer/great-circle-layer';
 export { default as S2Layer } from './s2-layer/s2-layer';
 export { default as QuadkeyLayer } from './quadkey-layer/quadkey-layer';
@@ -10,6 +11,7 @@ export { default as TerrainLayer } from './terrain-layer/terrain-layer';
 export { default as MVTLayer } from './mvt-layer/mvt-layer';
 export { default as GeohashLayer } from './geohash-layer/geohash-layer';
 export { default as _GeoCellLayer } from './geo-cell-layer/GeoCellLayer';
+export type { WMSLayerProps } from './wms-layer/wms-layer';
 export type { H3ClusterLayerProps } from './h3-layers/h3-cluster-layer';
 export type { H3HexagonLayerProps } from './h3-layers/h3-hexagon-layer';
 export type { GreatCircleLayerProps } from './great-circle-layer/great-circle-layer';