@deck.gl/carto 8.9.7 → 8.9.8
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.
- package/dist/dist.dev.js +774 -114
- package/dist/es5/api/layer-map.js +9 -15
- package/dist/es5/api/layer-map.js.map +1 -1
- package/dist/es5/api/maps-api-common.js +2 -1
- package/dist/es5/api/maps-api-common.js.map +1 -1
- package/dist/es5/api/maps-v3-client.js +17 -6
- package/dist/es5/api/maps-v3-client.js.map +1 -1
- package/dist/es5/api/parseMap.js +1 -1
- package/dist/es5/api/parseMap.js.map +1 -1
- package/dist/es5/index.js +8 -0
- package/dist/es5/index.js.map +1 -1
- package/dist/es5/layers/carto-layer.js +1 -1
- package/dist/es5/layers/carto-layer.js.map +1 -1
- package/dist/es5/layers/h3-tile-layer.js +2 -1
- package/dist/es5/layers/h3-tile-layer.js.map +1 -1
- package/dist/es5/layers/quadbin-tile-layer.js +2 -1
- package/dist/es5/layers/quadbin-tile-layer.js.map +1 -1
- package/dist/es5/layers/quadbin-utils.js +14 -4
- package/dist/es5/layers/quadbin-utils.js.map +1 -1
- package/dist/es5/layers/raster-layer-vertex.glsl.js +9 -0
- package/dist/es5/layers/raster-layer-vertex.glsl.js.map +1 -0
- package/dist/es5/layers/raster-layer.js +176 -0
- package/dist/es5/layers/raster-layer.js.map +1 -0
- package/dist/es5/layers/raster-tile-layer.js +114 -0
- package/dist/es5/layers/raster-tile-layer.js.map +1 -0
- package/dist/es5/layers/schema/carto-raster-tile-loader.js +80 -0
- package/dist/es5/layers/schema/carto-raster-tile-loader.js.map +1 -0
- package/dist/es5/layers/schema/carto-raster-tile.js +87 -0
- package/dist/es5/layers/schema/carto-raster-tile.js.map +1 -0
- package/dist/es5/layers/schema/carto-spatial-tile.js +1 -1
- package/dist/es5/layers/schema/carto-spatial-tile.js.map +1 -1
- package/dist/es5/layers/schema/carto-tile.js +2 -2
- package/dist/es5/layers/schema/carto-tile.js.map +1 -1
- package/dist/es5/layers/schema/fast-pbf.js +3 -11
- package/dist/es5/layers/schema/fast-pbf.js.map +1 -1
- package/dist/es5/layers/spatial-index-tile-layer.js +3 -41
- package/dist/es5/layers/spatial-index-tile-layer.js.map +1 -1
- package/dist/es5/utils.js +18 -0
- package/dist/es5/utils.js.map +1 -1
- package/dist/esm/api/layer-map.js +9 -21
- package/dist/esm/api/layer-map.js.map +1 -1
- package/dist/esm/api/maps-api-common.js +2 -1
- package/dist/esm/api/maps-api-common.js.map +1 -1
- package/dist/esm/api/maps-v3-client.js +9 -1
- package/dist/esm/api/maps-v3-client.js.map +1 -1
- package/dist/esm/api/parseMap.js +1 -1
- package/dist/esm/api/parseMap.js.map +1 -1
- package/dist/esm/index.js +1 -0
- package/dist/esm/index.js.map +1 -1
- package/dist/esm/layers/carto-layer.js +1 -1
- package/dist/esm/layers/carto-layer.js.map +1 -1
- package/dist/esm/layers/h3-tile-layer.js +2 -1
- package/dist/esm/layers/h3-tile-layer.js.map +1 -1
- package/dist/esm/layers/quadbin-tile-layer.js +2 -1
- package/dist/esm/layers/quadbin-tile-layer.js.map +1 -1
- package/dist/esm/layers/quadbin-utils.js +7 -4
- package/dist/esm/layers/quadbin-utils.js.map +1 -1
- package/dist/esm/layers/raster-layer-vertex.glsl.js +2 -0
- package/dist/esm/layers/raster-layer-vertex.glsl.js.map +1 -0
- package/dist/esm/layers/raster-layer.js +111 -0
- package/dist/esm/layers/raster-layer.js.map +1 -0
- package/dist/esm/layers/raster-tile-layer.js +67 -0
- package/dist/esm/layers/raster-tile-layer.js.map +1 -0
- package/dist/esm/layers/schema/carto-raster-tile-loader.js +46 -0
- package/dist/esm/layers/schema/carto-raster-tile-loader.js.map +1 -0
- package/dist/esm/layers/schema/carto-raster-tile.js +51 -0
- package/dist/esm/layers/schema/carto-raster-tile.js.map +1 -0
- package/dist/esm/layers/schema/carto-spatial-tile.js +2 -2
- package/dist/esm/layers/schema/carto-spatial-tile.js.map +1 -1
- package/dist/esm/layers/schema/carto-tile.js +3 -3
- package/dist/esm/layers/schema/carto-tile.js.map +1 -1
- package/dist/esm/layers/schema/fast-pbf.js +2 -8
- package/dist/esm/layers/schema/fast-pbf.js.map +1 -1
- package/dist/esm/layers/spatial-index-tile-layer.js +3 -41
- package/dist/esm/layers/spatial-index-tile-layer.js.map +1 -1
- package/dist/esm/utils.js +20 -0
- package/dist/esm/utils.js.map +1 -1
- package/dist.min.js +100 -23
- package/package.json +3 -3
- package/src/api/layer-map.ts +12 -19
- package/src/api/maps-api-common.ts +2 -1
- package/src/api/maps-v3-client.ts +6 -1
- package/src/api/parseMap.ts +1 -1
- package/src/index.ts +1 -0
- package/src/layers/carto-layer.ts +1 -1
- package/src/layers/h3-tile-layer.ts +2 -3
- package/src/layers/quadbin-tile-layer.ts +2 -3
- package/src/layers/quadbin-utils.ts +9 -5
- package/src/layers/raster-layer-vertex.glsl.ts +98 -0
- package/src/layers/raster-layer.ts +146 -0
- package/src/layers/raster-tile-layer.ts +63 -0
- package/src/layers/schema/carto-raster-tile-loader.ts +42 -0
- package/src/layers/schema/carto-raster-tile.ts +46 -0
- package/src/layers/schema/carto-spatial-tile.ts +2 -2
- package/src/layers/schema/carto-tile.ts +3 -3
- package/src/layers/schema/fast-pbf.ts +3 -9
- package/src/layers/spatial-index-tile-layer.ts +3 -38
- package/src/utils.ts +22 -0
- package/typed/api/layer-map.d.ts +2 -1
- package/typed/api/layer-map.d.ts.map +1 -1
- package/typed/api/maps-api-common.d.ts +1 -0
- package/typed/api/maps-api-common.d.ts.map +1 -1
- package/typed/api/maps-v3-client.d.ts.map +1 -1
- package/typed/index.d.ts +1 -0
- package/typed/index.d.ts.map +1 -1
- package/typed/layers/h3-tile-layer.d.ts.map +1 -1
- package/typed/layers/quadbin-tile-layer.d.ts.map +1 -1
- package/typed/layers/quadbin-utils.d.ts +1 -0
- package/typed/layers/quadbin-utils.d.ts.map +1 -1
- package/typed/layers/raster-layer-vertex.glsl.d.ts +3 -0
- package/typed/layers/raster-layer-vertex.glsl.d.ts.map +1 -0
- package/typed/layers/raster-layer.d.ts +19 -0
- package/typed/layers/raster-layer.d.ts.map +1 -0
- package/typed/layers/raster-tile-layer.d.ts +24 -0
- package/typed/layers/raster-tile-layer.d.ts.map +1 -0
- package/typed/layers/schema/carto-raster-tile-loader.d.ts +13 -0
- package/typed/layers/schema/carto-raster-tile-loader.d.ts.map +1 -0
- package/typed/layers/schema/carto-raster-tile.d.ts +9 -0
- package/typed/layers/schema/carto-raster-tile.d.ts.map +1 -0
- package/typed/layers/schema/carto-spa-tile.d.ts +57 -0
- package/typed/layers/schema/carto-spa-tile.d.ts.map +1 -0
- package/typed/layers/schema/fast-pbf.d.ts +1 -2
- package/typed/layers/schema/fast-pbf.d.ts.map +1 -1
- package/typed/layers/spatial-index-tile-layer.d.ts +1 -2
- package/typed/layers/spatial-index-tile-layer.d.ts.map +1 -1
- package/typed/utils.d.ts +5 -0
- package/typed/utils.d.ts.map +1 -1
- package/typed/api/index.js +0 -3
- package/typed/api/layer-map.js +0 -264
- package/typed/api/maps-api-common.js +0 -50
- package/typed/api/maps-client.js +0 -125
- package/typed/api/maps-v3-client.js +0 -304
- package/typed/api/parseMap.js +0 -178
- package/typed/basemap.js +0 -9
- package/typed/config.js +0 -35
- package/typed/index.js +0 -10
- package/typed/layers/carto-layer.js +0 -173
- package/typed/layers/carto-tile-layer.js +0 -105
- package/typed/layers/h3-tile-layer.js +0 -47
- package/typed/layers/h3-tileset-2d.js +0 -85
- package/typed/layers/quadkey-tile-layer.js +0 -42
- package/typed/layers/quadkey-tileset-2d.js +0 -36
- package/typed/layers/schema/carto-tile.js +0 -161
- package/typed/layers/spatial-index-tile-layer.js +0 -40
- package/typed/style/color-bins-style.js +0 -12
- package/typed/style/color-categories-style.js +0 -16
- package/typed/style/color-continuous-style.js +0 -12
- package/typed/style/palette.js +0 -62
- package/typed/style/utils.js +0 -15
- package/typed/utils.js +0 -4
package/dist/esm/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../../src/index.ts"],"names":["getDefaultCredentials","setDefaultCredentials","default","CartoLayer","_CartoTileLayer","_H3TileLayer","_PointLabelLayer","_QuadbinTileLayer","BASEMAP","colorBins","colorCategories","colorContinuous","FORMATS","TILE_FORMATS","MAP_TYPES","API_VERSIONS","CartoAPIError","fetchLayerData","fetchMap","getDataV2","_getDataV2","mapInstantiation","_mapInstantiation"],"mappings":"AAAA,SAAQA,qBAAR,EAA+BC,qBAA/B,QAA2D,UAA3D;AACA,SAAQC,OAAO,IAAIC,UAAnB,QAAoC,sBAApC;AACA,SAAQD,OAAO,IAAIE,eAAnB,QAAyC,2BAAzC;AACA,SAAQF,OAAO,IAAIG,YAAnB,QAAsC,wBAAtC;AACA,SAAQH,OAAO,IAAII,gBAAnB,QAA0C,4BAA1C;AACA,SAAQJ,OAAO,IAAIK,iBAAnB,QAA2C,6BAA3C;AACA,SAAQL,OAAO,IAAIM,OAAnB,QAAiC,WAAjC;AACA,
|
|
1
|
+
{"version":3,"sources":["../../src/index.ts"],"names":["getDefaultCredentials","setDefaultCredentials","default","CartoLayer","_CartoTileLayer","_H3TileLayer","_PointLabelLayer","_QuadbinTileLayer","_RasterTileLayer","BASEMAP","colorBins","colorCategories","colorContinuous","FORMATS","TILE_FORMATS","MAP_TYPES","API_VERSIONS","CartoAPIError","fetchLayerData","fetchMap","getDataV2","_getDataV2","mapInstantiation","_mapInstantiation"],"mappings":"AAAA,SAAQA,qBAAR,EAA+BC,qBAA/B,QAA2D,UAA3D;AACA,SAAQC,OAAO,IAAIC,UAAnB,QAAoC,sBAApC;AACA,SAAQD,OAAO,IAAIE,eAAnB,QAAyC,2BAAzC;AACA,SAAQF,OAAO,IAAIG,YAAnB,QAAsC,wBAAtC;AACA,SAAQH,OAAO,IAAII,gBAAnB,QAA0C,4BAA1C;AACA,SAAQJ,OAAO,IAAIK,iBAAnB,QAA2C,6BAA3C;AACA,SAAQL,OAAO,IAAIM,gBAAnB,QAA0C,4BAA1C;AACA,SAAQN,OAAO,IAAIO,OAAnB,QAAiC,WAAjC;AACA,SAAQP,OAAO,IAAIQ,SAAnB,QAAmC,0BAAnC;AACA,SAAQR,OAAO,IAAIS,eAAnB,QAAyC,gCAAzC;AACA,SAAQT,OAAO,IAAIU,eAAnB,QAAyC,gCAAzC;AACA,SACEC,OADF,EAEEC,YAFF,EAGEC,SAHF,EAIEC,YAJF,EAKEC,aALF,EAMEC,cANF,EAOEC,QAPF,EAQEC,SAAS,IAAIC,UARf,EASEC,gBAAgB,IAAIC,iBATtB,QAUO,OAVP","sourcesContent":["export {getDefaultCredentials, setDefaultCredentials} from './config';\nexport {default as CartoLayer} from './layers/carto-layer';\nexport {default as _CartoTileLayer} from './layers/carto-tile-layer';\nexport {default as _H3TileLayer} from './layers/h3-tile-layer';\nexport {default as _PointLabelLayer} from './layers/point-label-layer';\nexport {default as _QuadbinTileLayer} from './layers/quadbin-tile-layer';\nexport {default as _RasterTileLayer} from './layers/raster-tile-layer';\nexport {default as BASEMAP} from './basemap';\nexport {default as colorBins} from './style/color-bins-style';\nexport {default as colorCategories} from './style/color-categories-style';\nexport {default as colorContinuous} from './style/color-continuous-style';\nexport {\n FORMATS,\n TILE_FORMATS,\n MAP_TYPES,\n API_VERSIONS,\n CartoAPIError,\n fetchLayerData,\n fetchMap,\n getDataV2 as _getDataV2,\n mapInstantiation as _mapInstantiation\n} from './api';\nexport type {APIErrorContext, QueryParameters} from './api';\nexport type {CartoLayerProps} from './layers/carto-layer';\n"],"file":"index.js"}
|
|
@@ -186,7 +186,7 @@ export default class CartoLayer extends CompositeLayer {
|
|
|
186
186
|
|
|
187
187
|
const tileUrl = new URL(data.tiles[0]);
|
|
188
188
|
props.formatTiles = props.formatTiles || tileUrl.searchParams.get('formatTiles');
|
|
189
|
-
return [layerFromTileDataset(props.formatTiles, data.scheme), props];
|
|
189
|
+
return [layerFromTileDataset(props.formatTiles, data.scheme, props.type), props];
|
|
190
190
|
}
|
|
191
191
|
|
|
192
192
|
renderLayers() {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../../../src/layers/carto-layer.ts"],"names":["CompositeLayer","log","MVTLayer","fetchLayerData","getDataV2","API_VERSIONS","layerFromTileDataset","COLUMNS_SUPPORT","FORMATS","GEO_COLUMN_SUPPORT","MAP_TYPES","getDefaultCredentials","assert","defaultProps","data","type","onDataLoad","value","onDataError","optional","uniqueIdProperty","credentials","connection","format","formatTiles","clientId","geoColumn","columns","headers","aggregationExp","aggregationResLevel","queryParameters","CartoLayer","initializeState","state","apiVersion","isLoaded","getSubLayers","length","_checkProps","props","localCreds","Object","values","includes","V1","V2","QUERY","TILESET","V3","join","Array","isArray","updateState","oldProps","changeFlags","shouldUpdateData","dataChanged","JSON","stringify","setState","_updateData","source","rest","localConfig","result","TILEJSON","propName","layer","err","_getSubLayerAndProps","_notUsed","propsNoData","tileUrl","URL","tiles","searchParams","get","scheme","renderLayers","updateTriggers","loadOptions","accessToken","fetch","Authorization","getSubLayerProps","id","layerName"],"mappings":"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","sourcesContent":["import {\n CompositeLayer,\n CompositeLayerProps,\n Layer,\n LayerProps,\n log,\n UpdateParameters\n} from '@deck.gl/core';\n\nimport {MVTLayer} from '@deck.gl/geo-layers';\nimport {fetchLayerData, getDataV2, API_VERSIONS} from '../api';\nimport {CartoAPIError} from '../api/carto-api-error';\nimport {layerFromTileDataset} from '../api/layer-map';\nimport {\n COLUMNS_SUPPORT,\n FORMATS,\n GEO_COLUMN_SUPPORT,\n MapType,\n MAP_TYPES,\n TileFormat,\n QueryParameters\n} from '../api/maps-api-common';\nimport {\n ClassicCredentials,\n CloudNativeCredentials,\n Credentials,\n getDefaultCredentials\n} from '../config';\nimport {FetchLayerDataResult, Headers} from '../api/maps-v3-client';\nimport {assert} from '../utils';\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 => {}},\n onDataError: {type: 'function', value: null, 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 // (Headers, optional): Custom headers to include in the map instantiation request.\n headers: {type: 'object', value: {}, optional: true},\n\n // (String, optional): aggregation SQL expression. Only used for spatial index datasets\n aggregationExp: null,\n\n // (Number, optional): aggregation resolution level. Only used for spatial index datasets, defaults to 6 for quadbins, 4 for h3\n aggregationResLevel: null,\n\n // (QueryParameters, optional): query parameters to be sent to the server.\n queryParameters: null\n};\n\n/** All properties supported by CartoLayer. */\nexport type CartoLayerProps = _CartoLayerProps & CompositeLayerProps;\n\n/** Properties added by CartoLayer. */\ntype _CartoLayerProps = {\n /**\n * Either a SQL query or a name of dataset/tileset.\n */\n data: string;\n\n /**\n * Data type.\n *\n * Possible values are:\n * * `MAP_TYPES.QUERY`, if data is a SQL query.\n * * `MAP_TYPES.TILESET`, if data is a tileset name.\n * * `MAP_TYPES.TABLE`, if data is a dataset name. Only supported with API v3.\n */\n type: MapType;\n\n /**\n * Name of the connection registered in the CARTO workspace.\n *\n * Required when apiVersion is `API_VERSIONS.V3`.\n */\n connection?: string;\n\n /**\n * Use to override the default tile data format.\n *\n * Only supported when apiVersion is `API_VERSIONS.V3`.\n *\n * Possible values are: `TILE_FORMATS.BINARY`, `TILE_FORMATS.GEOJSON` and `TILE_FORMATS.MVT`.\n */\n formatTiles?: TileFormat;\n\n /**\n * Name of the geo_column in the CARTO platform.\n *\n * Use this override the default column (`'geom'`), from which the geometry information should be fetched.\n *\n * Only supported when apiVersion is `API_VERSIONS.V3` and type is `MAP_TYPES.TABLE`.\n */\n geoColumn?: string;\n\n /**\n * Names of columns to fetch.\n *\n * By default, all columns are fetched\n *\n * Only supported when apiVersion is `API_VERSIONS.V3` and type is `MAP_TYPES.TABLE`.\n */\n columns?: string[];\n\n /**\n * A string pointing to a unique attribute at the result of the query.\n *\n * A unique attribute is needed for highlighting with vector tiles when a feature is split across two or more tiles.\n */\n uniqueIdProperty?: string;\n\n /**\n * Optional. Overrides the configuration to connect with CARTO.\n *\n * @see Credentials\n */\n credentials?: Credentials;\n\n /**\n * Called when the request to the CARTO Maps API failed.\n *\n * By default the CartoAPIError is thrown.\n */\n onDataError?: (err: CartoAPIError) => void;\n\n clientId?: string;\n\n /** Custom headers to include in the map instantiation request **/\n headers?: Headers;\n\n /** Aggregation SQL expression. Only used for spatial index datasets **/\n aggregationExp?: string;\n\n /** Aggregation resolution level. Only used for spatial index datasets, defaults to 6 for quadbins, 4 for h3. **/\n aggregationResLevel?: number;\n\n /** Query parameters to be sent to the server. **/\n queryParameters?: QueryParameters;\n};\n\nexport default class CartoLayer<ExtraProps extends {} = {}> extends CompositeLayer<\n Required<_CartoLayerProps> & ExtraProps\n> {\n static layerName = 'CartoLayer';\n static defaultProps = defaultProps;\n\n initializeState(): void {\n this.state = {\n data: null,\n apiVersion: null\n };\n }\n\n get isLoaded(): boolean {\n return this.getSubLayers().length > 0 && super.isLoaded;\n }\n\n _checkProps(props: CartoLayerProps): void {\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 (!COLUMNS_SUPPORT.includes(type)) {\n log.assert(!columns, `columns prop is only supported for types: ${COLUMNS_SUPPORT.join()}`);\n }\n if (!GEO_COLUMN_SUPPORT.includes(type)) {\n log.assert(\n !geoColumn,\n `geoColumn prop is only supported for types: ${GEO_COLUMN_SUPPORT.join()}`\n );\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}: UpdateParameters<this>) {\n this._checkProps(props);\n const shouldUpdateData =\n changeFlags.dataChanged ||\n props.aggregationExp !== oldProps.aggregationExp ||\n props.aggregationResLevel !== oldProps.aggregationResLevel ||\n props.connection !== oldProps.connection ||\n props.geoColumn !== oldProps.geoColumn ||\n props.formatTiles !== oldProps.formatTiles ||\n props.type !== oldProps.type ||\n JSON.stringify(props.columns) !== JSON.stringify(oldProps.columns) ||\n JSON.stringify(props.credentials) !== JSON.stringify(oldProps.credentials) ||\n JSON.stringify(props.queryParameters) !== JSON.stringify(oldProps.queryParameters);\n\n if (shouldUpdateData) {\n this.setState({data: null, apiVersion: null});\n // eslint-disable-next-line @typescript-eslint/no-floating-promises\n this._updateData();\n }\n }\n\n async _updateData(): Promise<void> {\n try {\n const {type, data: source, credentials, connection, ...rest} = this.props;\n const localConfig = {...getDefaultCredentials(), ...credentials};\n const {apiVersion} = localConfig;\n\n let result: Partial<FetchLayerDataResult>;\n if (apiVersion === API_VERSIONS.V1 || apiVersion === API_VERSIONS.V2) {\n result = {\n data: await getDataV2({type, source, credentials: credentials as ClassicCredentials})\n };\n } else {\n result = await fetchLayerData({\n type,\n source,\n credentials: credentials as CloudNativeCredentials,\n connection,\n ...rest,\n // CartoLayer only supports tiled output from v8.8, force data format\n format: FORMATS.TILEJSON\n });\n }\n\n this.setState({...result, apiVersion});\n\n this.props.onDataLoad?.(result.data, {\n propName: 'data',\n layer: this\n });\n } catch (err) {\n if (this.props.onDataError) {\n this.props.onDataError(err as CartoAPIError);\n } else {\n throw err;\n }\n }\n }\n\n _getSubLayerAndProps(): [any, LayerProps] {\n assert(this.state);\n\n const {data, apiVersion} = this.state;\n\n const {uniqueIdProperty} = defaultProps;\n // eslint-disable-next-line @typescript-eslint/no-unused-vars\n const {data: _notUsed, ...propsNoData} = this.props;\n // @ts-expect-error 'uniqueIdProperty' is specified more than once, so this usage will be overwritten.\n const props = {uniqueIdProperty, ...propsNoData};\n\n if (apiVersion === API_VERSIONS.V1 || apiVersion === API_VERSIONS.V2) {\n return [MVTLayer, props];\n }\n\n /* global URL */\n const tileUrl = new URL(data.tiles[0]);\n props.formatTiles =\n props.formatTiles || (tileUrl.searchParams.get('formatTiles') as TileFormat);\n\n return [layerFromTileDataset(props.formatTiles, data.scheme), props];\n }\n\n renderLayers(): Layer | null {\n assert(this.state);\n\n const {apiVersion, data} = this.state;\n\n if (!data) return null;\n\n const {credentials, updateTriggers} = this.props;\n const loadOptions: any = {};\n if (apiVersion === API_VERSIONS.V3) {\n const localConfig = {...getDefaultCredentials(), ...credentials} as CloudNativeCredentials;\n const {accessToken} = localConfig;\n loadOptions.fetch = {headers: {Authorization: `Bearer ${accessToken}`}};\n }\n\n const [layer, props] = this._getSubLayerAndProps();\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 loadOptions,\n updateTriggers\n })\n );\n }\n}\n"],"file":"carto-layer.js"}
|
|
1
|
+
{"version":3,"sources":["../../../src/layers/carto-layer.ts"],"names":["CompositeLayer","log","MVTLayer","fetchLayerData","getDataV2","API_VERSIONS","layerFromTileDataset","COLUMNS_SUPPORT","FORMATS","GEO_COLUMN_SUPPORT","MAP_TYPES","getDefaultCredentials","assert","defaultProps","data","type","onDataLoad","value","onDataError","optional","uniqueIdProperty","credentials","connection","format","formatTiles","clientId","geoColumn","columns","headers","aggregationExp","aggregationResLevel","queryParameters","CartoLayer","initializeState","state","apiVersion","isLoaded","getSubLayers","length","_checkProps","props","localCreds","Object","values","includes","V1","V2","QUERY","TILESET","V3","join","Array","isArray","updateState","oldProps","changeFlags","shouldUpdateData","dataChanged","JSON","stringify","setState","_updateData","source","rest","localConfig","result","TILEJSON","propName","layer","err","_getSubLayerAndProps","_notUsed","propsNoData","tileUrl","URL","tiles","searchParams","get","scheme","renderLayers","updateTriggers","loadOptions","accessToken","fetch","Authorization","getSubLayerProps","id","layerName"],"mappings":"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","sourcesContent":["import {\n CompositeLayer,\n CompositeLayerProps,\n Layer,\n LayerProps,\n log,\n UpdateParameters\n} from '@deck.gl/core';\n\nimport {MVTLayer} from '@deck.gl/geo-layers';\nimport {fetchLayerData, getDataV2, API_VERSIONS} from '../api';\nimport {CartoAPIError} from '../api/carto-api-error';\nimport {layerFromTileDataset} from '../api/layer-map';\nimport {\n COLUMNS_SUPPORT,\n FORMATS,\n GEO_COLUMN_SUPPORT,\n MapType,\n MAP_TYPES,\n TileFormat,\n QueryParameters\n} from '../api/maps-api-common';\nimport {\n ClassicCredentials,\n CloudNativeCredentials,\n Credentials,\n getDefaultCredentials\n} from '../config';\nimport {FetchLayerDataResult, Headers} from '../api/maps-v3-client';\nimport {assert} from '../utils';\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 => {}},\n onDataError: {type: 'function', value: null, 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 // (Headers, optional): Custom headers to include in the map instantiation request.\n headers: {type: 'object', value: {}, optional: true},\n\n // (String, optional): aggregation SQL expression. Only used for spatial index datasets\n aggregationExp: null,\n\n // (Number, optional): aggregation resolution level. Only used for spatial index datasets, defaults to 6 for quadbins, 4 for h3\n aggregationResLevel: null,\n\n // (QueryParameters, optional): query parameters to be sent to the server.\n queryParameters: null\n};\n\n/** All properties supported by CartoLayer. */\nexport type CartoLayerProps = _CartoLayerProps & CompositeLayerProps;\n\n/** Properties added by CartoLayer. */\ntype _CartoLayerProps = {\n /**\n * Either a SQL query or a name of dataset/tileset.\n */\n data: string;\n\n /**\n * Data type.\n *\n * Possible values are:\n * * `MAP_TYPES.QUERY`, if data is a SQL query.\n * * `MAP_TYPES.TILESET`, if data is a tileset name.\n * * `MAP_TYPES.TABLE`, if data is a dataset name. Only supported with API v3.\n */\n type: MapType;\n\n /**\n * Name of the connection registered in the CARTO workspace.\n *\n * Required when apiVersion is `API_VERSIONS.V3`.\n */\n connection?: string;\n\n /**\n * Use to override the default tile data format.\n *\n * Only supported when apiVersion is `API_VERSIONS.V3`.\n *\n * Possible values are: `TILE_FORMATS.BINARY`, `TILE_FORMATS.GEOJSON` and `TILE_FORMATS.MVT`.\n */\n formatTiles?: TileFormat;\n\n /**\n * Name of the geo_column in the CARTO platform.\n *\n * Use this override the default column (`'geom'`), from which the geometry information should be fetched.\n *\n * Only supported when apiVersion is `API_VERSIONS.V3` and type is `MAP_TYPES.TABLE`.\n */\n geoColumn?: string;\n\n /**\n * Names of columns to fetch.\n *\n * By default, all columns are fetched\n *\n * Only supported when apiVersion is `API_VERSIONS.V3` and type is `MAP_TYPES.TABLE`.\n */\n columns?: string[];\n\n /**\n * A string pointing to a unique attribute at the result of the query.\n *\n * A unique attribute is needed for highlighting with vector tiles when a feature is split across two or more tiles.\n */\n uniqueIdProperty?: string;\n\n /**\n * Optional. Overrides the configuration to connect with CARTO.\n *\n * @see Credentials\n */\n credentials?: Credentials;\n\n /**\n * Called when the request to the CARTO Maps API failed.\n *\n * By default the CartoAPIError is thrown.\n */\n onDataError?: (err: CartoAPIError) => void;\n\n clientId?: string;\n\n /** Custom headers to include in the map instantiation request **/\n headers?: Headers;\n\n /** Aggregation SQL expression. Only used for spatial index datasets **/\n aggregationExp?: string;\n\n /** Aggregation resolution level. Only used for spatial index datasets, defaults to 6 for quadbins, 4 for h3. **/\n aggregationResLevel?: number;\n\n /** Query parameters to be sent to the server. **/\n queryParameters?: QueryParameters;\n};\n\nexport default class CartoLayer<ExtraProps extends {} = {}> extends CompositeLayer<\n Required<_CartoLayerProps> & ExtraProps\n> {\n static layerName = 'CartoLayer';\n static defaultProps = defaultProps;\n\n initializeState(): void {\n this.state = {\n data: null,\n apiVersion: null\n };\n }\n\n get isLoaded(): boolean {\n return this.getSubLayers().length > 0 && super.isLoaded;\n }\n\n _checkProps(props: CartoLayerProps): void {\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 (!COLUMNS_SUPPORT.includes(type)) {\n log.assert(!columns, `columns prop is only supported for types: ${COLUMNS_SUPPORT.join()}`);\n }\n if (!GEO_COLUMN_SUPPORT.includes(type)) {\n log.assert(\n !geoColumn,\n `geoColumn prop is only supported for types: ${GEO_COLUMN_SUPPORT.join()}`\n );\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}: UpdateParameters<this>) {\n this._checkProps(props);\n const shouldUpdateData =\n changeFlags.dataChanged ||\n props.aggregationExp !== oldProps.aggregationExp ||\n props.aggregationResLevel !== oldProps.aggregationResLevel ||\n props.connection !== oldProps.connection ||\n props.geoColumn !== oldProps.geoColumn ||\n props.formatTiles !== oldProps.formatTiles ||\n props.type !== oldProps.type ||\n JSON.stringify(props.columns) !== JSON.stringify(oldProps.columns) ||\n JSON.stringify(props.credentials) !== JSON.stringify(oldProps.credentials) ||\n JSON.stringify(props.queryParameters) !== JSON.stringify(oldProps.queryParameters);\n\n if (shouldUpdateData) {\n this.setState({data: null, apiVersion: null});\n // eslint-disable-next-line @typescript-eslint/no-floating-promises\n this._updateData();\n }\n }\n\n async _updateData(): Promise<void> {\n try {\n const {type, data: source, credentials, connection, ...rest} = this.props;\n const localConfig = {...getDefaultCredentials(), ...credentials};\n const {apiVersion} = localConfig;\n\n let result: Partial<FetchLayerDataResult>;\n if (apiVersion === API_VERSIONS.V1 || apiVersion === API_VERSIONS.V2) {\n result = {\n data: await getDataV2({type, source, credentials: credentials as ClassicCredentials})\n };\n } else {\n result = await fetchLayerData({\n type,\n source,\n credentials: credentials as CloudNativeCredentials,\n connection,\n ...rest,\n // CartoLayer only supports tiled output from v8.8, force data format\n format: FORMATS.TILEJSON\n });\n }\n\n this.setState({...result, apiVersion});\n\n this.props.onDataLoad?.(result.data, {\n propName: 'data',\n layer: this\n });\n } catch (err) {\n if (this.props.onDataError) {\n this.props.onDataError(err as CartoAPIError);\n } else {\n throw err;\n }\n }\n }\n\n _getSubLayerAndProps(): [any, LayerProps] {\n assert(this.state);\n\n const {data, apiVersion} = this.state;\n\n const {uniqueIdProperty} = defaultProps;\n // eslint-disable-next-line @typescript-eslint/no-unused-vars\n const {data: _notUsed, ...propsNoData} = this.props;\n // @ts-expect-error 'uniqueIdProperty' is specified more than once, so this usage will be overwritten.\n const props = {uniqueIdProperty, ...propsNoData};\n\n if (apiVersion === API_VERSIONS.V1 || apiVersion === API_VERSIONS.V2) {\n return [MVTLayer, props];\n }\n\n /* global URL */\n const tileUrl = new URL(data.tiles[0]);\n props.formatTiles =\n props.formatTiles || (tileUrl.searchParams.get('formatTiles') as TileFormat);\n\n return [layerFromTileDataset(props.formatTiles, data.scheme, props.type), props];\n }\n\n renderLayers(): Layer | null {\n assert(this.state);\n\n const {apiVersion, data} = this.state;\n\n if (!data) return null;\n\n const {credentials, updateTriggers} = this.props;\n const loadOptions: any = {};\n if (apiVersion === API_VERSIONS.V3) {\n const localConfig = {...getDefaultCredentials(), ...credentials} as CloudNativeCredentials;\n const {accessToken} = localConfig;\n loadOptions.fetch = {headers: {Authorization: `Bearer ${accessToken}`}};\n }\n\n const [layer, props] = this._getSubLayerAndProps();\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 loadOptions,\n updateTriggers\n })\n );\n }\n}\n"],"file":"carto-layer.js"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../../../src/layers/h3-tile-layer.ts"],"names":["CompositeLayer","H3HexagonLayer","H3Tileset2D","getHexagonResolution","SpatialIndexTileLayer","renderSubLayers","props","data","index","tile","length","getHexagon","d","id","centerHexagon","highPrecision","defaultProps","aggregationResLevel","H3TileLayer","initializeState","_checkH3Lib","setState","tileJSON","updateState","changeFlags","dataChanged","tiles","renderLayers","state","minresolution","parseInt","maxresolution","minZoom","Math","max","zoom","latitude","maxZoom","min","TilesetClass","loadOptions","getLoadOptions","cartoSpatialTile","scheme"],"mappings":";AAAA,SACEA,cADF,QAOO,eAPP;AAQA,SAAQC,cAAR,QAA6B,qBAA7B;AACA,OAAOC,WAAP,IAAqBC,oBAArB,QAAgD,iBAAhD;AACA,OAAOC,qBAAP,MAAkC,4BAAlC;;AAEA,MAAMC,eAAe,GAAGC,KAAK,IAAI;AAC/B,QAAM;AAACC,IAAAA;AAAD,MAASD,KAAf;AACA,QAAM;AAACE,IAAAA;AAAD,MAAUF,KAAK,CAACG,IAAtB;AACA,MAAI,CAACF,IAAD,IAAS,CAACA,IAAI,CAACG,MAAnB,EAA2B,OAAO,IAAP;AAE3B,SAAO,IAAIT,cAAJ,CAAmBK,KAAnB,EAA0B;AAC/BK,IAAAA,UAAU,EAAEC,CAAC,IAAIA,CAAC,CAACC,EADY;AAE/BC,IAAAA,aAAa,EAAEN,KAFgB;AAG/BO,IAAAA,aAAa,EAAE;AAHgB,GAA1B,CAAP;AAKD,CAVD;;AAYA,MAAMC,YAA+C,GAAG;AACtDC,EAAAA,mBAAmB,EAAE;AADiC,CAAxD;AAiBA,eAAe,MAAMC,WAAN,SAAoElB,cAApE,CAEb;AAAA;AAAA;;AAAA;AAAA;;AASAmB,EAAAA,eAAe,GAAS;AACtBlB,IAAAA,cAAc,CAACmB,WAAf;;AACA,SAAKC,QAAL,CAAc;AAACd,MAAAA,IAAI,EAAE,IAAP;AAAae,MAAAA,QAAQ,EAAE;AAAvB,KAAd;AACD;;AAEDC,EAAAA,WAAW,CAAC;AAACC,IAAAA;AAAD,GAAD,EAA8C;AACvD,QAAIA,WAAW,CAACC,WAAhB,EAA6B;AAC3B,UAAI;AAAClB,QAAAA;AAAD,UAAS,KAAKD,KAAlB;AACA,YAAMgB,QAAQ,GAAGf,IAAjB;AACAA,MAAAA,IAAI,GAAIe,QAAD,CAAkBI,KAAzB;AACA,WAAKL,QAAL,CAAc;AAACd,QAAAA,IAAD;AAAOe,QAAAA;AAAP,OAAd;AACD;AACF;;AAEDK,EAAAA,YAAY,GAA8B;AACxC,UAAM;AAACpB,MAAAA,IAAD;AAAOe,MAAAA;AAAP,QAAmB,KAAKM,KAA9B;AACA,QAAIC,aAAa,GAAGC,QAAQ,CAACR,QAAQ,CAACO,aAAV,CAA5B;AACA,QAAIE,aAAa,GAAGD,QAAQ,CAACR,QAAQ,CAACS,aAAV,CAA5B;;AAIA,QAAI,KAAKzB,KAAL,CAAW0B,OAAf,EAAwB;AACtBH,MAAAA,aAAa,GAAGI,IAAI,CAACC,GAAL,CACdL,aADc,EAEd1B,oBAAoB,CAAC;AAACgC,QAAAA,IAAI,EAAE,KAAK7B,KAAL,CAAW0B,OAAlB;AAA2BI,QAAAA,QAAQ,EAAE;AAArC,OAAD,CAFN,CAAhB;AAID;;AACD,QAAI,KAAK9B,KAAL,CAAW+B,OAAf,EAAwB;AACtBN,MAAAA,aAAa,GAAGE,IAAI,CAACK,GAAL,CACdP,aADc,EAEd5B,oBAAoB,CAAC;AAACgC,QAAAA,IAAI,EAAE,KAAK7B,KAAL,CAAW+B,OAAlB;AAA2BD,QAAAA,QAAQ,EAAE;AAArC,OAAD,CAFN,CAAhB;AAID;;AAID,WAAO,CACL,IAAIhC,qBAAJ,CAA0B,KAAKE,KAA/B,EAAsC;AACpCO,MAAAA,EAAE,0BAAmB,KAAKP,KAAL,CAAWO,EAA9B,CADkC;AAEpCN,MAAAA,IAFoC;AAIpCgC,MAAAA,YAAY,EAAErC,WAJsB;AAKpCG,MAAAA,eALoC;AAOpC2B,MAAAA,OAAO,EAAEH,aAP2B;AAQpCQ,MAAAA,OAAO,EAAEN,aAR2B;AASpCS,MAAAA,WAAW,EAAE,EACX,GAAG,KAAKC,cAAL,EADQ;AAEXC,QAAAA,gBAAgB,EAAE;
|
|
1
|
+
{"version":3,"sources":["../../../src/layers/h3-tile-layer.ts"],"names":["CompositeLayer","H3HexagonLayer","H3Tileset2D","getHexagonResolution","SpatialIndexTileLayer","renderSubLayers","props","data","index","tile","length","getHexagon","d","id","centerHexagon","highPrecision","defaultProps","aggregationResLevel","H3TileLayer","initializeState","_checkH3Lib","setState","tileJSON","updateState","changeFlags","dataChanged","tiles","renderLayers","state","minresolution","parseInt","maxresolution","minZoom","Math","max","zoom","latitude","maxZoom","min","TilesetClass","loadOptions","getLoadOptions","cartoSpatialTile","scheme","mimeType"],"mappings":";AAAA,SACEA,cADF,QAOO,eAPP;AAQA,SAAQC,cAAR,QAA6B,qBAA7B;AACA,OAAOC,WAAP,IAAqBC,oBAArB,QAAgD,iBAAhD;AACA,OAAOC,qBAAP,MAAkC,4BAAlC;;AAEA,MAAMC,eAAe,GAAGC,KAAK,IAAI;AAC/B,QAAM;AAACC,IAAAA;AAAD,MAASD,KAAf;AACA,QAAM;AAACE,IAAAA;AAAD,MAAUF,KAAK,CAACG,IAAtB;AACA,MAAI,CAACF,IAAD,IAAS,CAACA,IAAI,CAACG,MAAnB,EAA2B,OAAO,IAAP;AAE3B,SAAO,IAAIT,cAAJ,CAAmBK,KAAnB,EAA0B;AAC/BK,IAAAA,UAAU,EAAEC,CAAC,IAAIA,CAAC,CAACC,EADY;AAE/BC,IAAAA,aAAa,EAAEN,KAFgB;AAG/BO,IAAAA,aAAa,EAAE;AAHgB,GAA1B,CAAP;AAKD,CAVD;;AAYA,MAAMC,YAA+C,GAAG;AACtDC,EAAAA,mBAAmB,EAAE;AADiC,CAAxD;AAiBA,eAAe,MAAMC,WAAN,SAAoElB,cAApE,CAEb;AAAA;AAAA;;AAAA;AAAA;;AASAmB,EAAAA,eAAe,GAAS;AACtBlB,IAAAA,cAAc,CAACmB,WAAf;;AACA,SAAKC,QAAL,CAAc;AAACd,MAAAA,IAAI,EAAE,IAAP;AAAae,MAAAA,QAAQ,EAAE;AAAvB,KAAd;AACD;;AAEDC,EAAAA,WAAW,CAAC;AAACC,IAAAA;AAAD,GAAD,EAA8C;AACvD,QAAIA,WAAW,CAACC,WAAhB,EAA6B;AAC3B,UAAI;AAAClB,QAAAA;AAAD,UAAS,KAAKD,KAAlB;AACA,YAAMgB,QAAQ,GAAGf,IAAjB;AACAA,MAAAA,IAAI,GAAIe,QAAD,CAAkBI,KAAzB;AACA,WAAKL,QAAL,CAAc;AAACd,QAAAA,IAAD;AAAOe,QAAAA;AAAP,OAAd;AACD;AACF;;AAEDK,EAAAA,YAAY,GAA8B;AACxC,UAAM;AAACpB,MAAAA,IAAD;AAAOe,MAAAA;AAAP,QAAmB,KAAKM,KAA9B;AACA,QAAIC,aAAa,GAAGC,QAAQ,CAACR,QAAQ,CAACO,aAAV,CAA5B;AACA,QAAIE,aAAa,GAAGD,QAAQ,CAACR,QAAQ,CAACS,aAAV,CAA5B;;AAIA,QAAI,KAAKzB,KAAL,CAAW0B,OAAf,EAAwB;AACtBH,MAAAA,aAAa,GAAGI,IAAI,CAACC,GAAL,CACdL,aADc,EAEd1B,oBAAoB,CAAC;AAACgC,QAAAA,IAAI,EAAE,KAAK7B,KAAL,CAAW0B,OAAlB;AAA2BI,QAAAA,QAAQ,EAAE;AAArC,OAAD,CAFN,CAAhB;AAID;;AACD,QAAI,KAAK9B,KAAL,CAAW+B,OAAf,EAAwB;AACtBN,MAAAA,aAAa,GAAGE,IAAI,CAACK,GAAL,CACdP,aADc,EAEd5B,oBAAoB,CAAC;AAACgC,QAAAA,IAAI,EAAE,KAAK7B,KAAL,CAAW+B,OAAlB;AAA2BD,QAAAA,QAAQ,EAAE;AAArC,OAAD,CAFN,CAAhB;AAID;;AAID,WAAO,CACL,IAAIhC,qBAAJ,CAA0B,KAAKE,KAA/B,EAAsC;AACpCO,MAAAA,EAAE,0BAAmB,KAAKP,KAAL,CAAWO,EAA9B,CADkC;AAEpCN,MAAAA,IAFoC;AAIpCgC,MAAAA,YAAY,EAAErC,WAJsB;AAKpCG,MAAAA,eALoC;AAOpC2B,MAAAA,OAAO,EAAEH,aAP2B;AAQpCQ,MAAAA,OAAO,EAAEN,aAR2B;AASpCS,MAAAA,WAAW,EAAE,EACX,GAAG,KAAKC,cAAL,EADQ;AAEXC,QAAAA,gBAAgB,EAAE;AAACC,UAAAA,MAAM,EAAE;AAAT,SAFP;AAGXC,QAAAA,QAAQ,EAAE;AAHC;AATuB,KAAtC,CADK,CAAP;AAiBD;;AA9DD;;gBAFmB1B,W,eAGA,a;;gBAHAA,W,kBAIGF,Y","sourcesContent":["import {\n CompositeLayer,\n CompositeLayerProps,\n Layer,\n LayersList,\n UpdateParameters,\n DefaultProps\n} from '@deck.gl/core';\nimport {H3HexagonLayer} from '@deck.gl/geo-layers';\nimport H3Tileset2D, {getHexagonResolution} from './h3-tileset-2d';\nimport SpatialIndexTileLayer from './spatial-index-tile-layer';\n\nconst renderSubLayers = props => {\n const {data} = props;\n const {index} = props.tile;\n if (!data || !data.length) return null;\n\n return new H3HexagonLayer(props, {\n getHexagon: d => d.id,\n centerHexagon: index,\n highPrecision: true\n });\n};\n\nconst defaultProps: DefaultProps<H3HexagonLayerProps> = {\n aggregationResLevel: 4\n};\n\n/** All properties supported by H3TileLayer. */\nexport type H3TileLayerProps<DataT = any> = _H3TileLayerProps<DataT> & CompositeLayerProps;\n\n// TODO: use type from h3-hexagon-layer when available\n// eslint-disable-next-line @typescript-eslint/no-unused-vars\ntype H3HexagonLayerProps<DataT = any> = Record<string, any>;\n\n/** Properties added by H3TileLayer. */\ntype _H3TileLayerProps<DataT> = H3HexagonLayerProps<DataT> & {\n data: string;\n aggregationResLevel?: number;\n};\n\nexport default class H3TileLayer<DataT = any, ExtraPropsT extends {} = {}> extends CompositeLayer<\n ExtraPropsT & Required<_H3TileLayerProps<DataT>>\n> {\n static layerName = 'H3TileLayer';\n static defaultProps = defaultProps;\n\n state!: {\n tileJSON: any;\n data: any;\n };\n\n initializeState(): void {\n H3HexagonLayer._checkH3Lib();\n this.setState({data: null, tileJSON: null});\n }\n\n updateState({changeFlags}: UpdateParameters<this>): void {\n if (changeFlags.dataChanged) {\n let {data} = this.props;\n const tileJSON = data;\n data = (tileJSON as any).tiles;\n this.setState({data, tileJSON});\n }\n }\n\n renderLayers(): Layer | null | LayersList {\n const {data, tileJSON} = this.state;\n let minresolution = parseInt(tileJSON.minresolution);\n let maxresolution = parseInt(tileJSON.maxresolution);\n\n // Convert Mercator zooms provided in props into H3 res levels\n // and clip into valid range provided from the tilejson\n if (this.props.minZoom) {\n minresolution = Math.max(\n minresolution,\n getHexagonResolution({zoom: this.props.minZoom, latitude: 0})\n );\n }\n if (this.props.maxZoom) {\n maxresolution = Math.min(\n maxresolution,\n getHexagonResolution({zoom: this.props.maxZoom, latitude: 0})\n );\n }\n\n // The naming is unfortunate, but minZoom & maxZoom in the context\n // of a Tileset2D refer to the resolution levels, not the Mercator zooms\n return [\n new SpatialIndexTileLayer(this.props, {\n id: `h3-tile-layer-${this.props.id}`,\n data,\n // @ts-expect-error Tileset2D should be generic over TileIndex\n TilesetClass: H3Tileset2D,\n renderSubLayers,\n // minZoom and maxZoom are H3 resolutions, however we must use this naming as that is what the Tileset2D class expects\n minZoom: minresolution,\n maxZoom: maxresolution,\n loadOptions: {\n ...this.getLoadOptions(),\n cartoSpatialTile: {scheme: 'h3'},\n mimeType: 'application/vnd.carto-spatial-tile'\n }\n })\n ];\n }\n}\n"],"file":"h3-tile-layer.js"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../../../src/layers/quadbin-tile-layer.ts"],"names":["CompositeLayer","QuadbinLayer","QuadbinTileset2D","SpatialIndexTileLayer","hexToBigInt","renderSubLayers","props","data","length","isBigInt","id","getQuadbin","d","defaultProps","aggregationResLevel","QuadbinTileLayer","initializeState","setState","tileJSON","updateState","changeFlags","dataChanged","tiles","renderLayers","state","maxZoom","parseInt","maxresolution","TilesetClass","loadOptions","getLoadOptions","cartoSpatialTile","scheme"],"mappings":";AAAA,SACEA,cADF,QAOO,eAPP;AAQA,OAAOC,YAAP,MAA8C,iBAA9C;AACA,OAAOC,gBAAP,MAA6B,sBAA7B;AACA,OAAOC,qBAAP,MAAkC,4BAAlC;AACA,SAAQC,WAAR,QAA0B,SAA1B;AAEA,OAAO,MAAMC,eAAe,GAAGC,KAAK,IAAI;AACtC,QAAM;AAACC,IAAAA;AAAD,MAASD,KAAf;AACA,MAAI,CAACC,IAAD,IAAS,CAACA,IAAI,CAACC,MAAnB,EAA2B,OAAO,IAAP;AAC3B,QAAMC,QAAQ,GAAG,OAAOF,IAAI,CAAC,CAAD,CAAJ,CAAQG,EAAf,KAAsB,QAAvC;AACA,SAAO,IAAIT,YAAJ,CAAiBK,KAAjB,EAAwB;AAC7BK,IAAAA,UAAU,EAAEF,QAAQ,GAAGG,CAAC,IAAIA,CAAC,CAACF,EAAV,GAAeE,CAAC,IAAIR,WAAW,CAACQ,CAAC,CAACF,EAAH;AADtB,GAAxB,CAAP;AAGD,CAPM;AASP,MAAMG,YAAiD,GAAG;AACxDC,EAAAA,mBAAmB,EAAE;AADmC,CAA1D;AAcA,eAAe,MAAMC,gBAAN,SAGLf,cAHK,CAGgE;AAAA;AAAA;;AAAA;AAAA;;AAQ7EgB,EAAAA,eAAe,GAAS;AACtB,SAAKC,QAAL,CAAc;AAACV,MAAAA,IAAI,EAAE,IAAP;AAAaW,MAAAA,QAAQ,EAAE;AAAvB,KAAd;AACD;;AAEDC,EAAAA,WAAW,CAAC;AAACC,IAAAA;AAAD,GAAD,EAA8C;AACvD,QAAIA,WAAW,CAACC,WAAhB,EAA6B;AAC3B,UAAI;AAACd,QAAAA;AAAD,UAAS,KAAKD,KAAlB;AACA,YAAMY,QAAQ,GAAGX,IAAjB;AACAA,MAAAA,IAAI,GAAIW,QAAD,CAAkBI,KAAzB;AACA,WAAKL,QAAL,CAAc;AAACV,QAAAA,IAAD;AAAOW,QAAAA;AAAP,OAAd;AACD;AACF;;AAEDK,EAAAA,YAAY,GAA8B;AACxC,UAAM;AAAChB,MAAAA,IAAD;AAAOW,MAAAA;AAAP,QAAmB,KAAKM,KAA9B;AACA,UAAMC,OAAO,GAAGC,QAAQ,CAACR,QAAD,aAACA,QAAD,uBAACA,QAAQ,CAAES,aAAX,CAAxB;AACA,WAAO,CACL,IAAIxB,qBAAJ,CAA0B,KAAKG,KAA/B,EAAsC;AACpCI,MAAAA,EAAE,+BAAwB,KAAKJ,KAAL,CAAWI,EAAnC,CADkC;AAEpCH,MAAAA,IAFoC;AAIpCqB,MAAAA,YAAY,EAAE1B,gBAJsB;AAKpCG,MAAAA,eALoC;AAMpCoB,MAAAA,OANoC;AAOpCI,MAAAA,WAAW,EAAE,EACX,GAAG,KAAKC,cAAL,EADQ;AAEXC,QAAAA,gBAAgB,EAAE;
|
|
1
|
+
{"version":3,"sources":["../../../src/layers/quadbin-tile-layer.ts"],"names":["CompositeLayer","QuadbinLayer","QuadbinTileset2D","SpatialIndexTileLayer","hexToBigInt","renderSubLayers","props","data","length","isBigInt","id","getQuadbin","d","defaultProps","aggregationResLevel","QuadbinTileLayer","initializeState","setState","tileJSON","updateState","changeFlags","dataChanged","tiles","renderLayers","state","maxZoom","parseInt","maxresolution","TilesetClass","loadOptions","getLoadOptions","cartoSpatialTile","scheme","mimeType"],"mappings":";AAAA,SACEA,cADF,QAOO,eAPP;AAQA,OAAOC,YAAP,MAA8C,iBAA9C;AACA,OAAOC,gBAAP,MAA6B,sBAA7B;AACA,OAAOC,qBAAP,MAAkC,4BAAlC;AACA,SAAQC,WAAR,QAA0B,SAA1B;AAEA,OAAO,MAAMC,eAAe,GAAGC,KAAK,IAAI;AACtC,QAAM;AAACC,IAAAA;AAAD,MAASD,KAAf;AACA,MAAI,CAACC,IAAD,IAAS,CAACA,IAAI,CAACC,MAAnB,EAA2B,OAAO,IAAP;AAC3B,QAAMC,QAAQ,GAAG,OAAOF,IAAI,CAAC,CAAD,CAAJ,CAAQG,EAAf,KAAsB,QAAvC;AACA,SAAO,IAAIT,YAAJ,CAAiBK,KAAjB,EAAwB;AAC7BK,IAAAA,UAAU,EAAEF,QAAQ,GAAGG,CAAC,IAAIA,CAAC,CAACF,EAAV,GAAeE,CAAC,IAAIR,WAAW,CAACQ,CAAC,CAACF,EAAH;AADtB,GAAxB,CAAP;AAGD,CAPM;AASP,MAAMG,YAAiD,GAAG;AACxDC,EAAAA,mBAAmB,EAAE;AADmC,CAA1D;AAcA,eAAe,MAAMC,gBAAN,SAGLf,cAHK,CAGgE;AAAA;AAAA;;AAAA;AAAA;;AAQ7EgB,EAAAA,eAAe,GAAS;AACtB,SAAKC,QAAL,CAAc;AAACV,MAAAA,IAAI,EAAE,IAAP;AAAaW,MAAAA,QAAQ,EAAE;AAAvB,KAAd;AACD;;AAEDC,EAAAA,WAAW,CAAC;AAACC,IAAAA;AAAD,GAAD,EAA8C;AACvD,QAAIA,WAAW,CAACC,WAAhB,EAA6B;AAC3B,UAAI;AAACd,QAAAA;AAAD,UAAS,KAAKD,KAAlB;AACA,YAAMY,QAAQ,GAAGX,IAAjB;AACAA,MAAAA,IAAI,GAAIW,QAAD,CAAkBI,KAAzB;AACA,WAAKL,QAAL,CAAc;AAACV,QAAAA,IAAD;AAAOW,QAAAA;AAAP,OAAd;AACD;AACF;;AAEDK,EAAAA,YAAY,GAA8B;AACxC,UAAM;AAAChB,MAAAA,IAAD;AAAOW,MAAAA;AAAP,QAAmB,KAAKM,KAA9B;AACA,UAAMC,OAAO,GAAGC,QAAQ,CAACR,QAAD,aAACA,QAAD,uBAACA,QAAQ,CAAES,aAAX,CAAxB;AACA,WAAO,CACL,IAAIxB,qBAAJ,CAA0B,KAAKG,KAA/B,EAAsC;AACpCI,MAAAA,EAAE,+BAAwB,KAAKJ,KAAL,CAAWI,EAAnC,CADkC;AAEpCH,MAAAA,IAFoC;AAIpCqB,MAAAA,YAAY,EAAE1B,gBAJsB;AAKpCG,MAAAA,eALoC;AAMpCoB,MAAAA,OANoC;AAOpCI,MAAAA,WAAW,EAAE,EACX,GAAG,KAAKC,cAAL,EADQ;AAEXC,QAAAA,gBAAgB,EAAE;AAACC,UAAAA,MAAM,EAAE;AAAT,SAFP;AAGXC,QAAAA,QAAQ,EAAE;AAHC;AAPuB,KAAtC,CADK,CAAP;AAeD;;AAvC4E;;gBAH1DlB,gB,eAIA,kB;;gBAJAA,gB,kBAKGF,Y","sourcesContent":["import {\n CompositeLayer,\n CompositeLayerProps,\n Layer,\n LayersList,\n UpdateParameters,\n DefaultProps\n} from '@deck.gl/core';\nimport QuadbinLayer, {QuadbinLayerProps} from './quadbin-layer';\nimport QuadbinTileset2D from './quadbin-tileset-2d';\nimport SpatialIndexTileLayer from './spatial-index-tile-layer';\nimport {hexToBigInt} from 'quadbin';\n\nexport const renderSubLayers = props => {\n const {data} = props;\n if (!data || !data.length) return null;\n const isBigInt = typeof data[0].id === 'bigint';\n return new QuadbinLayer(props, {\n getQuadbin: isBigInt ? d => d.id : d => hexToBigInt(d.id)\n });\n};\n\nconst defaultProps: DefaultProps<QuadbinTileLayerProps> = {\n aggregationResLevel: 6\n};\n\n/** All properties supported by QuadbinTileLayer. */\nexport type QuadbinTileLayerProps<DataT = any> = _QuadbinTileLayerProps<DataT> &\n CompositeLayerProps;\n\n/** Properties added by QuadbinTileLayer. */\ntype _QuadbinTileLayerProps<DataT> = QuadbinLayerProps<DataT> & {\n data: string;\n aggregationResLevel?: number;\n};\n\nexport default class QuadbinTileLayer<\n DataT = any,\n ExtraProps extends {} = {}\n> extends CompositeLayer<ExtraProps & Required<_QuadbinTileLayerProps<DataT>>> {\n static layerName = 'QuadbinTileLayer';\n static defaultProps = defaultProps;\n\n state!: {\n tileJSON: any;\n data: any;\n };\n initializeState(): void {\n this.setState({data: null, tileJSON: null});\n }\n\n updateState({changeFlags}: UpdateParameters<this>): void {\n if (changeFlags.dataChanged) {\n let {data} = this.props;\n const tileJSON = data;\n data = (tileJSON as any).tiles;\n this.setState({data, tileJSON});\n }\n }\n\n renderLayers(): Layer | null | LayersList {\n const {data, tileJSON} = this.state;\n const maxZoom = parseInt(tileJSON?.maxresolution);\n return [\n new SpatialIndexTileLayer(this.props, {\n id: `quadbin-tile-layer-${this.props.id}`,\n data,\n // TODO: Tileset2D should be generic over TileIndex type\n TilesetClass: QuadbinTileset2D as any,\n renderSubLayers,\n maxZoom,\n loadOptions: {\n ...this.getLoadOptions(),\n cartoSpatialTile: {scheme: 'quadbin'},\n mimeType: 'application/vnd.carto-spatial-tile'\n }\n })\n ];\n }\n}\n"],"file":"quadbin-tile-layer.js"}
|
|
@@ -1,15 +1,18 @@
|
|
|
1
1
|
import { worldToLngLat } from '@math.gl/web-mercator';
|
|
2
2
|
import { cellToTile } from 'quadbin';
|
|
3
3
|
const TILE_SIZE = 512;
|
|
4
|
-
export function
|
|
4
|
+
export function quadbinToOffset(quadbin) {
|
|
5
5
|
const {
|
|
6
6
|
x,
|
|
7
7
|
y,
|
|
8
8
|
z
|
|
9
9
|
} = cellToTile(quadbin);
|
|
10
|
-
const
|
|
11
|
-
|
|
12
|
-
|
|
10
|
+
const scale = TILE_SIZE / (1 << z);
|
|
11
|
+
return [x * scale, TILE_SIZE - y * scale, scale];
|
|
12
|
+
}
|
|
13
|
+
export function quadbinToWorldBounds(quadbin, coverage) {
|
|
14
|
+
const [xOffset, yOffset, scale] = quadbinToOffset(quadbin);
|
|
15
|
+
return [[xOffset, yOffset], [xOffset + coverage * scale, yOffset - coverage * scale]];
|
|
13
16
|
}
|
|
14
17
|
export function getQuadbinPolygon(quadbin, coverage = 1) {
|
|
15
18
|
const [topLeft, bottomRight] = quadbinToWorldBounds(quadbin, coverage);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../../../src/layers/quadbin-utils.ts"],"names":["worldToLngLat","cellToTile","TILE_SIZE","
|
|
1
|
+
{"version":3,"sources":["../../../src/layers/quadbin-utils.ts"],"names":["worldToLngLat","cellToTile","TILE_SIZE","quadbinToOffset","quadbin","x","y","z","scale","quadbinToWorldBounds","coverage","xOffset","yOffset","getQuadbinPolygon","topLeft","bottomRight","w","n","e","s"],"mappings":"AAAA,SAAQA,aAAR,QAA4B,uBAA5B;AACA,SAAQC,UAAR,QAAyB,SAAzB;AAEA,MAAMC,SAAS,GAAG,GAAlB;AAEA,OAAO,SAASC,eAAT,CAAyBC,OAAzB,EAAoE;AACzE,QAAM;AAACC,IAAAA,CAAD;AAAIC,IAAAA,CAAJ;AAAOC,IAAAA;AAAP,MAAYN,UAAU,CAACG,OAAD,CAA5B;AACA,QAAMI,KAAK,GAAGN,SAAS,IAAI,KAAKK,CAAT,CAAvB;AACA,SAAO,CAACF,CAAC,GAAGG,KAAL,EAAYN,SAAS,GAAGI,CAAC,GAAGE,KAA5B,EAAmCA,KAAnC,CAAP;AACD;AAED,OAAO,SAASC,oBAAT,CAA8BL,OAA9B,EAA+CM,QAA/C,EAAuF;AAC5F,QAAM,CAACC,OAAD,EAAUC,OAAV,EAAmBJ,KAAnB,IAA4BL,eAAe,CAACC,OAAD,CAAjD;AACA,SAAO,CACL,CAACO,OAAD,EAAUC,OAAV,CADK,EAEL,CAACD,OAAO,GAAGD,QAAQ,GAAGF,KAAtB,EAA6BI,OAAO,GAAGF,QAAQ,GAAGF,KAAlD,CAFK,CAAP;AAID;AAED,OAAO,SAASK,iBAAT,CAA2BT,OAA3B,EAA4CM,QAAQ,GAAG,CAAvD,EAAoE;AACzE,QAAM,CAACI,OAAD,EAAUC,WAAV,IAAyBN,oBAAoB,CAACL,OAAD,EAAUM,QAAV,CAAnD;AACA,QAAM,CAACM,CAAD,EAAIC,CAAJ,IAASjB,aAAa,CAACc,OAAD,CAA5B;AACA,QAAM,CAACI,CAAD,EAAIC,CAAJ,IAASnB,aAAa,CAACe,WAAD,CAA5B;AACA,SAAO,CAACG,CAAD,EAAID,CAAJ,EAAOC,CAAP,EAAUC,CAAV,EAAaH,CAAb,EAAgBG,CAAhB,EAAmBH,CAAnB,EAAsBC,CAAtB,EAAyBC,CAAzB,EAA4BD,CAA5B,CAAP;AACD","sourcesContent":["import {worldToLngLat} from '@math.gl/web-mercator';\nimport {cellToTile} from 'quadbin';\n\nconst TILE_SIZE = 512;\n\nexport function quadbinToOffset(quadbin: bigint): [number, number, number] {\n const {x, y, z} = cellToTile(quadbin);\n const scale = TILE_SIZE / (1 << z);\n return [x * scale, TILE_SIZE - y * scale, scale];\n}\n\nexport function quadbinToWorldBounds(quadbin: bigint, coverage: number): [number[], number[]] {\n const [xOffset, yOffset, scale] = quadbinToOffset(quadbin);\n return [\n [xOffset, yOffset],\n [xOffset + coverage * scale, yOffset - coverage * scale]\n ];\n}\n\nexport function getQuadbinPolygon(quadbin: bigint, coverage = 1): number[] {\n const [topLeft, bottomRight] = quadbinToWorldBounds(quadbin, coverage);\n const [w, n] = worldToLngLat(topLeft);\n const [e, s] = worldToLngLat(bottomRight);\n return [e, n, e, s, w, s, w, n, e, n];\n}\n"],"file":"quadbin-utils.js"}
|
|
@@ -0,0 +1,2 @@
|
|
|
1
|
+
export default "#version 300 es\n#define SHADER_NAME raster-layer-vertex-shader\n\nin vec3 positions;\nin vec3 normals;\n\nin float instanceElevations;\nin vec4 instanceFillColors;\nin vec4 instanceLineColors;\n\nin vec3 instancePickingColors;\nuniform float opacity;\nuniform bool extruded;\nuniform bool stroked;\nuniform bool isStroke;\nuniform float coverage;\nuniform float elevationScale;\nuniform float widthScale;\nuniform vec3 offset;\nout vec4 vColor;\n#ifdef FLAT_SHADING\nout vec4 position_commonspace;\n#endif\n\nvoid main(void) {\n vec2 common_position = offset.xy;\n float scale = offset.z;\n\n int yIndex = - (gl_InstanceID / 256);\n int xIndex = gl_InstanceID + (yIndex * 256);\n common_position += scale * vec2(float(xIndex), float(yIndex));\n\n vec4 color = isStroke ? instanceLineColors : instanceFillColors;\n float shouldRender = float(color.a > 0.0 && instanceElevations >= 0.0);\n float cellWidth = coverage * scale;\n geometry.position = vec4(common_position, 0.0, 1.0);\n if (project_uProjectionMode == PROJECTION_MODE_WEB_MERCATOR_AUTO_OFFSET) {\n geometry.position.xyz -= project_uCommonOrigin;\n }\n float elevation = 0.0;\n float strokeOffsetRatio = 1.0;\n\n if (extruded) {\n elevation = instanceElevations * (positions.z + 1.0) / 2.0 * elevationScale;\n } else if (stroked) {\n float halfOffset = project_pixel_size(widthScale) / cellWidth;\n if (isStroke) {\n strokeOffsetRatio -= sign(positions.z) * halfOffset;\n } else {\n strokeOffsetRatio -= halfOffset;\n }\n }\n\n geometry.pickingColor = instancePickingColors;\n vec2 offset = (vec2(0.5) + positions.xy * strokeOffsetRatio) * cellWidth * shouldRender;\n vec3 pos = vec3(offset, project_size(elevation));\n DECKGL_FILTER_SIZE(pos, geometry);\n\n geometry.position.xyz += pos;\n gl_Position = project_common_position_to_clipspace(geometry.position);\n\n geometry.normal = project_normal(normals);\n DECKGL_FILTER_GL_POSITION(gl_Position, geometry);\n if (extruded && !isStroke) {\n#ifdef FLAT_SHADING\n position_commonspace = geometry.position;\n vColor = vec4(color.rgb, color.a * opacity);\n#else\n vec3 lightColor = lighting_getLightColor(color.rgb, project_uCameraPosition, geometry.position.xyz, geometry.normal);\n vColor = vec4(lightColor, color.a * opacity);\n#endif\n } else {\n vColor = vec4(color.rgb, color.a * opacity);\n }\n\n DECKGL_FILTER_COLOR(vColor, geometry);\n}\n";
|
|
2
|
+
//# sourceMappingURL=raster-layer-vertex.glsl.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"sources":["../../../src/layers/raster-layer-vertex.glsl.ts"],"names":[],"mappings":"AAAA","sourcesContent":["export default `\\\n#version 300 es\n#define SHADER_NAME raster-layer-vertex-shader\n\nin vec3 positions;\nin vec3 normals;\n\nin float instanceElevations;\nin vec4 instanceFillColors;\nin vec4 instanceLineColors;\n\nin vec3 instancePickingColors;\n\n// Custom uniforms\nuniform float opacity;\nuniform bool extruded;\nuniform bool stroked;\nuniform bool isStroke;\nuniform float coverage;\nuniform float elevationScale;\nuniform float widthScale;\nuniform vec3 offset;\n\n// Result\nout vec4 vColor;\n#ifdef FLAT_SHADING\nout vec4 position_commonspace;\n#endif\n\nvoid main(void) {\n // Rather than positioning using attribute, layout pixel grid using gl_InstanceID\n vec2 common_position = offset.xy;\n float scale = offset.z;\n\n int yIndex = - (gl_InstanceID / 256);\n int xIndex = gl_InstanceID + (yIndex * 256);\n common_position += scale * vec2(float(xIndex), float(yIndex));\n\n vec4 color = isStroke ? instanceLineColors : instanceFillColors;\n\n // if alpha == 0.0 or z < 0.0, do not render element\n float shouldRender = float(color.a > 0.0 && instanceElevations >= 0.0);\n float cellWidth = coverage * scale;\n\n // Get position directly from quadbin, rather than projecting\n // Important to set geometry.position before using project_ methods below\n // as geometry.worldPosition is not set (we don't know our lat/long)\n geometry.position = vec4(common_position, 0.0, 1.0);\n if (project_uProjectionMode == PROJECTION_MODE_WEB_MERCATOR_AUTO_OFFSET) {\n geometry.position.xyz -= project_uCommonOrigin;\n }\n\n // calculate elevation, if 3d not enabled set to 0\n // cylindar geometry height are between -1.0 to 1.0, transform it to between 0, 1\n float elevation = 0.0;\n // calculate stroke offset\n float strokeOffsetRatio = 1.0;\n\n if (extruded) {\n elevation = instanceElevations * (positions.z + 1.0) / 2.0 * elevationScale;\n } else if (stroked) {\n float halfOffset = project_pixel_size(widthScale) / cellWidth;\n if (isStroke) {\n strokeOffsetRatio -= sign(positions.z) * halfOffset;\n } else {\n strokeOffsetRatio -= halfOffset;\n }\n }\n\n geometry.pickingColor = instancePickingColors;\n\n // project center of column\n vec2 offset = (vec2(0.5) + positions.xy * strokeOffsetRatio) * cellWidth * shouldRender;\n vec3 pos = vec3(offset, project_size(elevation));\n DECKGL_FILTER_SIZE(pos, geometry);\n\n geometry.position.xyz += pos;\n gl_Position = project_common_position_to_clipspace(geometry.position);\n\n geometry.normal = project_normal(normals);\n DECKGL_FILTER_GL_POSITION(gl_Position, geometry);\n\n // Light calculations\n if (extruded && !isStroke) {\n#ifdef FLAT_SHADING\n position_commonspace = geometry.position;\n vColor = vec4(color.rgb, color.a * opacity);\n#else\n vec3 lightColor = lighting_getLightColor(color.rgb, project_uCameraPosition, geometry.position.xyz, geometry.normal);\n vColor = vec4(lightColor, color.a * opacity);\n#endif\n } else {\n vColor = vec4(color.rgb, color.a * opacity);\n }\n\n DECKGL_FILTER_COLOR(vColor, geometry);\n}\n`;\n"],"file":"raster-layer-vertex.glsl.js"}
|
|
@@ -0,0 +1,111 @@
|
|
|
1
|
+
import _defineProperty from "@babel/runtime/helpers/esm/defineProperty";
|
|
2
|
+
import { CompositeLayer } from '@deck.gl/core';
|
|
3
|
+
import { ColumnLayer } from '@deck.gl/layers';
|
|
4
|
+
import { quadbinToOffset } from './quadbin-utils';
|
|
5
|
+
import vs from './raster-layer-vertex.glsl';
|
|
6
|
+
import { assert, createBinaryProxy } from '../utils';
|
|
7
|
+
const defaultProps = { ...ColumnLayer.defaultProps,
|
|
8
|
+
extruded: false,
|
|
9
|
+
diskResolution: 4,
|
|
10
|
+
vertices: [[-0.5, -0.5], [0.5, -0.5], [0.5, 0.5], [-0.5, 0.5]]
|
|
11
|
+
};
|
|
12
|
+
|
|
13
|
+
class RasterColumnLayer extends ColumnLayer {
|
|
14
|
+
getShaders() {
|
|
15
|
+
const shaders = super.getShaders();
|
|
16
|
+
return { ...shaders,
|
|
17
|
+
vs
|
|
18
|
+
};
|
|
19
|
+
}
|
|
20
|
+
|
|
21
|
+
initializeState() {
|
|
22
|
+
const attributeManager = this.getAttributeManager();
|
|
23
|
+
attributeManager.addInstanced({
|
|
24
|
+
instanceElevations: {
|
|
25
|
+
size: 1,
|
|
26
|
+
transition: true,
|
|
27
|
+
accessor: 'getElevation'
|
|
28
|
+
},
|
|
29
|
+
instanceFillColors: {
|
|
30
|
+
size: this.props.colorFormat.length,
|
|
31
|
+
type: 5121,
|
|
32
|
+
normalized: true,
|
|
33
|
+
transition: true,
|
|
34
|
+
accessor: 'getFillColor',
|
|
35
|
+
defaultValue: [0, 0, 0, 255]
|
|
36
|
+
},
|
|
37
|
+
instanceLineColors: {
|
|
38
|
+
size: this.props.colorFormat.length,
|
|
39
|
+
type: 5121,
|
|
40
|
+
normalized: true,
|
|
41
|
+
transition: true,
|
|
42
|
+
accessor: 'getLineColor',
|
|
43
|
+
defaultValue: [255, 255, 255, 255]
|
|
44
|
+
}
|
|
45
|
+
});
|
|
46
|
+
}
|
|
47
|
+
|
|
48
|
+
}
|
|
49
|
+
|
|
50
|
+
_defineProperty(RasterColumnLayer, "layerName", 'RasterColumnLayer');
|
|
51
|
+
|
|
52
|
+
export default class RasterLayer extends CompositeLayer {
|
|
53
|
+
renderLayers() {
|
|
54
|
+
const {
|
|
55
|
+
data,
|
|
56
|
+
getElevation,
|
|
57
|
+
getFillColor,
|
|
58
|
+
getLineColor,
|
|
59
|
+
getLineWidth,
|
|
60
|
+
tileIndex,
|
|
61
|
+
updateTriggers
|
|
62
|
+
} = this.props;
|
|
63
|
+
if (!data || !tileIndex) return null;
|
|
64
|
+
const {
|
|
65
|
+
blockWidth,
|
|
66
|
+
blockHeight
|
|
67
|
+
} = data;
|
|
68
|
+
assert(blockWidth === blockHeight, "blockWidth (".concat(blockWidth, ") must equal blockHeight (").concat(blockHeight, ")"));
|
|
69
|
+
const [xOffset, yOffset, scale] = quadbinToOffset(tileIndex);
|
|
70
|
+
const offset = [xOffset, yOffset, scale / blockWidth];
|
|
71
|
+
const CellLayer = this.getSubLayerClass('column', RasterColumnLayer);
|
|
72
|
+
return new CellLayer(this.props, this.getSubLayerProps({
|
|
73
|
+
id: 'cell',
|
|
74
|
+
updateTriggers,
|
|
75
|
+
getElevation: this.getSubLayerAccessor(getElevation),
|
|
76
|
+
getFillColor: this.getSubLayerAccessor(getFillColor),
|
|
77
|
+
getLineColor: this.getSubLayerAccessor(getLineColor),
|
|
78
|
+
getLineWidth: this.getSubLayerAccessor(getLineWidth)
|
|
79
|
+
}), {
|
|
80
|
+
data: {
|
|
81
|
+
data,
|
|
82
|
+
length: blockWidth * blockHeight
|
|
83
|
+
},
|
|
84
|
+
offset
|
|
85
|
+
});
|
|
86
|
+
}
|
|
87
|
+
|
|
88
|
+
getSubLayerAccessor(accessor) {
|
|
89
|
+
if (typeof accessor !== 'function') {
|
|
90
|
+
return super.getSubLayerAccessor(accessor);
|
|
91
|
+
}
|
|
92
|
+
|
|
93
|
+
return (object, info) => {
|
|
94
|
+
const {
|
|
95
|
+
data,
|
|
96
|
+
index
|
|
97
|
+
} = info;
|
|
98
|
+
const binaryData = data.data;
|
|
99
|
+
const proxy = createBinaryProxy(binaryData.cells, index);
|
|
100
|
+
return accessor({
|
|
101
|
+
properties: proxy
|
|
102
|
+
}, info);
|
|
103
|
+
};
|
|
104
|
+
}
|
|
105
|
+
|
|
106
|
+
}
|
|
107
|
+
|
|
108
|
+
_defineProperty(RasterLayer, "layerName", 'RasterLayer');
|
|
109
|
+
|
|
110
|
+
_defineProperty(RasterLayer, "defaultProps", defaultProps);
|
|
111
|
+
//# sourceMappingURL=raster-layer.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"sources":["../../../src/layers/raster-layer.ts"],"names":["CompositeLayer","ColumnLayer","quadbinToOffset","vs","assert","createBinaryProxy","defaultProps","extruded","diskResolution","vertices","RasterColumnLayer","getShaders","shaders","initializeState","attributeManager","getAttributeManager","addInstanced","instanceElevations","size","transition","accessor","instanceFillColors","props","colorFormat","length","type","normalized","defaultValue","instanceLineColors","RasterLayer","renderLayers","data","getElevation","getFillColor","getLineColor","getLineWidth","tileIndex","updateTriggers","blockWidth","blockHeight","xOffset","yOffset","scale","offset","CellLayer","getSubLayerClass","getSubLayerProps","id","getSubLayerAccessor","object","info","index","binaryData","proxy","cells","properties"],"mappings":"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","sourcesContent":["import GL from '@luma.gl/constants';\nimport {\n Accessor,\n CompositeLayer,\n CompositeLayerProps,\n Layer,\n LayersList,\n DefaultProps\n} from '@deck.gl/core';\nimport {ColumnLayer, ColumnLayerProps} from '@deck.gl/layers';\nimport {quadbinToOffset} from './quadbin-utils';\nimport {Raster} from './schema/carto-raster-tile-loader';\nimport vs from './raster-layer-vertex.glsl';\nimport {assert, createBinaryProxy} from '../utils';\n\nconst defaultProps: DefaultProps<RasterLayerProps> = {\n ...ColumnLayer.defaultProps,\n extruded: false,\n diskResolution: 4,\n vertices: [\n [-0.5, -0.5],\n [0.5, -0.5],\n [0.5, 0.5],\n [-0.5, 0.5]\n ]\n};\n\n// Modified ColumnLayer with custom vertex shader\nclass RasterColumnLayer extends ColumnLayer {\n static layerName = 'RasterColumnLayer';\n\n getShaders() {\n const shaders = super.getShaders();\n return {...shaders, vs};\n }\n\n initializeState() {\n // Only add attributes needed by shader\n const attributeManager = this.getAttributeManager()!;\n /* eslint-disable max-len */\n attributeManager.addInstanced({\n instanceElevations: {\n size: 1,\n transition: true,\n accessor: 'getElevation'\n },\n instanceFillColors: {\n size: this.props.colorFormat.length,\n type: GL.UNSIGNED_BYTE,\n normalized: true,\n transition: true,\n accessor: 'getFillColor',\n defaultValue: [0, 0, 0, 255]\n },\n instanceLineColors: {\n size: this.props.colorFormat.length,\n type: GL.UNSIGNED_BYTE,\n normalized: true,\n transition: true,\n accessor: 'getLineColor',\n defaultValue: [255, 255, 255, 255]\n }\n });\n }\n}\n\n/** All properties supported by RasterLayer. */\nexport type RasterLayerProps<DataT = any> = _RasterLayerProps &\n ColumnLayerProps<DataT> &\n CompositeLayerProps;\n\n/** Properties added by RasterLayer. */\ntype _RasterLayerProps = {\n /**\n * Quadbin index of tile\n */\n tileIndex: bigint;\n};\n\n// Adapter layer around RasterColumnLayer that converts data & accessors into correct format\nexport default class RasterLayer<DataT = any, ExtraProps = {}> extends CompositeLayer<\n Required<RasterLayerProps<DataT>> & ExtraProps\n> {\n static layerName = 'RasterLayer';\n static defaultProps = defaultProps;\n\n renderLayers(): Layer | null | LayersList {\n // Rendering props underlying layer\n const {\n data,\n getElevation,\n getFillColor,\n getLineColor,\n getLineWidth,\n tileIndex,\n updateTriggers\n } = this.props;\n if (!data || !tileIndex) return null;\n\n const {blockWidth, blockHeight} = data as unknown as Raster;\n assert(\n blockWidth === blockHeight,\n `blockWidth (${blockWidth}) must equal blockHeight (${blockHeight})`\n );\n\n const [xOffset, yOffset, scale] = quadbinToOffset(tileIndex);\n const offset = [xOffset, yOffset, scale / blockWidth];\n\n // Filled Column Layer\n const CellLayer = this.getSubLayerClass('column', RasterColumnLayer);\n return new CellLayer(\n this.props,\n this.getSubLayerProps({\n id: 'cell',\n updateTriggers,\n\n getElevation: this.getSubLayerAccessor(getElevation),\n getFillColor: this.getSubLayerAccessor(getFillColor),\n getLineColor: this.getSubLayerAccessor(getLineColor),\n getLineWidth: this.getSubLayerAccessor(getLineWidth)\n }),\n {\n data: {\n data, // Pass through data for getSubLayerAccessor()\n length: blockWidth * blockHeight\n },\n offset\n }\n );\n }\n\n protected getSubLayerAccessor<In, Out>(accessor: Accessor<In, Out>): Accessor<In, Out> {\n if (typeof accessor !== 'function') {\n return super.getSubLayerAccessor(accessor);\n }\n\n // Proxy values back in standard feature format\n return (object, info) => {\n const {data, index} = info;\n const binaryData = (data as unknown as {data: Raster}).data;\n const proxy = createBinaryProxy(binaryData.cells, index);\n // @ts-ignore (TS2349) accessor is always function\n return accessor({properties: proxy}, info);\n };\n }\n}\n"],"file":"raster-layer.js"}
|
|
@@ -0,0 +1,67 @@
|
|
|
1
|
+
import _defineProperty from "@babel/runtime/helpers/esm/defineProperty";
|
|
2
|
+
import { CompositeLayer } from '@deck.gl/core';
|
|
3
|
+
import RasterLayer from './raster-layer';
|
|
4
|
+
import QuadbinTileset2D from './quadbin-tileset-2d';
|
|
5
|
+
import SpatialIndexTileLayer from './spatial-index-tile-layer';
|
|
6
|
+
export const renderSubLayers = props => {
|
|
7
|
+
var _props$tile, _props$tile$index;
|
|
8
|
+
|
|
9
|
+
const tileIndex = (_props$tile = props.tile) === null || _props$tile === void 0 ? void 0 : (_props$tile$index = _props$tile.index) === null || _props$tile$index === void 0 ? void 0 : _props$tile$index.q;
|
|
10
|
+
if (!tileIndex) return null;
|
|
11
|
+
return new RasterLayer(props, {
|
|
12
|
+
tileIndex
|
|
13
|
+
});
|
|
14
|
+
};
|
|
15
|
+
export default class RasterTileLayer extends CompositeLayer {
|
|
16
|
+
constructor(...args) {
|
|
17
|
+
super(...args);
|
|
18
|
+
|
|
19
|
+
_defineProperty(this, "state", void 0);
|
|
20
|
+
}
|
|
21
|
+
|
|
22
|
+
initializeState() {
|
|
23
|
+
this.setState({
|
|
24
|
+
data: null,
|
|
25
|
+
tileJSON: null
|
|
26
|
+
});
|
|
27
|
+
}
|
|
28
|
+
|
|
29
|
+
updateState({
|
|
30
|
+
changeFlags
|
|
31
|
+
}) {
|
|
32
|
+
if (changeFlags.dataChanged) {
|
|
33
|
+
let {
|
|
34
|
+
data
|
|
35
|
+
} = this.props;
|
|
36
|
+
const tileJSON = data;
|
|
37
|
+
data = tileJSON.tiles;
|
|
38
|
+
this.setState({
|
|
39
|
+
data,
|
|
40
|
+
tileJSON
|
|
41
|
+
});
|
|
42
|
+
}
|
|
43
|
+
}
|
|
44
|
+
|
|
45
|
+
renderLayers() {
|
|
46
|
+
const {
|
|
47
|
+
data,
|
|
48
|
+
tileJSON
|
|
49
|
+
} = this.state;
|
|
50
|
+
const minZoom = parseInt(tileJSON === null || tileJSON === void 0 ? void 0 : tileJSON.minzoom);
|
|
51
|
+
const maxZoom = parseInt(tileJSON === null || tileJSON === void 0 ? void 0 : tileJSON.maxzoom);
|
|
52
|
+
return [new SpatialIndexTileLayer(this.props, {
|
|
53
|
+
id: "raster-tile-layer-".concat(this.props.id),
|
|
54
|
+
data,
|
|
55
|
+
TilesetClass: QuadbinTileset2D,
|
|
56
|
+
renderSubLayers,
|
|
57
|
+
minZoom,
|
|
58
|
+
maxZoom
|
|
59
|
+
})];
|
|
60
|
+
}
|
|
61
|
+
|
|
62
|
+
}
|
|
63
|
+
|
|
64
|
+
_defineProperty(RasterTileLayer, "layerName", 'RasterTileLayer');
|
|
65
|
+
|
|
66
|
+
_defineProperty(RasterTileLayer, "defaultProps", {});
|
|
67
|
+
//# sourceMappingURL=raster-tile-layer.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"sources":["../../../src/layers/raster-tile-layer.ts"],"names":["CompositeLayer","RasterLayer","QuadbinTileset2D","SpatialIndexTileLayer","renderSubLayers","props","tileIndex","tile","index","q","RasterTileLayer","initializeState","setState","data","tileJSON","updateState","changeFlags","dataChanged","tiles","renderLayers","state","minZoom","parseInt","minzoom","maxZoom","maxzoom","id","TilesetClass"],"mappings":";AAAA,SACEA,cADF,QAMO,eANP;AAOA,OAAOC,WAAP,MAA4C,gBAA5C;AACA,OAAOC,gBAAP,MAA6B,sBAA7B;AACA,OAAOC,qBAAP,MAAkC,4BAAlC;AAEA,OAAO,MAAMC,eAAe,GAAGC,KAAK,IAAI;AAAA;;AACtC,QAAMC,SAAS,kBAAGD,KAAK,CAACE,IAAT,qEAAG,YAAYC,KAAf,sDAAG,kBAAmBC,CAArC;AACA,MAAI,CAACH,SAAL,EAAgB,OAAO,IAAP;AAChB,SAAO,IAAIL,WAAJ,CAAgBI,KAAhB,EAAuB;AAACC,IAAAA;AAAD,GAAvB,CAAP;AACD,CAJM;AAcP,eAAe,MAAMI,eAAN,SAGLV,cAHK,CAG+D;AAAA;AAAA;;AAAA;AAAA;;AAK5EW,EAAAA,eAAe,GAAS;AACtB,SAAKC,QAAL,CAAc;AAACC,MAAAA,IAAI,EAAE,IAAP;AAAaC,MAAAA,QAAQ,EAAE;AAAvB,KAAd;AACD;;AAEDC,EAAAA,WAAW,CAAC;AAACC,IAAAA;AAAD,GAAD,EAA8C;AACvD,QAAIA,WAAW,CAACC,WAAhB,EAA6B;AAC3B,UAAI;AAACJ,QAAAA;AAAD,UAAS,KAAKR,KAAlB;AACA,YAAMS,QAAQ,GAAGD,IAAjB;AACAA,MAAAA,IAAI,GAAIC,QAAD,CAAkBI,KAAzB;AACA,WAAKN,QAAL,CAAc;AAACC,QAAAA,IAAD;AAAOC,QAAAA;AAAP,OAAd;AACD;AACF;;AAEDK,EAAAA,YAAY,GAA8B;AACxC,UAAM;AAACN,MAAAA,IAAD;AAAOC,MAAAA;AAAP,QAAmB,KAAKM,KAA9B;AACA,UAAMC,OAAO,GAAGC,QAAQ,CAACR,QAAD,aAACA,QAAD,uBAACA,QAAQ,CAAES,OAAX,CAAxB;AACA,UAAMC,OAAO,GAAGF,QAAQ,CAACR,QAAD,aAACA,QAAD,uBAACA,QAAQ,CAAEW,OAAX,CAAxB;AACA,WAAO,CACL,IAAItB,qBAAJ,CAA0B,KAAKE,KAA/B,EAAsC;AACpCqB,MAAAA,EAAE,8BAAuB,KAAKrB,KAAL,CAAWqB,EAAlC,CADkC;AAEpCb,MAAAA,IAFoC;AAIpCc,MAAAA,YAAY,EAAEzB,gBAJsB;AAKpCE,MAAAA,eALoC;AAMpCiB,MAAAA,OANoC;AAOpCG,MAAAA;AAPoC,KAAtC,CADK,CAAP;AAWD;;AAjC2E;;gBAHzDd,e,eAIA,iB;;gBAJAA,e,kBAKG,E","sourcesContent":["import {\n CompositeLayer,\n CompositeLayerProps,\n Layer,\n LayersList,\n UpdateParameters\n} from '@deck.gl/core';\nimport RasterLayer, {RasterLayerProps} from './raster-layer';\nimport QuadbinTileset2D from './quadbin-tileset-2d';\nimport SpatialIndexTileLayer from './spatial-index-tile-layer';\n\nexport const renderSubLayers = props => {\n const tileIndex = props.tile?.index?.q;\n if (!tileIndex) return null;\n return new RasterLayer(props, {tileIndex});\n};\n\n/** All properties supported by RasterTileLayer. */\nexport type RasterTileLayerProps<DataT = any> = _RasterTileLayerProps<DataT> & CompositeLayerProps;\n\n/** Properties added by RasterTileLayer. */\ntype _RasterTileLayerProps<DataT> = RasterLayerProps<DataT> & {\n data: string;\n};\n\nexport default class RasterTileLayer<\n DataT = any,\n ExtraProps extends {} = {}\n> extends CompositeLayer<ExtraProps & Required<_RasterTileLayerProps<DataT>>> {\n static layerName = 'RasterTileLayer';\n static defaultProps = {};\n\n state!: {tileJSON: any; data: any};\n initializeState(): void {\n this.setState({data: null, tileJSON: null});\n }\n\n updateState({changeFlags}: UpdateParameters<this>): void {\n if (changeFlags.dataChanged) {\n let {data} = this.props;\n const tileJSON = data;\n data = (tileJSON as any).tiles;\n this.setState({data, tileJSON});\n }\n }\n\n renderLayers(): Layer | null | LayersList {\n const {data, tileJSON} = this.state;\n const minZoom = parseInt(tileJSON?.minzoom);\n const maxZoom = parseInt(tileJSON?.maxzoom);\n return [\n new SpatialIndexTileLayer(this.props, {\n id: `raster-tile-layer-${this.props.id}`,\n data,\n // TODO: Tileset2D should be generic over TileIndex type\n TilesetClass: QuadbinTileset2D as any,\n renderSubLayers,\n minZoom,\n maxZoom\n })\n ];\n }\n}\n"],"file":"raster-tile-layer.js"}
|
|
@@ -0,0 +1,46 @@
|
|
|
1
|
+
import { TileReader } from './carto-raster-tile';
|
|
2
|
+
import { parsePbf } from './tile-loader-utils';
|
|
3
|
+
const CartoRasterTileLoader = {
|
|
4
|
+
name: 'CARTO Raster Tile',
|
|
5
|
+
version: '1',
|
|
6
|
+
id: 'cartoRasterTile',
|
|
7
|
+
module: 'carto',
|
|
8
|
+
extensions: ['pbf'],
|
|
9
|
+
mimeTypes: ['application/vnd.carto-raster-tile'],
|
|
10
|
+
category: 'geometry',
|
|
11
|
+
worker: false,
|
|
12
|
+
parse: async (arrayBuffer, options) => parseCartoRasterTile(arrayBuffer, options),
|
|
13
|
+
parseSync: parseCartoRasterTile,
|
|
14
|
+
options: {}
|
|
15
|
+
};
|
|
16
|
+
|
|
17
|
+
function parseCartoRasterTile(arrayBuffer, options) {
|
|
18
|
+
if (!arrayBuffer) return null;
|
|
19
|
+
const tile = parsePbf(arrayBuffer, TileReader);
|
|
20
|
+
const {
|
|
21
|
+
bands,
|
|
22
|
+
blockHeight,
|
|
23
|
+
blockWidth
|
|
24
|
+
} = tile;
|
|
25
|
+
const numericProps = {};
|
|
26
|
+
|
|
27
|
+
for (let i = 0; i < bands.length; i++) {
|
|
28
|
+
const {
|
|
29
|
+
name,
|
|
30
|
+
data
|
|
31
|
+
} = bands[i];
|
|
32
|
+
numericProps[name] = data;
|
|
33
|
+
}
|
|
34
|
+
|
|
35
|
+
return {
|
|
36
|
+
blockWidth,
|
|
37
|
+
blockHeight,
|
|
38
|
+
cells: {
|
|
39
|
+
numericProps,
|
|
40
|
+
properties: []
|
|
41
|
+
}
|
|
42
|
+
};
|
|
43
|
+
}
|
|
44
|
+
|
|
45
|
+
export default CartoRasterTileLoader;
|
|
46
|
+
//# sourceMappingURL=carto-raster-tile-loader.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"sources":["../../../../src/layers/schema/carto-raster-tile-loader.ts"],"names":["TileReader","parsePbf","CartoRasterTileLoader","name","version","id","module","extensions","mimeTypes","category","worker","parse","arrayBuffer","options","parseCartoRasterTile","parseSync","tile","bands","blockHeight","blockWidth","numericProps","i","length","data","cells","properties"],"mappings":"AAEA,SAAQA,UAAR,QAAyB,qBAAzB;AACA,SAAQC,QAAR,QAAuB,qBAAvB;AAGA,MAAMC,qBAAuC,GAAG;AAC9CC,EAAAA,IAAI,EAAE,mBADwC;AAE9CC,EAAAA,OAAO,EAAE,GAFqC;AAG9CC,EAAAA,EAAE,EAAE,iBAH0C;AAI9CC,EAAAA,MAAM,EAAE,OAJsC;AAK9CC,EAAAA,UAAU,EAAE,CAAC,KAAD,CALkC;AAM9CC,EAAAA,SAAS,EAAE,CAAC,mCAAD,CANmC;AAO9CC,EAAAA,QAAQ,EAAE,UAPoC;AAQ9CC,EAAAA,MAAM,EAAE,KARsC;AAS9CC,EAAAA,KAAK,EAAE,OAAOC,WAAP,EAAoBC,OAApB,KAAgCC,oBAAoB,CAACF,WAAD,EAAcC,OAAd,CATb;AAU9CE,EAAAA,SAAS,EAAED,oBAVmC;AAW9CD,EAAAA,OAAO,EAAE;AAXqC,CAAhD;;AAuBA,SAASC,oBAAT,CAA8BF,WAA9B,EAAwDC,OAAxD,EAAgG;AAC9F,MAAI,CAACD,WAAL,EAAkB,OAAO,IAAP;AAClB,QAAMI,IAAI,GAAGf,QAAQ,CAACW,WAAD,EAAcZ,UAAd,CAArB;AACA,QAAM;AAACiB,IAAAA,KAAD;AAAQC,IAAAA,WAAR;AAAqBC,IAAAA;AAArB,MAAmCH,IAAzC;AACA,QAAMI,YAAY,GAAG,EAArB;;AACA,OAAK,IAAIC,CAAC,GAAG,CAAb,EAAgBA,CAAC,GAAGJ,KAAK,CAACK,MAA1B,EAAkCD,CAAC,EAAnC,EAAuC;AACrC,UAAM;AAAClB,MAAAA,IAAD;AAAOoB,MAAAA;AAAP,QAAeN,KAAK,CAACI,CAAD,CAA1B;AACAD,IAAAA,YAAY,CAACjB,IAAD,CAAZ,GAAqBoB,IAArB;AACD;;AACD,SAAO;AAACJ,IAAAA,UAAD;AAAaD,IAAAA,WAAb;AAA0BM,IAAAA,KAAK,EAAE;AAACJ,MAAAA,YAAD;AAAeK,MAAAA,UAAU,EAAE;AAA3B;AAAjC,GAAP;AACD;;AAED,eAAevB,qBAAf","sourcesContent":["import {LoaderOptions, LoaderWithParser} from '@loaders.gl/loader-utils';\n\nimport {TileReader} from './carto-raster-tile';\nimport {parsePbf} from './tile-loader-utils';\nimport {NumericProps, Properties} from './spatialjson-utils';\n\nconst CartoRasterTileLoader: LoaderWithParser = {\n name: 'CARTO Raster Tile',\n version: '1',\n id: 'cartoRasterTile',\n module: 'carto',\n extensions: ['pbf'],\n mimeTypes: ['application/vnd.carto-raster-tile'],\n category: 'geometry',\n worker: false,\n parse: async (arrayBuffer, options) => parseCartoRasterTile(arrayBuffer, options),\n parseSync: parseCartoRasterTile,\n options: {}\n};\n\nexport type Raster = {\n blockWidth: number;\n blockHeight: number;\n cells: {\n numericProps: NumericProps;\n properties: Properties[];\n };\n};\n\nfunction parseCartoRasterTile(arrayBuffer: ArrayBuffer, options?: LoaderOptions): Raster | null {\n if (!arrayBuffer) return null;\n const tile = parsePbf(arrayBuffer, TileReader);\n const {bands, blockHeight, blockWidth} = tile;\n const numericProps = {};\n for (let i = 0; i < bands.length; i++) {\n const {name, data} = bands[i];\n numericProps[name] = data;\n }\n return {blockWidth, blockHeight, cells: {numericProps, properties: []}};\n}\n\nexport default CartoRasterTileLoader;\n"],"file":"carto-raster-tile-loader.js"}
|
|
@@ -0,0 +1,51 @@
|
|
|
1
|
+
import { readPackedTypedArray } from './fast-pbf';
|
|
2
|
+
const ARRAY_TYPES = {
|
|
3
|
+
uint8: Uint8Array,
|
|
4
|
+
uint16: Uint16Array,
|
|
5
|
+
uint32: Uint32Array,
|
|
6
|
+
uint64: BigUint64Array,
|
|
7
|
+
int8: Int8Array,
|
|
8
|
+
int16: Int16Array,
|
|
9
|
+
int32: Int32Array,
|
|
10
|
+
int64: BigInt64Array,
|
|
11
|
+
float32: Float32Array,
|
|
12
|
+
float64: Float64Array
|
|
13
|
+
};
|
|
14
|
+
export class BandReader {
|
|
15
|
+
static read(pbf, end) {
|
|
16
|
+
return pbf.readFields(BandReader._readField, {
|
|
17
|
+
name: '',
|
|
18
|
+
type: '',
|
|
19
|
+
data: null
|
|
20
|
+
}, end);
|
|
21
|
+
}
|
|
22
|
+
|
|
23
|
+
static _readField(tag, obj, pbf) {
|
|
24
|
+
if (tag === 1) obj.name = pbf.readString();else if (tag === 2) obj.type = pbf.readString();else if (tag === 3) {
|
|
25
|
+
const TypedArray = ARRAY_TYPES[obj.type];
|
|
26
|
+
|
|
27
|
+
if (!TypedArray) {
|
|
28
|
+
throw Error("Invalid data type: ".concat(obj.type));
|
|
29
|
+
}
|
|
30
|
+
|
|
31
|
+
obj.data = {};
|
|
32
|
+
readPackedTypedArray(TypedArray, pbf, obj.data);
|
|
33
|
+
}
|
|
34
|
+
}
|
|
35
|
+
|
|
36
|
+
}
|
|
37
|
+
export class TileReader {
|
|
38
|
+
static read(pbf, end) {
|
|
39
|
+
return pbf.readFields(TileReader._readField, {
|
|
40
|
+
blockWidth: 0,
|
|
41
|
+
blockHeight: 0,
|
|
42
|
+
bands: []
|
|
43
|
+
}, end);
|
|
44
|
+
}
|
|
45
|
+
|
|
46
|
+
static _readField(tag, obj, pbf) {
|
|
47
|
+
if (tag === 1) obj.blockWidth = pbf.readVarint();else if (tag === 2) obj.blockHeight = pbf.readVarint();else if (tag === 3) obj.bands.push(BandReader.read(pbf, pbf.readVarint() + pbf.pos));
|
|
48
|
+
}
|
|
49
|
+
|
|
50
|
+
}
|
|
51
|
+
//# sourceMappingURL=carto-raster-tile.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"sources":["../../../../src/layers/schema/carto-raster-tile.ts"],"names":["readPackedTypedArray","ARRAY_TYPES","uint8","Uint8Array","uint16","Uint16Array","uint32","Uint32Array","uint64","BigUint64Array","int8","Int8Array","int16","Int16Array","int32","Int32Array","int64","BigInt64Array","float32","Float32Array","float64","Float64Array","BandReader","read","pbf","end","readFields","_readField","name","type","data","tag","obj","readString","TypedArray","Error","TileReader","blockWidth","blockHeight","bands","readVarint","push","pos"],"mappings":"AAAA,SAAQA,oBAAR,QAAmC,YAAnC;AAEA,MAAMC,WAAW,GAAG;AAClBC,EAAAA,KAAK,EAAEC,UADW;AAElBC,EAAAA,MAAM,EAAEC,WAFU;AAGlBC,EAAAA,MAAM,EAAEC,WAHU;AAIlBC,EAAAA,MAAM,EAAEC,cAJU;AAKlBC,EAAAA,IAAI,EAAEC,SALY;AAMlBC,EAAAA,KAAK,EAAEC,UANW;AAOlBC,EAAAA,KAAK,EAAEC,UAPW;AAQlBC,EAAAA,KAAK,EAAEC,aARW;AASlBC,EAAAA,OAAO,EAAEC,YATS;AAUlBC,EAAAA,OAAO,EAAEC;AAVS,CAApB;AAeA,OAAO,MAAMC,UAAN,CAAiB;AACX,SAAJC,IAAI,CAACC,GAAD,EAAMC,GAAN,EAAoB;AAC7B,WAAOD,GAAG,CAACE,UAAJ,CAAeJ,UAAU,CAACK,UAA1B,EAAsC;AAACC,MAAAA,IAAI,EAAE,EAAP;AAAWC,MAAAA,IAAI,EAAE,EAAjB;AAAqBC,MAAAA,IAAI,EAAE;AAA3B,KAAtC,EAAwEL,GAAxE,CAAP;AACD;;AAEgB,SAAVE,UAAU,CAAaI,GAAb,EAAkBC,GAAlB,EAAuBR,GAAvB,EAA4B;AAC3C,QAAIO,GAAG,KAAK,CAAZ,EAAeC,GAAG,CAACJ,IAAJ,GAAWJ,GAAG,CAACS,UAAJ,EAAX,CAAf,KACK,IAAIF,GAAG,KAAK,CAAZ,EAAeC,GAAG,CAACH,IAAJ,GAAWL,GAAG,CAACS,UAAJ,EAAX,CAAf,KACA,IAAIF,GAAG,KAAK,CAAZ,EAAe;AAClB,YAAMG,UAAU,GAAGjC,WAAW,CAAC+B,GAAG,CAACH,IAAL,CAA9B;;AACA,UAAI,CAACK,UAAL,EAAiB;AACf,cAAMC,KAAK,8BAAuBH,GAAG,CAACH,IAA3B,EAAX;AACD;;AACDG,MAAAA,GAAG,CAACF,IAAJ,GAAW,EAAX;AACA9B,MAAAA,oBAAoB,CAACkC,UAAD,EAAaV,GAAb,EAAkBQ,GAAG,CAACF,IAAtB,CAApB;AACD;AACF;;AAhBqB;AAmBxB,OAAO,MAAMM,UAAN,CAAiB;AACX,SAAJb,IAAI,CAACC,GAAD,EAAMC,GAAN,EAAW;AACpB,WAAOD,GAAG,CAACE,UAAJ,CAAeU,UAAU,CAACT,UAA1B,EAAsC;AAACU,MAAAA,UAAU,EAAE,CAAb;AAAgBC,MAAAA,WAAW,EAAE,CAA7B;AAAgCC,MAAAA,KAAK,EAAE;AAAvC,KAAtC,EAAkFd,GAAlF,CAAP;AACD;;AACgB,SAAVE,UAAU,CAAaI,GAAb,EAAkBC,GAAlB,EAAuBR,GAAvB,EAA4B;AAC3C,QAAIO,GAAG,KAAK,CAAZ,EAAeC,GAAG,CAACK,UAAJ,GAAiBb,GAAG,CAACgB,UAAJ,EAAjB,CAAf,KACK,IAAIT,GAAG,KAAK,CAAZ,EAAeC,GAAG,CAACM,WAAJ,GAAkBd,GAAG,CAACgB,UAAJ,EAAlB,CAAf,KACA,IAAIT,GAAG,KAAK,CAAZ,EAAeC,GAAG,CAACO,KAAJ,CAAUE,IAAV,CAAenB,UAAU,CAACC,IAAX,CAAgBC,GAAhB,EAAqBA,GAAG,CAACgB,UAAJ,KAAmBhB,GAAG,CAACkB,GAA5C,CAAf;AACrB;;AARqB","sourcesContent":["import {readPackedTypedArray} from './fast-pbf';\n\nconst ARRAY_TYPES = {\n uint8: Uint8Array,\n uint16: Uint16Array,\n uint32: Uint32Array,\n uint64: BigUint64Array,\n int8: Int8Array,\n int16: Int16Array,\n int32: Int32Array,\n int64: BigInt64Array,\n float32: Float32Array,\n float64: Float64Array\n};\n\n// Band ========================================\n\nexport class BandReader {\n static read(pbf, end?: number) {\n return pbf.readFields(BandReader._readField, {name: '', type: '', data: null}, end);\n }\n\n static _readField(this: void, tag, obj, pbf) {\n if (tag === 1) obj.name = pbf.readString();\n else if (tag === 2) obj.type = pbf.readString();\n else if (tag === 3) {\n const TypedArray = ARRAY_TYPES[obj.type];\n if (!TypedArray) {\n throw Error(`Invalid data type: ${obj.type}`);\n }\n obj.data = {};\n readPackedTypedArray(TypedArray, pbf, obj.data);\n }\n }\n}\n\nexport class TileReader {\n static read(pbf, end) {\n return pbf.readFields(TileReader._readField, {blockWidth: 0, blockHeight: 0, bands: []}, end);\n }\n static _readField(this: void, tag, obj, pbf) {\n if (tag === 1) obj.blockWidth = pbf.readVarint();\n else if (tag === 2) obj.blockHeight = pbf.readVarint();\n else if (tag === 3) obj.bands.push(BandReader.read(pbf, pbf.readVarint() + pbf.pos));\n }\n}\n"],"file":"carto-raster-tile.js"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import {
|
|
1
|
+
import { readPackedTypedArray } from './fast-pbf';
|
|
2
2
|
import { NumericPropKeyValueReader, PropertiesReader } from './carto-tile';
|
|
3
3
|
export class IndicesReader {
|
|
4
4
|
static read(pbf, end) {
|
|
@@ -8,7 +8,7 @@ export class IndicesReader {
|
|
|
8
8
|
}
|
|
9
9
|
|
|
10
10
|
static _readField(tag, obj, pbf) {
|
|
11
|
-
if (tag === 1)
|
|
11
|
+
if (tag === 1) readPackedTypedArray(BigUint64Array, pbf, obj);
|
|
12
12
|
}
|
|
13
13
|
|
|
14
14
|
}
|