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

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.3",
   "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": "da509f9b00415a8d0700951663b65b59077c0cae"
 }

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/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,246 @@
+// 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<any> & _WMSLayerProps;
+
+/** Props added by the TileLayer */
+type _WMSLayerProps = {
+  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', compare: false, value: () => {}},
+  // eslint-disable-next-line
+  onMetadataLoadError: {type: 'function', compare: false, value: console.error},
+  onImageLoadStart: {type: 'function', compare: false, value: () => {}},
+  onImageLoad: {type: 'function', compare: false, 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/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';

package/typed/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAqBA,OAAO,EAAC,OAAO,IAAI,gBAAgB,EAAC,MAAM,yCAAyC,CAAC;AACpF,OAAO,EAAC,OAAO,IAAI,OAAO,EAAC,MAAM,qBAAqB,CAAC;AACvD,OAAO,EAAC,OAAO,IAAI,YAAY,EAAC,MAAM,+BAA+B,CAAC;AACtE,OAAO,EAAC,OAAO,IAAI,SAAS,EAAC,MAAM,yBAAyB,CAAC;AAC7D,OAAO,EAAC,OAAO,IAAI,UAAU,EAAC,MAAM,2BAA2B,CAAC;AAChE,OAAO,EAAC,OAAO,IAAI,cAAc,EAAC,MAAM,8BAA8B,CAAC;AACvE,OAAO,EAAC,OAAO,IAAI,cAAc,EAAC,MAAM,8BAA8B,CAAC;AACvE,OAAO,EAAC,OAAO,IAAI,WAAW,EAAC,MAAM,+BAA+B,CAAC;AACrE,OAAO,EAAC,OAAO,IAAI,YAAY,EAAC,MAAM,+BAA+B,CAAC;AACtE,OAAO,EAAC,OAAO,IAAI,QAAQ,EAAC,MAAM,uBAAuB,CAAC;AAC1D,OAAO,EAAC,OAAO,IAAI,YAAY,EAAC,MAAM,+BAA+B,CAAC;AAEtE,OAAO,EAAC,OAAO,IAAI,aAAa,EAAC,MAAM,+BAA+B,CAAC;AAGvE,YAAY,EAAC,mBAAmB,EAAC,MAAM,8BAA8B,CAAC;AACtE,YAAY,EAAC,mBAAmB,EAAC,MAAM,8BAA8B,CAAC;AACtE,YAAY,EAAC,qBAAqB,EAAC,MAAM,yCAAyC,CAAC;AACnF,YAAY,EAAC,YAAY,EAAC,MAAM,qBAAqB,CAAC;AACtD,YAAY,EAAC,cAAc,EAAC,MAAM,yBAAyB,CAAC;AAC5D,YAAY,EAAC,iBAAiB,EAAC,MAAM,+BAA+B,CAAC;AACrE,YAAY,EAAC,iBAAiB,EAAC,MAAM,+BAA+B,CAAC;AACrE,YAAY,EAAC,gBAAgB,EAAC,MAAM,+BAA+B,CAAC;AACpE,YAAY,EAAC,aAAa,EAAC,MAAM,uBAAuB,CAAC;AACzD,YAAY,EAAC,iBAAiB,IAAI,kBAAkB,EAAC,MAAM,+BAA+B,CAAC;AAI3F,YAAY,EAAC,cAAc,EAAE,iBAAiB,EAAC,MAAM,cAAc,CAAC;AACpE,YAAY,EAAC,aAAa,IAAI,cAAc,EAAC,MAAM,cAAc,CAAC;AAElE,OAAO,EAAC,kBAAkB,IAAI,mBAAmB,EAAC,MAAM,cAAc,CAAC;AACvE,OAAO,EAAC,SAAS,IAAI,UAAU,EAAC,MAAM,cAAc,CAAC;AACrD,OAAO,EAAC,YAAY,IAAI,aAAa,EAAC,MAAM,cAAc,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAqBA,OAAO,EAAC,QAAQ,IAAI,SAAS,EAAC,MAAM,uBAAuB,CAAC;AAC5D,OAAO,EAAC,OAAO,IAAI,gBAAgB,EAAC,MAAM,yCAAyC,CAAC;AACpF,OAAO,EAAC,OAAO,IAAI,OAAO,EAAC,MAAM,qBAAqB,CAAC;AACvD,OAAO,EAAC,OAAO,IAAI,YAAY,EAAC,MAAM,+BAA+B,CAAC;AACtE,OAAO,EAAC,OAAO,IAAI,SAAS,EAAC,MAAM,yBAAyB,CAAC;AAC7D,OAAO,EAAC,OAAO,IAAI,UAAU,EAAC,MAAM,2BAA2B,CAAC;AAChE,OAAO,EAAC,OAAO,IAAI,cAAc,EAAC,MAAM,8BAA8B,CAAC;AACvE,OAAO,EAAC,OAAO,IAAI,cAAc,EAAC,MAAM,8BAA8B,CAAC;AACvE,OAAO,EAAC,OAAO,IAAI,WAAW,EAAC,MAAM,+BAA+B,CAAC;AACrE,OAAO,EAAC,OAAO,IAAI,YAAY,EAAC,MAAM,+BAA+B,CAAC;AACtE,OAAO,EAAC,OAAO,IAAI,QAAQ,EAAC,MAAM,uBAAuB,CAAC;AAC1D,OAAO,EAAC,OAAO,IAAI,YAAY,EAAC,MAAM,+BAA+B,CAAC;AAEtE,OAAO,EAAC,OAAO,IAAI,aAAa,EAAC,MAAM,+BAA+B,CAAC;AAGvE,YAAY,EAAC,aAAa,EAAC,MAAM,uBAAuB,CAAC;AACzD,YAAY,EAAC,mBAAmB,EAAC,MAAM,8BAA8B,CAAC;AACtE,YAAY,EAAC,mBAAmB,EAAC,MAAM,8BAA8B,CAAC;AACtE,YAAY,EAAC,qBAAqB,EAAC,MAAM,yCAAyC,CAAC;AACnF,YAAY,EAAC,YAAY,EAAC,MAAM,qBAAqB,CAAC;AACtD,YAAY,EAAC,cAAc,EAAC,MAAM,yBAAyB,CAAC;AAC5D,YAAY,EAAC,iBAAiB,EAAC,MAAM,+BAA+B,CAAC;AACrE,YAAY,EAAC,iBAAiB,EAAC,MAAM,+BAA+B,CAAC;AACrE,YAAY,EAAC,gBAAgB,EAAC,MAAM,+BAA+B,CAAC;AACpE,YAAY,EAAC,aAAa,EAAC,MAAM,uBAAuB,CAAC;AACzD,YAAY,EAAC,iBAAiB,IAAI,kBAAkB,EAAC,MAAM,+BAA+B,CAAC;AAI3F,YAAY,EAAC,cAAc,EAAE,iBAAiB,EAAC,MAAM,cAAc,CAAC;AACpE,YAAY,EAAC,aAAa,IAAI,cAAc,EAAC,MAAM,cAAc,CAAC;AAElE,OAAO,EAAC,kBAAkB,IAAI,mBAAmB,EAAC,MAAM,cAAc,CAAC;AACvE,OAAO,EAAC,SAAS,IAAI,UAAU,EAAC,MAAM,cAAc,CAAC;AACrD,OAAO,EAAC,YAAY,IAAI,aAAa,EAAC,MAAM,cAAc,CAAC"}

package/typed/tileset-2d/tileset-2d.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"tileset-2d.d.ts","sourceRoot":"","sources":["../../src/tileset-2d/tileset-2d.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"tileset-2d.d.ts","sourceRoot":"","sources":["../../src/tileset-2d/tileset-2d.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,QAAQ,EAAC,MAAM,eAAe,CAAC;AAGvC,OAAO,EAAC,OAAO,EAAS,MAAM,eAAe,CAAC;AAE9C,OAAO,EAAC,YAAY,EAAC,MAAM,kBAAkB,CAAC;AAG9C,OAAO,EAAS,SAAS,EAAE,MAAM,EAAC,MAAM,SAAS,CAAC;AAClD,OAAO,EAAC,aAAa,EAAC,MAAM,SAAS,CAAC;AAyBtC,eAAO,MAAM,cAAc,UAAU,CAAC;AACtC,eAAO,MAAM,gBAAgB,eAAe,CAAC;AAC7C,eAAO,MAAM,gBAAgB,mBAAmB,CAAC;AAEjD,oBAAY,0BAA0B,GAAG,CAAC,KAAK,EAAE,YAAY,EAAE,KAAK,IAAI,CAAC;AACzE,oBAAY,kBAAkB,GAC1B,OAAO,GACP,YAAY,GACZ,gBAAgB,GAChB,0BAA0B,CAAC;AAU/B,oBAAY,cAAc,CAAC,KAAK,GAAG,GAAG,IAAI;IACxC,iEAAiE;IACjE,WAAW,EAAE,CAAC,KAAK,EAAE,aAAa,KAAK,OAAO,CAAC,KAAK,CAAC,GAAG,KAAK,CAAC;IAE9D,4CAA4C;IAC5C,MAAM,CAAC,EAAE,MAAM,EAAE,GAAG,IAAI,CAAC;IACzB,8DAA8D;IAC9D,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,4DAA4D;IAC5D,OAAO,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IACxB,yDAAyD;IACzD,OAAO,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IACxB,sDAAsD;IACtD,YAAY,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAC7B,+DAA+D;IAC/D,gBAAgB,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IACjC,oFAAoF;IACpF,kBAAkB,CAAC,EAAE,kBAAkB,CAAC;IACxC,wDAAwD;IACxD,MAAM,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IACvB,qEAAqE;IACrE,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,gGAAgG;IAChG,UAAU,CAAC,EAAE,MAAM,CAAC;IAEpB,6CAA6C;IAC7C,UAAU,CAAC,EAAE,CAAC,IAAI,EAAE,YAAY,CAAC,KAAK,CAAC,KAAK,IAAI,CAAC;IACjD,gDAAgD;IAChD,YAAY,CAAC,EAAE,CAAC,IAAI,EAAE,YAAY,CAAC,KAAK,CAAC,KAAK,IAAI,CAAC;IACnD,yCAAyC;IACzC,WAAW,CAAC,EAAE,CAAC,GAAG,EAAE,GAAG,EAAE,IAAI,EAAE,YAAY,CAAC,KAAK,CAAC,KAAK,IAAI,CAAC;CAO7D,CAAC;AAEF,eAAO,MAAM,uBAAuB,EAAE,IAAI,CAAC,QAAQ,CAAC,cAAc,CAAC,EAAE,aAAa,CAkBjF,CAAC;AAEF;;;GAGG;AACH,qBAAa,SAAS;IACpB,OAAO,CAAC,IAAI,CAA2B;IACvC,OAAO,CAAC,iBAAiB,CAAmB;IAC5C,OAAO,CAAC,MAAM,CAA4B;IAC1C,OAAO,CAAC,MAAM,CAAU;IACxB,OAAO,CAAC,MAAM,CAAiB;IAE/B,OAAO,CAAC,cAAc,CAAS;IAC/B,OAAO,CAAC,SAAS,CAAkB;IACnC,OAAO,CAAC,OAAO,CAAC,CAAS;IACzB,OAAO,CAAC,cAAc,CAAwB;IAC9C,OAAO,CAAC,YAAY,CAAS;IAC7B,OAAO,CAAC,YAAY,CAAU;IAC9B,OAAO,CAAC,mBAAmB,CAAU;IAErC,OAAO,CAAC,QAAQ,CAAC,CAAS;IAC1B,OAAO,CAAC,QAAQ,CAAC,CAAS;IAE1B,OAAO,CAAC,UAAU,CAA+B;IAEjD;;;OAGG;gBACS,IAAI,EAAE,cAAc;IAkChC,IAAI,KAAK,wBAER;IAED,IAAI,aAAa,IAAI,YAAY,EAAE,GAAG,IAAI,CAEzC;IAED,IAAI,QAAQ,IAAI,OAAO,CAEtB;IAED,IAAI,WAAW,IAAI,OAAO,CAEzB;IAED,UAAU,CAAC,IAAI,EAAE,cAAc,GAAG,IAAI;IAWtC,QAAQ,IAAI,IAAI;IAWhB,SAAS,IAAI,IAAI;IAWjB;;OAEG;IACH,MAAM,CACJ,QAAQ,EAAE,QAAQ,EAClB,EAAC,MAAM,EAAE,WAAW,EAAC,GAAE;QAAC,MAAM,CAAC,EAAE,MAAM,CAAC;QAAC,WAAW,CAAC,EAAE,OAAO,CAAA;KAAM,GACnE,MAAM;IAmDT,aAAa,CACX,IAAI,EAAE,YAAY,EAClB,QAAQ,CAAC,EAAE;QAAC,CAAC,EAAE,MAAM,CAAC;QAAC,CAAC,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,MAAM,CAAC;QAAC,MAAM,EAAE,MAAM,CAAA;KAAC,GAC/D,OAAO;IAiCV,4DAA4D;IAC5D,cAAc,CAAC,EACb,QAAQ,EACR,OAAO,EACP,OAAO,EACP,MAAM,EACN,WAAW,EACX,kBAAkB,EACnB,EAAE;QACD,QAAQ,EAAE,QAAQ,CAAC;QACnB,OAAO,CAAC,EAAE,MAAM,CAAC;QACjB,OAAO,CAAC,EAAE,MAAM,CAAC;QACjB,MAAM,EAAE,MAAM,GAAG,SAAS,CAAC;QAC3B,QAAQ,CAAC,EAAE,MAAM,CAAC;QAClB,WAAW,CAAC,EAAE,OAAO,CAAC;QACtB,kBAAkB,CAAC,EAAE,OAAO,CAAC;QAC7B,UAAU,CAAC,EAAE,MAAM,CAAC;KACrB,GAAG,SAAS,EAAE;IAef,iDAAiD;IACjD,SAAS,CAAC,KAAK,EAAE,SAAS;IAI1B,4CAA4C;IAC5C,WAAW,CAAC,KAAK,EAAE,SAAS;IAI5B,kEAAkE;IAClE,eAAe,CAAC,KAAK,EAAE,SAAS,GAAG,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC;IAMtD,uCAAuC;IACvC,cAAc,CAAC,KAAK,EAAE,SAAS;;;;;IAQ/B,OAAO,CAAC,gBAAgB;IAoCxB,OAAO,CAAC,cAAc,CAA0B;IAEhD,OAAO,CAAC,cAAc;IAwBtB,OAAO,CAAC,YAAY;IAqBpB;;OAEG;IAEH,OAAO,CAAC,YAAY;IAmCpB,OAAO,CAAC,QAAQ;IA8BhB,mBAAmB,CAAC,IAAI,EAAE,YAAY,GAAG,YAAY,GAAG,IAAI;CAa7D"}

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

@@ -0,0 +1,56 @@
+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 WMSLayerProps = CompositeLayerProps<any> & _WMSLayerProps;
+/** Props added by the TileLayer */
+declare type _WMSLayerProps = {
+    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;
+};
+/**
+ * The layer is used in Hex Tile layer in order to properly discard invisible elements during animation
+ */
+export declare class WMSLayer<ExtraPropsT extends {} = {}> extends CompositeLayer<ExtraPropsT & Required<_WMSLayerProps>> {
+    static layerName: string;
+    static 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 */
+    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: WMSLayerProps): 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=wms-layer.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"wms-layer.d.ts","sourceRoot":"","sources":["../../src/wms-layer/wms-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,aAAa,GAAG,mBAAmB,CAAC,GAAG,CAAC,GAAG,cAAc,CAAC;AAEtE,mCAAmC;AACnC,aAAK,cAAc,GAAG;IACpB,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,cAAc,CAAC,EAAE,CAAC,QAAQ,EAAE,mBAAmB,KAAK,IAAI,CAAC;IACzD,mBAAmB,CAAC,EAAE,CAAC,KAAK,EAAE,KAAK,KAAK,IAAI,CAAC;IAC7C,gBAAgB,CAAC,EAAE,CAAC,SAAS,EAAE,OAAO,KAAK,IAAI,CAAC;IAChD,WAAW,CAAC,EAAE,CAAC,SAAS,EAAE,OAAO,KAAK,IAAI,CAAC;IAC3C,gBAAgB,CAAC,EAAE,CAAC,SAAS,EAAE,OAAO,EAAE,KAAK,EAAE,KAAK,KAAK,IAAI,CAAC;CAC/D,CAAC;AAuBF;;GAEG;AACH,qBAAa,QAAQ,CAAC,WAAW,SAAS,EAAE,GAAG,EAAE,CAAE,SAAQ,cAAc,CACvE,WAAW,GAAG,QAAQ,CAAC,cAAc,CAAC,CACvC;IACC,MAAM,CAAC,SAAS,SAAc;IAC9B,MAAM,CAAC,YAAY,EAAE,YAAY,CAAgB;IAEjD,KAAK,EAAG;QACN,WAAW,EAAE,WAAW,CAAC;QACzB,KAAK,EAAE,SAAS,CAAC;QACjB,MAAM,EAAE,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,CAAC,CAAC;QACzC,qBAAqB,EAAE;YACrB,IAAI,EAAE,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,CAAC,CAAC;YACvC,MAAM,EAAE,MAAM,EAAE,CAAC;YACjB,GAAG,EAAE,WAAW,GAAG,WAAW,CAAC;YAC/B,KAAK,EAAE,MAAM,CAAC;YACd,MAAM,EAAE,MAAM,CAAC;SAChB,CAAC;QACF,aAAa,EAAE,MAAM,CAAC;QAEtB,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;IAmBxB,kBAAkB,CAAC,CAAC,EAAE,MAAM,EAAE,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC;IAgBtE,kBAAkB,CAAC,KAAK,EAAE,aAAa,GAAG,WAAW;IAgBrD,6CAA6C;IACvC,aAAa,IAAI,OAAO,CAAC,IAAI,CAAC;IAcpC,oBAAoB;IACd,SAAS,CAAC,QAAQ,EAAE,QAAQ,EAAE,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAqDlE,oDAAoD;IACpD,OAAO,CAAC,YAAY;IAIpB,8FAA8F;IAC9F,OAAO,CAAC,QAAQ;CAIjB"}