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

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.1",
   "publishConfig": {
     "access": "public"
   },
@@ -56,5 +56,5 @@
     "@deck.gl/layers": "^8.0.0",
     "@loaders.gl/core": "^3.1.5"
   },
-  "gitHead": "d6eefe2e0992999416b2362340f86402b1f25b33"
+  "gitHead": "8a2f488c640bbf80982c684e7fd741982afe1d81"
 }

package/src/api/maps-v3-client.ts

@@ -10,7 +10,9 @@ import {
   MapInstantiation,
   MapType,
   MAP_TYPES,
-  SchemaField
+  SchemaField,
+  TileFormat,
+  TILE_FORMATS
 } from './maps-api-common';
 import {parseMap} from './parseMap';
 import {log} from '@deck.gl/core';
@@ -111,6 +113,7 @@ type FetchLayerDataParams = {
   schema?: boolean;
   clientId?: string;
   format?: Format;
+  formatTiles?: TileFormat;
 };
 
 /**
@@ -208,6 +211,7 @@ export async function fetchLayerData({
   geoColumn,
   columns,
   format,
+  formatTiles,
   schema,
   clientId
 }: FetchLayerDataParams): Promise<FetchLayerDataResult> {
@@ -221,6 +225,7 @@ export async function fetchLayerData({
     geoColumn,
     columns,
     format,
+    formatTiles,
     schema,
     clientId
   });
@@ -242,6 +247,7 @@ async function _fetchDataUrl({
   geoColumn,
   columns,
   format,
+  formatTiles,
   schema,
   clientId
 }: FetchLayerDataParams) {
@@ -288,6 +294,14 @@ async function _fetchDataUrl({
     assert(url && mapFormat, 'Unsupported data formats received from backend.');
   }
 
+  if (format === FORMATS.TILEJSON && formatTiles) {
+    log.assert(
+      Object.values(TILE_FORMATS).includes(formatTiles),
+      `Invalid value for formatTiles: ${formatTiles}. Use value from TILE_FORMATS`
+    );
+    url += `&${encodeParameter('formatTiles', formatTiles)}`;
+  }
+
   const {accessToken} = localCreds;
   return {url, accessToken, mapFormat, metadata};
 }
@@ -324,11 +338,13 @@ async function _fetchMapDataset(
   credentials: CloudNativeCredentials,
   clientId?: string
 ) {
+  const {connectionName: connection, columns, geoColumn, source, type} = dataset;
   // First fetch metadata
-  const {connectionName: connection, source, type} = dataset;
   const {url, mapFormat} = await _fetchDataUrl({
     credentials: {...credentials, accessToken},
     connection,
+    columns,
+    geoColumn,
     source,
     type,
     clientId

package/src/layers/carto-layer.js

@@ -92,8 +92,10 @@ export default class CartoLayer extends CompositeLayer {
       changeFlags.dataChanged ||
       props.connection !== oldProps.connection ||
       props.geoColumn !== oldProps.geoColumn ||
-      JSON.stringify(props.columns) !== JSON.stringify(oldProps.columns) ||
+      props.format !== oldProps.format ||
+      props.formatTiles !== oldProps.formatTiles ||
       props.type !== oldProps.type ||
+      JSON.stringify(props.columns) !== JSON.stringify(oldProps.columns) ||
       JSON.stringify(props.credentials) !== JSON.stringify(oldProps.credentials);
 
     if (shouldUpdateData) {
@@ -126,24 +128,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 ||
-        new URL(data.tiles[0]).searchParams.get('formatTiles') ||
-        TILE_FORMATS.MVT;
-      return formatTiles === TILE_FORMATS.MVT ? MVTLayer : CartoTileLayer;
+      const tileUrl = new URL(data.tiles[0]);
+
+      props.formatTiles =
+        props.formatTiles || tileUrl.searchParams.get('formatTiles') || TILE_FORMATS.MVT;
+
+      return props.formatTiles === TILE_FORMATS.MVT ? [MVTLayer, props] : [CartoTileLayer, props];
     }
 
     // It's a geojson layer
-    return GeoJsonLayer;
+    return [GeoJsonLayer, props];
   }
 
   renderLayers() {
@@ -153,11 +160,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

@@ -48,6 +48,8 @@ function parseCartoTile(arrayBuffer, options) {
   return data;
 }
 
+const defaultTileFormat = TILE_FORMATS.BINARY;
+
 const CartoTileLoader = {
   name: 'CARTO Tile',
   id: 'cartoTile',
@@ -60,15 +62,20 @@ const CartoTileLoader = {
   parseSync: parseCartoTile,
   options: {
     cartoTile: {
-      // TODO change to BINARY for 8.7 prod release
-      formatTiles: TILE_FORMATS.GEOJSON
+      formatTiles: defaultTileFormat
     }
   }
 };
 
+const defaultProps = {
+  ...MVTLayer.defaultProps,
+  formatTiles: defaultTileFormat,
+  loaders: [CartoTileLoader]
+};
+
 export default class CartoTileLayer extends MVTLayer {
   getTileData(tile) {
-    let url = _getURLFromTemplate(this.state.data, tile);
+    const url = _getURLFromTemplate(this.state.data, tile);
     if (!url) {
       return Promise.reject('Invalid URL');
     }
@@ -87,10 +94,6 @@ export default class CartoTileLayer extends MVTLayer {
         Object.values(TILE_FORMATS).includes(formatTiles),
         `Invalid value for formatTiles: ${formatTiles}. Use value from TILE_FORMATS`
       );
-      // eslint-disable-next-line no-undef
-      const newUrl = new URL(url);
-      newUrl.searchParams.set('formatTiles', formatTiles);
-      url = newUrl.toString();
       loadOptions.cartoTile = {formatTiles};
     }
 
@@ -118,4 +121,4 @@ export default class CartoTileLayer extends MVTLayer {
 }
 
 CartoTileLayer.layerName = 'CartoTileLayer';
-CartoTileLayer.defaultProps = {...MVTLayer.defaultProps, loaders: [CartoTileLoader]};
+CartoTileLayer.defaultProps = defaultProps;