@deck.gl/carto 8.7.0-beta.4 → 8.7.0-beta.5

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -1 +1 @@
1
- {"version":3,"sources":["../../../src/layers/carto-dynamic-tile-layer.js"],"names":["Protobuf","log","ClipExtension","MVTLayer","_getURLFromTemplate","GeoJsonLayer","geojsonToBinary","Tile","encodeParameter","TILE_FORMATS","parseJSON","arrayBuffer","JSON","parse","TextDecoder","decode","parsePbf","buffer","pbf","tile","read","unpackProperties","properties","length","map","item","currentRecord","data","forEach","key","value","parseCartoDynamicTile","options","formatTiles","cartoDynamicTile","GEOJSON","features","points","lines","polygons","CartoDynamicTileLoader","name","id","module","extensions","mimeTypes","category","worker","parseSync","BINARY","CartoDynamicTileLayer","getTileData","url","state","Promise","reject","loadOptions","getLoadOptions","fetch","props","signal","mimeType","assert","Object","values","includes","propName","layer","renderSubLayers","autoHighlight","bbox","west","south","east","north","clipBounds","subLayer","layerName","defaultProps","loaders"],"mappings":"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","sourcesContent":["/* global TextDecoder */\nimport Protobuf from 'pbf';\nimport {log} from '@deck.gl/core';\nimport {ClipExtension} from '@deck.gl/extensions';\nimport {MVTLayer, _getURLFromTemplate} from '@deck.gl/geo-layers';\nimport {GeoJsonLayer} from '@deck.gl/layers';\nimport {geojsonToBinary} from '@loaders.gl/gis';\nimport {Tile} from './schema/carto-dynamic-tile';\nimport {encodeParameter, TILE_FORMATS} from '../api/maps-api-common';\n\nfunction parseJSON(arrayBuffer) {\n return JSON.parse(new TextDecoder().decode(arrayBuffer));\n}\n\nfunction parsePbf(buffer) {\n const pbf = new Protobuf(buffer);\n const tile = Tile.read(pbf);\n return tile;\n}\n\nfunction unpackProperties(properties) {\n if (!properties || !properties.length) {\n return [];\n }\n return properties.map(item => {\n const currentRecord = {};\n item.data.forEach(({key, value}) => {\n currentRecord[key] = value;\n });\n return currentRecord;\n });\n}\n\nfunction parseCartoDynamicTile(arrayBuffer, options) {\n if (!arrayBuffer) return null;\n const formatTiles = options && options.cartoDynamicTile && options.cartoDynamicTile.formatTiles;\n if (formatTiles === TILE_FORMATS.GEOJSON) return geojsonToBinary(parseJSON(arrayBuffer).features);\n\n const tile = parsePbf(arrayBuffer);\n\n const {points, lines, polygons} = tile;\n const data = {\n points: {...points, properties: unpackProperties(points.properties)},\n lines: {...lines, properties: unpackProperties(lines.properties)},\n polygons: {...polygons, properties: unpackProperties(polygons.properties)}\n };\n\n return data;\n}\n\nconst CartoDynamicTileLoader = {\n name: 'CARTO Dynamic Tile',\n id: 'cartoDynamicTile',\n module: 'carto',\n extensions: ['pbf'],\n mimeTypes: ['application/x-protobuf'],\n category: 'geometry',\n worker: false,\n parse: async (arrayBuffer, options) => parseCartoDynamicTile(arrayBuffer, options),\n parseSync: parseCartoDynamicTile,\n options: {\n cartoDynamicTile: {\n formatTiles: TILE_FORMATS.BINARY\n }\n }\n};\n\nexport default class CartoDynamicTileLayer extends MVTLayer {\n getTileData(tile) {\n let url = _getURLFromTemplate(this.state.data, tile);\n if (!url) {\n return Promise.reject('Invalid URL');\n }\n\n let loadOptions = this.getLoadOptions();\n const {fetch, formatTiles} = this.props;\n const {signal} = tile;\n\n loadOptions = {\n ...loadOptions,\n mimeType: 'application/x-protobuf'\n };\n\n if (formatTiles) {\n log.assert(\n Object.values(TILE_FORMATS).includes(formatTiles),\n `Invalid value for formatTiles: ${formatTiles}. Use value from TILE_FORMATS`\n );\n url += `&${encodeParameter('formatTiles', formatTiles)}`;\n loadOptions.cartoDynamicTile = {formatTiles};\n }\n\n return fetch(url, {propName: 'data', layer: this, loadOptions, signal});\n }\n\n renderSubLayers(props) {\n if (props.data === null) {\n return null;\n }\n\n props.autoHighlight = false;\n\n const {\n bbox: {west, south, east, north}\n } = props.tile;\n props.extensions = [new ClipExtension(), ...props.extensions];\n props.clipBounds = [west, south, east, north];\n\n const subLayer = new GeoJsonLayer({\n ...props\n });\n return subLayer;\n }\n}\n\nCartoDynamicTileLayer.layerName = 'CartoDynamicTileLayer';\nCartoDynamicTileLayer.defaultProps = {...MVTLayer.defaultProps, loaders: [CartoDynamicTileLoader]};\n"],"file":"carto-dynamic-tile-layer.js"}
1
+ {"version":3,"sources":["../../../src/layers/carto-dynamic-tile-layer.js"],"names":["Protobuf","log","ClipExtension","MVTLayer","_getURLFromTemplate","GeoJsonLayer","geojsonToBinary","Tile","TILE_FORMATS","parseJSON","arrayBuffer","JSON","parse","TextDecoder","decode","parsePbf","buffer","pbf","tile","read","unpackProperties","properties","length","map","item","currentRecord","data","forEach","key","value","parseCartoDynamicTile","options","formatTiles","cartoDynamicTile","GEOJSON","features","points","lines","polygons","CartoDynamicTileLoader","name","id","module","extensions","mimeTypes","category","worker","parseSync","CartoDynamicTileLayer","getTileData","url","state","Promise","reject","loadOptions","getLoadOptions","fetch","props","signal","mimeType","assert","Object","values","includes","newUrl","URL","searchParams","set","toString","propName","layer","renderSubLayers","autoHighlight","bbox","west","south","east","north","clipBounds","subLayer","layerName","defaultProps","loaders"],"mappings":"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","sourcesContent":["/* global TextDecoder */\nimport Protobuf from 'pbf';\nimport {log} from '@deck.gl/core';\nimport {ClipExtension} from '@deck.gl/extensions';\nimport {MVTLayer, _getURLFromTemplate} from '@deck.gl/geo-layers';\nimport {GeoJsonLayer} from '@deck.gl/layers';\nimport {geojsonToBinary} from '@loaders.gl/gis';\nimport {Tile} from './schema/carto-dynamic-tile';\nimport {TILE_FORMATS} from '../api/maps-api-common';\n\nfunction parseJSON(arrayBuffer) {\n return JSON.parse(new TextDecoder().decode(arrayBuffer));\n}\n\nfunction parsePbf(buffer) {\n const pbf = new Protobuf(buffer);\n const tile = Tile.read(pbf);\n return tile;\n}\n\nfunction unpackProperties(properties) {\n if (!properties || !properties.length) {\n return [];\n }\n return properties.map(item => {\n const currentRecord = {};\n item.data.forEach(({key, value}) => {\n currentRecord[key] = value;\n });\n return currentRecord;\n });\n}\n\nfunction parseCartoDynamicTile(arrayBuffer, options) {\n if (!arrayBuffer) return null;\n const formatTiles = options && options.cartoDynamicTile && options.cartoDynamicTile.formatTiles;\n if (formatTiles === TILE_FORMATS.GEOJSON) return geojsonToBinary(parseJSON(arrayBuffer).features);\n\n const tile = parsePbf(arrayBuffer);\n\n const {points, lines, polygons} = tile;\n const data = {\n points: {...points, properties: unpackProperties(points.properties)},\n lines: {...lines, properties: unpackProperties(lines.properties)},\n polygons: {...polygons, properties: unpackProperties(polygons.properties)}\n };\n\n return data;\n}\n\nconst CartoDynamicTileLoader = {\n name: 'CARTO Dynamic Tile',\n id: 'cartoDynamicTile',\n module: 'carto',\n extensions: ['pbf'],\n mimeTypes: ['application/x-protobuf'],\n category: 'geometry',\n worker: false,\n parse: async (arrayBuffer, options) => parseCartoDynamicTile(arrayBuffer, options),\n parseSync: parseCartoDynamicTile,\n options: {\n cartoDynamicTile: {\n // TODO change to BINARY for 8.7 prod release\n formatTiles: TILE_FORMATS.GEOJSON\n }\n }\n};\n\nexport default class CartoDynamicTileLayer extends MVTLayer {\n getTileData(tile) {\n let url = _getURLFromTemplate(this.state.data, tile);\n if (!url) {\n return Promise.reject('Invalid URL');\n }\n\n let loadOptions = this.getLoadOptions();\n const {fetch, formatTiles} = this.props;\n const {signal} = tile;\n\n loadOptions = {\n ...loadOptions,\n mimeType: 'application/x-protobuf'\n };\n\n if (formatTiles) {\n log.assert(\n Object.values(TILE_FORMATS).includes(formatTiles),\n `Invalid value for formatTiles: ${formatTiles}. Use value from TILE_FORMATS`\n );\n // eslint-disable-next-line no-undef\n const newUrl = new URL(url);\n newUrl.searchParams.set('formatTiles', formatTiles);\n url = newUrl.toString();\n loadOptions.cartoDynamicTile = {formatTiles};\n }\n\n return fetch(url, {propName: 'data', layer: this, loadOptions, signal});\n }\n\n renderSubLayers(props) {\n if (props.data === null) {\n return null;\n }\n\n props.autoHighlight = false;\n\n const {\n bbox: {west, south, east, north}\n } = props.tile;\n props.extensions = [new ClipExtension(), ...(props.extensions || [])];\n props.clipBounds = [west, south, east, north];\n\n const subLayer = new GeoJsonLayer({\n ...props\n });\n return subLayer;\n }\n}\n\nCartoDynamicTileLayer.layerName = 'CartoDynamicTileLayer';\nCartoDynamicTileLayer.defaultProps = {...MVTLayer.defaultProps, loaders: [CartoDynamicTileLoader]};\n"],"file":"carto-dynamic-tile-layer.js"}
@@ -23,7 +23,7 @@ const defaultProps = {
23
23
  credentials: null,
24
24
  connection: null,
25
25
  format: null,
26
- formatTiles: TILE_FORMATS.GEOJSON,
26
+ formatTiles: null,
27
27
  clientId: null,
28
28
  geoColumn: null,
29
29
  columns: {
@@ -146,29 +146,35 @@ export default class CartoLayer extends CompositeLayer {
146
146
  }
147
147
  }
148
148
 
149
- renderLayers() {
149
+ _getRenderLayer() {
150
150
  const {
151
151
  data,
152
152
  format,
153
153
  apiVersion
154
154
  } = this.state;
155
+
156
+ if (apiVersion === API_VERSIONS.V1 || apiVersion === API_VERSIONS.V2) {
157
+ return MVTLayer;
158
+ }
159
+
160
+ if (format === FORMATS.TILEJSON) {
161
+ const formatTiles = this.props.formatTiles || new URL(data.tiles[0]).searchParams.get('formatTiles') || TILE_FORMATS.MVT;
162
+ return formatTiles === TILE_FORMATS.MVT ? MVTLayer : CartoDynamicTileLayer;
163
+ }
164
+
165
+ return GeoJsonLayer;
166
+ }
167
+
168
+ renderLayers() {
169
+ const {
170
+ data
171
+ } = this.state;
155
172
  if (!data) return null;
156
173
  const {
157
- type,
158
174
  updateTriggers
159
175
  } = this.props;
160
- let layer;
161
- const tilesFormat = apiVersion === API_VERSIONS.V3 && format === FORMATS.TILEJSON && new URLSearchParams(data.tiles[0]).get('format');
162
- const nonMvtTiles = tilesFormat && tilesFormat !== TILE_FORMATS.MVT;
163
- const dynamicTiles = apiVersion === API_VERSIONS.V3 && type === MAP_TYPES.TABLE && format === FORMATS.TILEJSON;
164
-
165
- if (nonMvtTiles || dynamicTiles) {
166
- layer = CartoDynamicTileLayer;
167
- } else if (apiVersion === API_VERSIONS.V1 || apiVersion === API_VERSIONS.V2 || format === FORMATS.TILEJSON) {
168
- layer = MVTLayer;
169
- } else {
170
- layer = GeoJsonLayer;
171
- }
176
+
177
+ const layer = this._getRenderLayer();
172
178
 
173
179
  const {
174
180
  formatTiles,
@@ -1 +1 @@
1
- {"version":3,"sources":["../../../src/layers/carto-layer.js"],"names":["CompositeLayer","log","CartoDynamicTileLayer","MVTLayer","GeoJsonLayer","fetchLayerData","getDataV2","API_VERSIONS","FORMATS","MAP_TYPES","TILE_FORMATS","getDefaultCredentials","defaultProps","data","type","onDataLoad","value","compare","onDataError","optional","uniqueIdProperty","credentials","connection","format","formatTiles","GEOJSON","clientId","geoColumn","columns","CartoLayer","initializeState","state","apiVersion","isLoaded","getSubLayers","length","_checkProps","props","localCreds","assert","Object","values","includes","V1","V2","QUERY","TILESET","V3","TABLE","Array","isArray","updateState","oldProps","changeFlags","shouldUpdateData","dataChanged","JSON","stringify","setState","_updateData","source","rest","localConfig","result","err","renderLayers","updateTriggers","layer","tilesFormat","TILEJSON","URLSearchParams","tiles","get","nonMvtTiles","MVT","dynamicTiles","getSubLayerProps","id","layerName"],"mappings":"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","sourcesContent":["import {CompositeLayer, log} from '@deck.gl/core';\nimport CartoDynamicTileLayer from './carto-dynamic-tile-layer';\nimport {MVTLayer} from '@deck.gl/geo-layers';\nimport {GeoJsonLayer} from '@deck.gl/layers';\nimport {fetchLayerData, getDataV2, API_VERSIONS} from '../api';\nimport {FORMATS, MAP_TYPES, TILE_FORMATS} from '../api/maps-api-common';\nimport {getDefaultCredentials} from '../config';\n\nconst defaultProps = {\n // (String, required): data resource to load. table name, sql query or tileset name.\n data: null,\n // (Enum (MAP_TYPES), required)\n type: null,\n onDataLoad: {type: 'function', value: data => {}, compare: false},\n onDataError: {type: 'function', value: null, compare: false, optional: true},\n uniqueIdProperty: 'cartodb_id',\n\n // override carto credentials for the layer, set to null to read from default\n credentials: null,\n\n /*********************/\n /* API v3 PARAMETERS */\n /**********************/\n // (String, required): connection name at CARTO platform\n connection: null,\n\n // (String, optional): format of data\n format: null,\n\n // (String, optional): format of data\n formatTiles: TILE_FORMATS.GEOJSON, // TODO: for 8.7 release switch to BINARY\n\n // (String, optional): clientId identifier used for internal tracing, place here a string to identify the client who is doing the request.\n clientId: null,\n\n // (String, optional): name of the `geo_column` in the CARTO platform. Use this override the default column ('geom'), from which the geometry information should be fetched.\n geoColumn: null,\n\n // (Array<String>, optional): names of columns to fetch. By default, all columns are fetched.\n columns: {type: 'array', value: null}\n};\n\nexport default class CartoLayer extends CompositeLayer {\n initializeState() {\n this.state = {\n data: null,\n apiVersion: null\n };\n }\n\n get isLoaded() {\n return this.getSubLayers().length > 0 && super.isLoaded;\n }\n\n _checkProps(props) {\n const {type, credentials, connection, geoColumn, columns} = props;\n const localCreds = {...getDefaultCredentials(), ...credentials};\n const {apiVersion} = localCreds;\n\n log.assert(\n Object.values(API_VERSIONS).includes(apiVersion),\n `Invalid apiVersion ${apiVersion}. Use API_VERSIONS enum.`\n );\n\n if (apiVersion === API_VERSIONS.V1 || apiVersion === API_VERSIONS.V2) {\n log.assert(\n type === MAP_TYPES.QUERY || type === MAP_TYPES.TILESET,\n `Invalid type ${type}. Use type MAP_TYPES.QUERY or MAP_TYPES.TILESET for apiVersion ${apiVersion}`\n );\n log.assert(!connection, `Connection prop is not supported for apiVersion ${apiVersion}`);\n log.assert(!geoColumn, `geoColumn prop is not supported for apiVersion ${apiVersion}`);\n log.assert(!columns, `columns prop is not supported for apiVersion ${apiVersion}`);\n } else if (apiVersion === API_VERSIONS.V3) {\n log.assert(connection, 'Missing mandatory connection parameter');\n log.assert(\n Object.values(MAP_TYPES).includes(type),\n `Invalid type ${type}. Use MAP_TYPES enum.`\n );\n if (type !== MAP_TYPES.TABLE) {\n log.assert(!geoColumn, `geoColumn prop is only supported for type ${MAP_TYPES.TABLE}`);\n log.assert(!columns, `columns prop is only supported for type ${MAP_TYPES.TABLE}`);\n }\n if (columns) {\n log.assert(Array.isArray(columns), 'columns prop must be an Array');\n }\n }\n }\n\n updateState({props, oldProps, changeFlags}) {\n this._checkProps(props);\n const shouldUpdateData =\n changeFlags.dataChanged ||\n props.connection !== oldProps.connection ||\n props.geoColumn !== oldProps.geoColumn ||\n JSON.stringify(props.columns) !== JSON.stringify(oldProps.columns) ||\n props.type !== oldProps.type ||\n JSON.stringify(props.credentials) !== JSON.stringify(oldProps.credentials);\n\n if (shouldUpdateData) {\n this.setState({data: null, apiVersion: null});\n this._updateData();\n }\n }\n\n async _updateData() {\n try {\n const {type, data: source, clientId, credentials, ...rest} = this.props;\n const localConfig = {...getDefaultCredentials(), ...credentials};\n const {apiVersion} = localConfig;\n\n let result;\n if (apiVersion === API_VERSIONS.V1 || apiVersion === API_VERSIONS.V2) {\n result = {data: await getDataV2({type, source, credentials})};\n } else {\n result = await fetchLayerData({type, source, clientId, credentials, ...rest});\n }\n\n this.setState({...result, apiVersion});\n this.props.onDataLoad(result.data);\n } catch (err) {\n if (this.props.onDataError) {\n this.props.onDataError(err);\n } else {\n throw err;\n }\n }\n }\n\n renderLayers() {\n const {data, format, apiVersion} = this.state;\n\n if (!data) return null;\n\n const {type, updateTriggers} = this.props;\n\n let layer;\n\n /* global URLSearchParams */\n const tilesFormat =\n apiVersion === API_VERSIONS.V3 &&\n format === FORMATS.TILEJSON &&\n new URLSearchParams(data.tiles[0]).get('format');\n const nonMvtTiles = tilesFormat && tilesFormat !== TILE_FORMATS.MVT;\n\n const dynamicTiles =\n apiVersion === API_VERSIONS.V3 && type === MAP_TYPES.TABLE && format === FORMATS.TILEJSON;\n\n if (nonMvtTiles || dynamicTiles) {\n layer = CartoDynamicTileLayer;\n } else if (\n apiVersion === API_VERSIONS.V1 ||\n apiVersion === API_VERSIONS.V2 ||\n format === FORMATS.TILEJSON\n ) {\n layer = MVTLayer;\n } else {\n layer = GeoJsonLayer;\n }\n\n const {formatTiles, uniqueIdProperty} = defaultProps;\n const props = {formatTiles, uniqueIdProperty, ...this.props};\n delete props.data;\n\n // eslint-disable-next-line new-cap\n return new layer(\n props,\n this.getSubLayerProps({\n id: `carto-${layer.layerName}`,\n data,\n updateTriggers\n })\n );\n }\n}\n\nCartoLayer.layerName = 'CartoLayer';\nCartoLayer.defaultProps = defaultProps;\n"],"file":"carto-layer.js"}
1
+ {"version":3,"sources":["../../../src/layers/carto-layer.js"],"names":["CompositeLayer","log","CartoDynamicTileLayer","MVTLayer","GeoJsonLayer","fetchLayerData","getDataV2","API_VERSIONS","FORMATS","MAP_TYPES","TILE_FORMATS","getDefaultCredentials","defaultProps","data","type","onDataLoad","value","compare","onDataError","optional","uniqueIdProperty","credentials","connection","format","formatTiles","clientId","geoColumn","columns","CartoLayer","initializeState","state","apiVersion","isLoaded","getSubLayers","length","_checkProps","props","localCreds","assert","Object","values","includes","V1","V2","QUERY","TILESET","V3","TABLE","Array","isArray","updateState","oldProps","changeFlags","shouldUpdateData","dataChanged","JSON","stringify","setState","_updateData","source","rest","localConfig","result","err","_getRenderLayer","TILEJSON","URL","tiles","searchParams","get","MVT","renderLayers","updateTriggers","layer","getSubLayerProps","id","layerName"],"mappings":"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","sourcesContent":["import {CompositeLayer, log} from '@deck.gl/core';\nimport CartoDynamicTileLayer from './carto-dynamic-tile-layer';\nimport {MVTLayer} from '@deck.gl/geo-layers';\nimport {GeoJsonLayer} from '@deck.gl/layers';\nimport {fetchLayerData, getDataV2, API_VERSIONS} from '../api';\nimport {FORMATS, MAP_TYPES, TILE_FORMATS} from '../api/maps-api-common';\nimport {getDefaultCredentials} from '../config';\n\nconst defaultProps = {\n // (String, required): data resource to load. table name, sql query or tileset name.\n data: null,\n // (Enum (MAP_TYPES), required)\n type: null,\n onDataLoad: {type: 'function', value: data => {}, compare: false},\n onDataError: {type: 'function', value: null, compare: false, optional: true},\n uniqueIdProperty: 'cartodb_id',\n\n // override carto credentials for the layer, set to null to read from default\n credentials: null,\n\n /*********************/\n /* API v3 PARAMETERS */\n /**********************/\n // (String, required): connection name at CARTO platform\n connection: null,\n\n // (String, optional): format of data\n format: null,\n\n // (String, optional): force format of data for tiles\n formatTiles: null,\n\n // (String, optional): clientId identifier used for internal tracing, place here a string to identify the client who is doing the request.\n clientId: null,\n\n // (String, optional): name of the `geo_column` in the CARTO platform. Use this override the default column ('geom'), from which the geometry information should be fetched.\n geoColumn: null,\n\n // (Array<String>, optional): names of columns to fetch. By default, all columns are fetched.\n columns: {type: 'array', value: null}\n};\n\nexport default class CartoLayer extends CompositeLayer {\n initializeState() {\n this.state = {\n data: null,\n apiVersion: null\n };\n }\n\n get isLoaded() {\n return this.getSubLayers().length > 0 && super.isLoaded;\n }\n\n _checkProps(props) {\n const {type, credentials, connection, geoColumn, columns} = props;\n const localCreds = {...getDefaultCredentials(), ...credentials};\n const {apiVersion} = localCreds;\n\n log.assert(\n Object.values(API_VERSIONS).includes(apiVersion),\n `Invalid apiVersion ${apiVersion}. Use API_VERSIONS enum.`\n );\n\n if (apiVersion === API_VERSIONS.V1 || apiVersion === API_VERSIONS.V2) {\n log.assert(\n type === MAP_TYPES.QUERY || type === MAP_TYPES.TILESET,\n `Invalid type ${type}. Use type MAP_TYPES.QUERY or MAP_TYPES.TILESET for apiVersion ${apiVersion}`\n );\n log.assert(!connection, `Connection prop is not supported for apiVersion ${apiVersion}`);\n log.assert(!geoColumn, `geoColumn prop is not supported for apiVersion ${apiVersion}`);\n log.assert(!columns, `columns prop is not supported for apiVersion ${apiVersion}`);\n } else if (apiVersion === API_VERSIONS.V3) {\n log.assert(connection, 'Missing mandatory connection parameter');\n log.assert(\n Object.values(MAP_TYPES).includes(type),\n `Invalid type ${type}. Use MAP_TYPES enum.`\n );\n if (type !== MAP_TYPES.TABLE) {\n log.assert(!geoColumn, `geoColumn prop is only supported for type ${MAP_TYPES.TABLE}`);\n log.assert(!columns, `columns prop is only supported for type ${MAP_TYPES.TABLE}`);\n }\n if (columns) {\n log.assert(Array.isArray(columns), 'columns prop must be an Array');\n }\n }\n }\n\n updateState({props, oldProps, changeFlags}) {\n this._checkProps(props);\n const shouldUpdateData =\n changeFlags.dataChanged ||\n props.connection !== oldProps.connection ||\n props.geoColumn !== oldProps.geoColumn ||\n JSON.stringify(props.columns) !== JSON.stringify(oldProps.columns) ||\n props.type !== oldProps.type ||\n JSON.stringify(props.credentials) !== JSON.stringify(oldProps.credentials);\n\n if (shouldUpdateData) {\n this.setState({data: null, apiVersion: null});\n this._updateData();\n }\n }\n\n async _updateData() {\n try {\n const {type, data: source, clientId, credentials, ...rest} = this.props;\n const localConfig = {...getDefaultCredentials(), ...credentials};\n const {apiVersion} = localConfig;\n\n let result;\n if (apiVersion === API_VERSIONS.V1 || apiVersion === API_VERSIONS.V2) {\n result = {data: await getDataV2({type, source, credentials})};\n } else {\n result = await fetchLayerData({type, source, clientId, credentials, ...rest});\n }\n\n this.setState({...result, apiVersion});\n this.props.onDataLoad(result.data);\n } catch (err) {\n if (this.props.onDataError) {\n this.props.onDataError(err);\n } else {\n throw err;\n }\n }\n }\n\n _getRenderLayer() {\n const {data, format, apiVersion} = this.state;\n\n if (apiVersion === API_VERSIONS.V1 || apiVersion === API_VERSIONS.V2) {\n return MVTLayer;\n }\n\n if (format === FORMATS.TILEJSON) {\n /* global URL */\n const formatTiles =\n this.props.formatTiles ||\n new URL(data.tiles[0]).searchParams.get('formatTiles') ||\n TILE_FORMATS.MVT;\n return formatTiles === TILE_FORMATS.MVT ? MVTLayer : CartoDynamicTileLayer;\n }\n\n // It's a geojson layer\n return GeoJsonLayer;\n }\n\n renderLayers() {\n const {data} = this.state;\n\n if (!data) return null;\n\n const {updateTriggers} = this.props;\n\n const layer = this._getRenderLayer();\n\n const {formatTiles, uniqueIdProperty} = defaultProps;\n const props = {formatTiles, uniqueIdProperty, ...this.props};\n delete props.data;\n\n // eslint-disable-next-line new-cap\n return new layer(\n props,\n this.getSubLayerProps({\n id: `carto-${layer.layerName}`,\n data,\n updateTriggers\n })\n );\n }\n}\n\nCartoLayer.layerName = 'CartoLayer';\nCartoLayer.defaultProps = defaultProps;\n"],"file":"carto-layer.js"}