@deck.gl/carto 8.8.9 → 8.8.10

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.8.9",
+  "version": "8.8.10",
   "publishConfig": {
     "access": "public"
   },
@@ -61,5 +61,5 @@
     "@deck.gl/layers": "^8.0.0",
     "@loaders.gl/core": "^3.0.0"
   },
-  "gitHead": "1cceaed3dad056c3fb51864e7f56585271ed1e5a"
+  "gitHead": "102716bbb1ff42eeb131ab9280d2d886602d1e6f"
 }

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

@@ -405,8 +405,7 @@ async function _fetchMapDataset(
   accessToken: string,
   credentials: CloudNativeCredentials,
   clientId?: string,
-  headers?: Headers,
-  queryParameters?: QueryParameters
+  headers?: Headers
 ) {
   const {
     aggregationExp,
@@ -416,7 +415,8 @@ async function _fetchMapDataset(
     format,
     geoColumn,
     source,
-    type
+    type,
+    queryParameters
   } = dataset;
   // First fetch metadata
   const {url, mapFormat} = await _fetchDataUrl({

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

@@ -1,6 +1,8 @@
-/* global TextDecoder */
-import Protobuf from 'pbf';
-import {log, DefaultProps} from '@deck.gl/core';
+import {registerLoaders} from '@loaders.gl/core';
+import CartoVectorTileLoader from './schema/carto-vector-tile-loader';
+registerLoaders([CartoVectorTileLoader]);
+
+import {DefaultProps} from '@deck.gl/core';
 import {ClipExtension} from '@deck.gl/extensions';
 import {
   MVTLayer,
@@ -11,81 +13,16 @@ import {
   _TileLoadProps as TileLoadProps
 } from '@deck.gl/geo-layers';
 import {GeoJsonLayer} from '@deck.gl/layers';
-import {geojsonToBinary} from '@loaders.gl/gis';
-import {KeyValueProperties, Tile, TileReader} from './schema/carto-tile';
-import {TileFormat, TILE_FORMATS} from '../api/maps-api-common';
-import {LoaderOptions, LoaderWithParser} from '@loaders.gl/loader-utils';
+import {binaryToGeojson, geojsonToBinary} from '@loaders.gl/gis';
 import type {BinaryFeatures} from '@loaders.gl/schema';
+import {TileFormat, TILE_FORMATS} from '../api/maps-api-common';
 import type {Feature} from 'geojson';
 
-function parseJSON(arrayBuffer: ArrayBuffer): any {
-  return JSON.parse(new TextDecoder().decode(arrayBuffer));
-}
-
-function parsePbf(buffer: ArrayBuffer): Tile {
-  const pbf = new Protobuf(buffer);
-  const tile = TileReader.read(pbf);
-  return tile;
-}
-
-function unpackProperties(properties: KeyValueProperties[]) {
-  if (!properties || !properties.length) {
-    return [];
-  }
-  return properties.map(item => {
-    const currentRecord: Record<string, unknown> = {};
-    item.data.forEach(({key, value}) => {
-      currentRecord[key] = value;
-    });
-    return currentRecord;
-  });
-}
-
-function parseCartoTile(arrayBuffer: ArrayBuffer, options?: LoaderOptions): BinaryFeatures | null {
-  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)}
-  };
-
-  // Note: there is slight, difference in `numericProps` type, however geojson/mvtlayer can cope with this
-  return data as unknown as BinaryFeatures;
-}
-
 const defaultTileFormat = TILE_FORMATS.BINARY;
 
-const CartoTileLoader: LoaderWithParser = {
-  name: 'CARTO Tile',
-  version: '1',
-  id: 'cartoTile',
-  module: 'carto',
-  extensions: ['pbf'],
-  mimeTypes: [
-    'application/vnd.carto-vector-tile',
-    'application/x-protobuf' // Back-compatibility
-  ],
-  category: 'geometry',
-  worker: false,
-  parse: async (arrayBuffer, options) => parseCartoTile(arrayBuffer, options),
-  parseSync: parseCartoTile,
-  options: {
-    cartoTile: {
-      formatTiles: defaultTileFormat
-    }
-  }
-};
-
 const defaultProps: DefaultProps<CartoTileLayerProps> = {
   ...MVTLayer.defaultProps,
-  formatTiles: defaultTileFormat,
-  loaders: [CartoTileLoader]
+  formatTiles: defaultTileFormat
 };
 
 /** All properties supported by CartoTileLayer. */
@@ -110,6 +47,12 @@ export default class CartoTileLayer<
   static layerName = 'CartoTileLayer';
   static defaultProps = defaultProps;
 
+  initializeState(): void {
+    super.initializeState();
+    const binary = this.props.formatTiles === TILE_FORMATS.BINARY;
+    this.setState({binary});
+  }
+
   getTileData(tile: TileLoadProps) {
     const url = _getURLFromTemplate(this.state.data, tile);
     if (!url) {
@@ -120,17 +63,13 @@ export default class CartoTileLayer<
     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`
-      );
-      loadOptions.cartoTile = {formatTiles};
+    // The backend doesn't yet support our custom mime-type, so force it here
+    // TODO remove once backend sends the correct mime-type
+    if (formatTiles === TILE_FORMATS.BINARY) {
+      loadOptions = {
+        ...loadOptions,
+        mimeType: 'application/vnd.carto-vector-tile'
+      };
     }
 
     return fetch(url, {propName: 'data', layer: this, loadOptions, signal});
@@ -161,4 +100,15 @@ export default class CartoTileLayer<
     const subLayer = new GeoJsonLayer(subLayerProps);
     return subLayer;
   }
+
+  getPickingInfo(params) {
+    const info = super.getPickingInfo(params);
+
+    if (this.state.binary && info.index !== -1) {
+      const {data} = params.sourceLayer!.props;
+      info.object = binaryToGeojson(data as BinaryFeatures, {globalFeatureId: info.index}) as DataT;
+    }
+
+    return info;
+  }
 }

package/src/layers/schema/carto-spatial-tile-loader.ts

@@ -1,9 +1,8 @@
-import Protobuf from 'pbf';
 import {LoaderOptions, LoaderWithParser} from '@loaders.gl/loader-utils';
 
-import {KeyValueProperties} from './carto-tile';
-import {binaryToSpatialjson, Properties, SpatialJson} from './spatialjson-utils';
 import {Tile, TileReader} from './carto-spatial-tile';
+import {parsePbf, unpackProperties} from './tile-loader-utils';
+import {binaryToSpatialjson, SpatialJson} from './spatialjson-utils';
 
 const CartoSpatialTileLoader: LoaderWithParser = {
   name: 'CARTO Spatial Tile',
@@ -11,10 +10,7 @@ const CartoSpatialTileLoader: LoaderWithParser = {
   id: 'cartoSpatialTile',
   module: 'carto',
   extensions: ['pbf'],
-  mimeTypes: [
-    'application/vnd.carto-spatial-tile',
-    'application/x-protobuf' // Back-compatibility
-  ],
+  mimeTypes: ['application/vnd.carto-spatial-tile'],
   category: 'geometry',
   worker: false,
   parse: async (arrayBuffer, options) => parseCartoSpatialTile(arrayBuffer, options),
@@ -22,31 +18,12 @@ const CartoSpatialTileLoader: LoaderWithParser = {
   options: {}
 };
 
-function parsePbf(buffer: ArrayBuffer): Tile {
-  const pbf = new Protobuf(buffer);
-  const tile = TileReader.read(pbf);
-  return tile;
-}
-
-function unpackProperties(properties: KeyValueProperties[]): Properties[] {
-  if (!properties || !properties.length) {
-    return [];
-  }
-  return properties.map(item => {
-    const currentRecord: Properties = {};
-    item.data.forEach(({key, value}) => {
-      currentRecord[key] = value;
-    });
-    return currentRecord;
-  });
-}
-
 function parseCartoSpatialTile(
   arrayBuffer: ArrayBuffer,
   options?: LoaderOptions
 ): SpatialJson | null {
   if (!arrayBuffer) return null;
-  const tile = parsePbf(arrayBuffer);
+  const tile: Tile = parsePbf(arrayBuffer, TileReader);
 
   const {cells} = tile;
   const data = {

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

@@ -67,6 +67,21 @@ class IntsReader {
   }
 }
 
+// Fields ========================================
+
+interface Fields {
+  id: number;
+}
+
+class FieldsReader {
+  static read(pbf, end?: number): Fields {
+    return pbf.readFields(FieldsReader._readField, {id: 0}, end);
+  }
+  static _readField(this: void, tag: number, obj: Fields, pbf) {
+    if (tag === 1) obj.id = pbf.readVarint();
+  }
+}
+
 // NumericProp ========================================
 
 export interface NumericProp {
@@ -106,13 +121,21 @@ interface Points {
   featureIds: Ints;
   properties: KeyValueProperties[];
   numericProps: Record<string, NumericProp>;
+  fields: Fields[];
 }
 
 class PointsReader {
   static read(pbf, end?: number): Points {
     return pbf.readFields(
       PointsReader._readField,
-      {positions: null, globalFeatureIds: null, featureIds: null, properties: [], numericProps: {}},
+      {
+        positions: null,
+        globalFeatureIds: null,
+        featureIds: null,
+        properties: [],
+        numericProps: {},
+        fields: []
+      },
       end
     );
   }
@@ -124,7 +147,7 @@ class PointsReader {
     else if (tag === 5) {
       const entry = NumericPropKeyValueReader.read(pbf, pbf.readVarint() + pbf.pos);
       obj.numericProps[entry.key] = entry.value;
-    }
+    } else if (tag === 6) obj.fields.push(FieldsReader.read(pbf, pbf.readVarint() + pbf.pos));
   }
 }
 
@@ -143,7 +166,8 @@ class LinesReader {
         globalFeatureIds: null,
         featureIds: null,
         properties: [],
-        numericProps: {}
+        numericProps: {},
+        fields: []
       },
       end
     );
@@ -157,7 +181,7 @@ class LinesReader {
     else if (tag === 6) {
       const entry = NumericPropKeyValueReader.read(pbf, pbf.readVarint() + pbf.pos);
       obj.numericProps[entry.key] = entry.value;
-    }
+    } else if (tag === 7) obj.fields.push(FieldsReader.read(pbf, pbf.readVarint() + pbf.pos));
   }
 }
 // Polygons ========================================
@@ -180,7 +204,8 @@ class PolygonsReader {
         primitivePolygonIndices: null,
         triangles: null,
         properties: [],
-        numericProps: {}
+        numericProps: {},
+        fields: []
       },
       end
     );
@@ -197,7 +222,7 @@ class PolygonsReader {
     else if (tag === 8) {
       const entry = NumericPropKeyValueReader.read(pbf, pbf.readVarint() + pbf.pos);
       obj.numericProps[entry.key] = entry.value;
-    }
+    } else if (tag === 9) obj.fields.push(FieldsReader.read(pbf, pbf.readVarint() + pbf.pos));
   }
 }
 

package/src/layers/schema/carto-vector-tile-loader.ts

@@ -0,0 +1,39 @@
+import {LoaderOptions, LoaderWithParser} from '@loaders.gl/loader-utils';
+import type {BinaryFeatures} from '@loaders.gl/schema';
+
+import {TileReader} from './carto-tile';
+import {parsePbf, unpackProperties} from './tile-loader-utils';
+
+const CartoVectorTileLoader: LoaderWithParser = {
+  name: 'CARTO Vector Tile',
+  version: '1',
+  id: 'cartoVectorTile',
+  module: 'carto',
+  extensions: ['pbf'],
+  mimeTypes: ['application/vnd.carto-vector-tile'],
+  category: 'geometry',
+  worker: false,
+  parse: async (arrayBuffer, options) => parseCartoVectorTile(arrayBuffer, options),
+  parseSync: parseCartoVectorTile,
+  options: {}
+};
+
+function parseCartoVectorTile(
+  arrayBuffer: ArrayBuffer,
+  options?: LoaderOptions
+): BinaryFeatures | null {
+  if (!arrayBuffer) return null;
+  const tile = parsePbf(arrayBuffer, TileReader);
+
+  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)}
+  };
+
+  // Note: there is slight, difference in `numericProps` type, however geojson/mvtlayer can cope with this
+  return data as unknown as BinaryFeatures;
+}
+
+export default CartoVectorTileLoader;

package/src/layers/schema/tile-loader-utils.ts

@@ -0,0 +1,22 @@
+import Protobuf from 'pbf';
+import {KeyValueProperties} from './carto-tile';
+import {Properties} from './spatialjson-utils';
+
+export function parsePbf(buffer: ArrayBuffer, TileReader) {
+  const pbf = new Protobuf(buffer);
+  const tile = TileReader.read(pbf);
+  return tile;
+}
+
+export function unpackProperties(properties: KeyValueProperties[]): Properties[] {
+  if (!properties || !properties.length) {
+    return [];
+  }
+  return properties.map(item => {
+    const currentRecord: Properties = {};
+    item.data.forEach(({key, value}) => {
+      currentRecord[key] = value;
+    });
+    return currentRecord;
+  });
+}

package/src/layers/spatial-index-tile-layer.ts

@@ -3,7 +3,13 @@ import CartoSpatialTileLoader from './schema/carto-spatial-tile-loader';
 registerLoaders([CartoSpatialTileLoader]);
 
 import {PickingInfo} from '@deck.gl/core';
-import {TileLayer, _Tile2DHeader as Tile2DHeader} from '@deck.gl/geo-layers';
+import {
+  TileLayer,
+  _getURLFromTemplate,
+  _Tile2DHeader as Tile2DHeader,
+  _TileLoadProps as TileLoadProps
+} from '@deck.gl/geo-layers';
+import {TILE_FORMATS} from '../api/maps-api-common';
 
 function isFeatureIdDefined(value: unknown): boolean {
   return value !== undefined && value !== null && value !== '';
@@ -12,6 +18,36 @@ function isFeatureIdDefined(value: unknown): boolean {
 export default class SpatialIndexTileLayer<ExtraProps = {}> extends TileLayer<any, ExtraProps> {
   static layerName = 'SpatialIndexTileLayer';
 
+  getTileData(tile: TileLoadProps) {
+    const {data, getTileData, fetch} = this.props;
+    const {signal} = tile;
+
+    tile.url =
+      typeof data === 'string' || Array.isArray(data) ? _getURLFromTemplate(data, tile) : null;
+    if (!tile.url) {
+      return Promise.reject('Invalid URL');
+    }
+
+    if (getTileData) {
+      return getTileData(tile);
+    }
+
+    let loadOptions = this.getLoadOptions();
+    // @ts-ignore
+    const {formatTiles} = this.props;
+
+    // The backend doesn't yet support our custom mime-type, so force it here
+    // TODO remove entire `getTileData` method once backend sends the correct mime-type
+    if (formatTiles === TILE_FORMATS.BINARY) {
+      loadOptions = {
+        ...loadOptions,
+        mimeType: 'application/vnd.carto-spatial-tile'
+      };
+    }
+
+    return fetch(tile.url, {propName: 'data', layer: this, loadOptions, signal});
+  }
+
   protected _updateAutoHighlight(info: PickingInfo): void {
     const {hoveredFeatureId} = this.state;
     const hoveredFeature = info.object;

package/typed/layers/carto-tile-layer.d.ts

@@ -18,6 +18,7 @@ declare type _CartoTileLayerProps = {
 export default class CartoTileLayer<DataT extends Feature = Feature, ExtraProps = {}> extends MVTLayer<DataT, Required<_CartoTileLayerProps> & ExtraProps> {
     static layerName: string;
     static defaultProps: DefaultProps<CartoTileLayerProps<Feature<import("geojson").Geometry, import("geojson").GeoJsonProperties>>>;
+    initializeState(): void;
     getTileData(tile: TileLoadProps): any;
     renderSubLayers(props: TileLayer['props'] & {
         id: string;
@@ -25,6 +26,7 @@ export default class CartoTileLayer<DataT extends Feature = Feature, ExtraProps
         _offset: number;
         tile: _Tile2DHeader;
     }): GeoJsonLayer | null;
+    getPickingInfo(params: any): import("modules/geo-layers/src/tile-layer/tile-layer").TiledPickingInfo<any>;
 }
 export {};
 //# sourceMappingURL=carto-tile-layer.d.ts.map

package/typed/layers/carto-tile-layer.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"carto-tile-layer.d.ts","sourceRoot":"","sources":["../../src/layers/carto-tile-layer.ts"],"names":[],"mappings":"AAEA,OAAO,EAAM,YAAY,EAAC,MAAM,eAAe,CAAC;AAEhD,OAAO,EACL,QAAQ,EACR,aAAa,EACb,SAAS,EAET,aAAa,EACb,cAAc,IAAI,aAAa,EAChC,MAAM,qBAAqB,CAAC;AAC7B,OAAO,EAAC,YAAY,EAAC,MAAM,iBAAiB,CAAC;AAG7C,OAAO,EAAC,UAAU,EAAe,MAAM,wBAAwB,CAAC;AAGhE,OAAO,KAAK,EAAC,OAAO,EAAC,MAAM,SAAS,CAAC;AAwErC,kDAAkD;AAClD,oBAAY,mBAAmB,CAAC,KAAK,SAAS,OAAO,GAAG,OAAO,IAAI,oBAAoB,GACrF,aAAa,CAAC,KAAK,CAAC,CAAC;AAEvB,0CAA0C;AAC1C,aAAK,oBAAoB,GAAG;IAC1B;;;;;OAKG;IACH,WAAW,CAAC,EAAE,UAAU,CAAC;CAC1B,CAAC;AAEF,MAAM,CAAC,OAAO,OAAO,cAAc,CACjC,KAAK,SAAS,OAAO,GAAG,OAAO,EAC/B,UAAU,GAAG,EAAE,CACf,SAAQ,QAAQ,CAAC,KAAK,EAAE,QAAQ,CAAC,oBAAoB,CAAC,GAAG,UAAU,CAAC;IACpE,MAAM,CAAC,SAAS,SAAoB;IACpC,MAAM,CAAC,YAAY,8GAAgB;IAEnC,WAAW,CAAC,IAAI,EAAE,aAAa;IA0B/B,eAAe,CACb,KAAK,EAAE,SAAS,CAAC,OAAO,CAAC,GAAG;QAC1B,EAAE,EAAE,MAAM,CAAC;QACX,IAAI,EAAE,GAAG,CAAC;QACV,OAAO,EAAE,MAAM,CAAC;QAChB,IAAI,EAAE,aAAa,CAAC;KACrB,GACA,YAAY,GAAG,IAAI;CAkBvB"}
+{"version":3,"file":"carto-tile-layer.d.ts","sourceRoot":"","sources":["../../src/layers/carto-tile-layer.ts"],"names":[],"mappings":"AAIA,OAAO,EAAC,YAAY,EAAC,MAAM,eAAe,CAAC;AAE3C,OAAO,EACL,QAAQ,EACR,aAAa,EACb,SAAS,EAET,aAAa,EACb,cAAc,IAAI,aAAa,EAChC,MAAM,qBAAqB,CAAC;AAC7B,OAAO,EAAC,YAAY,EAAC,MAAM,iBAAiB,CAAC;AAG7C,OAAO,EAAC,UAAU,EAAe,MAAM,wBAAwB,CAAC;AAChE,OAAO,KAAK,EAAC,OAAO,EAAC,MAAM,SAAS,CAAC;AASrC,kDAAkD;AAClD,oBAAY,mBAAmB,CAAC,KAAK,SAAS,OAAO,GAAG,OAAO,IAAI,oBAAoB,GACrF,aAAa,CAAC,KAAK,CAAC,CAAC;AAEvB,0CAA0C;AAC1C,aAAK,oBAAoB,GAAG;IAC1B;;;;;OAKG;IACH,WAAW,CAAC,EAAE,UAAU,CAAC;CAC1B,CAAC;AAEF,MAAM,CAAC,OAAO,OAAO,cAAc,CACjC,KAAK,SAAS,OAAO,GAAG,OAAO,EAC/B,UAAU,GAAG,EAAE,CACf,SAAQ,QAAQ,CAAC,KAAK,EAAE,QAAQ,CAAC,oBAAoB,CAAC,GAAG,UAAU,CAAC;IACpE,MAAM,CAAC,SAAS,SAAoB;IACpC,MAAM,CAAC,YAAY,8GAAgB;IAEnC,eAAe,IAAI,IAAI;IAMvB,WAAW,CAAC,IAAI,EAAE,aAAa;IAsB/B,eAAe,CACb,KAAK,EAAE,SAAS,CAAC,OAAO,CAAC,GAAG;QAC1B,EAAE,EAAE,MAAM,CAAC;QACX,IAAI,EAAE,GAAG,CAAC;QACV,OAAO,EAAE,MAAM,CAAC;QAChB,IAAI,EAAE,aAAa,CAAC;KACrB,GACA,YAAY,GAAG,IAAI;IAmBtB,cAAc,CAAC,MAAM,KAAA;CAUtB"}

package/typed/layers/schema/carto-spatial-tile-loader.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"carto-spatial-tile-loader.d.ts","sourceRoot":"","sources":["../../../src/layers/schema/carto-spatial-tile-loader.ts"],"names":[],"mappings":"AACA,OAAO,EAAgB,gBAAgB,EAAC,MAAM,0BAA0B,CAAC;AAMzE,QAAA,MAAM,sBAAsB,EAAE,gBAe7B,CAAC;AAoCF,eAAe,sBAAsB,CAAC"}
+{"version":3,"file":"carto-spatial-tile-loader.d.ts","sourceRoot":"","sources":["../../../src/layers/schema/carto-spatial-tile-loader.ts"],"names":[],"mappings":"AAAA,OAAO,EAAgB,gBAAgB,EAAC,MAAM,0BAA0B,CAAC;AAMzE,QAAA,MAAM,sBAAsB,EAAE,gBAY7B,CAAC;AAiBF,eAAe,sBAAsB,CAAC"}

package/typed/layers/schema/carto-tile.d.ts

@@ -17,6 +17,9 @@ interface Ints {
     value: Uint32Array;
     size: number;
 }
+interface Fields {
+    id: number;
+}
 export interface NumericProp {
     value: number[];
 }
@@ -34,6 +37,7 @@ interface Points {
     featureIds: Ints;
     properties: KeyValueProperties[];
     numericProps: Record<string, NumericProp>;
+    fields: Fields[];
 }
 interface Lines extends Points {
     pathIndices: Ints;

package/typed/layers/schema/carto-tile.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"carto-tile.d.ts","sourceRoot":"","sources":["../../../src/layers/schema/carto-tile.ts"],"names":[],"mappings":"AACA,UAAU,cAAc;IACtB,GAAG,EAAE,MAAM,CAAC;IACZ,KAAK,EAAE,MAAM,CAAC;CACf;AAcD,MAAM,WAAW,kBAAkB;IACjC,IAAI,EAAE,cAAc,EAAE,CAAC;CACxB;AAED,qBAAa,gBAAgB;IAC3B,MAAM,CAAC,IAAI,CAAC,GAAG,KAAA,EAAE,GAAG,CAAC,EAAE,MAAM;IAG7B,MAAM,CAAC,UAAU,CAAC,IAAI,EAAE,IAAI,EAAE,GAAG,EAAE,MAAM,EAAE,GAAG,EAAE,kBAAkB,EAAE,GAAG,KAAA;CAGxE;AAID,UAAU,OAAO;IACf,KAAK,EAAE,YAAY,CAAC;IACpB,IAAI,EAAE,MAAM,CAAC;CACd;AAiBD,UAAU,IAAI;IACZ,KAAK,EAAE,WAAW,CAAC;IACnB,IAAI,EAAE,MAAM,CAAC;CACd;AAeD,MAAM,WAAW,WAAW;IAC1B,KAAK,EAAE,MAAM,EAAE,CAAC;CACjB;AAYD,UAAU,oBAAoB;IAC5B,GAAG,EAAE,MAAM,CAAC;IACZ,KAAK,EAAE,WAAW,CAAC;CACpB;AAED,qBAAa,yBAAyB;IACpC,MAAM,CAAC,IAAI,CAAC,GAAG,KAAA,EAAE,GAAG,CAAC,EAAE,MAAM,GAAG,oBAAoB;IAGpD,MAAM,CAAC,UAAU,CAAC,IAAI,EAAE,IAAI,EAAE,GAAG,EAAE,MAAM,EAAE,GAAG,EAAE,oBAAoB,EAAE,GAAG,KAAA;CAI1E;AAID,UAAU,MAAM;IACd,SAAS,EAAE,OAAO,CAAC;IACnB,gBAAgB,EAAE,IAAI,CAAC;IACvB,UAAU,EAAE,IAAI,CAAC;IACjB,UAAU,EAAE,kBAAkB,EAAE,CAAC;IACjC,YAAY,EAAE,MAAM,CAAC,MAAM,EAAE,WAAW,CAAC,CAAC;CAC3C;AAsBD,UAAU,KAAM,SAAQ,MAAM;IAC5B,WAAW,EAAE,IAAI,CAAC;CACnB;AAgCD,UAAU,QAAS,SAAQ,MAAM;IAC/B,cAAc,EAAE,IAAI,CAAC;IACrB,uBAAuB,EAAE,IAAI,CAAC;IAC9B,SAAS,EAAE,IAAI,CAAC;CACjB;AAqCD,MAAM,WAAW,IAAI;IACnB,MAAM,EAAE,MAAM,CAAC;IACf,KAAK,EAAE,KAAK,CAAC;IACb,QAAQ,EAAE,QAAQ,CAAC;CACpB;AAED,qBAAa,UAAU;IACrB,MAAM,CAAC,IAAI,CAAC,GAAG,KAAA,EAAE,GAAG,CAAC,EAAE,MAAM,GAAG,IAAI;IAGpC,MAAM,CAAC,UAAU,CAAC,IAAI,EAAE,IAAI,EAAE,GAAG,EAAE,MAAM,EAAE,GAAG,EAAE,IAAI,EAAE,GAAG,KAAA;CAK1D"}
+{"version":3,"file":"carto-tile.d.ts","sourceRoot":"","sources":["../../../src/layers/schema/carto-tile.ts"],"names":[],"mappings":"AACA,UAAU,cAAc;IACtB,GAAG,EAAE,MAAM,CAAC;IACZ,KAAK,EAAE,MAAM,CAAC;CACf;AAcD,MAAM,WAAW,kBAAkB;IACjC,IAAI,EAAE,cAAc,EAAE,CAAC;CACxB;AAED,qBAAa,gBAAgB;IAC3B,MAAM,CAAC,IAAI,CAAC,GAAG,KAAA,EAAE,GAAG,CAAC,EAAE,MAAM;IAG7B,MAAM,CAAC,UAAU,CAAC,IAAI,EAAE,IAAI,EAAE,GAAG,EAAE,MAAM,EAAE,GAAG,EAAE,kBAAkB,EAAE,GAAG,KAAA;CAGxE;AAID,UAAU,OAAO;IACf,KAAK,EAAE,YAAY,CAAC;IACpB,IAAI,EAAE,MAAM,CAAC;CACd;AAiBD,UAAU,IAAI;IACZ,KAAK,EAAE,WAAW,CAAC;IACnB,IAAI,EAAE,MAAM,CAAC;CACd;AAeD,UAAU,MAAM;IACd,EAAE,EAAE,MAAM,CAAC;CACZ;AAaD,MAAM,WAAW,WAAW;IAC1B,KAAK,EAAE,MAAM,EAAE,CAAC;CACjB;AAYD,UAAU,oBAAoB;IAC5B,GAAG,EAAE,MAAM,CAAC;IACZ,KAAK,EAAE,WAAW,CAAC;CACpB;AAED,qBAAa,yBAAyB;IACpC,MAAM,CAAC,IAAI,CAAC,GAAG,KAAA,EAAE,GAAG,CAAC,EAAE,MAAM,GAAG,oBAAoB;IAGpD,MAAM,CAAC,UAAU,CAAC,IAAI,EAAE,IAAI,EAAE,GAAG,EAAE,MAAM,EAAE,GAAG,EAAE,oBAAoB,EAAE,GAAG,KAAA;CAI1E;AAID,UAAU,MAAM;IACd,SAAS,EAAE,OAAO,CAAC;IACnB,gBAAgB,EAAE,IAAI,CAAC;IACvB,UAAU,EAAE,IAAI,CAAC;IACjB,UAAU,EAAE,kBAAkB,EAAE,CAAC;IACjC,YAAY,EAAE,MAAM,CAAC,MAAM,EAAE,WAAW,CAAC,CAAC;IAC1C,MAAM,EAAE,MAAM,EAAE,CAAC;CAClB;AA6BD,UAAU,KAAM,SAAQ,MAAM;IAC5B,WAAW,EAAE,IAAI,CAAC;CACnB;AAiCD,UAAU,QAAS,SAAQ,MAAM;IAC/B,cAAc,EAAE,IAAI,CAAC;IACrB,uBAAuB,EAAE,IAAI,CAAC;IAC9B,SAAS,EAAE,IAAI,CAAC;CACjB;AAsCD,MAAM,WAAW,IAAI;IACnB,MAAM,EAAE,MAAM,CAAC;IACf,KAAK,EAAE,KAAK,CAAC;IACb,QAAQ,EAAE,QAAQ,CAAC;CACpB;AAED,qBAAa,UAAU;IACrB,MAAM,CAAC,IAAI,CAAC,GAAG,KAAA,EAAE,GAAG,CAAC,EAAE,MAAM,GAAG,IAAI;IAGpC,MAAM,CAAC,UAAU,CAAC,IAAI,EAAE,IAAI,EAAE,GAAG,EAAE,MAAM,EAAE,GAAG,EAAE,IAAI,EAAE,GAAG,KAAA;CAK1D"}

package/typed/layers/schema/carto-vector-tile-loader.d.ts

@@ -0,0 +1,4 @@
+import { LoaderWithParser } from '@loaders.gl/loader-utils';
+declare const CartoVectorTileLoader: LoaderWithParser;
+export default CartoVectorTileLoader;
+//# sourceMappingURL=carto-vector-tile-loader.d.ts.map

package/typed/layers/schema/carto-vector-tile-loader.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"carto-vector-tile-loader.d.ts","sourceRoot":"","sources":["../../../src/layers/schema/carto-vector-tile-loader.ts"],"names":[],"mappings":"AAAA,OAAO,EAAgB,gBAAgB,EAAC,MAAM,0BAA0B,CAAC;AAMzE,QAAA,MAAM,qBAAqB,EAAE,gBAY5B,CAAC;AAoBF,eAAe,qBAAqB,CAAC"}

package/typed/layers/schema/tile-loader-utils.d.ts

@@ -0,0 +1,5 @@
+import { KeyValueProperties } from './carto-tile';
+import { Properties } from './spatialjson-utils';
+export declare function parsePbf(buffer: ArrayBuffer, TileReader: any): any;
+export declare function unpackProperties(properties: KeyValueProperties[]): Properties[];
+//# sourceMappingURL=tile-loader-utils.d.ts.map

package/typed/layers/schema/tile-loader-utils.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"tile-loader-utils.d.ts","sourceRoot":"","sources":["../../../src/layers/schema/tile-loader-utils.ts"],"names":[],"mappings":"AACA,OAAO,EAAC,kBAAkB,EAAC,MAAM,cAAc,CAAC;AAChD,OAAO,EAAC,UAAU,EAAC,MAAM,qBAAqB,CAAC;AAE/C,wBAAgB,QAAQ,CAAC,MAAM,EAAE,WAAW,EAAE,UAAU,KAAA,OAIvD;AAED,wBAAgB,gBAAgB,CAAC,UAAU,EAAE,kBAAkB,EAAE,GAAG,UAAU,EAAE,CAW/E"}

package/typed/layers/spatial-index-tile-layer.d.ts

@@ -1,7 +1,8 @@
 import { PickingInfo } from '@deck.gl/core/typed';
-import { TileLayer, _Tile2DHeader as Tile2DHeader } from '@deck.gl/geo-layers/typed';
+import { TileLayer, _Tile2DHeader as Tile2DHeader, _TileLoadProps as TileLoadProps } from '@deck.gl/geo-layers/typed';
 export default class SpatialIndexTileLayer<ExtraProps = {}> extends TileLayer<any, ExtraProps> {
     static layerName: string;
+    getTileData(tile: TileLoadProps): any;
     protected _updateAutoHighlight(info: PickingInfo): void;
     getSubLayerPropsByTile(tile: Tile2DHeader): {
         highlightedObjectIndex: number;

package/typed/layers/spatial-index-tile-layer.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"spatial-index-tile-layer.d.ts","sourceRoot":"","sources":["../../src/layers/spatial-index-tile-layer.ts"],"names":[],"mappings":"AAIA,OAAO,EAAC,WAAW,EAAC,MAAM,eAAe,CAAC;AAC1C,OAAO,EAAC,SAAS,EAAE,aAAa,IAAI,YAAY,EAAC,MAAM,qBAAqB,CAAC;AAM7E,MAAM,CAAC,OAAO,OAAO,qBAAqB,CAAC,UAAU,GAAG,EAAE,CAAE,SAAQ,SAAS,CAAC,GAAG,EAAE,UAAU,CAAC;IAC5F,MAAM,CAAC,SAAS,SAA2B;IAE3C,SAAS,CAAC,oBAAoB,CAAC,IAAI,EAAE,WAAW,GAAG,IAAI;IAsBvD,sBAAsB,CAAC,IAAI,EAAE,YAAY;;;;IAOzC,yBAAyB,CAAC,IAAI,EAAE,YAAY;CAW7C"}
+{"version":3,"file":"spatial-index-tile-layer.d.ts","sourceRoot":"","sources":["../../src/layers/spatial-index-tile-layer.ts"],"names":[],"mappings":"AAIA,OAAO,EAAC,WAAW,EAAC,MAAM,eAAe,CAAC;AAC1C,OAAO,EACL,SAAS,EAET,aAAa,IAAI,YAAY,EAC7B,cAAc,IAAI,aAAa,EAChC,MAAM,qBAAqB,CAAC;AAO7B,MAAM,CAAC,OAAO,OAAO,qBAAqB,CAAC,UAAU,GAAG,EAAE,CAAE,SAAQ,SAAS,CAAC,GAAG,EAAE,UAAU,CAAC;IAC5F,MAAM,CAAC,SAAS,SAA2B;IAE3C,WAAW,CAAC,IAAI,EAAE,aAAa;IA8B/B,SAAS,CAAC,oBAAoB,CAAC,IAAI,EAAE,WAAW,GAAG,IAAI;IAsBvD,sBAAsB,CAAC,IAAI,EAAE,YAAY;;;;IAOzC,yBAAyB,CAAC,IAAI,EAAE,YAAY;CAW7C"}

package/typed/api/index.js

@@ -1,3 +0,0 @@
-export { FORMATS, TILE_FORMATS, MAP_TYPES, API_VERSIONS } from './maps-api-common';
-export { getDataV2, CONNECTIONS } from './maps-client';
-export { fetchLayerData, fetchMap, getData, mapInstantiation } from './maps-v3-client';