@deck.gl/geo-layers 8.6.3 → 8.7.0-alpha.10

package/package.json

@@ -2,7 +2,7 @@
   "name": "@deck.gl/geo-layers",
   "description": "deck.gl layers supporting geospatial use cases and GIS formats",
   "license": "MIT",
-  "version": "8.6.3",
+  "version": "8.7.0-alpha.10",
   "publishConfig": {
     "access": "public"
   },
@@ -29,18 +29,18 @@
     "prepublishOnly": "npm run build-bundle && npm run build-bundle -- --env.dev"
   },
   "dependencies": {
-    "@loaders.gl/3d-tiles": "^3.0.8",
-    "@loaders.gl/gis": "^3.0.8",
-    "@loaders.gl/loader-utils": "^3.0.8",
-    "@loaders.gl/mvt": "^3.0.8",
-    "@loaders.gl/terrain": "^3.0.8",
-    "@loaders.gl/tiles": "^3.0.8",
+    "@loaders.gl/3d-tiles": "^3.1.3",
+    "@loaders.gl/gis": "^3.1.3",
+    "@loaders.gl/loader-utils": "^3.1.3",
+    "@loaders.gl/mvt": "^3.1.3",
+    "@loaders.gl/terrain": "^3.1.3",
+    "@loaders.gl/tiles": "^3.1.3",
     "@luma.gl/experimental": "^8.5.10",
-    "@math.gl/culling": "^3.5.4",
-    "@math.gl/web-mercator": "^3.5.4",
+    "@math.gl/core": "^3.5.6",
+    "@math.gl/culling": "^3.5.6",
+    "@math.gl/web-mercator": "^3.5.6",
     "h3-js": "^3.6.0",
-    "long": "^3.2.0",
-    "math.gl": "^3.5.4"
+    "long": "^3.2.0"
   },
   "peerDependencies": {
     "@deck.gl/core": "^8.0.0",
@@ -49,5 +49,5 @@
     "@deck.gl/mesh-layers": "^8.0.0",
     "@loaders.gl/core": "^3.0.0"
   },
-  "gitHead": "938ee03697eecbaced24c9df637d53ab42375df1"
+  "gitHead": "b6c48fb68b66755743c28776a0642b56a2df086a"
 }

package/src/h3-layers/h3-hexagon-layer.js

@@ -8,7 +8,7 @@ import {
   edgeLength,
   UNITS
 } from 'h3-js';
-import {lerp} from 'math.gl';
+import {lerp} from '@math.gl/core';
 import {CompositeLayer, createIterable} from '@deck.gl/core';
 import {ColumnLayer, PolygonLayer} from '@deck.gl/layers';
 
@@ -304,6 +304,7 @@ export default class H3HexagonLayer extends CompositeLayer {
       forwardProps,
       this.getSubLayerProps({
         id: 'hexagon-cell',
+        flatShading: true,
         updateTriggers: forwardProps.updateTriggers
       }),
       {

package/src/mesh-layer/mesh-layer-vertex.glsl.js

@@ -26,12 +26,18 @@ out vec3 normals_commonspace;
 out vec4 position_commonspace;
 out vec4 vColor;
 
-void main(void) {
-  // https://github.com/Esri/i3s-spec/blob/master/docs/1.7/geometryUVRegion.cmn.md
-  vec2 uv = fract(texCoords) * (uvRegions.zw - uvRegions.xy) + uvRegions.xy;
+vec2 applyUVRegion(vec2 uv) {
+  #ifdef HAS_UV_REGIONS
+    // https://github.com/Esri/i3s-spec/blob/master/docs/1.7/geometryUVRegion.cmn.md
+    return fract(uv) * (uvRegions.zw - uvRegions.xy) + uvRegions.xy;
+  #else
+    return uv;
+  #endif
+}
 
+void main(void) {
+  vec2 uv = applyUVRegion(texCoords);
   geometry.uv = uv;
-  geometry.uv = texCoords;
 
   if (u_pickFeatureIds) {
     geometry.pickingColor = featureIdsPickingColors;
@@ -39,26 +45,9 @@ void main(void) {
     geometry.pickingColor = instancePickingColors;
   }
 
-  #ifdef MODULE_PBR
-    // set PBR data
-    #ifdef HAS_NORMALS
-      pbr_vNormal = project_normal(instanceModelMatrix * normals);
-      geometry.normal = pbr_vNormal;
-    #endif
-
-    #ifdef HAS_UV
-      pbr_vUV = uv;
-    #else
-      pbr_vUV = vec2(0., 0.);
-    #endif
-    geometry.uv = pbr_vUV;
-  #endif
-
   vTexCoord = uv;
   cameraPosition = project_uCameraPosition;
-  normals_commonspace = project_normal(instanceModelMatrix * normals);
   vColor = vec4(colors * instanceColors.rgb, instanceColors.a);
-  geometry.normal = normals_commonspace;
 
   vec3 pos = (instanceModelMatrix * positions) * sizeScale;
   vec3 projectedPosition = project_position(positions);
@@ -66,13 +55,25 @@ void main(void) {
   gl_Position = project_common_position_to_clipspace(position_commonspace);
 
   geometry.position = position_commonspace;
+  normals_commonspace = project_normal(instanceModelMatrix * normals);
+  geometry.normal = normals_commonspace;
+
+  DECKGL_FILTER_GL_POSITION(gl_Position, geometry);
 
   #ifdef MODULE_PBR
     // set PBR data
     pbr_vPosition = geometry.position.xyz;
-  #endif
+    #ifdef HAS_NORMALS
+      pbr_vNormal = geometry.normal;
+    #endif
 
-  DECKGL_FILTER_GL_POSITION(gl_Position, geometry);
+    #ifdef HAS_UV
+      pbr_vUV = uv;
+    #else
+      pbr_vUV = vec2(0., 0.);
+    #endif
+    geometry.uv = pbr_vUV;
+  #endif
 
   DECKGL_FILTER_COLOR(vColor, geometry);
 }

package/src/mesh-layer/mesh-layer.js

@@ -11,9 +11,6 @@ function validateGeometryAttributes(attributes) {
   if (!hasColorAttribute) {
     attributes.colors = {constant: true, value: new Float32Array([1, 1, 1])};
   }
-  if (!attributes.uvRegions) {
-    attributes.uvRegions = {constant: true, value: new Float32Array([0, 0, 1, 1])};
-  }
 }
 
 const defaultProps = {
@@ -76,7 +73,11 @@ export default class _MeshLayer extends SimpleMeshLayer {
       ...this.getShaders(),
       id,
       geometry: mesh,
-      defines: {...shaders.defines, ...materialParser?.defines},
+      defines: {
+        ...shaders.defines,
+        ...materialParser?.defines,
+        HAS_UV_REGIONS: mesh.attributes.uvRegions
+      },
       parameters: materialParser?.parameters,
       isInstanced: true
     });

package/src/mvt-layer/coordinate-transform.js

@@ -1,4 +1,4 @@
-import {lerp} from 'math.gl';
+import {lerp} from '@math.gl/core';
 
 const availableTransformations = {
   Point,

package/src/mvt-layer/mvt-layer.js

@@ -1,5 +1,5 @@
 import {log} from '@deck.gl/core';
-import {Matrix4} from 'math.gl';
+import {Matrix4} from '@math.gl/core';
 import {MVTWorkerLoader} from '@loaders.gl/mvt';
 import {binaryToGeojson} from '@loaders.gl/gis';
 import {COORDINATE_SYSTEM} from '@deck.gl/core';
@@ -43,6 +43,10 @@ export default class MVTLayer extends TileLayer {
       super.updateState({props, oldProps, context, changeFlags});
       this._setWGS84PropertyForTiles();
     }
+    const {highlightColor} = props;
+    if (highlightColor !== oldProps.highlightColor && Array.isArray(highlightColor)) {
+      this.setState({highlightColor});
+    }
   }
 
   /* eslint-disable complexity */
@@ -167,12 +171,17 @@ export default class MVTLayer extends TileLayer {
       newHoveredFeatureId = getFeatureUniqueId(hoveredFeature, uniqueIdProperty);
       newHoveredFeatureLayerName = getFeatureLayerName(hoveredFeature);
     }
+    let {highlightColor} = this.props;
+    if (typeof highlightColor === 'function') {
+      highlightColor = highlightColor(info);
+    }
 
     if (
       hoveredFeatureId !== newHoveredFeatureId ||
       hoveredFeatureLayerName !== newHoveredFeatureLayerName
     ) {
       this.setState({
+        highlightColor,
         hoveredFeatureId: newHoveredFeatureId,
         hoveredFeatureLayerName: newHoveredFeatureLayerName
       });
@@ -195,6 +204,13 @@ export default class MVTLayer extends TileLayer {
     return info;
   }
 
+  getSubLayerPropsByTile(tile) {
+    return {
+      highlightedObjectIndex: this.getHighlightedObjectIndex(tile),
+      highlightColor: this.state.highlightColor
+    };
+  }
+
   getHighlightedObjectIndex(tile) {
     const {hoveredFeatureId, hoveredFeatureLayerName} = this.state;
     const {uniqueIdProperty, highlightedFeatureId, binary} = this.props;

package/src/s2-layer/s2-utils.js

@@ -25,7 +25,13 @@ const MAX_RESOLUTION = 100;
 /* Adapted from s2-geometry's S2Cell.getCornerLatLngs */
 /* eslint-disable max-statements */
 function getGeoBounds({face, ij, level}) {
-  const offsets = [[0, 0], [0, 1], [1, 1], [1, 0], [0, 0]];
+  const offsets = [
+    [0, 0],
+    [0, 1],
+    [1, 1],
+    [1, 0],
+    [0, 0]
+  ];
 
   // The S2 cell edge is curved: http://s2geometry.io/
   // This is more prominent at lower levels

package/src/terrain-layer/terrain-layer.js

@@ -20,7 +20,7 @@
 
 import {CompositeLayer, log} from '@deck.gl/core';
 import {SimpleMeshLayer} from '@deck.gl/mesh-layers';
-import {WebMercatorViewport, COORDINATE_SYSTEM} from '@deck.gl/core';
+import {COORDINATE_SYSTEM} from '@deck.gl/core';
 import {TerrainWorkerLoader} from '@loaders.gl/terrain';
 import TileLayer from '../tile-layer/tile-layer';
 import {urlType, getURLFromTemplate} from '../tile-layer/utils';
@@ -123,17 +123,17 @@ export default class TerrainLayer extends CompositeLayer {
 
   getTiledTerrainData(tile) {
     const {elevationData, fetch, texture, elevationDecoder, meshMaxError} = this.props;
+    const {viewport} = this.context;
     const dataUrl = getURLFromTemplate(elevationData, tile);
     const textureUrl = getURLFromTemplate(texture, tile);
 
-    const {bbox, signal, z} = tile;
-    const viewport = new WebMercatorViewport({
-      longitude: (bbox.west + bbox.east) / 2,
-      latitude: (bbox.north + bbox.south) / 2,
-      zoom: z
-    });
-    const bottomLeft = viewport.projectFlat([bbox.west, bbox.south]);
-    const topRight = viewport.projectFlat([bbox.east, bbox.north]);
+    const {bbox, signal} = tile;
+    const bottomLeft = viewport.isGeospatial
+      ? viewport.projectFlat([bbox.west, bbox.south])
+      : [bbox.left, bbox.bottom];
+    const topRight = viewport.isGeospatial
+      ? viewport.projectFlat([bbox.east, bbox.north])
+      : [bbox.right, bbox.top];
     const bounds = [bottomLeft[0], bottomLeft[1], topRight[0], topRight[1]];
 
     const terrain = this.loadTerrain({
@@ -165,6 +165,7 @@ export default class TerrainLayer extends CompositeLayer {
       data: DUMMY_DATA,
       mesh,
       texture,
+      _instanced: false,
       coordinateSystem: COORDINATE_SYSTEM.CARTESIAN,
       getPosition: d => [0, 0, 0],
       getColor: color

package/src/tile-3d-layer/tile-3d-layer.js

@@ -192,13 +192,8 @@ export default class Tile3DLayer extends CompositeLayer {
   }
 
   _makePointCloudLayer(tileHeader, oldLayer) {
-    const {
-      attributes,
-      pointCount,
-      constantRGBA,
-      cartographicOrigin,
-      modelMatrix
-    } = tileHeader.content;
+    const {attributes, pointCount, constantRGBA, cartographicOrigin, modelMatrix} =
+      tileHeader.content;
     const {positions, normals, colors} = attributes;
 
     if (!positions) {
@@ -267,7 +262,15 @@ export default class Tile3DLayer extends CompositeLayer {
 
   _makeSimpleMeshLayer(tileHeader, oldLayer) {
     const content = tileHeader.content;
-    const {attributes, indices, modelMatrix, cartographicOrigin, material, featureIds} = content;
+    const {
+      attributes,
+      indices,
+      modelMatrix,
+      cartographicOrigin,
+      coordinateSystem = COORDINATE_SYSTEM.METER_OFFSETS,
+      material,
+      featureIds
+    } = content;
     const {_getMeshColor} = this.props;
 
     const geometry =
@@ -293,7 +296,7 @@ export default class Tile3DLayer extends CompositeLayer {
         pbrMaterial: material,
         modelMatrix,
         coordinateOrigin: cartographicOrigin,
-        coordinateSystem: COORDINATE_SYSTEM.METER_OFFSETS,
+        coordinateSystem,
         featureIds,
         _offset: 0
       }

package/src/tile-layer/tile-2d-traversal.js

@@ -12,9 +12,23 @@ const TILE_SIZE = 512;
 // number of world copies to check
 const MAX_MAPS = 3;
 // for calculating bounding volume of a tile in a non-web-mercator viewport
-const REF_POINTS_5 = [[0.5, 0.5], [0, 0], [0, 1], [1, 0], [1, 1]]; // 4 corners and center
-const REF_POINTS_9 = REF_POINTS_5.concat([[0, 0.5], [0.5, 0], [1, 0.5], [0.5, 1]]); // 4 corners, center and 4 mid points
-const REF_POINTS_11 = REF_POINTS_9.concat([[0.25, 0.5], [0.75, 0.5]]); // 2 additional points on equator for top tile
+const REF_POINTS_5 = [
+  [0.5, 0.5],
+  [0, 0],
+  [0, 1],
+  [1, 0],
+  [1, 1]
+]; // 4 corners and center
+const REF_POINTS_9 = REF_POINTS_5.concat([
+  [0, 0.5],
+  [0.5, 0],
+  [1, 0.5],
+  [0.5, 1]
+]); // 4 corners, center and 4 mid points
+const REF_POINTS_11 = REF_POINTS_9.concat([
+  [0.25, 0.5],
+  [0.75, 0.5]
+]); // 2 additional points on equator for top tile
 
 class OSMNode {
   constructor(x, y, z) {

package/src/tile-layer/tile-layer.js

@@ -144,18 +144,14 @@ export default class TileLayer extends CompositeLayer {
     this.props.onTileLoad(tile);
     tile.layers = null;
 
-    if (tile.isVisible) {
-      this.setNeedsUpdate();
-    }
+    this.setNeedsUpdate();
   }
 
   _onTileError(error, tile) {
     this.props.onTileError(error);
     tile.layers = null;
 
-    if (tile.isVisible) {
-      this.setNeedsUpdate();
-    }
+    this.setNeedsUpdate();
   }
 
   _onTileUnload(tile) {
@@ -183,8 +179,8 @@ export default class TileLayer extends CompositeLayer {
     return this.props.renderSubLayers(props);
   }
 
-  getHighlightedObjectIndex() {
-    return -1;
+  getSubLayerPropsByTile(tile) {
+    return null;
   }
 
   getPickingInfo({info, sourceLayer}) {
@@ -200,7 +196,7 @@ export default class TileLayer extends CompositeLayer {
 
   renderLayers() {
     return this.state.tileset.tiles.map(tile => {
-      const highlightedObjectIndex = this.getHighlightedObjectIndex(tile);
+      const subLayerProps = this.getSubLayerPropsByTile(tile);
       // cache the rendered layer in the tile
       if (!tile.isLoaded && !tile.content) {
         // nothing to show
@@ -215,14 +211,17 @@ export default class TileLayer extends CompositeLayer {
         tile.layers = flatten(layers, Boolean).map(layer =>
           layer.clone({
             tile,
-            highlightedObjectIndex
+            ...subLayerProps
           })
         );
       } else if (
+        subLayerProps &&
         tile.layers[0] &&
-        tile.layers[0].props.highlightedObjectIndex !== highlightedObjectIndex
+        Object.keys(subLayerProps).some(
+          propName => tile.layers[0].props[propName] !== subLayerProps[propName]
+        )
       ) {
-        tile.layers = tile.layers.map(layer => layer.clone({highlightedObjectIndex}));
+        tile.layers = tile.layers.map(layer => layer.clone(subLayerProps));
       }
       return tile.layers;
     });