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

package/dist/index.cjs

@@ -166,7 +166,7 @@ var A5Layer = class extends GeoCellLayer_default {
       positionFormat: "XY",
       getPolygon: (x, objectInfo) => {
         const pentagon = getPentagon(x, objectInfo);
-        const boundary = (0, import_a5_js.cellToBoundary)(typeof pentagon === "string" ? (0, import_a5_js.hexToBigInt)(pentagon) : pentagon, { closedRing: true, segments: "auto" });
+        const boundary = (0, import_a5_js.cellToBoundary)(typeof pentagon === "string" ? (0, import_a5_js.hexToU64)(pentagon) : pentagon, { closedRing: true, segments: "auto" });
         return flattenPolygon(boundary);
       }
     };
@@ -1275,7 +1275,7 @@ var Tileset2D = class {
     return this._frameNumber;
   }
   // eslint-disable-next-line complexity
-  isTileVisible(tile, cullRect) {
+  isTileVisible(tile, cullRect, modelMatrix) {
     if (!tile.isVisible) {
       return false;
     }
@@ -1285,12 +1285,16 @@ var Tileset2D = class {
         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 && !import_core5.Matrix4.IDENTITY.equals(modelMatrix)) {
+            const [left, top, right, bottom] = transformBox([bbox.left, bbox.top, bbox.right, bbox.bottom], modelMatrix);
+            bbox = { left, top, right, bottom };
+          }
           const y0 = Math.min(bbox.top, bbox.bottom);
           const y1 = Math.max(bbox.top, bbox.bottom);
           overlaps = bbox.left < maxX && bbox.right > minX && y0 < maxY && y1 > minY;
@@ -1520,6 +1524,7 @@ function getPlaceholderInChildren(tile) {
 }
 
 // dist/tile-layer/tile-layer.js
+var import_core7 = require("@math.gl/core");
 var defaultProps7 = {
   TilesetClass: Tileset2D,
   data: { type: "data", value: [] },
@@ -1697,7 +1702,8 @@ var TileLayer = class extends import_core6.CompositeLayer {
   }
   filterSubLayer({ layer, cullRect }) {
     const { tile } = layer.props;
-    return this.state.tileset.isTileVisible(tile, cullRect);
+    const { modelMatrix } = this.props;
+    return this.state.tileset.isTileVisible(tile, cullRect, modelMatrix ? new import_core7.Matrix4(modelMatrix) : null);
   }
 };
 TileLayer.defaultProps = defaultProps7;
@@ -1791,11 +1797,11 @@ var trips_layer_default = TripsLayer;
 
 // dist/h3-layers/h3-cluster-layer.js
 var import_h3_js3 = require("h3-js");
-var import_core8 = require("@deck.gl/core");
+var import_core9 = require("@deck.gl/core");
 
 // dist/h3-layers/h3-hexagon-layer.js
 var import_h3_js2 = require("h3-js");
-var import_core7 = require("@deck.gl/core");
+var import_core8 = require("@deck.gl/core");
 var import_layers6 = require("@deck.gl/layers");
 var UPDATE_THRESHOLD_KM = 10;
 function mergeTriggers(getHexagon, coverage) {
@@ -1817,7 +1823,7 @@ var defaultProps9 = {
   getHexagon: { type: "accessor", value: (x) => x.hexagon },
   extruded: true
 };
-var H3HexagonLayer = class extends import_core7.CompositeLayer {
+var H3HexagonLayer = class extends import_core8.CompositeLayer {
   initializeState() {
     H3HexagonLayer._checkH3Lib();
     this.state = {
@@ -1839,7 +1845,7 @@ var H3HexagonLayer = class extends import_core7.CompositeLayer {
     let resolution = -1;
     let hasPentagon = false;
     let hasMultipleRes = false;
-    const { iterable, objectInfo } = (0, import_core7.createIterable)(this.props.data);
+    const { iterable, objectInfo } = (0, import_core8.createIterable)(this.props.data);
     for (const object of iterable) {
       objectInfo.index++;
       const hexId = this.props.getHexagon(object, objectInfo);
@@ -1992,7 +1998,7 @@ var H3ClusterLayer = class extends GeoCellLayer_default {
     if (changeFlags.dataChanged || changeFlags.updateTriggersChanged && changeFlags.updateTriggersChanged.getHexagons) {
       const { data, getHexagons } = props;
       const polygons = [];
-      const { iterable, objectInfo } = (0, import_core8.createIterable)(data);
+      const { iterable, objectInfo } = (0, import_core9.createIterable)(data);
       for (const object of iterable) {
         objectInfo.index++;
         const hexagons = getHexagons(object, objectInfo);
@@ -2025,7 +2031,7 @@ var h3_cluster_layer_default = H3ClusterLayer;
 
 // dist/tile-3d-layer/tile-3d-layer.js
 var import_engine2 = require("@luma.gl/engine");
-var import_core9 = require("@deck.gl/core");
+var import_core10 = require("@deck.gl/core");
 var import_layers7 = require("@deck.gl/layers");
 var import_mesh_layers2 = require("@deck.gl/mesh-layers");
 
@@ -2280,7 +2286,7 @@ MeshLayer.defaultProps = defaultProps11;
 var mesh_layer_default = MeshLayer;
 
 // dist/tile-3d-layer/tile-3d-layer.js
-var import_core10 = require("@loaders.gl/core");
+var import_core11 = require("@loaders.gl/core");
 var import_tiles = require("@loaders.gl/tiles");
 var import_d_tiles = require("@loaders.gl/3d-tiles");
 var SINGLE_DATA = [0];
@@ -2300,10 +2306,10 @@ var defaultProps12 = {
   } },
   _getMeshColor: { type: "function", value: (tileHeader) => [255, 255, 255] }
 };
-var Tile3DLayer = class extends import_core9.CompositeLayer {
+var Tile3DLayer = class extends import_core10.CompositeLayer {
   initializeState() {
     if ("onTileLoadFail" in this.props) {
-      import_core9.log.removed("onTileLoadFail", "onTileError")();
+      import_core10.log.removed("onTileLoadFail", "onTileError")();
     }
     this.state = {
       layerMap: {},
@@ -2388,7 +2394,7 @@ var Tile3DLayer = class extends import_core9.CompositeLayer {
       }
       Object.assign(options, preloadOptions);
     }
-    const tilesetJson = await (0, import_core10.load)(actualTilesetUrl, loader, options.loadOptions);
+    const tilesetJson = await (0, import_core11.load)(actualTilesetUrl, loader, options.loadOptions);
     const tileset3d = new import_tiles.Tileset3D(tilesetJson, {
       onTileLoad: this._onTileLoad.bind(this),
       onTileUnload: this._onTileUnload.bind(this),
@@ -2470,7 +2476,7 @@ var Tile3DLayer = class extends import_core9.CompositeLayer {
       id: `${this.id}-pointcloud-${tileHeader.id}`,
       tile: tileHeader,
       data,
-      coordinateSystem: import_core9.COORDINATE_SYSTEM.METER_OFFSETS,
+      coordinateSystem: import_core10.COORDINATE_SYSTEM.METER_OFFSETS,
       coordinateOrigin: cartographicOrigin,
       modelMatrix,
       getColor: constantRGBA || getPointColor,
@@ -2489,7 +2495,7 @@ var Tile3DLayer = class extends import_core9.CompositeLayer {
       tile: tileHeader,
       data: instances || SINGLE_DATA,
       scenegraph: gltf,
-      coordinateSystem: import_core9.COORDINATE_SYSTEM.METER_OFFSETS,
+      coordinateSystem: import_core10.COORDINATE_SYSTEM.METER_OFFSETS,
       coordinateOrigin: cartographicOrigin,
       modelMatrix,
       getTransformMatrix: (instance) => instance.modelMatrix,
@@ -2499,7 +2505,7 @@ var Tile3DLayer = class extends import_core9.CompositeLayer {
   }
   _makeSimpleMeshLayer(tileHeader, oldLayer) {
     const content = tileHeader.content;
-    const { attributes, indices, modelMatrix, cartographicOrigin, coordinateSystem = import_core9.COORDINATE_SYSTEM.METER_OFFSETS, material, featureIds } = content;
+    const { attributes, indices, modelMatrix, cartographicOrigin, coordinateSystem = import_core10.COORDINATE_SYSTEM.METER_OFFSETS, material, featureIds } = content;
     const { _getMeshColor } = this.props;
     const geometry = oldLayer && oldLayer.props.mesh || new import_engine2.Geometry({
       topology: "triangle-list",
@@ -2569,9 +2575,9 @@ function getMeshGeometry(contentAttributes) {
 }
 
 // dist/terrain-layer/terrain-layer.js
-var import_core11 = require("@deck.gl/core");
-var import_mesh_layers3 = require("@deck.gl/mesh-layers");
 var import_core12 = require("@deck.gl/core");
+var import_mesh_layers3 = require("@deck.gl/mesh-layers");
+var import_core13 = require("@deck.gl/core");
 var import_terrain = require("@loaders.gl/terrain");
 var DUMMY_DATA = [1];
 var defaultProps13 = {
@@ -2609,7 +2615,7 @@ function urlTemplateToUpdateTrigger(template) {
   }
   return template || "";
 }
-var TerrainLayer = class extends import_core11.CompositeLayer {
+var TerrainLayer = class extends import_core12.CompositeLayer {
   updateState({ props, oldProps }) {
     const elevationDataChanged = props.elevationData !== oldProps.elevationData;
     if (elevationDataChanged) {
@@ -2623,7 +2629,7 @@ var TerrainLayer = class extends import_core11.CompositeLayer {
       this.setState({ terrain });
     }
     if (props.workerUrl) {
-      import_core11.log.removed("workerUrl", "loadOptions.terrain.workerUrl")();
+      import_core12.log.removed("workerUrl", "loadOptions.terrain.workerUrl")();
     }
   }
   loadTerrain({ elevationData, bounds, elevationDecoder, meshMaxError, signal }) {
@@ -2688,7 +2694,7 @@ var TerrainLayer = class extends import_core11.CompositeLayer {
       mesh,
       texture,
       _instanced: false,
-      coordinateSystem: import_core12.COORDINATE_SYSTEM.CARTESIAN,
+      coordinateSystem: import_core13.COORDINATE_SYSTEM.CARTESIAN,
       getPosition: (d) => [0, 0, 0],
       getColor: color,
       wireframe,
@@ -2769,15 +2775,15 @@ var terrain_layer_default = TerrainLayer;
 var isTileSetURL = (url) => url.includes("{x}") && (url.includes("{y}") || url.includes("{-y}"));
 
 // dist/mvt-layer/mvt-layer.js
-var import_core14 = require("@deck.gl/core");
+var import_core15 = require("@deck.gl/core");
 var import_layers8 = require("@deck.gl/layers");
 var import_extensions = require("@deck.gl/extensions");
-var import_core15 = require("@math.gl/core");
+var import_core16 = require("@math.gl/core");
 var import_mvt = require("@loaders.gl/mvt");
 var import_gis = require("@loaders.gl/gis");
 
 // dist/mvt-layer/coordinate-transform.js
-var import_core13 = require("@math.gl/core");
+var import_core14 = require("@math.gl/core");
 var availableTransformations = {
   Point,
   MultiPoint,
@@ -2787,8 +2793,8 @@ var availableTransformations = {
   MultiPolygon
 };
 function Point([pointX, pointY], [nw, se], viewport) {
-  const x = (0, import_core13.lerp)(nw[0], se[0], pointX);
-  const y = (0, import_core13.lerp)(nw[1], se[1], pointY);
+  const x = (0, import_core14.lerp)(nw[0], se[0], pointX);
+  const y = (0, import_core14.lerp)(nw[1], se[1], pointY);
   return viewport.unprojectFlat([x, y]);
 }
 function getPoints(geometry, bbox, viewport) {
@@ -3013,17 +3019,17 @@ var MVTLayer = class extends tile_layer_default {
     const yScale = -xScale;
     const xOffset = WORLD_SIZE * x / worldScale;
     const yOffset = WORLD_SIZE * (1 - y / worldScale);
-    const modelMatrix = new import_core15.Matrix4().scale([xScale, yScale, 1]);
+    const modelMatrix = new import_core16.Matrix4().scale([xScale, yScale, 1]);
     props.autoHighlight = false;
     if (!this.context.viewport.resolution) {
       props.modelMatrix = modelMatrix;
       props.coordinateOrigin = [xOffset, yOffset, 0];
-      props.coordinateSystem = import_core14.COORDINATE_SYSTEM.CARTESIAN;
+      props.coordinateSystem = import_core15.COORDINATE_SYSTEM.CARTESIAN;
       props.extensions = [...props.extensions || [], new import_extensions.ClipExtension()];
     }
     const subLayers = super.renderSubLayers(props);
     if (this.state.binary && !(subLayers instanceof import_layers8.GeoJsonLayer)) {
-      import_core14.log.warn("renderSubLayers() must return GeoJsonLayer when using binary:true")();
+      import_core15.log.warn("renderSubLayers() must return GeoJsonLayer when using binary:true")();
     }
     return subLayers;
   }