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

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

@@ -0,0 +1,121 @@
+/* global TextDecoder */
+import Protobuf from 'pbf';
+import {log} from '@deck.gl/core';
+import {ClipExtension} from '@deck.gl/extensions';
+import {MVTLayer, _getURLFromTemplate} from '@deck.gl/geo-layers';
+import {GeoJsonLayer} from '@deck.gl/layers';
+import {geojsonToBinary} from '@loaders.gl/gis';
+import {Tile} from './schema/carto-tile';
+import {TILE_FORMATS} from '../api/maps-api-common';
+
+function parseJSON(arrayBuffer) {
+  return JSON.parse(new TextDecoder().decode(arrayBuffer));
+}
+
+function parsePbf(buffer) {
+  const pbf = new Protobuf(buffer);
+  const tile = Tile.read(pbf);
+  return tile;
+}
+
+function unpackProperties(properties) {
+  if (!properties || !properties.length) {
+    return [];
+  }
+  return properties.map(item => {
+    const currentRecord = {};
+    item.data.forEach(({key, value}) => {
+      currentRecord[key] = value;
+    });
+    return currentRecord;
+  });
+}
+
+function parseCartoTile(arrayBuffer, options) {
+  if (!arrayBuffer) return null;
+  const formatTiles = options && options.cartoTile && options.cartoTile.formatTiles;
+  if (formatTiles === TILE_FORMATS.GEOJSON) return geojsonToBinary(parseJSON(arrayBuffer).features);
+
+  const tile = parsePbf(arrayBuffer);
+
+  const {points, lines, polygons} = tile;
+  const data = {
+    points: {...points, properties: unpackProperties(points.properties)},
+    lines: {...lines, properties: unpackProperties(lines.properties)},
+    polygons: {...polygons, properties: unpackProperties(polygons.properties)}
+  };
+
+  return data;
+}
+
+const CartoTileLoader = {
+  name: 'CARTO Tile',
+  id: 'cartoTile',
+  module: 'carto',
+  extensions: ['pbf'],
+  mimeTypes: ['application/x-protobuf'],
+  category: 'geometry',
+  worker: false,
+  parse: async (arrayBuffer, options) => parseCartoTile(arrayBuffer, options),
+  parseSync: parseCartoTile,
+  options: {
+    cartoTile: {
+      // TODO change to BINARY for 8.7 prod release
+      formatTiles: TILE_FORMATS.GEOJSON
+    }
+  }
+};
+
+export default class CartoTileLayer extends MVTLayer {
+  getTileData(tile) {
+    let url = _getURLFromTemplate(this.state.data, tile);
+    if (!url) {
+      return Promise.reject('Invalid URL');
+    }
+
+    let loadOptions = this.getLoadOptions();
+    const {fetch, formatTiles} = this.props;
+    const {signal} = tile;
+
+    loadOptions = {
+      ...loadOptions,
+      mimeType: 'application/x-protobuf'
+    };
+
+    if (formatTiles) {
+      log.assert(
+        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};
+    }
+
+    return fetch(url, {propName: 'data', layer: this, loadOptions, signal});
+  }
+
+  renderSubLayers(props) {
+    if (props.data === null) {
+      return null;
+    }
+
+    props.autoHighlight = false;
+
+    const {
+      bbox: {west, south, east, north}
+    } = props.tile;
+    props.extensions = [new ClipExtension(), ...(props.extensions || [])];
+    props.clipBounds = [west, south, east, north];
+
+    const subLayer = new GeoJsonLayer({
+      ...props
+    });
+    return subLayer;
+  }
+}
+
+CartoTileLayer.layerName = 'CartoTileLayer';
+CartoTileLayer.defaultProps = {...MVTLayer.defaultProps, loaders: [CartoTileLoader]};

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

@@ -0,0 +1,195 @@
+// KeyValueObject ========================================
+
+const KeyValueObject = {};
+
+KeyValueObject.read = function (pbf, end) {
+  return pbf.readFields(KeyValueObject._readField, {key: '', value: ''}, end);
+};
+KeyValueObject._readField = function (tag, obj, pbf) {
+  if (tag === 1) obj.key = pbf.readString();
+  else if (tag === 2) obj.value = pbf.readString();
+};
+
+// Properties ========================================
+
+const Properties = {};
+
+Properties.read = function (pbf, end) {
+  return pbf.readFields(Properties._readField, {data: []}, end);
+};
+Properties._readField = function (tag, obj, pbf) {
+  if (tag === 1) obj.data.push(KeyValueObject.read(pbf, pbf.readVarint() + pbf.pos));
+};
+
+// Doubles ========================================
+
+const Doubles = {};
+
+Doubles.read = function (pbf, end) {
+  // TODO perhaps we can do better and directly map from the source
+  // ArrayBuffer using ArrayBuffer.slice()
+  const {value, size} = pbf.readFields(Doubles._readField, {value: [], size: 0}, end);
+  return {value: new Float32Array(value), size};
+};
+Doubles._readField = function (tag, obj, pbf) {
+  if (tag === 1) pbf.readPackedDouble(obj.value);
+  else if (tag === 2) obj.size = pbf.readVarint(true);
+};
+
+// Ints ========================================
+
+const Ints = {};
+
+Ints.read = function (pbf, end) {
+  const {value, size} = pbf.readFields(Ints._readField, {value: [], size: 0}, end);
+  return {value: new Uint32Array(value), size};
+};
+Ints._readField = function (tag, obj, pbf) {
+  if (tag === 1) pbf.readPackedVarint(obj.value);
+  else if (tag === 2) obj.size = pbf.readVarint(true);
+};
+
+// NumericProp ========================================
+
+const NumericProp = {};
+
+NumericProp.read = function (pbf, end) {
+  return pbf.readFields(NumericProp._readField, {value: []}, end);
+};
+NumericProp._readField = function (tag, obj, pbf) {
+  if (tag === 1) pbf.readPackedDouble(obj.value);
+};
+
+// NumericPropKeyValue ========================================
+
+const NumericPropKeyValue = {};
+
+NumericPropKeyValue.read = function (pbf, end) {
+  return pbf.readFields(NumericPropKeyValue._readField, {key: '', value: null}, end);
+};
+NumericPropKeyValue._readField = function (tag, obj, pbf) {
+  if (tag === 1) obj.key = pbf.readString();
+  else if (tag === 2) obj.value = NumericProp.read(pbf, pbf.readVarint() + pbf.pos);
+};
+
+// NumericProp._FieldEntry1 ========================================
+
+NumericProp._FieldEntry1 = {};
+
+NumericProp._FieldEntry1.read = function (pbf, end) {
+  return pbf.readFields(NumericProp._FieldEntry1._readField, {key: '', value: 0}, end);
+};
+NumericProp._FieldEntry1._readField = function (tag, obj, pbf) {
+  if (tag === 1) obj.key = pbf.readString();
+  else if (tag === 2) obj.value = pbf.readDouble();
+};
+
+// StringProp ========================================
+
+const StringProp = {};
+
+StringProp.read = function (pbf, end) {
+  return pbf.readFields(StringProp._readField, {value: []}, end);
+};
+StringProp._readField = function (tag, obj, pbf) {
+  if (tag === 1) obj.value.push(pbf.readString());
+};
+
+// Points ========================================
+
+const Points = {};
+
+Points.read = function (pbf, end) {
+  return pbf.readFields(
+    Points._readField,
+    {positions: null, globalFeatureIds: null, featureIds: null, properties: [], numericProps: {}},
+    end
+  );
+};
+Points._readField = function (tag, obj, pbf) {
+  if (tag === 1) obj.positions = Doubles.read(pbf, pbf.readVarint() + pbf.pos);
+  else if (tag === 2) obj.globalFeatureIds = Ints.read(pbf, pbf.readVarint() + pbf.pos);
+  else if (tag === 3) obj.featureIds = Ints.read(pbf, pbf.readVarint() + pbf.pos);
+  else if (tag === 4) obj.properties.push(Properties.read(pbf, pbf.readVarint() + pbf.pos));
+  else if (tag === 5) {
+    const entry = NumericPropKeyValue.read(pbf, pbf.readVarint() + pbf.pos);
+    obj.numericProps[entry.key] = entry.value;
+  }
+};
+
+// Lines ========================================
+
+const Lines = {};
+
+Lines.read = function (pbf, end) {
+  return pbf.readFields(
+    Lines._readField,
+    {
+      positions: null,
+      pathIndices: null,
+      globalFeatureIds: null,
+      featureIds: null,
+      properties: [],
+      numericProps: {}
+    },
+    end
+  );
+};
+Lines._readField = function (tag, obj, pbf) {
+  if (tag === 1) obj.positions = Doubles.read(pbf, pbf.readVarint() + pbf.pos);
+  else if (tag === 2) obj.pathIndices = Ints.read(pbf, pbf.readVarint() + pbf.pos);
+  else if (tag === 3) obj.globalFeatureIds = Ints.read(pbf, pbf.readVarint() + pbf.pos);
+  else if (tag === 4) obj.featureIds = Ints.read(pbf, pbf.readVarint() + pbf.pos);
+  else if (tag === 5) obj.properties.push(Properties.read(pbf, pbf.readVarint() + pbf.pos));
+  else if (tag === 6) {
+    const entry = NumericPropKeyValue.read(pbf, pbf.readVarint() + pbf.pos);
+    obj.numericProps[entry.key] = entry.value;
+  }
+};
+
+// Polygons ========================================
+
+const Polygons = {};
+
+Polygons.read = function (pbf, end) {
+  return pbf.readFields(
+    Polygons._readField,
+    {
+      positions: null,
+      polygonIndices: null,
+      globalFeatureIds: null,
+      featureIds: null,
+      primitivePolygonIndices: null,
+      triangles: null,
+      properties: [],
+      numericProps: {}
+    },
+    end
+  );
+};
+Polygons._readField = function (tag, obj, pbf) {
+  if (tag === 1) obj.positions = Doubles.read(pbf, pbf.readVarint() + pbf.pos);
+  else if (tag === 2) obj.polygonIndices = Ints.read(pbf, pbf.readVarint() + pbf.pos);
+  else if (tag === 3) obj.globalFeatureIds = Ints.read(pbf, pbf.readVarint() + pbf.pos);
+  else if (tag === 4) obj.featureIds = Ints.read(pbf, pbf.readVarint() + pbf.pos);
+  else if (tag === 5) obj.primitivePolygonIndices = Ints.read(pbf, pbf.readVarint() + pbf.pos);
+  else if (tag === 6) obj.triangles = Ints.read(pbf, pbf.readVarint() + pbf.pos);
+  else if (tag === 7) obj.properties.push(Properties.read(pbf, pbf.readVarint() + pbf.pos));
+  else if (tag === 8) {
+    const entry = NumericPropKeyValue.read(pbf, pbf.readVarint() + pbf.pos);
+    obj.numericProps[entry.key] = entry.value;
+  }
+};
+
+// Tile ========================================
+
+export const Tile = {};
+
+Tile.read = function (pbf, end) {
+  return pbf.readFields(Tile._readField, {points: null, lines: null, polygons: null}, end);
+};
+Tile._readField = function (tag, obj, pbf) {
+  if (tag === 1) obj.points = Points.read(pbf, pbf.readVarint() + pbf.pos);
+  else if (tag === 2) obj.lines = Lines.read(pbf, pbf.readVarint() + pbf.pos);
+  else if (tag === 3) obj.polygons = Polygons.read(pbf, pbf.readVarint() + pbf.pos);
+};

package/src/style/color-bins-style.ts

@@ -0,0 +1,26 @@
+import {scaleThreshold} from 'd3-scale';
+import getPalette, {Color, DEFAULT_PALETTE, NULL_COLOR} from './palette';
+import {assert, AttributeSelector, getAttrValue} from './utils';
+
+export default function colorBins({
+  attr,
+  domain,
+  colors = DEFAULT_PALETTE,
+  nullColor = NULL_COLOR
+}: {
+  attr: AttributeSelector;
+  domain: number[];
+  colors?: string | Color[];
+  nullColor?: Color;
+}): AttributeSelector {
+  assert(Array.isArray(domain), 'Expected "domain" to be an array of numbers');
+
+  const palette = typeof colors === 'string' ? getPalette(colors, domain.length + 1) : colors;
+
+  const color = scaleThreshold<number, Color>().domain(domain).range(palette);
+
+  return d => {
+    const value = getAttrValue(attr, d);
+    return typeof value === 'number' && Number.isFinite(value) ? color(value) : nullColor;
+  };
+}

package/src/style/{color-categories-style.js → color-categories-style.ts}

@@ -1,5 +1,5 @@
-import getPalette, {DEFAULT_PALETTE, NULL_COLOR, OTHERS_COLOR} from './palette';
-import {assert, getAttrValue} from './utils';
+import getPalette, {Color, DEFAULT_PALETTE, NULL_COLOR, OTHERS_COLOR} from './palette';
+import {assert, AttributeSelector, getAttrValue} from './utils';
 
 export default function colorCategories({
   attr,
@@ -7,7 +7,13 @@ export default function colorCategories({
   colors = DEFAULT_PALETTE,
   nullColor = NULL_COLOR,
   othersColor = OTHERS_COLOR
-}) {
+}: {
+  attr: AttributeSelector;
+  domain: number[];
+  colors: string | Color[];
+  nullColor?: Color;
+  othersColor?: Color;
+}): AttributeSelector {
   assert(Array.isArray(domain), 'Expected "domain" to be an array of numbers or strings');
 
   const colorsByCategory = {};
@@ -19,7 +25,7 @@ export default function colorCategories({
 
   return d => {
     const value = getAttrValue(attr, d);
-    return Number.isFinite(value) || typeof value === 'string'
+    return (typeof value === 'number' && Number.isFinite(value)) || typeof value === 'string'
       ? colorsByCategory[value] || othersColor
       : nullColor;
   };

package/src/style/color-continuous-style.ts

@@ -0,0 +1,25 @@
+import {scaleLinear} from 'd3-scale';
+import getPalette, {Color, DEFAULT_PALETTE, NULL_COLOR} from './palette';
+import {assert, AttributeSelector, getAttrValue} from './utils';
+
+export default function colorContinuous({
+  attr,
+  domain,
+  colors = DEFAULT_PALETTE,
+  nullColor = NULL_COLOR
+}: {
+  attr: AttributeSelector;
+  domain: number[];
+  colors?: string | Color[];
+  nullColor?: Color;
+}): AttributeSelector {
+  assert(Array.isArray(domain), 'Expected "domain" to be an array of numbers');
+
+  const palette = typeof colors === 'string' ? getPalette(colors, domain.length) : colors;
+  const color = scaleLinear<Color>().domain(domain).range(palette);
+
+  return d => {
+    const value = getAttrValue(attr, d);
+    return typeof value === 'number' && Number.isFinite(value) ? color(value) : nullColor;
+  };
+}

package/src/style/{palette.js → palette.ts}

@@ -1,12 +1,19 @@
 import * as cartoColors from 'cartocolor';
 import {assert} from './utils';
 
+export type Color = [r: number, b: number, g: number, a?: number];
+
 export const DEFAULT_PALETTE = 'PurpOr';
-export const NULL_COLOR = [204, 204, 204];
-export const OTHERS_COLOR = [119, 119, 119];
+export const NULL_COLOR: Color = [204, 204, 204];
+export const OTHERS_COLOR: Color = [119, 119, 119];
+
+interface CartoColorsPalette {
+  tags?: string[];
+  [key: number]: string[];
+}
 
-export default function getPalette(name, numCategories) {
-  const palette = cartoColors[name];
+export default function getPalette(name: string, numCategories: number): Color[] {
+  const palette: CartoColorsPalette | undefined = cartoColors[name];
   let paletteIndex = numCategories;
 
   assert(palette, `Palette "${name}" not found. Expected a CARTOColors string`);
@@ -33,7 +40,7 @@ export default function getPalette(name, numCategories) {
   return colors.map(c => hexToRgb(c));
 }
 
-export function hexToRgb(hex) {
+export function hexToRgb(hex: string): Color {
   // Evaluate #ABC
   let result = /^#?([a-f\d]{1})([a-f\d]{1})([a-f\d]{1})$/i.exec(hex);
 
@@ -68,16 +75,12 @@ export function hexToRgb(hex) {
   // Evaluate #ABCDEFAF
   result = /^#?([a-f\d]{2})([a-f\d]{2})([a-f\d]{2})([a-f\d]{2})$/i.exec(hex);
 
-  if (result) {
-    return [
-      parseInt(result[1], 16),
-      parseInt(result[2], 16),
-      parseInt(result[3], 16),
-      parseInt(result[4], 16)
-    ];
-  }
-
   assert(result, `Hexadecimal color "${hex}" was not parsed correctly`);
 
-  return NULL_COLOR;
+  return [
+    parseInt(result[1], 16),
+    parseInt(result[2], 16),
+    parseInt(result[3], 16),
+    parseInt(result[4], 16)
+  ];
 }

package/src/style/{utils.js → utils.ts}

@@ -1,23 +1,20 @@
 const ALLOWED_ATTR_TYPES = Object.freeze(['function', 'string']);
 
-export function getAttrValue(attr, d) {
+type Row = {properties: Record<string, unknown>};
+export type AttributeSelector = string | ((d: Row) => unknown);
+
+export function getAttrValue(attr: AttributeSelector, d: Row): unknown {
   assert(typeof d === 'object', 'Expected "data" to be an object');
   assert(ALLOWED_ATTR_TYPES.includes(typeof attr), 'Expected "attr" to be a function or string');
 
   // Is function
-  if (typeof attr === ALLOWED_ATTR_TYPES[0]) {
+  if (typeof attr === 'function') {
     return attr(d);
   }
-
-  // Is string
-  if (typeof attr === ALLOWED_ATTR_TYPES[1]) {
-    return d.properties[attr];
-  }
-
-  return {};
+  return d.properties[attr];
 }
 
-export function assert(condition, message = '') {
+export function assert(condition, message = ''): asserts condition {
   if (!condition) {
     throw new Error(`CARTO style error: ${message}`);
   }

package/src/utils.ts

@@ -0,0 +1,5 @@
+import {log} from '@deck.gl/core';
+
+export function assert(condition: unknown, message?: string): asserts condition {
+  log.assert(condition, message);
+}

package/dist/es5/layers/carto-dynamic-tile-layer.js.map

@@ -1 +0,0 @@
-{"version":3,"sources":["../../../src/layers/carto-dynamic-tile-layer.js"],"names":["parseJSON","arrayBuffer","JSON","parse","TextDecoder","decode","parseCartoDynamicTile","options","formatTiles","cartoDynamicTile","features","CartoDynamicTileLoader","name","id","module","extensions","mimeTypes","category","worker","parseSync","CartoDynamicTileLayer","tile","url","state","data","Promise","reject","loadOptions","getLoadOptions","props","fetch","signal","mimeType","log","assert","includes","cartoBinaryTile","propName","layer","autoHighlight","bbox","west","south","east","north","ClipExtension","clipBounds","subLayer","GeoJsonLayer","MVTLayer","layerName","defaultProps","loaders"],"mappings":"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","sourcesContent":["/* global TextDecoder */\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 {encodeParameter} from '../api/maps-api-common';\n\nfunction parseJSON(arrayBuffer) {\n  return JSON.parse(new TextDecoder().decode(arrayBuffer));\n}\n\nfunction parseCartoDynamicTile(arrayBuffer, options) {\n  if (!arrayBuffer) return null;\n  const formatTiles = options && options.cartoDynamicTile && options.cartoDynamicTile.formatTiles;\n  if (formatTiles === 'geojson') return geojsonToBinary(parseJSON(arrayBuffer).features);\n  return null;\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: '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        ['geojson'].includes(formatTiles),\n        `Invalid value for formatTiles: ${formatTiles}`\n      );\n      url += `&${encodeParameter('formatTiles', formatTiles)}`;\n      loadOptions.cartoBinaryTile = {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()];\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"}

package/dist/esm/layers/carto-dynamic-tile-layer.js

@@ -1,97 +0,0 @@
-import { log } from '@deck.gl/core';
-import { ClipExtension } from '@deck.gl/extensions';
-import { MVTLayer, _getURLFromTemplate } from '@deck.gl/geo-layers';
-import { GeoJsonLayer } from '@deck.gl/layers';
-import { geojsonToBinary } from '@loaders.gl/gis';
-import { encodeParameter } from '../api/maps-api-common';
-
-function parseJSON(arrayBuffer) {
-  return JSON.parse(new TextDecoder().decode(arrayBuffer));
-}
-
-function parseCartoDynamicTile(arrayBuffer, options) {
-  if (!arrayBuffer) return null;
-  const formatTiles = options && options.cartoDynamicTile && options.cartoDynamicTile.formatTiles;
-  if (formatTiles === 'geojson') return geojsonToBinary(parseJSON(arrayBuffer).features);
-  return null;
-}
-
-const CartoDynamicTileLoader = {
-  name: 'CARTO Dynamic Tile',
-  id: 'cartoDynamicTile',
-  module: 'carto',
-  extensions: ['pbf'],
-  mimeTypes: ['application/x-protobuf'],
-  category: 'geometry',
-  worker: false,
-  parse: async (arrayBuffer, options) => parseCartoDynamicTile(arrayBuffer, options),
-  parseSync: parseCartoDynamicTile,
-  options: {
-    cartoDynamicTile: {
-      formatTiles: 'geojson'
-    }
-  }
-};
-export default class CartoDynamicTileLayer extends MVTLayer {
-  getTileData(tile) {
-    let url = _getURLFromTemplate(this.state.data, tile);
-
-    if (!url) {
-      return Promise.reject('Invalid URL');
-    }
-
-    let loadOptions = this.getLoadOptions();
-    const {
-      fetch,
-      formatTiles
-    } = this.props;
-    const {
-      signal
-    } = tile;
-    loadOptions = { ...loadOptions,
-      mimeType: 'application/x-protobuf'
-    };
-
-    if (formatTiles) {
-      log.assert(['geojson'].includes(formatTiles), "Invalid value for formatTiles: ".concat(formatTiles));
-      url += "&".concat(encodeParameter('formatTiles', formatTiles));
-      loadOptions.cartoBinaryTile = {
-        formatTiles
-      };
-    }
-
-    return fetch(url, {
-      propName: 'data',
-      layer: this,
-      loadOptions,
-      signal
-    });
-  }
-
-  renderSubLayers(props) {
-    if (props.data === null) {
-      return null;
-    }
-
-    props.autoHighlight = false;
-    const {
-      bbox: {
-        west,
-        south,
-        east,
-        north
-      }
-    } = props.tile;
-    props.extensions = [new ClipExtension()];
-    props.clipBounds = [west, south, east, north];
-    const subLayer = new GeoJsonLayer({ ...props
-    });
-    return subLayer;
-  }
-
-}
-CartoDynamicTileLayer.layerName = 'CartoDynamicTileLayer';
-CartoDynamicTileLayer.defaultProps = { ...MVTLayer.defaultProps,
-  loaders: [CartoDynamicTileLoader]
-};
-//# sourceMappingURL=carto-dynamic-tile-layer.js.map

package/dist/esm/layers/carto-dynamic-tile-layer.js.map

@@ -1 +0,0 @@
-{"version":3,"sources":["../../../src/layers/carto-dynamic-tile-layer.js"],"names":["log","ClipExtension","MVTLayer","_getURLFromTemplate","GeoJsonLayer","geojsonToBinary","encodeParameter","parseJSON","arrayBuffer","JSON","parse","TextDecoder","decode","parseCartoDynamicTile","options","formatTiles","cartoDynamicTile","features","CartoDynamicTileLoader","name","id","module","extensions","mimeTypes","category","worker","parseSync","CartoDynamicTileLayer","getTileData","tile","url","state","data","Promise","reject","loadOptions","getLoadOptions","fetch","props","signal","mimeType","assert","includes","cartoBinaryTile","propName","layer","renderSubLayers","autoHighlight","bbox","west","south","east","north","clipBounds","subLayer","layerName","defaultProps","loaders"],"mappings":"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","sourcesContent":["/* global TextDecoder */\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 {encodeParameter} from '../api/maps-api-common';\n\nfunction parseJSON(arrayBuffer) {\n  return JSON.parse(new TextDecoder().decode(arrayBuffer));\n}\n\nfunction parseCartoDynamicTile(arrayBuffer, options) {\n  if (!arrayBuffer) return null;\n  const formatTiles = options && options.cartoDynamicTile && options.cartoDynamicTile.formatTiles;\n  if (formatTiles === 'geojson') return geojsonToBinary(parseJSON(arrayBuffer).features);\n  return null;\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: '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        ['geojson'].includes(formatTiles),\n        `Invalid value for formatTiles: ${formatTiles}`\n      );\n      url += `&${encodeParameter('formatTiles', formatTiles)}`;\n      loadOptions.cartoBinaryTile = {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()];\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"}

package/src/api/maps-api-common.js

@@ -1,34 +0,0 @@
-export const DEFAULT_USER_COMPONENT_IN_URL = '{user}';
-export const DEFAULT_REGION_COMPONENT_IN_URL = '{region}';
-
-export const API_VERSIONS = {
-  V1: 'v1',
-  V2: 'v2',
-  V3: 'v3'
-};
-
-export const DEFAULT_MAPS_URL_FORMAT = {
-  [API_VERSIONS.V1]: `https://${DEFAULT_USER_COMPONENT_IN_URL}.carto.com/api/v1/map`,
-  [API_VERSIONS.V2]: `https://maps-api-v2.${DEFAULT_REGION_COMPONENT_IN_URL}.carto.com/user/${DEFAULT_USER_COMPONENT_IN_URL}`
-};
-
-export const MAP_TYPES = {
-  QUERY: 'query',
-  TABLE: 'table',
-  TILESET: 'tileset'
-};
-
-// AVAILABLE FORMATS
-export const FORMATS = {
-  GEOJSON: 'geojson',
-  NDJSON: 'ndjson',
-  TILEJSON: 'tilejson',
-  JSON: 'json'
-};
-
-/**
- * Simple encode parameter
- */
-export function encodeParameter(name, value) {
-  return `${name}=${encodeURIComponent(value)}`;
-}

package/src/basemap.js

@@ -1,10 +0,0 @@
-const base_url = 'https://basemaps.cartocdn.com/gl/{basemap}-gl-style/style.json';
-
-export default {
-  VOYAGER: base_url.replace('{basemap}', 'voyager'),
-  POSITRON: base_url.replace('{basemap}', 'positron'),
-  DARK_MATTER: base_url.replace('{basemap}', 'dark-matter'),
-  VOYAGER_NOLABELS: base_url.replace('{basemap}', 'voyager-nolabels'),
-  POSITRON_NOLABELS: base_url.replace('{basemap}', 'positron-nolabels'),
-  DARK_MATTER_NOLABELS: base_url.replace('{basemap}', 'dark-matter-nolabels')
-};