@deck.gl/geo-layers 9.0.0-beta.9 → 9.0.0

package/package.json

@@ -3,7 +3,7 @@
   "description": "deck.gl layers supporting geospatial use cases and GIS formats",
   "license": "MIT",
   "type": "module",
-  "version": "9.0.0-beta.9",
+  "version": "9.0.0",
   "publishConfig": {
     "access": "public"
   },
@@ -38,16 +38,16 @@
     "prepublishOnly": "npm run build-bundle && npm run build-bundle -- --env=dev"
   },
   "dependencies": {
-    "@loaders.gl/3d-tiles": "^4.2.0-alpha.5",
-    "@loaders.gl/gis": "^4.2.0-alpha.5",
-    "@loaders.gl/loader-utils": "^4.2.0-alpha.5",
-    "@loaders.gl/mvt": "^4.2.0-alpha.5",
-    "@loaders.gl/schema": "^4.2.0-alpha.5",
-    "@loaders.gl/terrain": "^4.2.0-alpha.5",
-    "@loaders.gl/tiles": "^4.2.0-alpha.5",
-    "@loaders.gl/wms": "^4.2.0-alpha.5",
-    "@luma.gl/gltf": "^9.0.0",
-    "@luma.gl/shadertools": "^9.0.0",
+    "@loaders.gl/3d-tiles": "^4.1.4",
+    "@loaders.gl/gis": "^4.1.4",
+    "@loaders.gl/loader-utils": "^4.1.4",
+    "@loaders.gl/mvt": "^4.1.4",
+    "@loaders.gl/schema": "^4.1.4",
+    "@loaders.gl/terrain": "^4.1.4",
+    "@loaders.gl/tiles": "^4.1.4",
+    "@loaders.gl/wms": "^4.1.4",
+    "@luma.gl/gltf": "^9.0.6",
+    "@luma.gl/shadertools": "^9.0.6",
     "@math.gl/core": "^4.0.0",
     "@math.gl/culling": "^4.0.0",
     "@math.gl/web-mercator": "^4.0.0",
@@ -56,13 +56,13 @@
     "long": "^3.2.0"
   },
   "peerDependencies": {
-    "@deck.gl/core": "^9.0.0-beta",
-    "@deck.gl/extensions": "^9.0.0-beta",
-    "@deck.gl/layers": "^9.0.0-beta",
-    "@deck.gl/mesh-layers": "^9.0.0-beta",
-    "@loaders.gl/core": "^4.2.0-alpha.5",
+    "@deck.gl/core": "^9.0.0",
+    "@deck.gl/extensions": "^9.0.0",
+    "@deck.gl/layers": "^9.0.0",
+    "@deck.gl/mesh-layers": "^9.0.0",
+    "@loaders.gl/core": "^4.1.0",
     "@luma.gl/core": "^9.0.0",
     "@luma.gl/engine": "^9.0.0"
   },
-  "gitHead": "44cfc784310d1c6ac7766ff80e0df8c364f97354"
+  "gitHead": "fcb5ccf0a899e651949b24986488211e278e9321"
 }

package/src/index.ts

@@ -40,12 +40,12 @@ 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';
 export type {S2LayerProps} from './s2-layer/s2-layer';
-export type {TileLayerProps} from './tile-layer/tile-layer';
+export type {TileLayerProps, TileLayerPickingInfo} from './tile-layer/tile-layer';
 export type {TripsLayerProps} from './trips-layer/trips-layer';
 export type {QuadkeyLayerProps} from './quadkey-layer/quadkey-layer';
 export type {TerrainLayerProps} from './terrain-layer/terrain-layer';
 export type {Tile3DLayerProps} from './tile-3d-layer/tile-3d-layer';
-export type {MVTLayerProps} from './mvt-layer/mvt-layer';
+export type {MVTLayerProps, MVTLayerPickingInfo} from './mvt-layer/mvt-layer';
 export type {GeoCellLayerProps as _GeoCellLayerProps} from './geo-cell-layer/GeoCellLayer';
 
 // Tileset2D

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

@@ -18,12 +18,12 @@ import {binaryToGeojson} from '@loaders.gl/gis';
 
 import type {Loader} from '@loaders.gl/loader-utils';
 import type {BinaryFeatureCollection} from '@loaders.gl/schema';
-import type {Feature} from 'geojson';
+import type {Feature, Geometry} from 'geojson';
 
 import {transform} from './coordinate-transform';
 import findIndexBinary from './find-index-binary';
 
-import TileLayer, {TiledPickingInfo, TileLayerProps} from '../tile-layer/tile-layer';
+import TileLayer, {TileLayerPickingInfo, TileLayerProps} from '../tile-layer/tile-layer';
 
 import type {Tileset2DProps, TileLoadProps, GeoBoundingBox} from '../tileset-2d/index';
 import {
@@ -62,6 +62,11 @@ export type TileJson = {
 
 type ParsedMvtTile = Feature[] | BinaryFeatureCollection;
 
+export type MVTLayerPickingInfo<FeaturePropertiesT = {}> = TileLayerPickingInfo<
+  ParsedMvtTile,
+  PickingInfo<Feature<Geometry, FeaturePropertiesT>>
+>;
+
 /** All props supported by the MVTLayer */
 export type MVTLayerProps<FeaturePropertiesT = unknown> = _MVTLayerProps<FeaturePropertiesT> &
   Omit<TileLayerProps<ParsedMvtTile>, 'data'>;
@@ -298,7 +303,7 @@ export default class MVTLayer<
     }
   }
 
-  getPickingInfo(params: GetPickingInfoParams): TiledPickingInfo {
+  getPickingInfo(params: GetPickingInfoParams): MVTLayerPickingInfo<FeaturePropertiesT> {
     const info = super.getPickingInfo(params);
 
     const isWGS84 = Boolean(this.context.viewport.resolution);

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

@@ -146,8 +146,14 @@ type _TileLayerProps<DataT> = {
   zoomOffset?: number;
 };
 
-export type TiledPickingInfo<DataT = any> = PickingInfo & {
+export type TileLayerPickingInfo<
+  DataT = any,
+  SubLayerPickingInfo = PickingInfo
+> = SubLayerPickingInfo & {
+  /** The picked tile */
   tile?: Tile2DHeader<DataT>;
+  /** the tile that emitted the picking event */
+  sourceTile: Tile2DHeader<DataT>;
 };
 
 /**
@@ -334,12 +340,13 @@ export default class TileLayer<DataT = any, ExtraPropsT extends {} = {}> extends
     return null;
   }
 
-  getPickingInfo({info, sourceLayer}: GetPickingInfoParams): TiledPickingInfo<DataT> {
-    const sourceTile = (sourceLayer as any).props.tile;
+  getPickingInfo(params: GetPickingInfoParams): TileLayerPickingInfo<DataT> {
+    const sourceTile: Tile2DHeader<DataT> = (params.sourceLayer as any).props.tile;
+    const info = params.info as TileLayerPickingInfo<DataT>;
     if (info.picked) {
-      (info as any).tile = sourceTile;
+      info.tile = sourceTile;
     }
-    (info as any).sourceTile = sourceTile;
+    info.sourceTile = sourceTile;
     return info;
   }