@deck.gl/carto 8.7.0-beta.6 → 8.7.0-beta.7

package/package.json

@@ -2,7 +2,7 @@
   "name": "@deck.gl/carto",
   "description": "CARTO official integration with Deck.gl. Build geospatial applications using CARTO and Deck.gl.",
   "license": "MIT",
-  "version": "8.7.0-beta.6",
+  "version": "8.7.0-beta.7",
   "publishConfig": {
     "access": "public"
   },
@@ -56,5 +56,5 @@
     "@deck.gl/layers": "^8.0.0",
     "@loaders.gl/core": "^3.1.5"
   },
-  "gitHead": "d6eefe2e0992999416b2362340f86402b1f25b33"
+  "gitHead": "32b25b0d1c4d2985b021eb15f2b2245d81b574bd"
 }

package/src/layers/carto-layer.js

@@ -126,24 +126,29 @@ export default class CartoLayer extends CompositeLayer {
     }
   }
 
-  _getRenderLayer() {
+  _getSubLayerAndProps() {
     const {data, format, apiVersion} = this.state;
 
+    const {uniqueIdProperty} = defaultProps;
+    const props = {uniqueIdProperty, ...this.props};
+    delete props.data;
+
     if (apiVersion === API_VERSIONS.V1 || apiVersion === API_VERSIONS.V2) {
-      return MVTLayer;
+      return [MVTLayer, props];
     }
 
     if (format === FORMATS.TILEJSON) {
       /* global URL */
-      const formatTiles =
-        this.props.formatTiles ||
+      props.formatTiles =
+        props.formatTiles ||
         new URL(data.tiles[0]).searchParams.get('formatTiles') ||
         TILE_FORMATS.MVT;
-      return formatTiles === TILE_FORMATS.MVT ? MVTLayer : CartoTileLayer;
+
+      return props.formatTiles === TILE_FORMATS.MVT ? [MVTLayer, props] : [CartoTileLayer, props];
     }
 
     // It's a geojson layer
-    return GeoJsonLayer;
+    return [GeoJsonLayer, props];
   }
 
   renderLayers() {
@@ -153,11 +158,7 @@ export default class CartoLayer extends CompositeLayer {
 
     const {updateTriggers} = this.props;
 
-    const layer = this._getRenderLayer();
-
-    const {formatTiles, uniqueIdProperty} = defaultProps;
-    const props = {formatTiles, uniqueIdProperty, ...this.props};
-    delete props.data;
+    const [layer, props] = this._getSubLayerAndProps();
 
     // eslint-disable-next-line new-cap
     return new layer(

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

@@ -61,7 +61,7 @@ const CartoTileLoader = {
   options: {
     cartoTile: {
       // TODO change to BINARY for 8.7 prod release
-      formatTiles: TILE_FORMATS.GEOJSON
+      formatTiles: TILE_FORMATS.BINARY
     }
   }
 };