@deck.gl/extensions 8.9.7 → 8.9.9

package/dist/dist.dev.js

@@ -2387,6 +2387,7 @@ float collision_isVisible(vec2 texCoords, vec3 pickingColor) {
       }
     }
     return isGeospatial ? new import_core19.WebMercatorViewport({
+      id: viewport.id,
       x: border,
       y: border,
       width,
@@ -2396,6 +2397,7 @@ float collision_isVisible(vec2 texCoords, vec3 pickingColor) {
       zoom,
       orthographic: true
     }) : new import_core19.OrthographicViewport({
+      id: viewport.id,
       x: border,
       y: border,
       width,
@@ -3092,6 +3094,7 @@ commonPos = geometry.position.xyz;
 if (terrain_mode == TERRAIN_MODE_WRITE_HEIGHT_MAP) {
   vec2 texCoords = (commonPos.xy - terrain_bounds.xy) / terrain_bounds.zw;
   position = vec4(texCoords * 2.0 - 1.0, 0.0, 1.0);
+  commonPos.z += project_uCommonOrigin.z;
 }
 if (terrain_mode == TERRAIN_MODE_USE_HEIGHT_MAP) {
   vec3 anchor = geometry.worldPosition;
@@ -3263,7 +3266,15 @@ if ((terrain_mode == TERRAIN_MODE_USE_COVER) || (terrain_mode == TERRAIN_MODE_US
     _updateViewport(viewport) {
       const targetLayer = this.targetLayer;
       let shouldRedraw = false;
-      if (this.targetBounds !== targetLayer.getBounds()) {
+      if (this.tile && "boundingBox" in this.tile) {
+        if (!this.targetBounds) {
+          shouldRedraw = true;
+          this.targetBounds = this.tile.boundingBox;
+          const bottomLeftCommon = viewport.projectPosition(this.targetBounds[0]);
+          const topRightCommon = viewport.projectPosition(this.targetBounds[1]);
+          this.targetBoundsCommon = [bottomLeftCommon[0], bottomLeftCommon[1], topRightCommon[0], topRightCommon[1]];
+        }
+      } else if (this.targetBounds !== targetLayer.getBounds()) {
         shouldRedraw = true;
         this.targetBounds = targetLayer.getBounds();
         this.targetBoundsCommon = joinLayerBounds([targetLayer], viewport);
@@ -3337,7 +3348,7 @@ if ((terrain_mode == TERRAIN_MODE_USE_COVER) || (terrain_mode == TERRAIN_MODE_US
     return layers.filter((layer) => {
       const tile = getTile(layer);
       if (tile) {
-        return intersect(sourceTile.bbox, tile.bbox);
+        return intersect(sourceTile.boundingBox, tile.boundingBox);
       }
       return true;
     });
@@ -3355,11 +3366,8 @@ if ((terrain_mode == TERRAIN_MODE_USE_COVER) || (terrain_mode == TERRAIN_MODE_US
     return null;
   }
   function intersect(b1, b2) {
-    if ("west" in b1 && "west" in b2) {
-      return b1.west < b2.east && b2.west < b1.east && b1.south < b2.north && b2.south < b1.north;
-    }
-    if ("left" in b1 && "left" in b2) {
-      return b1.left < b2.right && b2.left < b1.right && b1.top < b2.bottom && b2.top < b1.bottom;
+    if (b1 && b2) {
+      return b1[0][0] < b2[1][0] && b2[0][0] < b1[1][0] && b1[0][1] < b2[1][1] && b2[0][1] < b1[1][1];
     }
     return false;
   }
@@ -3528,6 +3536,10 @@ if ((terrain_mode == TERRAIN_MODE_USE_COVER) || (terrain_mode == TERRAIN_MODE_US
         this.renderViewport = null;
       } else if (layersChanged || viewportChanged) {
         const bounds = getRenderBounds(this.layersBoundsCommon, viewport);
+        if (bounds[2] <= bounds[0] || bounds[3] <= bounds[1]) {
+          this.renderViewport = null;
+          return false;
+        }
         this.bounds = bounds;
         this.lastViewport = viewport;
         const scale = viewport.scale;

package/dist/es5/terrain/height-map-builder.js

@@ -76,6 +76,12 @@ var HeightMapBuilder = function () {
         this.renderViewport = null;
       } else if (layersChanged || viewportChanged) {
         var bounds = (0, _projectionUtils.getRenderBounds)(this.layersBoundsCommon, viewport);
+
+        if (bounds[2] <= bounds[0] || bounds[3] <= bounds[1]) {
+          this.renderViewport = null;
+          return false;
+        }
+
         this.bounds = bounds;
         this.lastViewport = viewport;
         var scale = viewport.scale;

package/dist/es5/terrain/height-map-builder.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../src/terrain/height-map-builder.ts"],"names":["MAP_MAX_SIZE","HeightMapBuilder","gl","renderViewport","fbo","id","float","layers","viewport","layersChanged","length","some","layer","i","props","transitions","getBounds","layersBounds","map","layersBoundsCommon","viewportChanged","lastViewport","equals","bounds","scale","pixelWidth","pixelHeight","center","zoom","width","Math","min","height","color","delete","Framebuffer","isSupported","colorBufferFloat"],"mappings":"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","sourcesContent":["import {Framebuffer} from '@luma.gl/core';\nimport {joinLayerBounds, getRenderBounds, makeViewport, Bounds} from '../utils/projection-utils';\nimport {createRenderTarget} from './utils';\n\nimport type {Viewport, Layer} from '@deck.gl/core';\n\nconst MAP_MAX_SIZE = 2048;\n\n/**\n * Manages the lifecycle of the height map (a framebuffer that encodes elevation).\n * One instance of height map is is shared across all layers. It is updated when the viewport changes\n * or when some terrain source layer's data changes.\n * During the draw call of any terrainDrawMode:offset layers,\n * the vertex shader reads from this framebuffer to retrieve its z offset.\n */\nexport class HeightMapBuilder {\n  /** Viewport used to draw into the texture */\n  renderViewport: Viewport | null = null;\n  /** Bounds of the height map texture, in cartesian space */\n  bounds: Bounds | null = null;\n\n  protected fbo?: Framebuffer;\n  protected gl: WebGLRenderingContext;\n  /** Last rendered layers */\n  private layers: Layer[] = [];\n  /** Last layer.getBounds() */\n  private layersBounds: ([number[], number[]] | null)[] = [];\n  /** The union of layersBounds in cartesian space */\n  private layersBoundsCommon: Bounds | null = null;\n  private lastViewport: Viewport | null = null;\n\n  static isSupported(gl: WebGLRenderingContext): boolean {\n    return Framebuffer.isSupported(gl, {colorBufferFloat: true});\n  }\n\n  constructor(gl: WebGLRenderingContext) {\n    this.gl = gl;\n  }\n\n  /** Returns the height map framebuffer for read/write access.\n   * Returns null when the texture is invalid.\n   */\n  getRenderFramebuffer(): Framebuffer | null {\n    if (!this.renderViewport) {\n      return null;\n    }\n    if (!this.fbo) {\n      this.fbo = createRenderTarget(this.gl, {id: 'height-map', float: true});\n    }\n    return this.fbo;\n  }\n\n  /** Called every render cycle to check if the framebuffer needs update */\n  shouldUpdate({layers, viewport}: {layers: Layer[]; viewport: Viewport}): boolean {\n    const layersChanged =\n      layers.length !== this.layers.length ||\n      layers.some(\n        (layer, i) =>\n          // Layer instance is updated\n          // Layer props might have changed\n          // Undetermined props could have an effect on the output geometry of a terrain source,\n          // for example getElevation+updateTriggers, elevationScale, modelMatrix\n          layer !== this.layers[i] ||\n          // Some prop is in transition\n          layer.props.transitions ||\n          // Layer's geometry bounds have changed\n          layer.getBounds() !== this.layersBounds[i]\n      );\n\n    if (layersChanged) {\n      // Recalculate cached bounds\n      this.layers = layers;\n      this.layersBounds = layers.map(layer => layer.getBounds());\n      this.layersBoundsCommon = joinLayerBounds(layers, viewport);\n    }\n\n    const viewportChanged = !this.lastViewport || !viewport.equals(this.lastViewport);\n\n    if (!this.layersBoundsCommon) {\n      this.renderViewport = null;\n    } else if (layersChanged || viewportChanged) {\n      const bounds = getRenderBounds(this.layersBoundsCommon, viewport);\n      this.bounds = bounds;\n      this.lastViewport = viewport;\n\n      const scale = viewport.scale;\n      const pixelWidth = (bounds[2] - bounds[0]) * scale;\n      const pixelHeight = (bounds[3] - bounds[1]) * scale;\n\n      this.renderViewport =\n        pixelWidth > 0 || pixelHeight > 0\n          ? makeViewport({\n              // It's not important whether the geometry is visible in this viewport, because\n              // vertices will not use the standard project_to_clipspace in the DRAW_TO_HEIGHT_MAP shader\n              // However the viewport must have the same center and zoom as the screen viewport\n              // So that projection uniforms used for calculating z are the same\n              bounds: [\n                viewport.center[0] - 1,\n                viewport.center[1] - 1,\n                viewport.center[0] + 1,\n                viewport.center[1] + 1\n              ],\n              zoom: viewport.zoom,\n              width: Math.min(pixelWidth, MAP_MAX_SIZE),\n              height: Math.min(pixelHeight, MAP_MAX_SIZE),\n              viewport\n            })\n          : null;\n      return true;\n    }\n    return false;\n  }\n\n  delete() {\n    if (this.fbo) {\n      this.fbo.color.delete();\n      this.fbo.delete();\n    }\n  }\n}\n"],"file":"height-map-builder.js"}
+{"version":3,"sources":["../../../src/terrain/height-map-builder.ts"],"names":["MAP_MAX_SIZE","HeightMapBuilder","gl","renderViewport","fbo","id","float","layers","viewport","layersChanged","length","some","layer","i","props","transitions","getBounds","layersBounds","map","layersBoundsCommon","viewportChanged","lastViewport","equals","bounds","scale","pixelWidth","pixelHeight","center","zoom","width","Math","min","height","color","delete","Framebuffer","isSupported","colorBufferFloat"],"mappings":"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","sourcesContent":["import {Framebuffer} from '@luma.gl/core';\nimport {joinLayerBounds, getRenderBounds, makeViewport, Bounds} from '../utils/projection-utils';\nimport {createRenderTarget} from './utils';\n\nimport type {Viewport, Layer} from '@deck.gl/core';\n\nconst MAP_MAX_SIZE = 2048;\n\n/**\n * Manages the lifecycle of the height map (a framebuffer that encodes elevation).\n * One instance of height map is is shared across all layers. It is updated when the viewport changes\n * or when some terrain source layer's data changes.\n * During the draw call of any terrainDrawMode:offset layers,\n * the vertex shader reads from this framebuffer to retrieve its z offset.\n */\nexport class HeightMapBuilder {\n  /** Viewport used to draw into the texture */\n  renderViewport: Viewport | null = null;\n  /** Bounds of the height map texture, in cartesian space */\n  bounds: Bounds | null = null;\n\n  protected fbo?: Framebuffer;\n  protected gl: WebGLRenderingContext;\n  /** Last rendered layers */\n  private layers: Layer[] = [];\n  /** Last layer.getBounds() */\n  private layersBounds: ([number[], number[]] | null)[] = [];\n  /** The union of layersBounds in cartesian space */\n  private layersBoundsCommon: Bounds | null = null;\n  private lastViewport: Viewport | null = null;\n\n  static isSupported(gl: WebGLRenderingContext): boolean {\n    return Framebuffer.isSupported(gl, {colorBufferFloat: true});\n  }\n\n  constructor(gl: WebGLRenderingContext) {\n    this.gl = gl;\n  }\n\n  /** Returns the height map framebuffer for read/write access.\n   * Returns null when the texture is invalid.\n   */\n  getRenderFramebuffer(): Framebuffer | null {\n    if (!this.renderViewport) {\n      return null;\n    }\n    if (!this.fbo) {\n      this.fbo = createRenderTarget(this.gl, {id: 'height-map', float: true});\n    }\n    return this.fbo;\n  }\n\n  /** Called every render cycle to check if the framebuffer needs update */\n  shouldUpdate({layers, viewport}: {layers: Layer[]; viewport: Viewport}): boolean {\n    const layersChanged =\n      layers.length !== this.layers.length ||\n      layers.some(\n        (layer, i) =>\n          // Layer instance is updated\n          // Layer props might have changed\n          // Undetermined props could have an effect on the output geometry of a terrain source,\n          // for example getElevation+updateTriggers, elevationScale, modelMatrix\n          layer !== this.layers[i] ||\n          // Some prop is in transition\n          layer.props.transitions ||\n          // Layer's geometry bounds have changed\n          layer.getBounds() !== this.layersBounds[i]\n      );\n\n    if (layersChanged) {\n      // Recalculate cached bounds\n      this.layers = layers;\n      this.layersBounds = layers.map(layer => layer.getBounds());\n      this.layersBoundsCommon = joinLayerBounds(layers, viewport);\n    }\n\n    const viewportChanged = !this.lastViewport || !viewport.equals(this.lastViewport);\n\n    if (!this.layersBoundsCommon) {\n      this.renderViewport = null;\n    } else if (layersChanged || viewportChanged) {\n      const bounds = getRenderBounds(this.layersBoundsCommon, viewport);\n      if (bounds[2] <= bounds[0] || bounds[3] <= bounds[1]) {\n        this.renderViewport = null;\n        return false;\n      }\n\n      this.bounds = bounds;\n      this.lastViewport = viewport;\n\n      const scale = viewport.scale;\n      const pixelWidth = (bounds[2] - bounds[0]) * scale;\n      const pixelHeight = (bounds[3] - bounds[1]) * scale;\n\n      this.renderViewport =\n        pixelWidth > 0 || pixelHeight > 0\n          ? makeViewport({\n              // It's not important whether the geometry is visible in this viewport, because\n              // vertices will not use the standard project_to_clipspace in the DRAW_TO_HEIGHT_MAP shader\n              // However the viewport must have the same center and zoom as the screen viewport\n              // So that projection uniforms used for calculating z are the same\n              bounds: [\n                viewport.center[0] - 1,\n                viewport.center[1] - 1,\n                viewport.center[0] + 1,\n                viewport.center[1] + 1\n              ],\n              zoom: viewport.zoom,\n              width: Math.min(pixelWidth, MAP_MAX_SIZE),\n              height: Math.min(pixelHeight, MAP_MAX_SIZE),\n              viewport\n            })\n          : null;\n      return true;\n    }\n    return false;\n  }\n\n  delete() {\n    if (this.fbo) {\n      this.fbo.color.delete();\n      this.fbo.delete();\n    }\n  }\n}\n"],"file":"height-map-builder.js"}

package/dist/es5/terrain/shader-module.js

@@ -25,7 +25,7 @@ var terrainModule = {
   inject: {
     'vs:#decl': "\nuniform float terrain_mode;\nuniform sampler2D terrain_map;\nuniform vec4 terrain_bounds;\nvarying vec3 commonPos;\n".concat(TERRAIN_MODE_CONSTANTS, "\n    "),
     'vs:#main-start': "\nif (terrain_mode == TERRAIN_MODE_SKIP) {\n  gl_Position = vec4(0.0);\n  return;\n}\n",
-    'vs:DECKGL_FILTER_GL_POSITION': "\ncommonPos = geometry.position.xyz;\nif (terrain_mode == TERRAIN_MODE_WRITE_HEIGHT_MAP) {\n  vec2 texCoords = (commonPos.xy - terrain_bounds.xy) / terrain_bounds.zw;\n  position = vec4(texCoords * 2.0 - 1.0, 0.0, 1.0);\n}\nif (terrain_mode == TERRAIN_MODE_USE_HEIGHT_MAP) {\n  vec3 anchor = geometry.worldPosition;\n  anchor.z = 0.0;\n  vec3 anchorCommon = project_position(anchor);\n  vec2 texCoords = (anchorCommon.xy - terrain_bounds.xy) / terrain_bounds.zw;\n  if (texCoords.x >= 0.0 && texCoords.y >= 0.0 && texCoords.x <= 1.0 && texCoords.y <= 1.0) {\n    float terrainZ = texture2D(terrain_map, texCoords).r;\n    geometry.position.z += terrainZ;\n    position = project_common_position_to_clipspace(geometry.position);\n  }\n}\n    ",
+    'vs:DECKGL_FILTER_GL_POSITION': "\ncommonPos = geometry.position.xyz;\nif (terrain_mode == TERRAIN_MODE_WRITE_HEIGHT_MAP) {\n  vec2 texCoords = (commonPos.xy - terrain_bounds.xy) / terrain_bounds.zw;\n  position = vec4(texCoords * 2.0 - 1.0, 0.0, 1.0);\n  commonPos.z += project_uCommonOrigin.z;\n}\nif (terrain_mode == TERRAIN_MODE_USE_HEIGHT_MAP) {\n  vec3 anchor = geometry.worldPosition;\n  anchor.z = 0.0;\n  vec3 anchorCommon = project_position(anchor);\n  vec2 texCoords = (anchorCommon.xy - terrain_bounds.xy) / terrain_bounds.zw;\n  if (texCoords.x >= 0.0 && texCoords.y >= 0.0 && texCoords.x <= 1.0 && texCoords.y <= 1.0) {\n    float terrainZ = texture2D(terrain_map, texCoords).r;\n    geometry.position.z += terrainZ;\n    position = project_common_position_to_clipspace(geometry.position);\n  }\n}\n    ",
     'fs:#decl': "\nuniform float terrain_mode;\nuniform sampler2D terrain_map;\nuniform vec4 terrain_bounds;\nvarying vec3 commonPos;\n".concat(TERRAIN_MODE_CONSTANTS, "\n    "),
     'fs:#main-start': "\nif (terrain_mode == TERRAIN_MODE_WRITE_HEIGHT_MAP) {\n  gl_FragColor = vec4(commonPos.z, 0.0, 0.0, 1.0);\n  return;\n}\n    ",
     'fs:DECKGL_FILTER_COLOR': "\nif ((terrain_mode == TERRAIN_MODE_USE_COVER) || (terrain_mode == TERRAIN_MODE_USE_COVER_ONLY)) {\n  vec2 texCoords = (commonPos.xy - terrain_bounds.xy) / terrain_bounds.zw;\n  vec4 pixel = texture2D(terrain_map, texCoords);\n  if (terrain_mode == TERRAIN_MODE_USE_COVER_ONLY) {\n    color = pixel;\n  } else {\n    // pixel is premultiplied\n    color = pixel + color * (1.0 - pixel.a);\n  }\n  return;\n}\n    "

package/dist/es5/terrain/shader-module.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../src/terrain/shader-module.ts"],"names":["TERRAIN_MODE","NONE","WRITE_HEIGHT_MAP","USE_HEIGHT_MAP","USE_COVER","USE_COVER_ONLY","SKIP","TERRAIN_MODE_CONSTANTS","Object","keys","map","key","join","terrainModule","name","dependencies","project","inject","getUniforms","opts","uniforms","drawToTerrainHeightMap","heightMap","heightMapBounds","dummyHeightMap","terrainCover","useTerrainHeightMap","terrainSkipRender","project_uCommonOrigin","mode","sampler","bounds","isPicking","pickingActive","getPickingFramebuffer","getRenderFramebuffer","terrain_mode","terrain_map","terrain_bounds"],"mappings":"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","sourcesContent":["/* eslint-disable camelcase */\n\nimport {project} from '@deck.gl/core';\nimport type {_ShaderModule as ShaderModule} from '@deck.gl/core';\n\nimport type {Texture2D} from '@luma.gl/core';\nimport type {Bounds} from '../utils/projection-utils';\nimport type {TerrainCover} from './terrain-cover';\n\n/** Module parameters expected by the terrain shader module */\nexport type TerrainModuleSettings = {\n  pickingActive?: boolean;\n  heightMap: Texture2D | null;\n  heightMapBounds?: Bounds | null;\n  dummyHeightMap: Texture2D;\n  terrainCover?: TerrainCover | null;\n  drawToTerrainHeightMap?: boolean;\n  useTerrainHeightMap?: boolean;\n  terrainSkipRender?: boolean;\n};\n\n/** A model can have one of the following modes */\nexport const TERRAIN_MODE = {\n  NONE: 0,\n  /** A terrain layer rendering encoded ground elevation into the height map */\n  WRITE_HEIGHT_MAP: 1,\n  /** An offset layer reading encoded ground elevation from the height map */\n  USE_HEIGHT_MAP: 2,\n  /** A terrain layer rendering to screen, using the cover fbo overlaid with its own texture */\n  USE_COVER: 3,\n  /** A terrain layer rendering to screen, using the cover fbo as texture */\n  USE_COVER_ONLY: 4,\n  /** Draped layer is rendered into a texture, and never to screen */\n  SKIP: 5\n};\n\nconst TERRAIN_MODE_CONSTANTS = Object.keys(TERRAIN_MODE)\n  .map(key => `const float TERRAIN_MODE_${key} = ${TERRAIN_MODE[key]}.0;`)\n  .join('\\n');\n\nexport const terrainModule = {\n  name: 'terrain',\n  dependencies: [project],\n  inject: {\n    'vs:#decl': `\nuniform float terrain_mode;\nuniform sampler2D terrain_map;\nuniform vec4 terrain_bounds;\nvarying vec3 commonPos;\n${TERRAIN_MODE_CONSTANTS}\n    `,\n    'vs:#main-start': `\nif (terrain_mode == TERRAIN_MODE_SKIP) {\n  gl_Position = vec4(0.0);\n  return;\n}\n`,\n    'vs:DECKGL_FILTER_GL_POSITION': `\ncommonPos = geometry.position.xyz;\nif (terrain_mode == TERRAIN_MODE_WRITE_HEIGHT_MAP) {\n  vec2 texCoords = (commonPos.xy - terrain_bounds.xy) / terrain_bounds.zw;\n  position = vec4(texCoords * 2.0 - 1.0, 0.0, 1.0);\n}\nif (terrain_mode == TERRAIN_MODE_USE_HEIGHT_MAP) {\n  vec3 anchor = geometry.worldPosition;\n  anchor.z = 0.0;\n  vec3 anchorCommon = project_position(anchor);\n  vec2 texCoords = (anchorCommon.xy - terrain_bounds.xy) / terrain_bounds.zw;\n  if (texCoords.x >= 0.0 && texCoords.y >= 0.0 && texCoords.x <= 1.0 && texCoords.y <= 1.0) {\n    float terrainZ = texture2D(terrain_map, texCoords).r;\n    geometry.position.z += terrainZ;\n    position = project_common_position_to_clipspace(geometry.position);\n  }\n}\n    `,\n    'fs:#decl': `\nuniform float terrain_mode;\nuniform sampler2D terrain_map;\nuniform vec4 terrain_bounds;\nvarying vec3 commonPos;\n${TERRAIN_MODE_CONSTANTS}\n    `,\n    'fs:#main-start': `\nif (terrain_mode == TERRAIN_MODE_WRITE_HEIGHT_MAP) {\n  gl_FragColor = vec4(commonPos.z, 0.0, 0.0, 1.0);\n  return;\n}\n    `,\n    'fs:DECKGL_FILTER_COLOR': `\nif ((terrain_mode == TERRAIN_MODE_USE_COVER) || (terrain_mode == TERRAIN_MODE_USE_COVER_ONLY)) {\n  vec2 texCoords = (commonPos.xy - terrain_bounds.xy) / terrain_bounds.zw;\n  vec4 pixel = texture2D(terrain_map, texCoords);\n  if (terrain_mode == TERRAIN_MODE_USE_COVER_ONLY) {\n    color = pixel;\n  } else {\n    // pixel is premultiplied\n    color = pixel + color * (1.0 - pixel.a);\n  }\n  return;\n}\n    `\n  },\n  // eslint-disable-next-line complexity\n  getUniforms: (opts = {}, uniforms) => {\n    if ('dummyHeightMap' in opts) {\n      const {\n        drawToTerrainHeightMap,\n        heightMap,\n        heightMapBounds,\n        dummyHeightMap,\n        terrainCover,\n        useTerrainHeightMap,\n        terrainSkipRender\n      } = opts;\n      const {project_uCommonOrigin} = uniforms;\n\n      let mode: number = terrainSkipRender ? TERRAIN_MODE.SKIP : TERRAIN_MODE.NONE;\n      // height map if case USE_HEIGHT_MAP, terrain cover if USE_COVER, otherwise empty\n      let sampler: Texture2D = dummyHeightMap;\n      // height map bounds if case USE_HEIGHT_MAP, terrain cover bounds if USE_COVER, otherwise null\n      let bounds: number[] | null = null;\n      if (drawToTerrainHeightMap) {\n        mode = TERRAIN_MODE.WRITE_HEIGHT_MAP;\n        bounds = heightMapBounds!;\n      } else if (useTerrainHeightMap && heightMap) {\n        mode = TERRAIN_MODE.USE_HEIGHT_MAP;\n        sampler = heightMap;\n        bounds = heightMapBounds!;\n      } else if (terrainCover) {\n        // This is a terrain layer\n        const isPicking = opts.pickingActive;\n        sampler = isPicking\n          ? terrainCover.getPickingFramebuffer()\n          : terrainCover.getRenderFramebuffer();\n        if (isPicking) {\n          // Never render the layer itself in picking pass\n          mode = TERRAIN_MODE.SKIP;\n        }\n        if (sampler) {\n          mode = mode === TERRAIN_MODE.SKIP ? TERRAIN_MODE.USE_COVER_ONLY : TERRAIN_MODE.USE_COVER;\n          bounds = terrainCover.bounds;\n        } else {\n          sampler = dummyHeightMap;\n        }\n      }\n\n      /* eslint-disable camelcase */\n      return {\n        terrain_mode: mode,\n        terrain_map: sampler,\n        // Convert bounds to the common space, as [minX, minY, width, height]\n        terrain_bounds: bounds\n          ? [\n              bounds[0] - project_uCommonOrigin[0],\n              bounds[1] - project_uCommonOrigin[1],\n              bounds[2] - bounds[0],\n              bounds[3] - bounds[1]\n            ]\n          : [0, 0, 0, 0]\n      };\n    }\n    return null;\n  }\n} as ShaderModule<TerrainModuleSettings>;\n"],"file":"shader-module.js"}
+{"version":3,"sources":["../../../src/terrain/shader-module.ts"],"names":["TERRAIN_MODE","NONE","WRITE_HEIGHT_MAP","USE_HEIGHT_MAP","USE_COVER","USE_COVER_ONLY","SKIP","TERRAIN_MODE_CONSTANTS","Object","keys","map","key","join","terrainModule","name","dependencies","project","inject","getUniforms","opts","uniforms","drawToTerrainHeightMap","heightMap","heightMapBounds","dummyHeightMap","terrainCover","useTerrainHeightMap","terrainSkipRender","project_uCommonOrigin","mode","sampler","bounds","isPicking","pickingActive","getPickingFramebuffer","getRenderFramebuffer","terrain_mode","terrain_map","terrain_bounds"],"mappings":"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","sourcesContent":["/* eslint-disable camelcase */\n\nimport {project} from '@deck.gl/core';\nimport type {_ShaderModule as ShaderModule} from '@deck.gl/core';\n\nimport type {Texture2D} from '@luma.gl/core';\nimport type {Bounds} from '../utils/projection-utils';\nimport type {TerrainCover} from './terrain-cover';\n\n/** Module parameters expected by the terrain shader module */\nexport type TerrainModuleSettings = {\n  pickingActive?: boolean;\n  heightMap: Texture2D | null;\n  heightMapBounds?: Bounds | null;\n  dummyHeightMap: Texture2D;\n  terrainCover?: TerrainCover | null;\n  drawToTerrainHeightMap?: boolean;\n  useTerrainHeightMap?: boolean;\n  terrainSkipRender?: boolean;\n};\n\n/** A model can have one of the following modes */\nexport const TERRAIN_MODE = {\n  NONE: 0,\n  /** A terrain layer rendering encoded ground elevation into the height map */\n  WRITE_HEIGHT_MAP: 1,\n  /** An offset layer reading encoded ground elevation from the height map */\n  USE_HEIGHT_MAP: 2,\n  /** A terrain layer rendering to screen, using the cover fbo overlaid with its own texture */\n  USE_COVER: 3,\n  /** A terrain layer rendering to screen, using the cover fbo as texture */\n  USE_COVER_ONLY: 4,\n  /** Draped layer is rendered into a texture, and never to screen */\n  SKIP: 5\n};\n\nconst TERRAIN_MODE_CONSTANTS = Object.keys(TERRAIN_MODE)\n  .map(key => `const float TERRAIN_MODE_${key} = ${TERRAIN_MODE[key]}.0;`)\n  .join('\\n');\n\nexport const terrainModule = {\n  name: 'terrain',\n  dependencies: [project],\n  inject: {\n    'vs:#decl': `\nuniform float terrain_mode;\nuniform sampler2D terrain_map;\nuniform vec4 terrain_bounds;\nvarying vec3 commonPos;\n${TERRAIN_MODE_CONSTANTS}\n    `,\n    'vs:#main-start': `\nif (terrain_mode == TERRAIN_MODE_SKIP) {\n  gl_Position = vec4(0.0);\n  return;\n}\n`,\n    'vs:DECKGL_FILTER_GL_POSITION': `\ncommonPos = geometry.position.xyz;\nif (terrain_mode == TERRAIN_MODE_WRITE_HEIGHT_MAP) {\n  vec2 texCoords = (commonPos.xy - terrain_bounds.xy) / terrain_bounds.zw;\n  position = vec4(texCoords * 2.0 - 1.0, 0.0, 1.0);\n  commonPos.z += project_uCommonOrigin.z;\n}\nif (terrain_mode == TERRAIN_MODE_USE_HEIGHT_MAP) {\n  vec3 anchor = geometry.worldPosition;\n  anchor.z = 0.0;\n  vec3 anchorCommon = project_position(anchor);\n  vec2 texCoords = (anchorCommon.xy - terrain_bounds.xy) / terrain_bounds.zw;\n  if (texCoords.x >= 0.0 && texCoords.y >= 0.0 && texCoords.x <= 1.0 && texCoords.y <= 1.0) {\n    float terrainZ = texture2D(terrain_map, texCoords).r;\n    geometry.position.z += terrainZ;\n    position = project_common_position_to_clipspace(geometry.position);\n  }\n}\n    `,\n    'fs:#decl': `\nuniform float terrain_mode;\nuniform sampler2D terrain_map;\nuniform vec4 terrain_bounds;\nvarying vec3 commonPos;\n${TERRAIN_MODE_CONSTANTS}\n    `,\n    'fs:#main-start': `\nif (terrain_mode == TERRAIN_MODE_WRITE_HEIGHT_MAP) {\n  gl_FragColor = vec4(commonPos.z, 0.0, 0.0, 1.0);\n  return;\n}\n    `,\n    'fs:DECKGL_FILTER_COLOR': `\nif ((terrain_mode == TERRAIN_MODE_USE_COVER) || (terrain_mode == TERRAIN_MODE_USE_COVER_ONLY)) {\n  vec2 texCoords = (commonPos.xy - terrain_bounds.xy) / terrain_bounds.zw;\n  vec4 pixel = texture2D(terrain_map, texCoords);\n  if (terrain_mode == TERRAIN_MODE_USE_COVER_ONLY) {\n    color = pixel;\n  } else {\n    // pixel is premultiplied\n    color = pixel + color * (1.0 - pixel.a);\n  }\n  return;\n}\n    `\n  },\n  // eslint-disable-next-line complexity\n  getUniforms: (opts = {}, uniforms) => {\n    if ('dummyHeightMap' in opts) {\n      const {\n        drawToTerrainHeightMap,\n        heightMap,\n        heightMapBounds,\n        dummyHeightMap,\n        terrainCover,\n        useTerrainHeightMap,\n        terrainSkipRender\n      } = opts;\n      const {project_uCommonOrigin} = uniforms;\n\n      let mode: number = terrainSkipRender ? TERRAIN_MODE.SKIP : TERRAIN_MODE.NONE;\n      // height map if case USE_HEIGHT_MAP, terrain cover if USE_COVER, otherwise empty\n      let sampler: Texture2D = dummyHeightMap;\n      // height map bounds if case USE_HEIGHT_MAP, terrain cover bounds if USE_COVER, otherwise null\n      let bounds: number[] | null = null;\n      if (drawToTerrainHeightMap) {\n        mode = TERRAIN_MODE.WRITE_HEIGHT_MAP;\n        bounds = heightMapBounds!;\n      } else if (useTerrainHeightMap && heightMap) {\n        mode = TERRAIN_MODE.USE_HEIGHT_MAP;\n        sampler = heightMap;\n        bounds = heightMapBounds!;\n      } else if (terrainCover) {\n        // This is a terrain layer\n        const isPicking = opts.pickingActive;\n        sampler = isPicking\n          ? terrainCover.getPickingFramebuffer()\n          : terrainCover.getRenderFramebuffer();\n        if (isPicking) {\n          // Never render the layer itself in picking pass\n          mode = TERRAIN_MODE.SKIP;\n        }\n        if (sampler) {\n          mode = mode === TERRAIN_MODE.SKIP ? TERRAIN_MODE.USE_COVER_ONLY : TERRAIN_MODE.USE_COVER;\n          bounds = terrainCover.bounds;\n        } else {\n          sampler = dummyHeightMap;\n        }\n      }\n\n      /* eslint-disable camelcase */\n      return {\n        terrain_mode: mode,\n        terrain_map: sampler,\n        // Convert bounds to the common space, as [minX, minY, width, height]\n        terrain_bounds: bounds\n          ? [\n              bounds[0] - project_uCommonOrigin[0],\n              bounds[1] - project_uCommonOrigin[1],\n              bounds[2] - bounds[0],\n              bounds[3] - bounds[1]\n            ]\n          : [0, 0, 0, 0]\n      };\n    }\n    return null;\n  }\n} as ShaderModule<TerrainModuleSettings>;\n"],"file":"shader-module.js"}

package/dist/es5/terrain/terrain-cover.js

@@ -120,7 +120,15 @@ var TerrainCover = function () {
       var targetLayer = this.targetLayer;
       var shouldRedraw = false;
 
-      if (this.targetBounds !== targetLayer.getBounds()) {
+      if (this.tile && 'boundingBox' in this.tile) {
+        if (!this.targetBounds) {
+          shouldRedraw = true;
+          this.targetBounds = this.tile.boundingBox;
+          var bottomLeftCommon = viewport.projectPosition(this.targetBounds[0]);
+          var topRightCommon = viewport.projectPosition(this.targetBounds[1]);
+          this.targetBoundsCommon = [bottomLeftCommon[0], bottomLeftCommon[1], topRightCommon[0], topRightCommon[1]];
+        }
+      } else if (this.targetBounds !== targetLayer.getBounds()) {
         shouldRedraw = true;
         this.targetBounds = targetLayer.getBounds();
         this.targetBoundsCommon = (0, _projectionUtils.joinLayerBounds)([targetLayer], viewport);
@@ -224,7 +232,7 @@ function getIntersectingLayers(sourceTile, layers) {
     var tile = getTile(layer);
 
     if (tile) {
-      return intersect(sourceTile.bbox, tile.bbox);
+      return intersect(sourceTile.boundingBox, tile.boundingBox);
     }
 
     return true;
@@ -246,12 +254,8 @@ function getTile(layer) {
 }
 
 function intersect(b1, b2) {
-  if ('west' in b1 && 'west' in b2) {
-    return b1.west < b2.east && b2.west < b1.east && b1.south < b2.north && b2.south < b1.north;
-  }
-
-  if ('left' in b1 && 'left' in b2) {
-    return b1.left < b2.right && b2.left < b1.right && b1.top < b2.bottom && b2.top < b1.bottom;
+  if (b1 && b2) {
+    return b1[0][0] < b2[1][0] && b2[0][0] < b1[1][0] && b1[0][1] < b2[1][1] && b2[0][1] < b1[1][1];
   }
 
   return false;

package/dist/es5/terrain/terrain-cover.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../src/terrain/terrain-cover.ts"],"names":["TerrainCover","targetLayer","tile","getTile","id","Boolean","getCurrentLayer","viewport","layers","layerNeedsRedraw","sizeChanged","_updateViewport","layersChanged","_updateLayers","needsRedraw","getIntersectingLayers","length","i","map","layer","shouldRedraw","targetBounds","getBounds","targetBoundsCommon","newZoom","Math","ceil","zoom","bounds","oldZoom","renderViewport","newBounds","oldBounds","some","x","fbo","context","gl","props","pickable","pickingFbo","filter","includes","texture","delete","sourceTile","intersect","bbox","parent","b1","b2","west","east","south","north","left","right","top","bottom"],"mappings":"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","sourcesContent":["import {Framebuffer} from '@luma.gl/core';\n\nimport type {Layer, Viewport} from '@deck.gl/core';\n\nimport {createRenderTarget} from './utils';\nimport {joinLayerBounds, makeViewport, getRenderBounds, Bounds} from '../utils/projection-utils';\n\n// TODO - import from loaders when Tileset2D is split out\ntype GeoBoundingBox = {west: number; north: number; east: number; south: number};\ntype NonGeoBoundingBox = {left: number; top: number; right: number; bottom: number};\ntype Tile2DHeader = {\n  bbox: GeoBoundingBox | NonGeoBoundingBox;\n};\n\n/**\n * Manages the lifecycle of the terrain cover (draped textures over a terrain mesh).\n * One terrain cover is created for each unique terrain layer (primitive layer with operation:terrain).\n * It is updated when the terrain source layer's mesh changes or when any of the terrainDrawMode:drape\n * layers requires redraw.\n * During the draw call of a terrain layer, the drape texture is overlaid on top of the layer's own color.\n */\nexport class TerrainCover {\n  isDirty: boolean = true;\n  /** The terrain layer that this instance belongs to */\n  targetLayer: Layer;\n  /** Viewport used to draw into the texture */\n  renderViewport: Viewport | null = null;\n  /** Bounds of the terrain cover texture, in cartesian space */\n  bounds: Bounds | null = null;\n\n  private fbo?: Framebuffer;\n  private pickingFbo?: Framebuffer;\n  private layers: string[] = [];\n  private tile: Tile2DHeader | null;\n  /** Cached version of targetLayer.getBounds() */\n  private targetBounds: [number[], number[]] | null = null;\n  /** targetBounds in cartesian space */\n  private targetBoundsCommon: Bounds | null = null;\n\n  constructor(targetLayer: Layer) {\n    this.targetLayer = targetLayer;\n    this.tile = getTile(targetLayer);\n  }\n\n  get id() {\n    return this.targetLayer.id;\n  }\n\n  /** returns true if the target layer is still in use (i.e. not finalized) */\n  get isActive(): boolean {\n    return Boolean(this.targetLayer.getCurrentLayer());\n  }\n\n  shouldUpdate({\n    targetLayer,\n    viewport,\n    layers,\n    layerNeedsRedraw\n  }: {\n    targetLayer?: Layer;\n    viewport?: Viewport;\n    layers?: Layer[];\n    layerNeedsRedraw?: Record<string, boolean>;\n  }): boolean {\n    if (targetLayer) {\n      this.targetLayer = targetLayer;\n    }\n    const sizeChanged = viewport ? this._updateViewport(viewport) : false;\n\n    let layersChanged = layers ? this._updateLayers(layers) : false;\n\n    if (layerNeedsRedraw) {\n      for (const id of this.layers) {\n        if (layerNeedsRedraw[id]) {\n          layersChanged = true;\n          // console.log('layer needs redraw', id);\n          break;\n        }\n      }\n    }\n\n    return layersChanged || sizeChanged;\n  }\n\n  /** Compare layers with the last version. Only rerender if necessary. */\n  private _updateLayers(layers: Layer[]): boolean {\n    let needsRedraw = false;\n    layers = this.tile ? getIntersectingLayers(this.tile, layers) : layers;\n\n    if (layers.length !== this.layers.length) {\n      needsRedraw = true;\n      // console.log('layers count changed', this.layers.length, '>>', layers.length);\n    } else {\n      for (let i = 0; i < layers.length; i++) {\n        const id = layers[i].id;\n        if (id !== this.layers[i]) {\n          needsRedraw = true;\n          // console.log('layer added/removed', id);\n          break;\n        }\n      }\n    }\n    if (needsRedraw) {\n      this.layers = layers.map(layer => layer.id);\n    }\n    return needsRedraw;\n  }\n\n  /** Compare viewport and terrain bounds with the last version. Only rerender if necesary. */\n  private _updateViewport(viewport: Viewport): boolean {\n    const targetLayer = this.targetLayer;\n    let shouldRedraw = false;\n\n    if (this.targetBounds !== targetLayer.getBounds()) {\n      // console.log('bounds changed', this.bounds, '>>', newBounds);\n      shouldRedraw = true;\n      this.targetBounds = targetLayer.getBounds();\n      this.targetBoundsCommon = joinLayerBounds([targetLayer], viewport);\n    }\n\n    if (!this.targetBoundsCommon) {\n      return false;\n    }\n\n    const newZoom = Math.ceil(viewport.zoom + 0.5);\n    // If the terrain layer is bound to a tile, always render a texture that cover the whole tile.\n    // Otherwise, use the smaller of layer bounds and the viewport bounds.\n    if (this.tile) {\n      this.bounds = this.targetBoundsCommon;\n    } else {\n      const oldZoom = this.renderViewport?.zoom;\n      shouldRedraw = shouldRedraw || newZoom !== oldZoom;\n      const newBounds = getRenderBounds(this.targetBoundsCommon, viewport);\n      const oldBounds = this.bounds;\n      shouldRedraw = shouldRedraw || !oldBounds || newBounds.some((x, i) => x !== oldBounds[i]);\n      this.bounds = newBounds;\n    }\n\n    if (shouldRedraw) {\n      this.renderViewport = makeViewport({\n        bounds: this.bounds,\n        zoom: newZoom,\n        viewport\n      });\n    }\n\n    return shouldRedraw;\n  }\n\n  getRenderFramebuffer(): Framebuffer | null {\n    if (!this.renderViewport || this.layers.length === 0) {\n      return null;\n    }\n    if (!this.fbo) {\n      this.fbo = createRenderTarget(this.targetLayer.context.gl, {id: this.id});\n    }\n    return this.fbo;\n  }\n\n  getPickingFramebuffer(): Framebuffer | null {\n    if (!this.renderViewport || (this.layers.length === 0 && !this.targetLayer.props.pickable)) {\n      return null;\n    }\n    if (!this.pickingFbo) {\n      this.pickingFbo = createRenderTarget(this.targetLayer.context.gl, {id: `${this.id}-picking`});\n    }\n    return this.pickingFbo;\n  }\n\n  filterLayers(layers: Layer[]) {\n    return layers.filter(({id}) => this.layers.includes(id));\n  }\n\n  delete() {\n    const {fbo, pickingFbo} = this;\n    if (fbo) {\n      fbo.texture.delete();\n      fbo.delete();\n    }\n    if (pickingFbo) {\n      pickingFbo.texture.delete();\n      pickingFbo.delete();\n    }\n  }\n}\n\n/**\n * Remove layers that do not overlap with the current terrain cover.\n * This implementation only has effect when a TileLayer is overlaid on top of a TileLayer\n */\nfunction getIntersectingLayers(sourceTile: Tile2DHeader, layers: Layer[]): Layer[] {\n  return layers.filter(layer => {\n    const tile = getTile(layer);\n    if (tile) {\n      return intersect(sourceTile.bbox, tile.bbox);\n    }\n    return true;\n  });\n}\n\n/** If layer is the descendent of a TileLayer, return the corresponding tile. */\nfunction getTile(layer: Layer): Tile2DHeader | null {\n  while (layer) {\n    // @ts-expect-error tile may not exist\n    const {tile} = layer.props;\n    if (tile) {\n      return tile;\n    }\n    layer = layer.parent as Layer;\n  }\n  return null;\n}\n\nfunction intersect(\n  b1: GeoBoundingBox | NonGeoBoundingBox,\n  b2: GeoBoundingBox | NonGeoBoundingBox\n): boolean {\n  if ('west' in b1 && 'west' in b2) {\n    return b1.west < b2.east && b2.west < b1.east && b1.south < b2.north && b2.south < b1.north;\n  }\n  if ('left' in b1 && 'left' in b2) {\n    return b1.left < b2.right && b2.left < b1.right && b1.top < b2.bottom && b2.top < b1.bottom;\n  }\n  return false;\n}\n"],"file":"terrain-cover.js"}
+{"version":3,"sources":["../../../src/terrain/terrain-cover.ts"],"names":["TerrainCover","targetLayer","tile","getTile","id","Boolean","getCurrentLayer","viewport","layers","layerNeedsRedraw","sizeChanged","_updateViewport","layersChanged","_updateLayers","needsRedraw","getIntersectingLayers","length","i","map","layer","shouldRedraw","targetBounds","boundingBox","bottomLeftCommon","projectPosition","topRightCommon","targetBoundsCommon","getBounds","newZoom","Math","ceil","zoom","bounds","oldZoom","renderViewport","newBounds","oldBounds","some","x","fbo","context","gl","props","pickable","pickingFbo","filter","includes","texture","delete","sourceTile","intersect","parent","b1","b2"],"mappings":"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","sourcesContent":["import {Framebuffer} from '@luma.gl/core';\n\nimport type {Layer, Viewport} from '@deck.gl/core';\n\nimport {createRenderTarget} from './utils';\nimport {joinLayerBounds, makeViewport, getRenderBounds, Bounds} from '../utils/projection-utils';\n\ntype TileHeader = {\n  boundingBox: [min: number[], max: number[]];\n};\n\n/**\n * Manages the lifecycle of the terrain cover (draped textures over a terrain mesh).\n * One terrain cover is created for each unique terrain layer (primitive layer with operation:terrain).\n * It is updated when the terrain source layer's mesh changes or when any of the terrainDrawMode:drape\n * layers requires redraw.\n * During the draw call of a terrain layer, the drape texture is overlaid on top of the layer's own color.\n */\nexport class TerrainCover {\n  isDirty: boolean = true;\n  /** The terrain layer that this instance belongs to */\n  targetLayer: Layer;\n  /** Viewport used to draw into the texture */\n  renderViewport: Viewport | null = null;\n  /** Bounds of the terrain cover texture, in cartesian space */\n  bounds: Bounds | null = null;\n\n  private fbo?: Framebuffer;\n  private pickingFbo?: Framebuffer;\n  private layers: string[] = [];\n  private tile: TileHeader | null;\n  /** Cached version of targetLayer.getBounds() */\n  private targetBounds: [number[], number[]] | null = null;\n  /** targetBounds in cartesian space */\n  private targetBoundsCommon: Bounds | null = null;\n\n  constructor(targetLayer: Layer) {\n    this.targetLayer = targetLayer;\n    this.tile = getTile(targetLayer);\n  }\n\n  get id() {\n    return this.targetLayer.id;\n  }\n\n  /** returns true if the target layer is still in use (i.e. not finalized) */\n  get isActive(): boolean {\n    return Boolean(this.targetLayer.getCurrentLayer());\n  }\n\n  shouldUpdate({\n    targetLayer,\n    viewport,\n    layers,\n    layerNeedsRedraw\n  }: {\n    targetLayer?: Layer;\n    viewport?: Viewport;\n    layers?: Layer[];\n    layerNeedsRedraw?: Record<string, boolean>;\n  }): boolean {\n    if (targetLayer) {\n      this.targetLayer = targetLayer;\n    }\n    const sizeChanged = viewport ? this._updateViewport(viewport) : false;\n\n    let layersChanged = layers ? this._updateLayers(layers) : false;\n\n    if (layerNeedsRedraw) {\n      for (const id of this.layers) {\n        if (layerNeedsRedraw[id]) {\n          layersChanged = true;\n          // console.log('layer needs redraw', id);\n          break;\n        }\n      }\n    }\n\n    return layersChanged || sizeChanged;\n  }\n\n  /** Compare layers with the last version. Only rerender if necessary. */\n  private _updateLayers(layers: Layer[]): boolean {\n    let needsRedraw = false;\n    layers = this.tile ? getIntersectingLayers(this.tile, layers) : layers;\n\n    if (layers.length !== this.layers.length) {\n      needsRedraw = true;\n      // console.log('layers count changed', this.layers.length, '>>', layers.length);\n    } else {\n      for (let i = 0; i < layers.length; i++) {\n        const id = layers[i].id;\n        if (id !== this.layers[i]) {\n          needsRedraw = true;\n          // console.log('layer added/removed', id);\n          break;\n        }\n      }\n    }\n    if (needsRedraw) {\n      this.layers = layers.map(layer => layer.id);\n    }\n    return needsRedraw;\n  }\n\n  /** Compare viewport and terrain bounds with the last version. Only rerender if necesary. */\n  private _updateViewport(viewport: Viewport): boolean {\n    const targetLayer = this.targetLayer;\n    let shouldRedraw = false;\n\n    if (this.tile && 'boundingBox' in this.tile) {\n      if (!this.targetBounds) {\n        shouldRedraw = true;\n        this.targetBounds = this.tile.boundingBox;\n\n        const bottomLeftCommon = viewport.projectPosition(this.targetBounds[0]);\n        const topRightCommon = viewport.projectPosition(this.targetBounds[1]);\n        this.targetBoundsCommon = [\n          bottomLeftCommon[0],\n          bottomLeftCommon[1],\n          topRightCommon[0],\n          topRightCommon[1]\n        ];\n      }\n    } else if (this.targetBounds !== targetLayer.getBounds()) {\n      // console.log('bounds changed', this.bounds, '>>', newBounds);\n      shouldRedraw = true;\n      this.targetBounds = targetLayer.getBounds();\n      this.targetBoundsCommon = joinLayerBounds([targetLayer], viewport);\n    }\n\n    if (!this.targetBoundsCommon) {\n      return false;\n    }\n\n    const newZoom = Math.ceil(viewport.zoom + 0.5);\n    // If the terrain layer is bound to a tile, always render a texture that cover the whole tile.\n    // Otherwise, use the smaller of layer bounds and the viewport bounds.\n    if (this.tile) {\n      this.bounds = this.targetBoundsCommon;\n    } else {\n      const oldZoom = this.renderViewport?.zoom;\n      shouldRedraw = shouldRedraw || newZoom !== oldZoom;\n      const newBounds = getRenderBounds(this.targetBoundsCommon, viewport);\n      const oldBounds = this.bounds;\n      shouldRedraw = shouldRedraw || !oldBounds || newBounds.some((x, i) => x !== oldBounds[i]);\n      this.bounds = newBounds;\n    }\n\n    if (shouldRedraw) {\n      this.renderViewport = makeViewport({\n        bounds: this.bounds,\n        zoom: newZoom,\n        viewport\n      });\n    }\n\n    return shouldRedraw;\n  }\n\n  getRenderFramebuffer(): Framebuffer | null {\n    if (!this.renderViewport || this.layers.length === 0) {\n      return null;\n    }\n    if (!this.fbo) {\n      this.fbo = createRenderTarget(this.targetLayer.context.gl, {id: this.id});\n    }\n    return this.fbo;\n  }\n\n  getPickingFramebuffer(): Framebuffer | null {\n    if (!this.renderViewport || (this.layers.length === 0 && !this.targetLayer.props.pickable)) {\n      return null;\n    }\n    if (!this.pickingFbo) {\n      this.pickingFbo = createRenderTarget(this.targetLayer.context.gl, {id: `${this.id}-picking`});\n    }\n    return this.pickingFbo;\n  }\n\n  filterLayers(layers: Layer[]) {\n    return layers.filter(({id}) => this.layers.includes(id));\n  }\n\n  delete() {\n    const {fbo, pickingFbo} = this;\n    if (fbo) {\n      fbo.texture.delete();\n      fbo.delete();\n    }\n    if (pickingFbo) {\n      pickingFbo.texture.delete();\n      pickingFbo.delete();\n    }\n  }\n}\n\n/**\n * Remove layers that do not overlap with the current terrain cover.\n * This implementation only has effect when a TileLayer is overlaid on top of a TileLayer\n */\nfunction getIntersectingLayers(sourceTile: TileHeader, layers: Layer[]): Layer[] {\n  return layers.filter(layer => {\n    const tile = getTile(layer);\n    if (tile) {\n      return intersect(sourceTile.boundingBox, tile.boundingBox);\n    }\n    return true;\n  });\n}\n\n/** If layer is the descendent of a TileLayer, return the corresponding tile. */\nfunction getTile(layer: Layer): TileHeader | null {\n  while (layer) {\n    // @ts-expect-error tile may not exist\n    const {tile} = layer.props;\n    if (tile) {\n      return tile;\n    }\n    layer = layer.parent as Layer;\n  }\n  return null;\n}\n\nfunction intersect(b1?: [number[], number[]], b2?: [number[], number[]]): boolean {\n  if (b1 && b2) {\n    return b1[0][0] < b2[1][0] && b2[0][0] < b1[1][0] && b1[0][1] < b2[1][1] && b2[0][1] < b1[1][1];\n  }\n  return false;\n}\n"],"file":"terrain-cover.js"}

package/dist/es5/utils/projection-utils.js

@@ -98,6 +98,7 @@ function makeViewport(opts) {
   }
 
   return isGeospatial ? new _core.WebMercatorViewport({
+    id: viewport.id,
     x: border,
     y: border,
     width: width,
@@ -107,6 +108,7 @@ function makeViewport(opts) {
     zoom: zoom,
     orthographic: true
   }) : new _core.OrthographicViewport({
+    id: viewport.id,
     x: border,
     y: border,
     width: width,

package/dist/es5/utils/projection-utils.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../src/utils/projection-utils.ts"],"names":["joinLayerBounds","layers","viewport","bounds","Infinity","layer","layerBounds","getBounds","bottomLeftCommon","projectPosition","autoOffset","topRightCommon","Math","min","max","Number","isFinite","MAX_VIEWPORT_SIZE","makeViewport","opts","border","isGeospatial","centerWorld","unprojectPosition","width","height","zoom","undefined","scale","log2","round","abs","maxSize","r","WebMercatorViewport","x","y","longitude","latitude","orthographic","OrthographicViewport","target","flipY","getViewportBounds","zRange","viewportBoundsWorld","length","minZ","maxZ","bounds0","z","bounds1","viewportBottomLeftCommon","slice","viewportTopRightCommon","getRenderBounds","viewportBounds","paddedBounds","doubleBounds","dx","dy","centerX","centerY"],"mappings":";;;;;;;;;;;;;;AAAA;;;;;;;;AAUO,SAASA,eAAT,CAELC,MAFK,EAILC,QAJK,EAKU;AAEf,MAAMC,MAAc,GAAG,CAACC,QAAD,EAAWA,QAAX,EAAqB,CAACA,QAAtB,EAAgC,CAACA,QAAjC,CAAvB;;AAFe,6CAGKH,MAHL;AAAA;;AAAA;AAGf,wDAA4B;AAAA,UAAjBI,KAAiB;AAC1B,UAAMC,WAAW,GAAGD,KAAK,CAACE,SAAN,EAApB;;AACA,UAAID,WAAJ,EAAiB;AACf,YAAME,gBAAgB,GAAGH,KAAK,CAACI,eAAN,CAAsBH,WAAW,CAAC,CAAD,CAAjC,EAAsC;AAACJ,UAAAA,QAAQ,EAARA,QAAD;AAAWQ,UAAAA,UAAU,EAAE;AAAvB,SAAtC,CAAzB;AACA,YAAMC,cAAc,GAAGN,KAAK,CAACI,eAAN,CAAsBH,WAAW,CAAC,CAAD,CAAjC,EAAsC;AAACJ,UAAAA,QAAQ,EAARA,QAAD;AAAWQ,UAAAA,UAAU,EAAE;AAAvB,SAAtC,CAAvB;AAEAP,QAAAA,MAAM,CAAC,CAAD,CAAN,GAAYS,IAAI,CAACC,GAAL,CAASV,MAAM,CAAC,CAAD,CAAf,EAAoBK,gBAAgB,CAAC,CAAD,CAApC,CAAZ;AACAL,QAAAA,MAAM,CAAC,CAAD,CAAN,GAAYS,IAAI,CAACC,GAAL,CAASV,MAAM,CAAC,CAAD,CAAf,EAAoBK,gBAAgB,CAAC,CAAD,CAApC,CAAZ;AACAL,QAAAA,MAAM,CAAC,CAAD,CAAN,GAAYS,IAAI,CAACE,GAAL,CAASX,MAAM,CAAC,CAAD,CAAf,EAAoBQ,cAAc,CAAC,CAAD,CAAlC,CAAZ;AACAR,QAAAA,MAAM,CAAC,CAAD,CAAN,GAAYS,IAAI,CAACE,GAAL,CAASX,MAAM,CAAC,CAAD,CAAf,EAAoBQ,cAAc,CAAC,CAAD,CAAlC,CAAZ;AACD;AACF;AAdc;AAAA;AAAA;AAAA;AAAA;;AAgBf,MAAII,MAAM,CAACC,QAAP,CAAgBb,MAAM,CAAC,CAAD,CAAtB,CAAJ,EAAgC;AAC9B,WAAOA,MAAP;AACD;;AACD,SAAO,IAAP;AACD;;AAED,IAAMc,iBAAiB,GAAG,IAA1B;;AAGO,SAASC,YAAT,CAAsBC,IAAtB,EAaa;AAClB,MAAOhB,MAAP,GAAuCgB,IAAvC,CAAOhB,MAAP;AAAA,MAAeD,QAAf,GAAuCiB,IAAvC,CAAejB,QAAf;AAAA,qBAAuCiB,IAAvC,CAAyBC,MAAzB;AAAA,MAAyBA,MAAzB,6BAAkC,CAAlC;AACA,MAAOC,YAAP,GAAuBnB,QAAvB,CAAOmB,YAAP;;AAEA,MAAIlB,MAAM,CAAC,CAAD,CAAN,IAAaA,MAAM,CAAC,CAAD,CAAnB,IAA0BA,MAAM,CAAC,CAAD,CAAN,IAAaA,MAAM,CAAC,CAAD,CAAjD,EAAsD;AACpD,WAAO,IAAP;AACD;;AAED,MAAMmB,WAAW,GAAGpB,QAAQ,CAACqB,iBAAT,CAA2B,CAC7C,CAACpB,MAAM,CAAC,CAAD,CAAN,GAAYA,MAAM,CAAC,CAAD,CAAnB,IAA0B,CADmB,EAE7C,CAACA,MAAM,CAAC,CAAD,CAAN,GAAYA,MAAM,CAAC,CAAD,CAAnB,IAA0B,CAFmB,EAG7C,CAH6C,CAA3B,CAApB;AAMA,MAAKqB,KAAL,GAA4BL,IAA5B,CAAKK,KAAL;AAAA,MAAYC,MAAZ,GAA4BN,IAA5B,CAAYM,MAAZ;AAAA,MAAoBC,IAApB,GAA4BP,IAA5B,CAAoBO,IAApB;;AACA,MAAIA,IAAI,KAAKC,SAAb,EAAwB;AAEtBH,IAAAA,KAAK,GAAGA,KAAK,GAAIJ,MAAM,GAAG,CAA1B;AACAK,IAAAA,MAAM,GAAGA,MAAM,GAAIL,MAAM,GAAG,CAA5B;AACA,QAAMQ,KAAK,GAAGhB,IAAI,CAACC,GAAL,CAASW,KAAK,IAAIrB,MAAM,CAAC,CAAD,CAAN,GAAYA,MAAM,CAAC,CAAD,CAAtB,CAAd,EAA0CsB,MAAM,IAAItB,MAAM,CAAC,CAAD,CAAN,GAAYA,MAAM,CAAC,CAAD,CAAtB,CAAhD,CAAd;AACAuB,IAAAA,IAAI,GAAGd,IAAI,CAACC,GAAL,CAASD,IAAI,CAACiB,IAAL,CAAUD,KAAV,CAAT,EAA2B,EAA3B,CAAP;AACD,GAND,MAMO,IAAI,CAACJ,KAAD,IAAU,CAACC,MAAf,EAAuB;AAE5B,QAAMG,MAAK,YAAG,CAAH,EAAQF,IAAR,CAAX;;AACAF,IAAAA,KAAK,GAAGZ,IAAI,CAACkB,KAAL,CAAWlB,IAAI,CAACmB,GAAL,CAAS5B,MAAM,CAAC,CAAD,CAAN,GAAYA,MAAM,CAAC,CAAD,CAA3B,IAAkCyB,MAA7C,CAAR;AACAH,IAAAA,MAAM,GAAGb,IAAI,CAACkB,KAAL,CAAWlB,IAAI,CAACmB,GAAL,CAAS5B,MAAM,CAAC,CAAD,CAAN,GAAYA,MAAM,CAAC,CAAD,CAA3B,IAAkCyB,MAA7C,CAAT;AACA,QAAMI,OAAO,GAAGf,iBAAiB,GAAGG,MAAM,GAAG,CAA7C;;AACA,QAAII,KAAK,GAAGQ,OAAR,IAAmBP,MAAM,GAAGO,OAAhC,EAAyC;AACvC,UAAMC,CAAC,GAAGD,OAAO,GAAGpB,IAAI,CAACE,GAAL,CAASU,KAAT,EAAgBC,MAAhB,CAApB;AACAD,MAAAA,KAAK,GAAGZ,IAAI,CAACkB,KAAL,CAAWN,KAAK,GAAGS,CAAnB,CAAR;AACAR,MAAAA,MAAM,GAAGb,IAAI,CAACkB,KAAL,CAAWL,MAAM,GAAGQ,CAApB,CAAT;AACAP,MAAAA,IAAI,IAAId,IAAI,CAACiB,IAAL,CAAUI,CAAV,CAAR;AACD;AACF;;AAID,SAAOZ,YAAY,GACf,IAAIa,yBAAJ,CAAwB;AACtBC,IAAAA,CAAC,EAAEf,MADmB;AAEtBgB,IAAAA,CAAC,EAAEhB,MAFmB;AAGtBI,IAAAA,KAAK,EAALA,KAHsB;AAItBC,IAAAA,MAAM,EAANA,MAJsB;AAKtBY,IAAAA,SAAS,EAAEf,WAAW,CAAC,CAAD,CALA;AAMtBgB,IAAAA,QAAQ,EAAEhB,WAAW,CAAC,CAAD,CANC;AAOtBI,IAAAA,IAAI,EAAJA,IAPsB;AAQtBa,IAAAA,YAAY,EAAE;AARQ,GAAxB,CADe,GAWf,IAAIC,0BAAJ,CAAyB;AACvBL,IAAAA,CAAC,EAAEf,MADoB;AAEvBgB,IAAAA,CAAC,EAAEhB,MAFoB;AAGvBI,IAAAA,KAAK,EAALA,KAHuB;AAIvBC,IAAAA,MAAM,EAANA,MAJuB;AAKvBgB,IAAAA,MAAM,EAAEnB,WALe;AAMvBI,IAAAA,IAAI,EAAJA,IANuB;AAOvBgB,IAAAA,KAAK,EAAE;AAPgB,GAAzB,CAXJ;AAoBD;;AAGM,SAASC,iBAAT,CAA2BzC,QAA3B,EAA+C0C,MAA/C,EAAkF;AAEvF,MAAIC,mBAAJ;;AACA,MAAID,MAAM,IAAIA,MAAM,CAACE,MAAP,KAAkB,CAAhC,EAAmC;AACjC,+CAAqBF,MAArB;AAAA,QAAOG,IAAP;AAAA,QAAaC,IAAb;;AACA,QAAMC,OAAO,GAAG/C,QAAQ,CAACK,SAAT,CAAmB;AAAC2C,MAAAA,CAAC,EAAEH;AAAJ,KAAnB,CAAhB;AACA,QAAMI,OAAO,GAAGjD,QAAQ,CAACK,SAAT,CAAmB;AAAC2C,MAAAA,CAAC,EAAEF;AAAJ,KAAnB,CAAhB;AACAH,IAAAA,mBAAmB,GAAG,CACpBjC,IAAI,CAACC,GAAL,CAASoC,OAAO,CAAC,CAAD,CAAhB,EAAqBE,OAAO,CAAC,CAAD,CAA5B,CADoB,EAEpBvC,IAAI,CAACC,GAAL,CAASoC,OAAO,CAAC,CAAD,CAAhB,EAAqBE,OAAO,CAAC,CAAD,CAA5B,CAFoB,EAGpBvC,IAAI,CAACE,GAAL,CAASmC,OAAO,CAAC,CAAD,CAAhB,EAAqBE,OAAO,CAAC,CAAD,CAA5B,CAHoB,EAIpBvC,IAAI,CAACE,GAAL,CAASmC,OAAO,CAAC,CAAD,CAAhB,EAAqBE,OAAO,CAAC,CAAD,CAA5B,CAJoB,CAAtB;AAMD,GAVD,MAUO;AACLN,IAAAA,mBAAmB,GAAG3C,QAAQ,CAACK,SAAT,EAAtB;AACD;;AAGD,MAAM6C,wBAAwB,GAAGlD,QAAQ,CAACO,eAAT,CAAyBoC,mBAAmB,CAACQ,KAApB,CAA0B,CAA1B,EAA6B,CAA7B,CAAzB,CAAjC;AACA,MAAMC,sBAAsB,GAAGpD,QAAQ,CAACO,eAAT,CAAyBoC,mBAAmB,CAACQ,KAApB,CAA0B,CAA1B,EAA6B,CAA7B,CAAzB,CAA/B;AACA,SAAO,CACLD,wBAAwB,CAAC,CAAD,CADnB,EAELA,wBAAwB,CAAC,CAAD,CAFnB,EAGLE,sBAAsB,CAAC,CAAD,CAHjB,EAILA,sBAAsB,CAAC,CAAD,CAJjB,CAAP;AAMD;;AAMM,SAASC,eAAT,CACLjD,WADK,EAELJ,QAFK,EAGL0C,MAHK,EAIG;AACR,MAAI,CAACtC,WAAL,EAAkB;AAChB,WAAO,CAAC,CAAD,EAAI,CAAJ,EAAO,CAAP,EAAU,CAAV,CAAP;AACD;;AAED,MAAMkD,cAAc,GAAGb,iBAAiB,CAACzC,QAAD,EAAW0C,MAAX,CAAxC;AAGA,MAAMa,YAAY,GAAGC,YAAY,CAACF,cAAD,CAAjC;;AAIA,MACElD,WAAW,CAAC,CAAD,CAAX,GAAiBA,WAAW,CAAC,CAAD,CAA5B,IAAmCmD,YAAY,CAAC,CAAD,CAAZ,GAAkBA,YAAY,CAAC,CAAD,CAAjE,IACAnD,WAAW,CAAC,CAAD,CAAX,GAAiBA,WAAW,CAAC,CAAD,CAA5B,IAAmCmD,YAAY,CAAC,CAAD,CAAZ,GAAkBA,YAAY,CAAC,CAAD,CAFnE,EAGE;AACA,WAAOnD,WAAP;AACD;;AAQD,SAAO,CACLM,IAAI,CAACE,GAAL,CAASR,WAAW,CAAC,CAAD,CAApB,EAAyBmD,YAAY,CAAC,CAAD,CAArC,CADK,EAEL7C,IAAI,CAACE,GAAL,CAASR,WAAW,CAAC,CAAD,CAApB,EAAyBmD,YAAY,CAAC,CAAD,CAArC,CAFK,EAGL7C,IAAI,CAACC,GAAL,CAASP,WAAW,CAAC,CAAD,CAApB,EAAyBmD,YAAY,CAAC,CAAD,CAArC,CAHK,EAIL7C,IAAI,CAACC,GAAL,CAASP,WAAW,CAAC,CAAD,CAApB,EAAyBmD,YAAY,CAAC,CAAD,CAArC,CAJK,CAAP;AAMD;;AAED,SAASC,YAAT,CAAsBvD,MAAtB,EAA8C;AAC5C,MAAMwD,EAAE,GAAGxD,MAAM,CAAC,CAAD,CAAN,GAAYA,MAAM,CAAC,CAAD,CAA7B;AACA,MAAMyD,EAAE,GAAGzD,MAAM,CAAC,CAAD,CAAN,GAAYA,MAAM,CAAC,CAAD,CAA7B;AACA,MAAM0D,OAAO,GAAG,CAAC1D,MAAM,CAAC,CAAD,CAAN,GAAYA,MAAM,CAAC,CAAD,CAAnB,IAA0B,CAA1C;AACA,MAAM2D,OAAO,GAAG,CAAC3D,MAAM,CAAC,CAAD,CAAN,GAAYA,MAAM,CAAC,CAAD,CAAnB,IAA0B,CAA1C;AACA,SAAO,CAAC0D,OAAO,GAAGF,EAAX,EAAeG,OAAO,GAAGF,EAAzB,EAA6BC,OAAO,GAAGF,EAAvC,EAA2CG,OAAO,GAAGF,EAArD,CAAP;AACD","sourcesContent":["import {WebMercatorViewport, OrthographicViewport} from '@deck.gl/core';\nimport type {Layer, Viewport} from '@deck.gl/core';\n\n/** Bounds in CARTESIAN coordinates */\nexport type Bounds = [minX: number, minY: number, maxX: number, maxY: number];\n\n/*\n * Compute the union of bounds from multiple layers\n * Returns bounds in CARTESIAN coordinates\n */\nexport function joinLayerBounds(\n  /** The layers to combine */\n  layers: Layer[],\n  /** A Viewport instance that is used to determine the type of the view */\n  viewport: Viewport\n): Bounds | null {\n  // Join the bounds of layer data\n  const bounds: Bounds = [Infinity, Infinity, -Infinity, -Infinity];\n  for (const layer of layers) {\n    const layerBounds = layer.getBounds();\n    if (layerBounds) {\n      const bottomLeftCommon = layer.projectPosition(layerBounds[0], {viewport, autoOffset: false});\n      const topRightCommon = layer.projectPosition(layerBounds[1], {viewport, autoOffset: false});\n\n      bounds[0] = Math.min(bounds[0], bottomLeftCommon[0]);\n      bounds[1] = Math.min(bounds[1], bottomLeftCommon[1]);\n      bounds[2] = Math.max(bounds[2], topRightCommon[0]);\n      bounds[3] = Math.max(bounds[3], topRightCommon[1]);\n    }\n  }\n\n  if (Number.isFinite(bounds[0])) {\n    return bounds;\n  }\n  return null;\n}\n\nconst MAX_VIEWPORT_SIZE = 2048;\n\n/** Construct a viewport that just covers the target bounds. Used for rendering to common space indexed texture. */\nexport function makeViewport(opts: {\n  /** The cartesian bounds of layers that will render into this texture */\n  bounds: Bounds;\n  /** Target width. If not specified, will be deduced from zoom */\n  width?: number;\n  /** Target height. If not specified, will be deduced from zoom */\n  height?: number;\n  /** Target zoom. If not specified, will be deduced from width and height */\n  zoom?: number;\n  /** Border around the viewport in pixels */\n  border?: number;\n  /** A viewport used to determine the output type */\n  viewport: Viewport;\n}): Viewport | null {\n  const {bounds, viewport, border = 0} = opts;\n  const {isGeospatial} = viewport;\n\n  if (bounds[2] <= bounds[0] || bounds[3] <= bounds[1]) {\n    return null;\n  }\n\n  const centerWorld = viewport.unprojectPosition([\n    (bounds[0] + bounds[2]) / 2,\n    (bounds[1] + bounds[3]) / 2,\n    0\n  ]);\n\n  let {width, height, zoom} = opts;\n  if (zoom === undefined) {\n    // Use width and height to determine zoom\n    width = width! - border * 2;\n    height = height! - border * 2;\n    const scale = Math.min(width / (bounds[2] - bounds[0]), height / (bounds[3] - bounds[1]));\n    zoom = Math.min(Math.log2(scale), 20);\n  } else if (!width || !height) {\n    // Use zoom to determine width and height\n    const scale = 2 ** zoom;\n    width = Math.round(Math.abs(bounds[2] - bounds[0]) * scale);\n    height = Math.round(Math.abs(bounds[3] - bounds[1]) * scale);\n    const maxSize = MAX_VIEWPORT_SIZE - border * 2;\n    if (width > maxSize || height > maxSize) {\n      const r = maxSize / Math.max(width, height);\n      width = Math.round(width * r);\n      height = Math.round(height * r);\n      zoom += Math.log2(r);\n    }\n  }\n\n  // TODO - find a more generic way to construct this viewport\n  // Geospatial viewports may not be web-mercator\n  return isGeospatial\n    ? new WebMercatorViewport({\n        x: border,\n        y: border,\n        width,\n        height,\n        longitude: centerWorld[0],\n        latitude: centerWorld[1],\n        zoom,\n        orthographic: true\n      })\n    : new OrthographicViewport({\n        x: border,\n        y: border,\n        width,\n        height,\n        target: centerWorld,\n        zoom,\n        flipY: false\n      });\n}\n\n/** Returns viewport bounds in CARTESIAN coordinates */\nexport function getViewportBounds(viewport: Viewport, zRange?: [number, number]): Bounds {\n  // Viewport bounds in world coordinates\n  let viewportBoundsWorld: Bounds;\n  if (zRange && zRange.length === 2) {\n    const [minZ, maxZ] = zRange;\n    const bounds0 = viewport.getBounds({z: minZ});\n    const bounds1 = viewport.getBounds({z: maxZ});\n    viewportBoundsWorld = [\n      Math.min(bounds0[0], bounds1[0]),\n      Math.min(bounds0[1], bounds1[1]),\n      Math.max(bounds0[2], bounds1[2]),\n      Math.max(bounds0[3], bounds1[3])\n    ];\n  } else {\n    viewportBoundsWorld = viewport.getBounds();\n  }\n\n  // Viewport bounds in cartesian coordinates\n  const viewportBottomLeftCommon = viewport.projectPosition(viewportBoundsWorld.slice(0, 2));\n  const viewportTopRightCommon = viewport.projectPosition(viewportBoundsWorld.slice(2, 4));\n  return [\n    viewportBottomLeftCommon[0],\n    viewportBottomLeftCommon[1],\n    viewportTopRightCommon[0],\n    viewportTopRightCommon[1]\n  ];\n}\n\n/*\n * Determine the common space bounds that best cover the given data for the given viewport\n * Returns bounds in CARTESIAN coordinates\n */\nexport function getRenderBounds(\n  layerBounds: Bounds,\n  viewport: Viewport,\n  zRange?: [number, number]\n): Bounds {\n  if (!layerBounds) {\n    return [0, 0, 1, 1];\n  }\n\n  const viewportBounds = getViewportBounds(viewport, zRange);\n  // Expand viewport bounds by 2X. Heurestically chosen to avoid masking\n  // errors when mask is partially out of view\n  const paddedBounds = doubleBounds(viewportBounds);\n\n  // When bounds of the layers are smaller than the viewport bounds simply use\n  // mask bounds, so as to maximize resolution & avoid rerenders\n  if (\n    layerBounds[2] - layerBounds[0] <= paddedBounds[2] - paddedBounds[0] &&\n    layerBounds[3] - layerBounds[1] <= paddedBounds[3] - paddedBounds[1]\n  ) {\n    return layerBounds;\n  }\n\n  // As viewport shrinks, to avoid pixelation along mask edges\n  // we need to reduce the bounds and only render the visible portion\n  // of the mask.\n  // We pad the viewport bounds to capture the section\n  // of the mask just outside the viewport to correctly maskByInstance.\n  // Intersect mask & padded viewport bounds\n  return [\n    Math.max(layerBounds[0], paddedBounds[0]),\n    Math.max(layerBounds[1], paddedBounds[1]),\n    Math.min(layerBounds[2], paddedBounds[2]),\n    Math.min(layerBounds[3], paddedBounds[3])\n  ];\n}\n\nfunction doubleBounds(bounds: Bounds): Bounds {\n  const dx = bounds[2] - bounds[0];\n  const dy = bounds[3] - bounds[1];\n  const centerX = (bounds[0] + bounds[2]) / 2;\n  const centerY = (bounds[1] + bounds[3]) / 2;\n  return [centerX - dx, centerY - dy, centerX + dx, centerY + dy];\n}\n"],"file":"projection-utils.js"}
+{"version":3,"sources":["../../../src/utils/projection-utils.ts"],"names":["joinLayerBounds","layers","viewport","bounds","Infinity","layer","layerBounds","getBounds","bottomLeftCommon","projectPosition","autoOffset","topRightCommon","Math","min","max","Number","isFinite","MAX_VIEWPORT_SIZE","makeViewport","opts","border","isGeospatial","centerWorld","unprojectPosition","width","height","zoom","undefined","scale","log2","round","abs","maxSize","r","WebMercatorViewport","id","x","y","longitude","latitude","orthographic","OrthographicViewport","target","flipY","getViewportBounds","zRange","viewportBoundsWorld","length","minZ","maxZ","bounds0","z","bounds1","viewportBottomLeftCommon","slice","viewportTopRightCommon","getRenderBounds","viewportBounds","paddedBounds","doubleBounds","dx","dy","centerX","centerY"],"mappings":"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","sourcesContent":["import {WebMercatorViewport, OrthographicViewport} from '@deck.gl/core';\nimport type {Layer, Viewport} from '@deck.gl/core';\n\n/** Bounds in CARTESIAN coordinates */\nexport type Bounds = [minX: number, minY: number, maxX: number, maxY: number];\n\n/*\n * Compute the union of bounds from multiple layers\n * Returns bounds in CARTESIAN coordinates\n */\nexport function joinLayerBounds(\n  /** The layers to combine */\n  layers: Layer[],\n  /** A Viewport instance that is used to determine the type of the view */\n  viewport: Viewport\n): Bounds | null {\n  // Join the bounds of layer data\n  const bounds: Bounds = [Infinity, Infinity, -Infinity, -Infinity];\n  for (const layer of layers) {\n    const layerBounds = layer.getBounds();\n    if (layerBounds) {\n      const bottomLeftCommon = layer.projectPosition(layerBounds[0], {viewport, autoOffset: false});\n      const topRightCommon = layer.projectPosition(layerBounds[1], {viewport, autoOffset: false});\n\n      bounds[0] = Math.min(bounds[0], bottomLeftCommon[0]);\n      bounds[1] = Math.min(bounds[1], bottomLeftCommon[1]);\n      bounds[2] = Math.max(bounds[2], topRightCommon[0]);\n      bounds[3] = Math.max(bounds[3], topRightCommon[1]);\n    }\n  }\n\n  if (Number.isFinite(bounds[0])) {\n    return bounds;\n  }\n  return null;\n}\n\nconst MAX_VIEWPORT_SIZE = 2048;\n\n/** Construct a viewport that just covers the target bounds. Used for rendering to common space indexed texture. */\nexport function makeViewport(opts: {\n  /** The cartesian bounds of layers that will render into this texture */\n  bounds: Bounds;\n  /** Target width. If not specified, will be deduced from zoom */\n  width?: number;\n  /** Target height. If not specified, will be deduced from zoom */\n  height?: number;\n  /** Target zoom. If not specified, will be deduced from width and height */\n  zoom?: number;\n  /** Border around the viewport in pixels */\n  border?: number;\n  /** A viewport used to determine the output type */\n  viewport: Viewport;\n}): Viewport | null {\n  const {bounds, viewport, border = 0} = opts;\n  const {isGeospatial} = viewport;\n\n  if (bounds[2] <= bounds[0] || bounds[3] <= bounds[1]) {\n    return null;\n  }\n\n  const centerWorld = viewport.unprojectPosition([\n    (bounds[0] + bounds[2]) / 2,\n    (bounds[1] + bounds[3]) / 2,\n    0\n  ]);\n\n  let {width, height, zoom} = opts;\n  if (zoom === undefined) {\n    // Use width and height to determine zoom\n    width = width! - border * 2;\n    height = height! - border * 2;\n    const scale = Math.min(width / (bounds[2] - bounds[0]), height / (bounds[3] - bounds[1]));\n    zoom = Math.min(Math.log2(scale), 20);\n  } else if (!width || !height) {\n    // Use zoom to determine width and height\n    const scale = 2 ** zoom;\n    width = Math.round(Math.abs(bounds[2] - bounds[0]) * scale);\n    height = Math.round(Math.abs(bounds[3] - bounds[1]) * scale);\n    const maxSize = MAX_VIEWPORT_SIZE - border * 2;\n    if (width > maxSize || height > maxSize) {\n      const r = maxSize / Math.max(width, height);\n      width = Math.round(width * r);\n      height = Math.round(height * r);\n      zoom += Math.log2(r);\n    }\n  }\n\n  // TODO - find a more generic way to construct this viewport\n  // Geospatial viewports may not be web-mercator\n  return isGeospatial\n    ? new WebMercatorViewport({\n        id: viewport.id,\n        x: border,\n        y: border,\n        width,\n        height,\n        longitude: centerWorld[0],\n        latitude: centerWorld[1],\n        zoom,\n        orthographic: true\n      })\n    : new OrthographicViewport({\n        id: viewport.id,\n        x: border,\n        y: border,\n        width,\n        height,\n        target: centerWorld,\n        zoom,\n        flipY: false\n      });\n}\n\n/** Returns viewport bounds in CARTESIAN coordinates */\nexport function getViewportBounds(viewport: Viewport, zRange?: [number, number]): Bounds {\n  // Viewport bounds in world coordinates\n  let viewportBoundsWorld: Bounds;\n  if (zRange && zRange.length === 2) {\n    const [minZ, maxZ] = zRange;\n    const bounds0 = viewport.getBounds({z: minZ});\n    const bounds1 = viewport.getBounds({z: maxZ});\n    viewportBoundsWorld = [\n      Math.min(bounds0[0], bounds1[0]),\n      Math.min(bounds0[1], bounds1[1]),\n      Math.max(bounds0[2], bounds1[2]),\n      Math.max(bounds0[3], bounds1[3])\n    ];\n  } else {\n    viewportBoundsWorld = viewport.getBounds();\n  }\n\n  // Viewport bounds in cartesian coordinates\n  const viewportBottomLeftCommon = viewport.projectPosition(viewportBoundsWorld.slice(0, 2));\n  const viewportTopRightCommon = viewport.projectPosition(viewportBoundsWorld.slice(2, 4));\n  return [\n    viewportBottomLeftCommon[0],\n    viewportBottomLeftCommon[1],\n    viewportTopRightCommon[0],\n    viewportTopRightCommon[1]\n  ];\n}\n\n/*\n * Determine the common space bounds that best cover the given data for the given viewport\n * Returns bounds in CARTESIAN coordinates\n */\nexport function getRenderBounds(\n  layerBounds: Bounds,\n  viewport: Viewport,\n  zRange?: [number, number]\n): Bounds {\n  if (!layerBounds) {\n    return [0, 0, 1, 1];\n  }\n\n  const viewportBounds = getViewportBounds(viewport, zRange);\n  // Expand viewport bounds by 2X. Heurestically chosen to avoid masking\n  // errors when mask is partially out of view\n  const paddedBounds = doubleBounds(viewportBounds);\n\n  // When bounds of the layers are smaller than the viewport bounds simply use\n  // mask bounds, so as to maximize resolution & avoid rerenders\n  if (\n    layerBounds[2] - layerBounds[0] <= paddedBounds[2] - paddedBounds[0] &&\n    layerBounds[3] - layerBounds[1] <= paddedBounds[3] - paddedBounds[1]\n  ) {\n    return layerBounds;\n  }\n\n  // As viewport shrinks, to avoid pixelation along mask edges\n  // we need to reduce the bounds and only render the visible portion\n  // of the mask.\n  // We pad the viewport bounds to capture the section\n  // of the mask just outside the viewport to correctly maskByInstance.\n  // Intersect mask & padded viewport bounds\n  return [\n    Math.max(layerBounds[0], paddedBounds[0]),\n    Math.max(layerBounds[1], paddedBounds[1]),\n    Math.min(layerBounds[2], paddedBounds[2]),\n    Math.min(layerBounds[3], paddedBounds[3])\n  ];\n}\n\nfunction doubleBounds(bounds: Bounds): Bounds {\n  const dx = bounds[2] - bounds[0];\n  const dy = bounds[3] - bounds[1];\n  const centerX = (bounds[0] + bounds[2]) / 2;\n  const centerY = (bounds[1] + bounds[3]) / 2;\n  return [centerX - dx, centerY - dy, centerX + dx, centerY + dy];\n}\n"],"file":"projection-utils.js"}

package/dist/esm/terrain/height-map-builder.js

@@ -63,6 +63,12 @@ export class HeightMapBuilder {
       this.renderViewport = null;
     } else if (layersChanged || viewportChanged) {
       const bounds = getRenderBounds(this.layersBoundsCommon, viewport);
+
+      if (bounds[2] <= bounds[0] || bounds[3] <= bounds[1]) {
+        this.renderViewport = null;
+        return false;
+      }
+
       this.bounds = bounds;
       this.lastViewport = viewport;
       const scale = viewport.scale;

package/dist/esm/terrain/height-map-builder.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../src/terrain/height-map-builder.ts"],"names":["Framebuffer","joinLayerBounds","getRenderBounds","makeViewport","createRenderTarget","MAP_MAX_SIZE","HeightMapBuilder","isSupported","gl","colorBufferFloat","constructor","getRenderFramebuffer","renderViewport","fbo","id","float","shouldUpdate","layers","viewport","layersChanged","length","some","layer","i","props","transitions","getBounds","layersBounds","map","layersBoundsCommon","viewportChanged","lastViewport","equals","bounds","scale","pixelWidth","pixelHeight","center","zoom","width","Math","min","height","delete","color"],"mappings":"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","sourcesContent":["import {Framebuffer} from '@luma.gl/core';\nimport {joinLayerBounds, getRenderBounds, makeViewport, Bounds} from '../utils/projection-utils';\nimport {createRenderTarget} from './utils';\n\nimport type {Viewport, Layer} from '@deck.gl/core';\n\nconst MAP_MAX_SIZE = 2048;\n\n/**\n * Manages the lifecycle of the height map (a framebuffer that encodes elevation).\n * One instance of height map is is shared across all layers. It is updated when the viewport changes\n * or when some terrain source layer's data changes.\n * During the draw call of any terrainDrawMode:offset layers,\n * the vertex shader reads from this framebuffer to retrieve its z offset.\n */\nexport class HeightMapBuilder {\n  /** Viewport used to draw into the texture */\n  renderViewport: Viewport | null = null;\n  /** Bounds of the height map texture, in cartesian space */\n  bounds: Bounds | null = null;\n\n  protected fbo?: Framebuffer;\n  protected gl: WebGLRenderingContext;\n  /** Last rendered layers */\n  private layers: Layer[] = [];\n  /** Last layer.getBounds() */\n  private layersBounds: ([number[], number[]] | null)[] = [];\n  /** The union of layersBounds in cartesian space */\n  private layersBoundsCommon: Bounds | null = null;\n  private lastViewport: Viewport | null = null;\n\n  static isSupported(gl: WebGLRenderingContext): boolean {\n    return Framebuffer.isSupported(gl, {colorBufferFloat: true});\n  }\n\n  constructor(gl: WebGLRenderingContext) {\n    this.gl = gl;\n  }\n\n  /** Returns the height map framebuffer for read/write access.\n   * Returns null when the texture is invalid.\n   */\n  getRenderFramebuffer(): Framebuffer | null {\n    if (!this.renderViewport) {\n      return null;\n    }\n    if (!this.fbo) {\n      this.fbo = createRenderTarget(this.gl, {id: 'height-map', float: true});\n    }\n    return this.fbo;\n  }\n\n  /** Called every render cycle to check if the framebuffer needs update */\n  shouldUpdate({layers, viewport}: {layers: Layer[]; viewport: Viewport}): boolean {\n    const layersChanged =\n      layers.length !== this.layers.length ||\n      layers.some(\n        (layer, i) =>\n          // Layer instance is updated\n          // Layer props might have changed\n          // Undetermined props could have an effect on the output geometry of a terrain source,\n          // for example getElevation+updateTriggers, elevationScale, modelMatrix\n          layer !== this.layers[i] ||\n          // Some prop is in transition\n          layer.props.transitions ||\n          // Layer's geometry bounds have changed\n          layer.getBounds() !== this.layersBounds[i]\n      );\n\n    if (layersChanged) {\n      // Recalculate cached bounds\n      this.layers = layers;\n      this.layersBounds = layers.map(layer => layer.getBounds());\n      this.layersBoundsCommon = joinLayerBounds(layers, viewport);\n    }\n\n    const viewportChanged = !this.lastViewport || !viewport.equals(this.lastViewport);\n\n    if (!this.layersBoundsCommon) {\n      this.renderViewport = null;\n    } else if (layersChanged || viewportChanged) {\n      const bounds = getRenderBounds(this.layersBoundsCommon, viewport);\n      this.bounds = bounds;\n      this.lastViewport = viewport;\n\n      const scale = viewport.scale;\n      const pixelWidth = (bounds[2] - bounds[0]) * scale;\n      const pixelHeight = (bounds[3] - bounds[1]) * scale;\n\n      this.renderViewport =\n        pixelWidth > 0 || pixelHeight > 0\n          ? makeViewport({\n              // It's not important whether the geometry is visible in this viewport, because\n              // vertices will not use the standard project_to_clipspace in the DRAW_TO_HEIGHT_MAP shader\n              // However the viewport must have the same center and zoom as the screen viewport\n              // So that projection uniforms used for calculating z are the same\n              bounds: [\n                viewport.center[0] - 1,\n                viewport.center[1] - 1,\n                viewport.center[0] + 1,\n                viewport.center[1] + 1\n              ],\n              zoom: viewport.zoom,\n              width: Math.min(pixelWidth, MAP_MAX_SIZE),\n              height: Math.min(pixelHeight, MAP_MAX_SIZE),\n              viewport\n            })\n          : null;\n      return true;\n    }\n    return false;\n  }\n\n  delete() {\n    if (this.fbo) {\n      this.fbo.color.delete();\n      this.fbo.delete();\n    }\n  }\n}\n"],"file":"height-map-builder.js"}
+{"version":3,"sources":["../../../src/terrain/height-map-builder.ts"],"names":["Framebuffer","joinLayerBounds","getRenderBounds","makeViewport","createRenderTarget","MAP_MAX_SIZE","HeightMapBuilder","isSupported","gl","colorBufferFloat","constructor","getRenderFramebuffer","renderViewport","fbo","id","float","shouldUpdate","layers","viewport","layersChanged","length","some","layer","i","props","transitions","getBounds","layersBounds","map","layersBoundsCommon","viewportChanged","lastViewport","equals","bounds","scale","pixelWidth","pixelHeight","center","zoom","width","Math","min","height","delete","color"],"mappings":";AAAA,SAAQA,WAAR,QAA0B,eAA1B;AACA,SAAQC,eAAR,EAAyBC,eAAzB,EAA0CC,YAA1C,QAAqE,2BAArE;AACA,SAAQC,kBAAR,QAAiC,SAAjC;AAIA,MAAMC,YAAY,GAAG,IAArB;AASA,OAAO,MAAMC,gBAAN,CAAuB;AAgBV,SAAXC,WAAW,CAACC,EAAD,EAAqC;AACrD,WAAOR,WAAW,CAACO,WAAZ,CAAwBC,EAAxB,EAA4B;AAACC,MAAAA,gBAAgB,EAAE;AAAnB,KAA5B,CAAP;AACD;;AAEDC,EAAAA,WAAW,CAACF,EAAD,EAA4B;AAAA,4CAlBL,IAkBK;;AAAA,oCAhBf,IAgBe;;AAAA;;AAAA;;AAAA,oCAXb,EAWa;;AAAA,0CATiB,EASjB;;AAAA,gDAPK,IAOL;;AAAA,0CANC,IAMD;;AACrC,SAAKA,EAAL,GAAUA,EAAV;AACD;;AAKDG,EAAAA,oBAAoB,GAAuB;AACzC,QAAI,CAAC,KAAKC,cAAV,EAA0B;AACxB,aAAO,IAAP;AACD;;AACD,QAAI,CAAC,KAAKC,GAAV,EAAe;AACb,WAAKA,GAAL,GAAWT,kBAAkB,CAAC,KAAKI,EAAN,EAAU;AAACM,QAAAA,EAAE,EAAE,YAAL;AAAmBC,QAAAA,KAAK,EAAE;AAA1B,OAAV,CAA7B;AACD;;AACD,WAAO,KAAKF,GAAZ;AACD;;AAGDG,EAAAA,YAAY,CAAC;AAACC,IAAAA,MAAD;AAASC,IAAAA;AAAT,GAAD,EAAqE;AAC/E,UAAMC,aAAa,GACjBF,MAAM,CAACG,MAAP,KAAkB,KAAKH,MAAL,CAAYG,MAA9B,IACAH,MAAM,CAACI,IAAP,CACE,CAACC,KAAD,EAAQC,CAAR,KAKED,KAAK,KAAK,KAAKL,MAAL,CAAYM,CAAZ,CAAV,IAEAD,KAAK,CAACE,KAAN,CAAYC,WAFZ,IAIAH,KAAK,CAACI,SAAN,OAAsB,KAAKC,YAAL,CAAkBJ,CAAlB,CAV1B,CAFF;;AAeA,QAAIJ,aAAJ,EAAmB;AAEjB,WAAKF,MAAL,GAAcA,MAAd;AACA,WAAKU,YAAL,GAAoBV,MAAM,CAACW,GAAP,CAAWN,KAAK,IAAIA,KAAK,CAACI,SAAN,EAApB,CAApB;AACA,WAAKG,kBAAL,GAA0B5B,eAAe,CAACgB,MAAD,EAASC,QAAT,CAAzC;AACD;;AAED,UAAMY,eAAe,GAAG,CAAC,KAAKC,YAAN,IAAsB,CAACb,QAAQ,CAACc,MAAT,CAAgB,KAAKD,YAArB,CAA/C;;AAEA,QAAI,CAAC,KAAKF,kBAAV,EAA8B;AAC5B,WAAKjB,cAAL,GAAsB,IAAtB;AACD,KAFD,MAEO,IAAIO,aAAa,IAAIW,eAArB,EAAsC;AAC3C,YAAMG,MAAM,GAAG/B,eAAe,CAAC,KAAK2B,kBAAN,EAA0BX,QAA1B,CAA9B;;AACA,UAAIe,MAAM,CAAC,CAAD,CAAN,IAAaA,MAAM,CAAC,CAAD,CAAnB,IAA0BA,MAAM,CAAC,CAAD,CAAN,IAAaA,MAAM,CAAC,CAAD,CAAjD,EAAsD;AACpD,aAAKrB,cAAL,GAAsB,IAAtB;AACA,eAAO,KAAP;AACD;;AAED,WAAKqB,MAAL,GAAcA,MAAd;AACA,WAAKF,YAAL,GAAoBb,QAApB;AAEA,YAAMgB,KAAK,GAAGhB,QAAQ,CAACgB,KAAvB;AACA,YAAMC,UAAU,GAAG,CAACF,MAAM,CAAC,CAAD,CAAN,GAAYA,MAAM,CAAC,CAAD,CAAnB,IAA0BC,KAA7C;AACA,YAAME,WAAW,GAAG,CAACH,MAAM,CAAC,CAAD,CAAN,GAAYA,MAAM,CAAC,CAAD,CAAnB,IAA0BC,KAA9C;AAEA,WAAKtB,cAAL,GACEuB,UAAU,GAAG,CAAb,IAAkBC,WAAW,GAAG,CAAhC,GACIjC,YAAY,CAAC;AAKX8B,QAAAA,MAAM,EAAE,CACNf,QAAQ,CAACmB,MAAT,CAAgB,CAAhB,IAAqB,CADf,EAENnB,QAAQ,CAACmB,MAAT,CAAgB,CAAhB,IAAqB,CAFf,EAGNnB,QAAQ,CAACmB,MAAT,CAAgB,CAAhB,IAAqB,CAHf,EAINnB,QAAQ,CAACmB,MAAT,CAAgB,CAAhB,IAAqB,CAJf,CALG;AAWXC,QAAAA,IAAI,EAAEpB,QAAQ,CAACoB,IAXJ;AAYXC,QAAAA,KAAK,EAAEC,IAAI,CAACC,GAAL,CAASN,UAAT,EAAqB9B,YAArB,CAZI;AAaXqC,QAAAA,MAAM,EAAEF,IAAI,CAACC,GAAL,CAASL,WAAT,EAAsB/B,YAAtB,CAbG;AAcXa,QAAAA;AAdW,OAAD,CADhB,GAiBI,IAlBN;AAmBA,aAAO,IAAP;AACD;;AACD,WAAO,KAAP;AACD;;AAEDyB,EAAAA,MAAM,GAAG;AACP,QAAI,KAAK9B,GAAT,EAAc;AACZ,WAAKA,GAAL,CAAS+B,KAAT,CAAeD,MAAf;AACA,WAAK9B,GAAL,CAAS8B,MAAT;AACD;AACF;;AA5G2B","sourcesContent":["import {Framebuffer} from '@luma.gl/core';\nimport {joinLayerBounds, getRenderBounds, makeViewport, Bounds} from '../utils/projection-utils';\nimport {createRenderTarget} from './utils';\n\nimport type {Viewport, Layer} from '@deck.gl/core';\n\nconst MAP_MAX_SIZE = 2048;\n\n/**\n * Manages the lifecycle of the height map (a framebuffer that encodes elevation).\n * One instance of height map is is shared across all layers. It is updated when the viewport changes\n * or when some terrain source layer's data changes.\n * During the draw call of any terrainDrawMode:offset layers,\n * the vertex shader reads from this framebuffer to retrieve its z offset.\n */\nexport class HeightMapBuilder {\n  /** Viewport used to draw into the texture */\n  renderViewport: Viewport | null = null;\n  /** Bounds of the height map texture, in cartesian space */\n  bounds: Bounds | null = null;\n\n  protected fbo?: Framebuffer;\n  protected gl: WebGLRenderingContext;\n  /** Last rendered layers */\n  private layers: Layer[] = [];\n  /** Last layer.getBounds() */\n  private layersBounds: ([number[], number[]] | null)[] = [];\n  /** The union of layersBounds in cartesian space */\n  private layersBoundsCommon: Bounds | null = null;\n  private lastViewport: Viewport | null = null;\n\n  static isSupported(gl: WebGLRenderingContext): boolean {\n    return Framebuffer.isSupported(gl, {colorBufferFloat: true});\n  }\n\n  constructor(gl: WebGLRenderingContext) {\n    this.gl = gl;\n  }\n\n  /** Returns the height map framebuffer for read/write access.\n   * Returns null when the texture is invalid.\n   */\n  getRenderFramebuffer(): Framebuffer | null {\n    if (!this.renderViewport) {\n      return null;\n    }\n    if (!this.fbo) {\n      this.fbo = createRenderTarget(this.gl, {id: 'height-map', float: true});\n    }\n    return this.fbo;\n  }\n\n  /** Called every render cycle to check if the framebuffer needs update */\n  shouldUpdate({layers, viewport}: {layers: Layer[]; viewport: Viewport}): boolean {\n    const layersChanged =\n      layers.length !== this.layers.length ||\n      layers.some(\n        (layer, i) =>\n          // Layer instance is updated\n          // Layer props might have changed\n          // Undetermined props could have an effect on the output geometry of a terrain source,\n          // for example getElevation+updateTriggers, elevationScale, modelMatrix\n          layer !== this.layers[i] ||\n          // Some prop is in transition\n          layer.props.transitions ||\n          // Layer's geometry bounds have changed\n          layer.getBounds() !== this.layersBounds[i]\n      );\n\n    if (layersChanged) {\n      // Recalculate cached bounds\n      this.layers = layers;\n      this.layersBounds = layers.map(layer => layer.getBounds());\n      this.layersBoundsCommon = joinLayerBounds(layers, viewport);\n    }\n\n    const viewportChanged = !this.lastViewport || !viewport.equals(this.lastViewport);\n\n    if (!this.layersBoundsCommon) {\n      this.renderViewport = null;\n    } else if (layersChanged || viewportChanged) {\n      const bounds = getRenderBounds(this.layersBoundsCommon, viewport);\n      if (bounds[2] <= bounds[0] || bounds[3] <= bounds[1]) {\n        this.renderViewport = null;\n        return false;\n      }\n\n      this.bounds = bounds;\n      this.lastViewport = viewport;\n\n      const scale = viewport.scale;\n      const pixelWidth = (bounds[2] - bounds[0]) * scale;\n      const pixelHeight = (bounds[3] - bounds[1]) * scale;\n\n      this.renderViewport =\n        pixelWidth > 0 || pixelHeight > 0\n          ? makeViewport({\n              // It's not important whether the geometry is visible in this viewport, because\n              // vertices will not use the standard project_to_clipspace in the DRAW_TO_HEIGHT_MAP shader\n              // However the viewport must have the same center and zoom as the screen viewport\n              // So that projection uniforms used for calculating z are the same\n              bounds: [\n                viewport.center[0] - 1,\n                viewport.center[1] - 1,\n                viewport.center[0] + 1,\n                viewport.center[1] + 1\n              ],\n              zoom: viewport.zoom,\n              width: Math.min(pixelWidth, MAP_MAX_SIZE),\n              height: Math.min(pixelHeight, MAP_MAX_SIZE),\n              viewport\n            })\n          : null;\n      return true;\n    }\n    return false;\n  }\n\n  delete() {\n    if (this.fbo) {\n      this.fbo.color.delete();\n      this.fbo.delete();\n    }\n  }\n}\n"],"file":"height-map-builder.js"}

package/dist/esm/terrain/shader-module.js

@@ -14,7 +14,7 @@ export const terrainModule = {
   inject: {
     'vs:#decl': "\nuniform float terrain_mode;\nuniform sampler2D terrain_map;\nuniform vec4 terrain_bounds;\nvarying vec3 commonPos;\n".concat(TERRAIN_MODE_CONSTANTS, "\n    "),
     'vs:#main-start': "\nif (terrain_mode == TERRAIN_MODE_SKIP) {\n  gl_Position = vec4(0.0);\n  return;\n}\n",
-    'vs:DECKGL_FILTER_GL_POSITION': "\ncommonPos = geometry.position.xyz;\nif (terrain_mode == TERRAIN_MODE_WRITE_HEIGHT_MAP) {\n  vec2 texCoords = (commonPos.xy - terrain_bounds.xy) / terrain_bounds.zw;\n  position = vec4(texCoords * 2.0 - 1.0, 0.0, 1.0);\n}\nif (terrain_mode == TERRAIN_MODE_USE_HEIGHT_MAP) {\n  vec3 anchor = geometry.worldPosition;\n  anchor.z = 0.0;\n  vec3 anchorCommon = project_position(anchor);\n  vec2 texCoords = (anchorCommon.xy - terrain_bounds.xy) / terrain_bounds.zw;\n  if (texCoords.x >= 0.0 && texCoords.y >= 0.0 && texCoords.x <= 1.0 && texCoords.y <= 1.0) {\n    float terrainZ = texture2D(terrain_map, texCoords).r;\n    geometry.position.z += terrainZ;\n    position = project_common_position_to_clipspace(geometry.position);\n  }\n}\n    ",
+    'vs:DECKGL_FILTER_GL_POSITION': "\ncommonPos = geometry.position.xyz;\nif (terrain_mode == TERRAIN_MODE_WRITE_HEIGHT_MAP) {\n  vec2 texCoords = (commonPos.xy - terrain_bounds.xy) / terrain_bounds.zw;\n  position = vec4(texCoords * 2.0 - 1.0, 0.0, 1.0);\n  commonPos.z += project_uCommonOrigin.z;\n}\nif (terrain_mode == TERRAIN_MODE_USE_HEIGHT_MAP) {\n  vec3 anchor = geometry.worldPosition;\n  anchor.z = 0.0;\n  vec3 anchorCommon = project_position(anchor);\n  vec2 texCoords = (anchorCommon.xy - terrain_bounds.xy) / terrain_bounds.zw;\n  if (texCoords.x >= 0.0 && texCoords.y >= 0.0 && texCoords.x <= 1.0 && texCoords.y <= 1.0) {\n    float terrainZ = texture2D(terrain_map, texCoords).r;\n    geometry.position.z += terrainZ;\n    position = project_common_position_to_clipspace(geometry.position);\n  }\n}\n    ",
     'fs:#decl': "\nuniform float terrain_mode;\nuniform sampler2D terrain_map;\nuniform vec4 terrain_bounds;\nvarying vec3 commonPos;\n".concat(TERRAIN_MODE_CONSTANTS, "\n    "),
     'fs:#main-start': "\nif (terrain_mode == TERRAIN_MODE_WRITE_HEIGHT_MAP) {\n  gl_FragColor = vec4(commonPos.z, 0.0, 0.0, 1.0);\n  return;\n}\n    ",
     'fs:DECKGL_FILTER_COLOR': "\nif ((terrain_mode == TERRAIN_MODE_USE_COVER) || (terrain_mode == TERRAIN_MODE_USE_COVER_ONLY)) {\n  vec2 texCoords = (commonPos.xy - terrain_bounds.xy) / terrain_bounds.zw;\n  vec4 pixel = texture2D(terrain_map, texCoords);\n  if (terrain_mode == TERRAIN_MODE_USE_COVER_ONLY) {\n    color = pixel;\n  } else {\n    // pixel is premultiplied\n    color = pixel + color * (1.0 - pixel.a);\n  }\n  return;\n}\n    "

package/dist/esm/terrain/shader-module.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../src/terrain/shader-module.ts"],"names":["project","TERRAIN_MODE","NONE","WRITE_HEIGHT_MAP","USE_HEIGHT_MAP","USE_COVER","USE_COVER_ONLY","SKIP","TERRAIN_MODE_CONSTANTS","Object","keys","map","key","join","terrainModule","name","dependencies","inject","getUniforms","opts","uniforms","drawToTerrainHeightMap","heightMap","heightMapBounds","dummyHeightMap","terrainCover","useTerrainHeightMap","terrainSkipRender","project_uCommonOrigin","mode","sampler","bounds","isPicking","pickingActive","getPickingFramebuffer","getRenderFramebuffer","terrain_mode","terrain_map","terrain_bounds"],"mappings":"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","sourcesContent":["/* eslint-disable camelcase */\n\nimport {project} from '@deck.gl/core';\nimport type {_ShaderModule as ShaderModule} from '@deck.gl/core';\n\nimport type {Texture2D} from '@luma.gl/core';\nimport type {Bounds} from '../utils/projection-utils';\nimport type {TerrainCover} from './terrain-cover';\n\n/** Module parameters expected by the terrain shader module */\nexport type TerrainModuleSettings = {\n  pickingActive?: boolean;\n  heightMap: Texture2D | null;\n  heightMapBounds?: Bounds | null;\n  dummyHeightMap: Texture2D;\n  terrainCover?: TerrainCover | null;\n  drawToTerrainHeightMap?: boolean;\n  useTerrainHeightMap?: boolean;\n  terrainSkipRender?: boolean;\n};\n\n/** A model can have one of the following modes */\nexport const TERRAIN_MODE = {\n  NONE: 0,\n  /** A terrain layer rendering encoded ground elevation into the height map */\n  WRITE_HEIGHT_MAP: 1,\n  /** An offset layer reading encoded ground elevation from the height map */\n  USE_HEIGHT_MAP: 2,\n  /** A terrain layer rendering to screen, using the cover fbo overlaid with its own texture */\n  USE_COVER: 3,\n  /** A terrain layer rendering to screen, using the cover fbo as texture */\n  USE_COVER_ONLY: 4,\n  /** Draped layer is rendered into a texture, and never to screen */\n  SKIP: 5\n};\n\nconst TERRAIN_MODE_CONSTANTS = Object.keys(TERRAIN_MODE)\n  .map(key => `const float TERRAIN_MODE_${key} = ${TERRAIN_MODE[key]}.0;`)\n  .join('\\n');\n\nexport const terrainModule = {\n  name: 'terrain',\n  dependencies: [project],\n  inject: {\n    'vs:#decl': `\nuniform float terrain_mode;\nuniform sampler2D terrain_map;\nuniform vec4 terrain_bounds;\nvarying vec3 commonPos;\n${TERRAIN_MODE_CONSTANTS}\n    `,\n    'vs:#main-start': `\nif (terrain_mode == TERRAIN_MODE_SKIP) {\n  gl_Position = vec4(0.0);\n  return;\n}\n`,\n    'vs:DECKGL_FILTER_GL_POSITION': `\ncommonPos = geometry.position.xyz;\nif (terrain_mode == TERRAIN_MODE_WRITE_HEIGHT_MAP) {\n  vec2 texCoords = (commonPos.xy - terrain_bounds.xy) / terrain_bounds.zw;\n  position = vec4(texCoords * 2.0 - 1.0, 0.0, 1.0);\n}\nif (terrain_mode == TERRAIN_MODE_USE_HEIGHT_MAP) {\n  vec3 anchor = geometry.worldPosition;\n  anchor.z = 0.0;\n  vec3 anchorCommon = project_position(anchor);\n  vec2 texCoords = (anchorCommon.xy - terrain_bounds.xy) / terrain_bounds.zw;\n  if (texCoords.x >= 0.0 && texCoords.y >= 0.0 && texCoords.x <= 1.0 && texCoords.y <= 1.0) {\n    float terrainZ = texture2D(terrain_map, texCoords).r;\n    geometry.position.z += terrainZ;\n    position = project_common_position_to_clipspace(geometry.position);\n  }\n}\n    `,\n    'fs:#decl': `\nuniform float terrain_mode;\nuniform sampler2D terrain_map;\nuniform vec4 terrain_bounds;\nvarying vec3 commonPos;\n${TERRAIN_MODE_CONSTANTS}\n    `,\n    'fs:#main-start': `\nif (terrain_mode == TERRAIN_MODE_WRITE_HEIGHT_MAP) {\n  gl_FragColor = vec4(commonPos.z, 0.0, 0.0, 1.0);\n  return;\n}\n    `,\n    'fs:DECKGL_FILTER_COLOR': `\nif ((terrain_mode == TERRAIN_MODE_USE_COVER) || (terrain_mode == TERRAIN_MODE_USE_COVER_ONLY)) {\n  vec2 texCoords = (commonPos.xy - terrain_bounds.xy) / terrain_bounds.zw;\n  vec4 pixel = texture2D(terrain_map, texCoords);\n  if (terrain_mode == TERRAIN_MODE_USE_COVER_ONLY) {\n    color = pixel;\n  } else {\n    // pixel is premultiplied\n    color = pixel + color * (1.0 - pixel.a);\n  }\n  return;\n}\n    `\n  },\n  // eslint-disable-next-line complexity\n  getUniforms: (opts = {}, uniforms) => {\n    if ('dummyHeightMap' in opts) {\n      const {\n        drawToTerrainHeightMap,\n        heightMap,\n        heightMapBounds,\n        dummyHeightMap,\n        terrainCover,\n        useTerrainHeightMap,\n        terrainSkipRender\n      } = opts;\n      const {project_uCommonOrigin} = uniforms;\n\n      let mode: number = terrainSkipRender ? TERRAIN_MODE.SKIP : TERRAIN_MODE.NONE;\n      // height map if case USE_HEIGHT_MAP, terrain cover if USE_COVER, otherwise empty\n      let sampler: Texture2D = dummyHeightMap;\n      // height map bounds if case USE_HEIGHT_MAP, terrain cover bounds if USE_COVER, otherwise null\n      let bounds: number[] | null = null;\n      if (drawToTerrainHeightMap) {\n        mode = TERRAIN_MODE.WRITE_HEIGHT_MAP;\n        bounds = heightMapBounds!;\n      } else if (useTerrainHeightMap && heightMap) {\n        mode = TERRAIN_MODE.USE_HEIGHT_MAP;\n        sampler = heightMap;\n        bounds = heightMapBounds!;\n      } else if (terrainCover) {\n        // This is a terrain layer\n        const isPicking = opts.pickingActive;\n        sampler = isPicking\n          ? terrainCover.getPickingFramebuffer()\n          : terrainCover.getRenderFramebuffer();\n        if (isPicking) {\n          // Never render the layer itself in picking pass\n          mode = TERRAIN_MODE.SKIP;\n        }\n        if (sampler) {\n          mode = mode === TERRAIN_MODE.SKIP ? TERRAIN_MODE.USE_COVER_ONLY : TERRAIN_MODE.USE_COVER;\n          bounds = terrainCover.bounds;\n        } else {\n          sampler = dummyHeightMap;\n        }\n      }\n\n      /* eslint-disable camelcase */\n      return {\n        terrain_mode: mode,\n        terrain_map: sampler,\n        // Convert bounds to the common space, as [minX, minY, width, height]\n        terrain_bounds: bounds\n          ? [\n              bounds[0] - project_uCommonOrigin[0],\n              bounds[1] - project_uCommonOrigin[1],\n              bounds[2] - bounds[0],\n              bounds[3] - bounds[1]\n            ]\n          : [0, 0, 0, 0]\n      };\n    }\n    return null;\n  }\n} as ShaderModule<TerrainModuleSettings>;\n"],"file":"shader-module.js"}
+{"version":3,"sources":["../../../src/terrain/shader-module.ts"],"names":["project","TERRAIN_MODE","NONE","WRITE_HEIGHT_MAP","USE_HEIGHT_MAP","USE_COVER","USE_COVER_ONLY","SKIP","TERRAIN_MODE_CONSTANTS","Object","keys","map","key","join","terrainModule","name","dependencies","inject","getUniforms","opts","uniforms","drawToTerrainHeightMap","heightMap","heightMapBounds","dummyHeightMap","terrainCover","useTerrainHeightMap","terrainSkipRender","project_uCommonOrigin","mode","sampler","bounds","isPicking","pickingActive","getPickingFramebuffer","getRenderFramebuffer","terrain_mode","terrain_map","terrain_bounds"],"mappings":"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","sourcesContent":["/* eslint-disable camelcase */\n\nimport {project} from '@deck.gl/core';\nimport type {_ShaderModule as ShaderModule} from '@deck.gl/core';\n\nimport type {Texture2D} from '@luma.gl/core';\nimport type {Bounds} from '../utils/projection-utils';\nimport type {TerrainCover} from './terrain-cover';\n\n/** Module parameters expected by the terrain shader module */\nexport type TerrainModuleSettings = {\n  pickingActive?: boolean;\n  heightMap: Texture2D | null;\n  heightMapBounds?: Bounds | null;\n  dummyHeightMap: Texture2D;\n  terrainCover?: TerrainCover | null;\n  drawToTerrainHeightMap?: boolean;\n  useTerrainHeightMap?: boolean;\n  terrainSkipRender?: boolean;\n};\n\n/** A model can have one of the following modes */\nexport const TERRAIN_MODE = {\n  NONE: 0,\n  /** A terrain layer rendering encoded ground elevation into the height map */\n  WRITE_HEIGHT_MAP: 1,\n  /** An offset layer reading encoded ground elevation from the height map */\n  USE_HEIGHT_MAP: 2,\n  /** A terrain layer rendering to screen, using the cover fbo overlaid with its own texture */\n  USE_COVER: 3,\n  /** A terrain layer rendering to screen, using the cover fbo as texture */\n  USE_COVER_ONLY: 4,\n  /** Draped layer is rendered into a texture, and never to screen */\n  SKIP: 5\n};\n\nconst TERRAIN_MODE_CONSTANTS = Object.keys(TERRAIN_MODE)\n  .map(key => `const float TERRAIN_MODE_${key} = ${TERRAIN_MODE[key]}.0;`)\n  .join('\\n');\n\nexport const terrainModule = {\n  name: 'terrain',\n  dependencies: [project],\n  inject: {\n    'vs:#decl': `\nuniform float terrain_mode;\nuniform sampler2D terrain_map;\nuniform vec4 terrain_bounds;\nvarying vec3 commonPos;\n${TERRAIN_MODE_CONSTANTS}\n    `,\n    'vs:#main-start': `\nif (terrain_mode == TERRAIN_MODE_SKIP) {\n  gl_Position = vec4(0.0);\n  return;\n}\n`,\n    'vs:DECKGL_FILTER_GL_POSITION': `\ncommonPos = geometry.position.xyz;\nif (terrain_mode == TERRAIN_MODE_WRITE_HEIGHT_MAP) {\n  vec2 texCoords = (commonPos.xy - terrain_bounds.xy) / terrain_bounds.zw;\n  position = vec4(texCoords * 2.0 - 1.0, 0.0, 1.0);\n  commonPos.z += project_uCommonOrigin.z;\n}\nif (terrain_mode == TERRAIN_MODE_USE_HEIGHT_MAP) {\n  vec3 anchor = geometry.worldPosition;\n  anchor.z = 0.0;\n  vec3 anchorCommon = project_position(anchor);\n  vec2 texCoords = (anchorCommon.xy - terrain_bounds.xy) / terrain_bounds.zw;\n  if (texCoords.x >= 0.0 && texCoords.y >= 0.0 && texCoords.x <= 1.0 && texCoords.y <= 1.0) {\n    float terrainZ = texture2D(terrain_map, texCoords).r;\n    geometry.position.z += terrainZ;\n    position = project_common_position_to_clipspace(geometry.position);\n  }\n}\n    `,\n    'fs:#decl': `\nuniform float terrain_mode;\nuniform sampler2D terrain_map;\nuniform vec4 terrain_bounds;\nvarying vec3 commonPos;\n${TERRAIN_MODE_CONSTANTS}\n    `,\n    'fs:#main-start': `\nif (terrain_mode == TERRAIN_MODE_WRITE_HEIGHT_MAP) {\n  gl_FragColor = vec4(commonPos.z, 0.0, 0.0, 1.0);\n  return;\n}\n    `,\n    'fs:DECKGL_FILTER_COLOR': `\nif ((terrain_mode == TERRAIN_MODE_USE_COVER) || (terrain_mode == TERRAIN_MODE_USE_COVER_ONLY)) {\n  vec2 texCoords = (commonPos.xy - terrain_bounds.xy) / terrain_bounds.zw;\n  vec4 pixel = texture2D(terrain_map, texCoords);\n  if (terrain_mode == TERRAIN_MODE_USE_COVER_ONLY) {\n    color = pixel;\n  } else {\n    // pixel is premultiplied\n    color = pixel + color * (1.0 - pixel.a);\n  }\n  return;\n}\n    `\n  },\n  // eslint-disable-next-line complexity\n  getUniforms: (opts = {}, uniforms) => {\n    if ('dummyHeightMap' in opts) {\n      const {\n        drawToTerrainHeightMap,\n        heightMap,\n        heightMapBounds,\n        dummyHeightMap,\n        terrainCover,\n        useTerrainHeightMap,\n        terrainSkipRender\n      } = opts;\n      const {project_uCommonOrigin} = uniforms;\n\n      let mode: number = terrainSkipRender ? TERRAIN_MODE.SKIP : TERRAIN_MODE.NONE;\n      // height map if case USE_HEIGHT_MAP, terrain cover if USE_COVER, otherwise empty\n      let sampler: Texture2D = dummyHeightMap;\n      // height map bounds if case USE_HEIGHT_MAP, terrain cover bounds if USE_COVER, otherwise null\n      let bounds: number[] | null = null;\n      if (drawToTerrainHeightMap) {\n        mode = TERRAIN_MODE.WRITE_HEIGHT_MAP;\n        bounds = heightMapBounds!;\n      } else if (useTerrainHeightMap && heightMap) {\n        mode = TERRAIN_MODE.USE_HEIGHT_MAP;\n        sampler = heightMap;\n        bounds = heightMapBounds!;\n      } else if (terrainCover) {\n        // This is a terrain layer\n        const isPicking = opts.pickingActive;\n        sampler = isPicking\n          ? terrainCover.getPickingFramebuffer()\n          : terrainCover.getRenderFramebuffer();\n        if (isPicking) {\n          // Never render the layer itself in picking pass\n          mode = TERRAIN_MODE.SKIP;\n        }\n        if (sampler) {\n          mode = mode === TERRAIN_MODE.SKIP ? TERRAIN_MODE.USE_COVER_ONLY : TERRAIN_MODE.USE_COVER;\n          bounds = terrainCover.bounds;\n        } else {\n          sampler = dummyHeightMap;\n        }\n      }\n\n      /* eslint-disable camelcase */\n      return {\n        terrain_mode: mode,\n        terrain_map: sampler,\n        // Convert bounds to the common space, as [minX, minY, width, height]\n        terrain_bounds: bounds\n          ? [\n              bounds[0] - project_uCommonOrigin[0],\n              bounds[1] - project_uCommonOrigin[1],\n              bounds[2] - bounds[0],\n              bounds[3] - bounds[1]\n            ]\n          : [0, 0, 0, 0]\n      };\n    }\n    return null;\n  }\n} as ShaderModule<TerrainModuleSettings>;\n"],"file":"shader-module.js"}

package/dist/esm/terrain/terrain-cover.js

@@ -88,7 +88,15 @@ export class TerrainCover {
     const targetLayer = this.targetLayer;
     let shouldRedraw = false;
 
-    if (this.targetBounds !== targetLayer.getBounds()) {
+    if (this.tile && 'boundingBox' in this.tile) {
+      if (!this.targetBounds) {
+        shouldRedraw = true;
+        this.targetBounds = this.tile.boundingBox;
+        const bottomLeftCommon = viewport.projectPosition(this.targetBounds[0]);
+        const topRightCommon = viewport.projectPosition(this.targetBounds[1]);
+        this.targetBoundsCommon = [bottomLeftCommon[0], bottomLeftCommon[1], topRightCommon[0], topRightCommon[1]];
+      }
+    } else if (this.targetBounds !== targetLayer.getBounds()) {
       shouldRedraw = true;
       this.targetBounds = targetLayer.getBounds();
       this.targetBoundsCommon = joinLayerBounds([targetLayer], viewport);
@@ -182,7 +190,7 @@ function getIntersectingLayers(sourceTile, layers) {
     const tile = getTile(layer);
 
     if (tile) {
-      return intersect(sourceTile.bbox, tile.bbox);
+      return intersect(sourceTile.boundingBox, tile.boundingBox);
     }
 
     return true;
@@ -206,12 +214,8 @@ function getTile(layer) {
 }
 
 function intersect(b1, b2) {
-  if ('west' in b1 && 'west' in b2) {
-    return b1.west < b2.east && b2.west < b1.east && b1.south < b2.north && b2.south < b1.north;
-  }
-
-  if ('left' in b1 && 'left' in b2) {
-    return b1.left < b2.right && b2.left < b1.right && b1.top < b2.bottom && b2.top < b1.bottom;
+  if (b1 && b2) {
+    return b1[0][0] < b2[1][0] && b2[0][0] < b1[1][0] && b1[0][1] < b2[1][1] && b2[0][1] < b1[1][1];
   }
 
   return false;