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

package/package.json

@@ -3,7 +3,7 @@
   "description": "deck.gl layers supporting geospatial use cases and GIS formats",
   "license": "MIT",
   "type": "module",
-  "version": "9.2.0-alpha.3",
+  "version": "9.2.0-beta.2",
   "publishConfig": {
     "access": "public"
   },
@@ -46,13 +46,13 @@
     "@loaders.gl/terrain": "^4.2.0",
     "@loaders.gl/tiles": "^4.2.0",
     "@loaders.gl/wms": "^4.2.0",
-    "@luma.gl/gltf": "^9.2.0-alpha.5",
-    "@luma.gl/shadertools": "^9.2.0-alpha.5",
+    "@luma.gl/gltf": "^9.2.0",
+    "@luma.gl/shadertools": "^9.2.0",
     "@math.gl/core": "^4.1.0",
     "@math.gl/culling": "^4.1.0",
     "@math.gl/web-mercator": "^4.1.0",
     "@types/geojson": "^7946.0.8",
-    "a5-js": "^0.4.0",
+    "a5-js": "^0.5.0",
     "h3-js": "^4.1.0",
     "long": "^3.2.0"
   },
@@ -62,8 +62,8 @@
     "@deck.gl/layers": "^9.1.0",
     "@deck.gl/mesh-layers": "^9.1.0",
     "@loaders.gl/core": "^4.2.0",
-    "@luma.gl/core": "^9.2.0-alpha.5",
-    "@luma.gl/engine": "^9.2.0-alpha.5"
+    "@luma.gl/core": "^9.2.0",
+    "@luma.gl/engine": "^9.2.0"
   },
-  "gitHead": "f34ff252c38397cd37d7d443e16ba906fda7d3c9"
+  "gitHead": "d4804c69863b62a32dda0d1942ab209000f2ffdf"
 }

package/src/a5-layer/a5-layer.ts

@@ -4,7 +4,7 @@
 
 import {AccessorFunction, DefaultProps} from '@deck.gl/core';
 import GeoCellLayer, {GeoCellLayerProps} from '../geo-cell-layer/GeoCellLayer';
-import {cellToBoundary, hexToBigInt} from 'a5-js';
+import {cellToBoundary, hexToU64} from 'a5-js';
 import {flattenPolygon} from '../h3-layers/h3-utils';
 
 const defaultProps: DefaultProps<A5LayerProps> = {
@@ -43,7 +43,7 @@ export default class A5Layer<DataT = any, ExtraProps extends {} = {}> extends Ge
       getPolygon: (x: DataT, objectInfo) => {
         const pentagon = getPentagon(x, objectInfo);
         const boundary = cellToBoundary(
-          typeof pentagon === 'string' ? hexToBigInt(pentagon) : pentagon,
+          typeof pentagon === 'string' ? hexToU64(pentagon) : pentagon,
           {closedRing: true, segments: 'auto'}
         );
         return flattenPolygon(boundary);

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

@@ -26,6 +26,7 @@ import {
   Tileset2DProps
 } from '../tileset-2d/index';
 import {urlType, URLTemplate, getURLFromTemplate} from '../tileset-2d/index';
+import {Matrix4} from '@math.gl/core';
 
 const defaultProps: DefaultProps<TileLayerProps> = {
   TilesetClass: Tileset2D,
@@ -401,6 +402,11 @@ export default class TileLayer<DataT = any, ExtraPropsT extends {} = {}> extends
 
   filterSubLayer({layer, cullRect}: FilterContext) {
     const {tile} = (layer as Layer<{tile: Tile2DHeader}>).props;
-    return this.state.tileset!.isTileVisible(tile, cullRect);
+    const {modelMatrix} = this.props;
+    return this.state.tileset!.isTileVisible(
+      tile,
+      cullRect,
+      modelMatrix ? new Matrix4(modelMatrix) : null
+    );
   }
 }

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

@@ -9,7 +9,7 @@ import {Matrix4, equals, NumericArray} from '@math.gl/core';
 
 import {Tile2DHeader} from './tile-2d-header';
 
-import {getTileIndices, tileToBoundingBox, getCullBounds} from './utils';
+import {getTileIndices, tileToBoundingBox, getCullBounds, transformBox} from './utils';
 import {Bounds, TileIndex, ZRange} from './types';
 import {TileLoadProps} from './types';
 import {memoize} from './memoize';
@@ -291,7 +291,8 @@ export class Tileset2D {
   // eslint-disable-next-line complexity
   isTileVisible(
     tile: Tile2DHeader,
-    cullRect?: {x: number; y: number; width: number; height: number}
+    cullRect?: {x: number; y: number; width: number; height: number},
+    modelMatrix?: Matrix4 | null
   ): boolean {
     if (!tile.isVisible) {
       return false;
@@ -303,12 +304,19 @@ export class Tileset2D {
         z: this._zRange,
         cullRect
       });
-      const {bbox} = tile;
+      let {bbox} = tile;
       for (const [minX, minY, maxX, maxY] of boundsArr) {
         let overlaps;
         if ('west' in bbox) {
           overlaps = bbox.west < maxX && bbox.east > minX && bbox.south < maxY && bbox.north > minY;
         } else {
+          if (modelMatrix && !Matrix4.IDENTITY.equals(modelMatrix)) {
+            const [left, top, right, bottom] = transformBox(
+              [bbox.left, bbox.top, bbox.right, bbox.bottom],
+              modelMatrix
+            );
+            bbox = {left, top, right, bottom};
+          }
           // top/bottom could be swapped depending on the indexing system
           const y0 = Math.min(bbox.top, bbox.bottom);
           const y1 = Math.max(bbox.top, bbox.bottom);

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

@@ -39,7 +39,7 @@ export const urlType = {
   }
 };
 
-function transformBox(bbox: Bounds, modelMatrix: Matrix4): Bounds {
+export function transformBox(bbox: Bounds, modelMatrix: Matrix4): Bounds {
   const transformedCoords = [
     // top-left
     modelMatrix.transformAsPoint([bbox[0], bbox[1]]),