@deck.gl/carto 8.8.5 → 8.8.8

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.5",
+  "version": "8.8.8",
   "publishConfig": {
     "access": "public"
   },
@@ -61,5 +61,5 @@
     "@deck.gl/layers": "^8.0.0",
     "@loaders.gl/core": "^3.0.0"
   },
-  "gitHead": "96af77adfd71563e0da68acd4e7ae318f551c5de"
+  "gitHead": "20b9dc5ce2eaaec72d0c262622a4afeb4bcc6e96"
 }

package/src/api/index.ts

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

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

@@ -77,3 +77,11 @@ type MapInstantiationFormats = Record<
 export function encodeParameter(name: string, value: string | boolean | number): string {
   return `${name}=${encodeURIComponent(value)}`;
 }
+
+export type QueryParameterValue = string | number | boolean | Array<QueryParameterValue> | object;
+
+export type NamedQueryParameter = Record<string, QueryParameterValue>;
+
+export type PositionalQueryParameter = QueryParameterValue[];
+
+export type QueryParameters = NamedQueryParameter | PositionalQueryParameter;

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

@@ -17,6 +17,7 @@ import {
   MapInstantiation,
   MapType,
   MAP_TYPES,
+  QueryParameters,
   SchemaField,
   TileFormat,
   TILE_FORMATS
@@ -28,9 +29,11 @@ import {assert} from '../utils';
 const MAX_GET_LENGTH = 2048;
 const DEFAULT_CLIENT = 'deck-gl-carto';
 
+export type Headers = Record<string, string>;
 interface RequestParams {
   method?: string;
   url: string;
+  headers?: Headers;
   accessToken?: string;
   body?: any;
 }
@@ -38,8 +41,15 @@ interface RequestParams {
 /**
  * Request against Maps API
  */
-async function request({method, url, accessToken, body}: RequestParams): Promise<Response> {
-  const headers: Record<string, string> = {
+async function request({
+  method,
+  url,
+  headers: customHeaders,
+  accessToken,
+  body
+}: RequestParams): Promise<Response> {
+  const headers: Headers = {
+    ...customHeaders,
     Accept: 'application/json'
   };
 
@@ -66,10 +76,11 @@ async function request({method, url, accessToken, body}: RequestParams): Promise
 async function requestJson<T = unknown>({
   method,
   url,
+  headers,
   accessToken,
   body
 }: RequestParams): Promise<T> {
-  const response = await request({method, url, accessToken, body});
+  const response = await request({method, url, headers, accessToken, body});
   const json = await response.json();
 
   if (!response.ok) {
@@ -120,8 +131,10 @@ type FetchLayerDataParams = {
   clientId?: string;
   format?: Format;
   formatTiles?: TileFormat;
+  headers?: Headers;
   aggregationExp?: string;
   aggregationResLevel?: number;
+  queryParameters?: QueryParameters;
 };
 
 /**
@@ -134,13 +147,18 @@ function getParameters({
   columns,
   clientId,
   aggregationExp,
-  aggregationResLevel
+  aggregationResLevel,
+  queryParameters
 }: Omit<FetchLayerDataParams, 'connection' | 'credentials'>) {
   const parameters = [encodeParameter('client', clientId || DEFAULT_CLIENT)];
 
   const sourceName = type === MAP_TYPES.QUERY ? 'q' : 'name';
   parameters.push(encodeParameter(sourceName, source));
 
+  if (queryParameters) {
+    parameters.push(encodeParameter('queryParameters', JSON.stringify(queryParameters)));
+  }
+
   if (geoColumn) {
     parameters.push(encodeParameter('geo_column', geoColumn));
   }
@@ -173,8 +191,10 @@ export async function mapInstantiation({
   geoColumn,
   columns,
   clientId,
+  headers,
   aggregationExp,
-  aggregationResLevel
+  aggregationResLevel,
+  queryParameters
 }: FetchLayerDataParams): Promise<MapInstantiation> {
   const baseUrl = `${credentials.mapsUrl}/${connection}/${type}`;
   const url = `${baseUrl}?${getParameters({
@@ -184,7 +204,8 @@ export async function mapInstantiation({
     columns,
     clientId,
     aggregationResLevel,
-    aggregationExp
+    aggregationExp,
+    queryParameters
   })}`;
   const {accessToken} = credentials;
 
@@ -192,12 +213,13 @@ export async function mapInstantiation({
     // need to be a POST request
     const body = JSON.stringify({
       q: source,
-      client: clientId || DEFAULT_CLIENT
+      client: clientId || DEFAULT_CLIENT,
+      queryParameters
     });
-    return await requestJson({method: 'POST', url: baseUrl, accessToken, body});
+    return await requestJson({method: 'POST', url: baseUrl, headers, accessToken, body});
   }
 
-  return await requestJson({url, accessToken});
+  return await requestJson({url, headers, accessToken});
 }
 
 function getUrlFromMetadata(metadata: MapInstantiation, format: Format): string | null {
@@ -267,8 +289,10 @@ export async function fetchLayerData({
   format,
   formatTiles,
   clientId,
+  headers,
   aggregationExp,
-  aggregationResLevel
+  aggregationResLevel,
+  queryParameters
 }: FetchLayerDataParams): Promise<FetchLayerDataResult> {
   // Internally we split data fetching into two parts to allow us to
   // conditionally fetch the actual data, depending on the metadata state
@@ -282,8 +306,10 @@ export async function fetchLayerData({
     format,
     formatTiles,
     clientId,
+    headers,
     aggregationExp,
-    aggregationResLevel
+    aggregationResLevel,
+    queryParameters
   });
 
   const data = await requestData({url, format: mapFormat, accessToken});
@@ -301,8 +327,10 @@ async function _fetchDataUrl({
   format,
   formatTiles,
   clientId,
+  headers,
   aggregationExp,
-  aggregationResLevel
+  aggregationResLevel,
+  queryParameters
 }: FetchLayerDataParams) {
   const defaultCredentials = getDefaultCredentials();
   // Only pick up default credentials if they have been defined for
@@ -334,8 +362,10 @@ async function _fetchDataUrl({
     geoColumn,
     columns,
     clientId,
+    headers,
     aggregationExp,
-    aggregationResLevel
+    aggregationResLevel,
+    queryParameters
   });
   let url: string | null = null;
   let mapFormat: Format | undefined;
@@ -374,7 +404,9 @@ async function _fetchMapDataset(
   dataset,
   accessToken: string,
   credentials: CloudNativeCredentials,
-  clientId?: string
+  clientId?: string,
+  headers?: Headers,
+  queryParameters?: QueryParameters
 ) {
   const {
     aggregationExp,
@@ -396,8 +428,10 @@ async function _fetchMapDataset(
     columns,
     format,
     geoColumn,
+    headers,
     source,
-    type
+    type,
+    queryParameters
   });
 
   // Extract the last time the data changed
@@ -441,9 +475,12 @@ async function _fetchTilestats(
 async function fillInMapDatasets(
   {datasets, token},
   clientId: string,
-  credentials: CloudNativeCredentials
+  credentials: CloudNativeCredentials,
+  headers?: Headers
 ) {
-  const promises = datasets.map(dataset => _fetchMapDataset(dataset, token, credentials, clientId));
+  const promises = datasets.map(dataset =>
+    _fetchMapDataset(dataset, token, credentials, clientId, headers)
+  );
   return await Promise.all(promises);
 }
 
@@ -487,12 +524,14 @@ export async function fetchMap({
   cartoMapId,
   clientId,
   credentials,
+  headers,
   autoRefresh,
   onNewData
 }: {
   cartoMapId: string;
   clientId: string;
   credentials?: CloudNativeCredentials;
+  headers?: Headers;
   autoRefresh?: number;
   onNewData?: (map: any) => void;
 }) {
@@ -521,7 +560,7 @@ export async function fetchMap({
   }
 
   const url = `${localCreds.mapsUrl}/public/${cartoMapId}`;
-  const map = await requestJson<any>({url, accessToken});
+  const map = await requestJson<any>({url, headers, accessToken});
 
   // Periodically check if the data has changed. Note that this
   // will not update when a map is published.
@@ -529,7 +568,7 @@ export async function fetchMap({
   if (autoRefresh) {
     // eslint-disable-next-line @typescript-eslint/no-misused-promises
     const intervalId = setInterval(async () => {
-      const changed = await fillInMapDatasets(map, clientId, localCreds);
+      const changed = await fillInMapDatasets(map, clientId, localCreds, headers);
       if (onNewData && changed.some(v => v === true)) {
         onNewData(parseMap(map));
       }
@@ -550,7 +589,7 @@ export async function fetchMap({
   });
 
   // Mutates map.datasets so that dataset.data contains data
-  await fillInMapDatasets(map, clientId, localCreds);
+  await fillInMapDatasets(map, clientId, localCreds, headers);
 
   // Mutates attributes in visualChannels to contain tile stats
   await fillInTileStats(map, localCreds);

package/src/index.ts

@@ -22,5 +22,5 @@ export {
   getDataV2 as _getDataV2,
   mapInstantiation as _mapInstantiation
 } from './api';
-
+export type {QueryParameters} from './api';
 export type {CartoLayerProps} from './layers/carto-layer';

package/src/layers/carto-layer.ts

@@ -16,7 +16,8 @@ import {
   GEO_COLUMN_SUPPORT,
   MapType,
   MAP_TYPES,
-  TileFormat
+  TileFormat,
+  QueryParameters
 } from '../api/maps-api-common';
 import {
   ClassicCredentials,
@@ -24,7 +25,7 @@ import {
   Credentials,
   getDefaultCredentials
 } from '../config';
-import {FetchLayerDataResult} from '../api/maps-v3-client';
+import {FetchLayerDataResult, Headers} from '../api/maps-v3-client';
 import {assert} from '../utils';
 
 const defaultProps = {
@@ -60,11 +61,17 @@ const defaultProps = {
   // (Array<String>, optional): names of columns to fetch. By default, all columns are fetched.
   columns: {type: 'array', value: null},
 
+  // (Headers, optional): Custom headers to include in the map instantiation request.
+  headers: {type: 'object', value: {}, optional: true},
+
   // (String, optional): aggregation SQL expression. Only used for spatial index datasets
   aggregationExp: null,
 
   // (Number, optional): aggregation resolution level. Only used for spatial index datasets, defaults to 6 for quadbins, 4 for h3
-  aggregationResLevel: null
+  aggregationResLevel: null,
+
+  // (QueryParameters, optional): query parameters to be sent to the server.
+  queryParameters: null
 };
 
 /** All properties supported by CartoLayer. */
@@ -144,11 +151,17 @@ type _CartoLayerProps = {
 
   clientId?: string;
 
+  /** Custom headers to include in the map instantiation request **/
+  headers?: Headers;
+
   /** Aggregation SQL expression. Only used for spatial index datasets **/
   aggregationExp?: string;
 
   /** Aggregation resolution level. Only used for spatial index datasets, defaults to 6 for quadbins, 4 for h3. **/
   aggregationResLevel?: number;
+
+  /** Query parameters to be sent to the server. **/
+  queryParameters?: QueryParameters;
 };
 
 export default class CartoLayer<ExtraProps = {}> extends CompositeLayer<
@@ -218,7 +231,8 @@ export default class CartoLayer<ExtraProps = {}> extends CompositeLayer<
       props.formatTiles !== oldProps.formatTiles ||
       props.type !== oldProps.type ||
       JSON.stringify(props.columns) !== JSON.stringify(oldProps.columns) ||
-      JSON.stringify(props.credentials) !== JSON.stringify(oldProps.credentials);
+      JSON.stringify(props.credentials) !== JSON.stringify(oldProps.credentials) ||
+      JSON.stringify(props.queryParameters) !== JSON.stringify(oldProps.queryParameters);
 
     if (shouldUpdateData) {
       this.setState({data: null, apiVersion: null});
@@ -229,7 +243,7 @@ export default class CartoLayer<ExtraProps = {}> extends CompositeLayer<
 
   async _updateData(): Promise<void> {
     try {
-      const {type, data: source, clientId, credentials, connection, ...rest} = this.props;
+      const {type, data: source, credentials, connection, ...rest} = this.props;
       const localConfig = {...getDefaultCredentials(), ...credentials};
       const {apiVersion} = localConfig;
 
@@ -242,7 +256,6 @@ export default class CartoLayer<ExtraProps = {}> extends CompositeLayer<
         result = await fetchLayerData({
           type,
           source,
-          clientId,
           credentials: credentials as CloudNativeCredentials,
           connection,
           ...rest,

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

@@ -12,7 +12,7 @@ import {
 } from '@deck.gl/geo-layers';
 import {GeoJsonLayer} from '@deck.gl/layers';
 import {geojsonToBinary} from '@loaders.gl/gis';
-import {Properties, Tile, TileReader} from './schema/carto-tile';
+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 type {BinaryFeatures} from '@loaders.gl/schema';
@@ -28,7 +28,7 @@ function parsePbf(buffer: ArrayBuffer): Tile {
   return tile;
 }
 
-function unpackProperties(properties: Properties[]) {
+function unpackProperties(properties: KeyValueProperties[]) {
   if (!properties || !properties.length) {
     return [];
   }
@@ -67,7 +67,10 @@ const CartoTileLoader: LoaderWithParser = {
   id: 'cartoTile',
   module: 'carto',
   extensions: ['pbf'],
-  mimeTypes: ['application/x-protobuf'],
+  mimeTypes: [
+    'application/vnd.carto-vector-tile',
+    'application/x-protobuf' // Back-compatibility
+  ],
   category: 'geometry',
   worker: false,
   parse: async (arrayBuffer, options) => parseCartoTile(arrayBuffer, options),

package/src/layers/quadbin-utils.ts

@@ -12,11 +12,11 @@ const B = [
 ];
 const S = [0n, 1n, 2n, 4n, 8n, 16n];
 
-function indexToBigInt(index: string): bigint {
+export function indexToBigInt(index: string): bigint {
   return BigInt(`0x${index}`);
 }
 
-function bigIntToIndex(quadbin: bigint): string {
+export function bigIntToIndex(quadbin: bigint): string {
   return quadbin.toString(16);
 }
 

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

@@ -0,0 +1,59 @@
+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';
+
+const CartoSpatialTileLoader: LoaderWithParser = {
+  name: 'CARTO Spatial Tile',
+  version: '1',
+  id: 'cartoSpatialTile',
+  module: 'carto',
+  extensions: ['pbf'],
+  mimeTypes: [
+    'application/vnd.carto-spatial-tile',
+    'application/x-protobuf' // Back-compatibility
+  ],
+  category: 'geometry',
+  worker: false,
+  parse: async (arrayBuffer, options) => parseCartoSpatialTile(arrayBuffer, options),
+  parseSync: parseCartoSpatialTile,
+  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 {cells} = tile;
+  const data = {
+    cells: {...cells, properties: unpackProperties(cells.properties)}
+  };
+
+  return binaryToSpatialjson(data);
+}
+
+export default CartoSpatialTileLoader;

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

@@ -0,0 +1,83 @@
+import {Indices, IndexScheme} from './spatialjson-utils';
+import {
+  KeyValueProperties,
+  NumericProp,
+  NumericPropKeyValueReader,
+  PropertiesReader
+} from './carto-tile';
+
+// Indices =====================================
+
+export class IndicesReader {
+  static read(pbf, end?: number): Indices {
+    const {value} = pbf.readFields(IndicesReader._readField, {value: []}, end);
+    return {value: new BigUint64Array(value)};
+  }
+  static _readField(this: void, tag: number, obj, pbf) {
+    if (tag === 1) readPackedFixed64(pbf, obj.value);
+  }
+}
+
+// Cells =========================================
+
+interface Cells {
+  indices: Indices;
+  properties: KeyValueProperties[];
+  numericProps: Record<string, NumericProp>;
+}
+
+class CellsReader {
+  static read(pbf, end?: number): Cells {
+    return pbf.readFields(
+      CellsReader._readField,
+      {indices: null, properties: [], numericProps: {}},
+      end
+    );
+  }
+  static _readField(this: void, tag: number, obj: Cells, pbf) {
+    if (tag === 1) obj.indices = IndicesReader.read(pbf, pbf.readVarint() + pbf.pos);
+    else if (tag === 2) obj.properties.push(PropertiesReader.read(pbf, pbf.readVarint() + pbf.pos));
+    else if (tag === 3) {
+      const entry = NumericPropKeyValueReader.read(pbf, pbf.readVarint() + pbf.pos);
+      obj.numericProps[entry.key] = entry.value;
+    }
+  }
+}
+
+// Tile ========================================
+
+// TODO this type is very similar to SpatialBinary, should align
+export interface Tile {
+  scheme: IndexScheme;
+  cells: Cells;
+}
+
+export class TileReader {
+  static read(pbf, end?: number): Tile {
+    return pbf.readFields(TileReader._readField, {scheme: 0, cells: null}, end);
+  }
+  static _readField(this: void, tag: number, obj: Tile, pbf) {
+    if (tag === 1) obj.scheme = pbf.readVarint();
+    else if (tag === 2) obj.cells = CellsReader.read(pbf, pbf.readVarint() + pbf.pos);
+  }
+}
+
+// pbf doesn't support BigInt natively, implement support for packed fixed64 type
+const SHIFT_LEFT_32 = BigInt((1 << 16) * (1 << 16));
+
+function readPackedEnd(pbf) {
+  return pbf.type === 2 ? pbf.readVarint() + pbf.pos : pbf.pos + 1;
+}
+function readFixed64(pbf) {
+  const a = BigInt(pbf.readFixed32());
+  const b = BigInt(pbf.readFixed32());
+  return a + b * SHIFT_LEFT_32;
+}
+
+function readPackedFixed64(pbf, arr) {
+  if (pbf.type !== 2) return arr.push(readFixed64(pbf));
+  const end = readPackedEnd(pbf);
+  arr = arr || [];
+  while (pbf.pos < end) arr.push(readFixed64(pbf));
+  return arr;
+}

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

@@ -16,15 +16,15 @@ class KeyValueObjectReader {
 
 // Properties ========================================
 
-export interface Properties {
+export interface KeyValueProperties {
   data: KeyValueObject[];
 }
 
-class PropertiesReader {
+export class PropertiesReader {
   static read(pbf, end?: number) {
     return pbf.readFields(PropertiesReader._readField, {data: []}, end);
   }
-  static _readField(this: void, tag: number, obj: Properties, pbf) {
+  static _readField(this: void, tag: number, obj: KeyValueProperties, pbf) {
     if (tag === 1) obj.data.push(KeyValueObjectReader.read(pbf, pbf.readVarint() + pbf.pos));
   }
 }
@@ -69,7 +69,7 @@ class IntsReader {
 
 // NumericProp ========================================
 
-interface NumericProp {
+export interface NumericProp {
   value: number[];
 }
 
@@ -88,7 +88,7 @@ interface NumbericPropKeyValue {
   value: NumericProp;
 }
 
-class NumericPropKeyValueReader {
+export class NumericPropKeyValueReader {
   static read(pbf, end?: number): NumbericPropKeyValue {
     return pbf.readFields(NumericPropKeyValueReader._readField, {key: '', value: null}, end);
   }
@@ -104,7 +104,7 @@ interface Points {
   positions: Doubles;
   globalFeatureIds: Ints;
   featureIds: Ints;
-  properties: Properties[];
+  properties: KeyValueProperties[];
   numericProps: Record<string, NumericProp>;
 }
 

package/src/layers/schema/spatialjson-utils.ts

@@ -0,0 +1,35 @@
+import {bigIntToIndex} from '../quadbin-utils';
+
+export type IndexScheme = 'h3' | 'quadbin';
+type TypedArray = Float32Array | Float64Array;
+
+export type Indices = {value: BigUint64Array};
+export type NumericProps = Record<string, {value: number[] | TypedArray}>;
+export type Properties = Record<string, string | number | boolean | null>;
+export type Cells = {
+  indices: Indices;
+  numericProps: NumericProps;
+  properties: Properties[];
+};
+export type SpatialBinary = {scheme?: IndexScheme; cells: Cells};
+export type SpatialJson = {
+  id: string;
+  properties: Properties;
+}[];
+
+export function binaryToSpatialjson(binary: SpatialBinary): SpatialJson {
+  const {cells} = binary;
+  const count = cells.indices.value.length;
+  const spatial: any[] = [];
+  for (let i = 0; i < count; i++) {
+    const id = bigIntToIndex(cells.indices.value[i]);
+
+    const properties = {...cells.properties[i]};
+    for (const key of Object.keys(cells.numericProps)) {
+      properties[key] = cells.numericProps[key].value[i];
+    }
+    spatial.push({id, properties});
+  }
+
+  return spatial;
+}

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

@@ -1,3 +1,7 @@
+import {registerLoaders} from '@loaders.gl/core';
+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';
 

package/typed/api/index.d.ts

@@ -1,4 +1,5 @@
 export { FORMATS, TILE_FORMATS, MAP_TYPES, API_VERSIONS } from './maps-api-common';
+export type { QueryParameters } from './maps-api-common';
 export { getDataV2, CONNECTIONS } from './maps-client';
 export { fetchLayerData, fetchMap, mapInstantiation } from './maps-v3-client';
 //# sourceMappingURL=index.d.ts.map

package/typed/api/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/api/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,OAAO,EAAE,YAAY,EAAE,SAAS,EAAE,YAAY,EAAC,MAAM,mBAAmB,CAAC;AACjF,OAAO,EAAC,SAAS,EAAE,WAAW,EAAC,MAAM,eAAe,CAAC;AACrD,OAAO,EAAC,cAAc,EAAE,QAAQ,EAAE,gBAAgB,EAAC,MAAM,kBAAkB,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/api/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,OAAO,EAAE,YAAY,EAAE,SAAS,EAAE,YAAY,EAAC,MAAM,mBAAmB,CAAC;AACjF,YAAY,EAAC,eAAe,EAAC,MAAM,mBAAmB,CAAC;AACvD,OAAO,EAAC,SAAS,EAAE,WAAW,EAAC,MAAM,eAAe,CAAC;AACrD,OAAO,EAAC,cAAc,EAAE,QAAQ,EAAE,gBAAgB,EAAC,MAAM,kBAAkB,CAAC"}

package/typed/api/maps-api-common.d.ts

@@ -61,5 +61,9 @@ declare type MapInstantiationFormats = Record<Format, {
  * Simple encode parameter
  */
 export declare function encodeParameter(name: string, value: string | boolean | number): string;
+export declare type QueryParameterValue = string | number | boolean | Array<QueryParameterValue> | object;
+export declare type NamedQueryParameter = Record<string, QueryParameterValue>;
+export declare type PositionalQueryParameter = QueryParameterValue[];
+export declare type QueryParameters = NamedQueryParameter | PositionalQueryParameter;
 export {};
 //# sourceMappingURL=maps-api-common.d.ts.map

package/typed/api/maps-api-common.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"maps-api-common.d.ts","sourceRoot":"","sources":["../../src/api/maps-api-common.ts"],"names":[],"mappings":"AAAA,eAAO,MAAM,6BAA6B,WAAW,CAAC;AACtD,eAAO,MAAM,+BAA+B,aAAa,CAAC;AAE1D,oBAAY,QAAQ,CAAC,CAAC,SAAS,EAAE,IAAI,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC;AAChD,eAAO,MAAM,YAAY;;;;CAIf,CAAC;AACX,oBAAY,UAAU,GAAG,QAAQ,CAAC,OAAO,YAAY,CAAC,CAAC;AAEvD,eAAO,MAAM,uBAAuB;;;CAG1B,CAAC;AAEX,eAAO,MAAM,SAAS;;;;CAIZ,CAAC;AACX,oBAAY,OAAO,GAAG,QAAQ,CAAC,OAAO,SAAS,CAAC,CAAC;AACjD,eAAO,MAAM,eAAe,EAAE,OAAO,EAAsB,CAAC;AAC5D,eAAO,MAAM,kBAAkB,EAAE,OAAO,EAAuC,CAAC;AAGhF,eAAO,MAAM,OAAO;;;;;CAKV,CAAC;AACX,oBAAY,MAAM,GAAG,QAAQ,CAAC,OAAO,OAAO,CAAC,CAAC;AAG9C,eAAO,MAAM,YAAY;;;;;CAKf,CAAC;AACX,oBAAY,UAAU,GAAG,QAAQ,CAAC,OAAO,YAAY,CAAC,CAAC;AAEvD,oBAAY,eAAe;IACzB,MAAM,WAAW;IACjB,MAAM,WAAW;IACjB,MAAM,WAAW;IACjB,QAAQ,aAAa;IACrB,SAAS,cAAc;IACvB,MAAM,WAAW;IACjB,OAAO,YAAY;IACnB,OAAO,YAAY;IACnB,OAAO,YAAY;CACpB;AACD,MAAM,WAAW,WAAW;IAC1B,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,eAAe,CAAC;CACvB;AAED,MAAM,WAAW,gBAAiB,SAAQ,uBAAuB;IAC/D,KAAK,EAAE,MAAM,CAAC;IACd,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,MAAM,EAAE,WAAW,EAAE,CAAC;CACvB;AAED,aAAK,uBAAuB,GAAG,MAAM,CACnC,MAAM,EACN;IACE,GAAG,EAAE,MAAM,EAAE,CAAC;IACd,KAAK,CAAC,EAAE,GAAG,CAAC;CACb,CACF,CAAC;AAEF;;GAEG;AACH,wBAAgB,eAAe,CAAC,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,GAAG,OAAO,GAAG,MAAM,GAAG,MAAM,CAEtF"}
+{"version":3,"file":"maps-api-common.d.ts","sourceRoot":"","sources":["../../src/api/maps-api-common.ts"],"names":[],"mappings":"AAAA,eAAO,MAAM,6BAA6B,WAAW,CAAC;AACtD,eAAO,MAAM,+BAA+B,aAAa,CAAC;AAE1D,oBAAY,QAAQ,CAAC,CAAC,SAAS,EAAE,IAAI,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC;AAChD,eAAO,MAAM,YAAY;;;;CAIf,CAAC;AACX,oBAAY,UAAU,GAAG,QAAQ,CAAC,OAAO,YAAY,CAAC,CAAC;AAEvD,eAAO,MAAM,uBAAuB;;;CAG1B,CAAC;AAEX,eAAO,MAAM,SAAS;;;;CAIZ,CAAC;AACX,oBAAY,OAAO,GAAG,QAAQ,CAAC,OAAO,SAAS,CAAC,CAAC;AACjD,eAAO,MAAM,eAAe,EAAE,OAAO,EAAsB,CAAC;AAC5D,eAAO,MAAM,kBAAkB,EAAE,OAAO,EAAuC,CAAC;AAGhF,eAAO,MAAM,OAAO;;;;;CAKV,CAAC;AACX,oBAAY,MAAM,GAAG,QAAQ,CAAC,OAAO,OAAO,CAAC,CAAC;AAG9C,eAAO,MAAM,YAAY;;;;;CAKf,CAAC;AACX,oBAAY,UAAU,GAAG,QAAQ,CAAC,OAAO,YAAY,CAAC,CAAC;AAEvD,oBAAY,eAAe;IACzB,MAAM,WAAW;IACjB,MAAM,WAAW;IACjB,MAAM,WAAW;IACjB,QAAQ,aAAa;IACrB,SAAS,cAAc;IACvB,MAAM,WAAW;IACjB,OAAO,YAAY;IACnB,OAAO,YAAY;IACnB,OAAO,YAAY;CACpB;AACD,MAAM,WAAW,WAAW;IAC1B,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,eAAe,CAAC;CACvB;AAED,MAAM,WAAW,gBAAiB,SAAQ,uBAAuB;IAC/D,KAAK,EAAE,MAAM,CAAC;IACd,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,MAAM,EAAE,WAAW,EAAE,CAAC;CACvB;AAED,aAAK,uBAAuB,GAAG,MAAM,CACnC,MAAM,EACN;IACE,GAAG,EAAE,MAAM,EAAE,CAAC;IACd,KAAK,CAAC,EAAE,GAAG,CAAC;CACb,CACF,CAAC;AAEF;;GAEG;AACH,wBAAgB,eAAe,CAAC,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,GAAG,OAAO,GAAG,MAAM,GAAG,MAAM,CAEtF;AAED,oBAAY,mBAAmB,GAAG,MAAM,GAAG,MAAM,GAAG,OAAO,GAAG,KAAK,CAAC,mBAAmB,CAAC,GAAG,MAAM,CAAC;AAElG,oBAAY,mBAAmB,GAAG,MAAM,CAAC,MAAM,EAAE,mBAAmB,CAAC,CAAC;AAEtE,oBAAY,wBAAwB,GAAG,mBAAmB,EAAE,CAAC;AAE7D,oBAAY,eAAe,GAAG,mBAAmB,GAAG,wBAAwB,CAAC"}