@deck.gl/carto 8.8.0-alpha.6 → 8.8.0-beta.3
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 +13289 -13228
- package/dist/es5/layers/carto-layer.js +1 -1
- package/dist/es5/layers/carto-layer.js.map +1 -1
- package/dist/es5/layers/carto-tile-layer.js.map +1 -1
- package/dist/es5/layers/h3-tile-layer.js.map +1 -1
- package/dist/es5/layers/h3-tileset-2d.js +3 -7
- package/dist/es5/layers/h3-tileset-2d.js.map +1 -1
- package/dist/es5/layers/quadkey-tile-layer.js.map +1 -1
- package/dist/es5/layers/quadkey-tileset-2d.js +25 -2
- package/dist/es5/layers/quadkey-tileset-2d.js.map +1 -1
- package/dist/es5/layers/spatial-index-tile-layer.js +3 -0
- package/dist/es5/layers/spatial-index-tile-layer.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/carto-tile-layer.js.map +1 -1
- package/dist/esm/layers/h3-tile-layer.js.map +1 -1
- package/dist/esm/layers/h3-tileset-2d.js +4 -8
- package/dist/esm/layers/h3-tileset-2d.js.map +1 -1
- package/dist/esm/layers/quadkey-tile-layer.js.map +1 -1
- package/dist/esm/layers/quadkey-tileset-2d.js +25 -2
- package/dist/esm/layers/quadkey-tileset-2d.js.map +1 -1
- package/dist/esm/layers/spatial-index-tile-layer.js +3 -0
- package/dist/esm/layers/spatial-index-tile-layer.js.map +1 -1
- package/dist.min.js +3 -3
- package/package.json +10 -10
- package/src/layers/carto-layer.ts +16 -3
- package/src/layers/carto-tile-layer.ts +2 -2
- package/src/layers/h3-tile-layer.ts +4 -3
- package/src/layers/h3-tileset-2d.ts +9 -16
- package/src/layers/quadkey-tile-layer.ts +3 -2
- package/src/layers/quadkey-tileset-2d.ts +20 -2
- package/src/layers/spatial-index-tile-layer.ts +2 -0
- package/typed/api/maps-v3-client.d.ts +1 -1
- package/typed/api/parseMap.d.ts +1 -1
- package/typed/layers/carto-layer.d.ts +5 -3
- package/typed/layers/carto-layer.d.ts.map +1 -1
- package/typed/layers/carto-tile-layer.d.ts +2 -35
- package/typed/layers/carto-tile-layer.d.ts.map +1 -1
- package/typed/layers/h3-tile-layer.d.ts +3 -5
- package/typed/layers/h3-tile-layer.d.ts.map +1 -1
- package/typed/layers/h3-tileset-2d.d.ts.map +1 -1
- package/typed/layers/quadkey-tile-layer.d.ts +2 -4
- package/typed/layers/quadkey-tile-layer.d.ts.map +1 -1
- package/typed/layers/quadkey-tileset-2d.d.ts +1 -1
- package/typed/layers/quadkey-tileset-2d.d.ts.map +1 -1
- package/typed/layers/spatial-index-tile-layer.d.ts +1 -0
- package/typed/layers/spatial-index-tile-layer.d.ts.map +1 -1
|
@@ -162,7 +162,7 @@ var CartoLayer = function (_CompositeLayer) {
|
|
|
162
162
|
|
|
163
163
|
this._checkProps(props);
|
|
164
164
|
|
|
165
|
-
var shouldUpdateData = changeFlags.dataChanged || props.connection !== oldProps.connection || props.geoColumn !== oldProps.geoColumn || props.format !== oldProps.format || props.formatTiles !== oldProps.formatTiles || props.type !== oldProps.type || JSON.stringify(props.columns) !== JSON.stringify(oldProps.columns) || JSON.stringify(props.credentials) !== JSON.stringify(oldProps.credentials);
|
|
165
|
+
var shouldUpdateData = changeFlags.dataChanged || props.aggregationExp !== oldProps.aggregationExp || props.aggregationResLevel !== oldProps.aggregationResLevel || props.connection !== oldProps.connection || props.geoColumn !== oldProps.geoColumn || props.format !== oldProps.format || props.formatTiles !== oldProps.formatTiles || props.type !== oldProps.type || JSON.stringify(props.columns) !== JSON.stringify(oldProps.columns) || JSON.stringify(props.credentials) !== JSON.stringify(oldProps.credentials);
|
|
166
166
|
|
|
167
167
|
if (shouldUpdateData) {
|
|
168
168
|
this.setState({
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../../../src/layers/carto-layer.ts"],"names":["defaultProps","data","type","onDataLoad","value","compare","onDataError","optional","uniqueIdProperty","credentials","connection","format","formatTiles","clientId","geoColumn","columns","aggregationExp","aggregationResLevel","CartoLayer","state","apiVersion","getSubLayers","length","props","localCreds","log","assert","Object","values","API_VERSIONS","includes","V1","V2","MAP_TYPES","QUERY","TILESET","V3","COLUMNS_SUPPORT","join","GEO_COLUMN_SUPPORT","Array","isArray","oldProps","changeFlags","_checkProps","shouldUpdateData","dataChanged","JSON","stringify","setState","_updateData","source","rest","localConfig","result","propName","layer","_notUsed","propsNoData","MVTLayer","FORMATS","TILEJSON","tileUrl","URL","tiles","searchParams","get","TILE_FORMATS","MVT","scheme","H3TileLayer","QuadkeyTileLayer","CartoTileLayer","GeoJsonLayer","updateTriggers","_getSubLayerAndProps","getSubLayerProps","id","layerName","CompositeLayer"],"mappings":"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","sourcesContent":["import {CompositeLayer, Layer, log} from '@deck.gl/core';\nimport CartoTileLayer from './carto-tile-layer';\nimport H3TileLayer from './h3-tile-layer';\nimport QuadkeyTileLayer from './quadkey-tile-layer';\nimport {MVTLayer} from '@deck.gl/geo-layers';\nimport {GeoJsonLayer} from '@deck.gl/layers';\nimport {fetchLayerData, getDataV2, API_VERSIONS} from '../api';\nimport {\n COLUMNS_SUPPORT,\n Format,\n FORMATS,\n GEO_COLUMN_SUPPORT,\n MapType,\n MAP_TYPES,\n TileFormat,\n TILE_FORMATS\n} from '../api/maps-api-common';\nimport {\n ClassicCredentials,\n CloudNativeCredentials,\n Credentials,\n getDefaultCredentials\n} from '../config';\nimport {CompositeLayerProps, LayerProps} from 'modules/core/src/types/layer-props';\nimport {ChangeFlags} from 'modules/core/src/lib/layer-state';\nimport {FetchLayerDataResult} 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 => {}, compare: false},\n onDataError: {type: 'function', value: null, compare: false, optional: true},\n uniqueIdProperty: 'cartodb_id',\n\n // override carto credentials for the layer, set to null to read from default\n credentials: null,\n\n /*********************/\n /* API v3 PARAMETERS */\n /**********************/\n // (String, required): connection name at CARTO platform\n connection: null,\n\n // (String, optional): format of data\n format: null,\n\n // (String, optional): force format of data for tiles\n formatTiles: null,\n\n // (String, optional): clientId identifier used for internal tracing, place here a string to identify the client who is doing the request.\n clientId: null,\n\n // (String, optional): name of the `geo_column` in the CARTO platform. Use this override the default column ('geom'), from which the geometry information should be fetched.\n geoColumn: null,\n\n // (Array<String>, optional): names of columns to fetch. By default, all columns are fetched.\n columns: {type: 'array', value: null},\n\n // (String, optional): aggregration SQL expression. Only used for spatial index datasets\n aggregationExp: null,\n\n // (Number, optional): aggregration resolution level. Only used for spatial index datasets, defaults to 6 for quadkeys, 4 for h3\n aggregationResLevel: null\n};\n\n/** All properties supported by CartoLayer. */\nexport type CartoLayerProps<DataT = any> = _CartoLayerProps & CompositeLayerProps<DataT>;\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 data format.\n *\n * Only supported when apiVersion is `API_VERSIONS.V3`.\n *\n * Possible values are: `FORMATS.GEOJSON`, `FORMATS.JSON` and `FORMATS.TILEJSON`.\n */\n format?: Format;\n\n /**\n * Use to override the default tile data format.\n *\n * Only supported when apiVersion is `API_VERSIONS.V3` and format is `FORMATS.TILEJSON`.\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 Error is thrown.\n */\n onDataError?: (err: unknown) => void;\n\n clientId?: string;\n};\n\nexport default class CartoLayer<ExtraProps = {}> extends CompositeLayer<\n Required<_CartoLayerProps> & ExtraProps\n> {\n static layerName = 'CartoLayer';\n static defaultProps = defaultProps as any;\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({\n props,\n oldProps,\n changeFlags\n }: {\n props: CartoLayerProps;\n oldProps: CartoLayerProps;\n context: any;\n changeFlags: ChangeFlags;\n }): void {\n this._checkProps(props);\n const shouldUpdateData =\n changeFlags.dataChanged ||\n props.connection !== oldProps.connection ||\n props.geoColumn !== oldProps.geoColumn ||\n props.format !== oldProps.format ||\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\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, clientId, 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 clientId,\n credentials: credentials as CloudNativeCredentials,\n connection,\n ...rest\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 Error);\n } else {\n throw err;\n }\n }\n }\n\n _getSubLayerAndProps(): [any, LayerProps] {\n assert(this.state);\n\n const {data, format, 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 if (format === FORMATS.TILEJSON) {\n /* global URL */\n const tileUrl = new URL(data.tiles[0]);\n\n props.formatTiles =\n props.formatTiles ||\n (tileUrl.searchParams.get('formatTiles') as TileFormat) ||\n TILE_FORMATS.MVT;\n\n if (data.scheme === 'h3') {\n return [H3TileLayer, props];\n }\n if (data.scheme === 'quadkey') {\n return [QuadkeyTileLayer, props];\n }\n return props.formatTiles === TILE_FORMATS.MVT ? [MVTLayer, props] : [CartoTileLayer, props];\n }\n\n // It's a geojson layer\n return [GeoJsonLayer, props];\n }\n\n renderLayers(): Layer | null {\n assert(this.state);\n\n const {data} = this.state;\n\n if (!data) return null;\n\n const {updateTriggers} = this.props;\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 updateTriggers\n })\n );\n }\n}\n"],"file":"carto-layer.js"}
|
|
1
|
+
{"version":3,"sources":["../../../src/layers/carto-layer.ts"],"names":["defaultProps","data","type","onDataLoad","value","compare","onDataError","optional","uniqueIdProperty","credentials","connection","format","formatTiles","clientId","geoColumn","columns","aggregationExp","aggregationResLevel","CartoLayer","state","apiVersion","getSubLayers","length","props","localCreds","log","assert","Object","values","API_VERSIONS","includes","V1","V2","MAP_TYPES","QUERY","TILESET","V3","COLUMNS_SUPPORT","join","GEO_COLUMN_SUPPORT","Array","isArray","oldProps","changeFlags","_checkProps","shouldUpdateData","dataChanged","JSON","stringify","setState","_updateData","source","rest","localConfig","result","propName","layer","_notUsed","propsNoData","MVTLayer","FORMATS","TILEJSON","tileUrl","URL","tiles","searchParams","get","TILE_FORMATS","MVT","scheme","H3TileLayer","QuadkeyTileLayer","CartoTileLayer","GeoJsonLayer","updateTriggers","_getSubLayerAndProps","getSubLayerProps","id","layerName","CompositeLayer"],"mappings":"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","sourcesContent":["import {\n CompositeLayer,\n Layer,\n log,\n CompositeLayerProps,\n LayerProps,\n ChangeFlags\n} from '@deck.gl/core';\nimport CartoTileLayer from './carto-tile-layer';\nimport H3TileLayer from './h3-tile-layer';\nimport QuadkeyTileLayer from './quadkey-tile-layer';\nimport {MVTLayer} from '@deck.gl/geo-layers';\nimport {GeoJsonLayer} from '@deck.gl/layers';\nimport {fetchLayerData, getDataV2, API_VERSIONS} from '../api';\nimport {\n COLUMNS_SUPPORT,\n Format,\n FORMATS,\n GEO_COLUMN_SUPPORT,\n MapType,\n MAP_TYPES,\n TileFormat,\n TILE_FORMATS\n} from '../api/maps-api-common';\nimport {\n ClassicCredentials,\n CloudNativeCredentials,\n Credentials,\n getDefaultCredentials\n} from '../config';\nimport {FetchLayerDataResult} 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 => {}, compare: false},\n onDataError: {type: 'function', value: null, compare: false, optional: true},\n uniqueIdProperty: 'cartodb_id',\n\n // override carto credentials for the layer, set to null to read from default\n credentials: null,\n\n /*********************/\n /* API v3 PARAMETERS */\n /**********************/\n // (String, required): connection name at CARTO platform\n connection: null,\n\n // (String, optional): format of data\n format: null,\n\n // (String, optional): force format of data for tiles\n formatTiles: null,\n\n // (String, optional): clientId identifier used for internal tracing, place here a string to identify the client who is doing the request.\n clientId: null,\n\n // (String, optional): name of the `geo_column` in the CARTO platform. Use this override the default column ('geom'), from which the geometry information should be fetched.\n geoColumn: null,\n\n // (Array<String>, optional): names of columns to fetch. By default, all columns are fetched.\n columns: {type: 'array', value: null},\n\n // (String, optional): aggregration SQL expression. Only used for spatial index datasets\n aggregationExp: null,\n\n // (Number, optional): aggregration resolution level. Only used for spatial index datasets, defaults to 6 for quadkeys, 4 for h3\n aggregationResLevel: null\n};\n\n/** All properties supported by CartoLayer. */\nexport type CartoLayerProps<DataT = any> = _CartoLayerProps & CompositeLayerProps<DataT>;\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 data format.\n *\n * Only supported when apiVersion is `API_VERSIONS.V3`.\n *\n * Possible values are: `FORMATS.GEOJSON`, `FORMATS.JSON` and `FORMATS.TILEJSON`.\n */\n format?: Format;\n\n /**\n * Use to override the default tile data format.\n *\n * Only supported when apiVersion is `API_VERSIONS.V3` and format is `FORMATS.TILEJSON`.\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 Error is thrown.\n */\n onDataError?: (err: unknown) => void;\n\n clientId?: string;\n\n /** Aggregration SQL expression. Only used for spatial index datasets **/\n aggregationExp?: string;\n\n /** Aggregration resolution level. Only used for spatial index datasets, defaults to 6 for quadkeys, 4 for h3. **/\n aggregationResLevel?: number;\n};\n\nexport default class CartoLayer<ExtraProps = {}> extends CompositeLayer<\n Required<_CartoLayerProps> & ExtraProps\n> {\n static layerName = 'CartoLayer';\n static defaultProps = defaultProps as any;\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({\n props,\n oldProps,\n changeFlags\n }: {\n props: CartoLayerProps;\n oldProps: CartoLayerProps;\n context: any;\n changeFlags: ChangeFlags;\n }): void {\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.format !== oldProps.format ||\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\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, clientId, 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 clientId,\n credentials: credentials as CloudNativeCredentials,\n connection,\n ...rest\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 Error);\n } else {\n throw err;\n }\n }\n }\n\n _getSubLayerAndProps(): [any, LayerProps] {\n assert(this.state);\n\n const {data, format, 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 if (format === FORMATS.TILEJSON) {\n /* global URL */\n const tileUrl = new URL(data.tiles[0]);\n\n props.formatTiles =\n props.formatTiles ||\n (tileUrl.searchParams.get('formatTiles') as TileFormat) ||\n TILE_FORMATS.MVT;\n\n if (data.scheme === 'h3') {\n return [H3TileLayer, props];\n }\n if (data.scheme === 'quadkey') {\n return [QuadkeyTileLayer, props];\n }\n return props.formatTiles === TILE_FORMATS.MVT ? [MVTLayer, props] : [CartoTileLayer, props];\n }\n\n // It's a geojson layer\n return [GeoJsonLayer, props];\n }\n\n renderLayers(): Layer | null {\n assert(this.state);\n\n const {data} = this.state;\n\n if (!data) return null;\n\n const {updateTriggers} = this.props;\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 updateTriggers\n })\n );\n }\n}\n"],"file":"carto-layer.js"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../../../src/layers/carto-tile-layer.ts"],"names":["parseJSON","arrayBuffer","JSON","parse","TextDecoder","decode","parsePbf","buffer","pbf","Protobuf","tile","TileReader","read","unpackProperties","properties","length","map","item","currentRecord","data","forEach","key","value","parseCartoTile","options","formatTiles","cartoTile","TILE_FORMATS","GEOJSON","features","points","lines","polygons","defaultTileFormat","BINARY","CartoTileLoader","name","version","id","module","extensions","mimeTypes","category","worker","parseSync","defaultProps","MVTLayer","loaders","CartoTileLayer","url","state","Promise","reject","loadOptions","getLoadOptions","props","fetch","signal","mimeType","log","assert","Object","values","includes","propName","layer","tileBbox","bbox","west","south","east","north","subLayerProps","autoHighlight","ClipExtension","clipBounds","subLayer","GeoJsonLayer"],"mappings":"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
|
|
1
|
+
{"version":3,"sources":["../../../src/layers/carto-tile-layer.ts"],"names":["parseJSON","arrayBuffer","JSON","parse","TextDecoder","decode","parsePbf","buffer","pbf","Protobuf","tile","TileReader","read","unpackProperties","properties","length","map","item","currentRecord","data","forEach","key","value","parseCartoTile","options","formatTiles","cartoTile","TILE_FORMATS","GEOJSON","features","points","lines","polygons","defaultTileFormat","BINARY","CartoTileLoader","name","version","id","module","extensions","mimeTypes","category","worker","parseSync","defaultProps","MVTLayer","loaders","CartoTileLayer","url","state","Promise","reject","loadOptions","getLoadOptions","props","fetch","signal","mimeType","log","assert","Object","values","includes","propName","layer","tileBbox","bbox","west","south","east","north","subLayerProps","autoHighlight","ClipExtension","clipBounds","subLayer","GeoJsonLayer"],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;AACA;;AACA;;AACA;;AACA;;AAQA;;AACA;;AACA;;AACA;;;;;;;;;;AAKA,SAASA,SAAT,CAAmBC,WAAnB,EAAkD;AAChD,SAAOC,IAAI,CAACC,KAAL,CAAW,IAAIC,WAAJ,GAAkBC,MAAlB,CAAyBJ,WAAzB,CAAX,CAAP;AACD;;AAED,SAASK,QAAT,CAAkBC,MAAlB,EAA6C;AAC3C,MAAMC,GAAG,GAAG,IAAIC,YAAJ,CAAaF,MAAb,CAAZ;;AACA,MAAMG,IAAI,GAAGC,sBAAWC,IAAX,CAAgBJ,GAAhB,CAAb;;AACA,SAAOE,IAAP;AACD;;AAED,SAASG,gBAAT,CAA0BC,UAA1B,EAAoD;AAClD,MAAI,CAACA,UAAD,IAAe,CAACA,UAAU,CAACC,MAA/B,EAAuC;AACrC,WAAO,EAAP;AACD;;AACD,SAAOD,UAAU,CAACE,GAAX,CAAe,UAAAC,IAAI,EAAI;AAC5B,QAAMC,aAAsC,GAAG,EAA/C;AACAD,IAAAA,IAAI,CAACE,IAAL,CAAUC,OAAV,CAAkB,gBAAkB;AAAA,UAAhBC,GAAgB,QAAhBA,GAAgB;AAAA,UAAXC,KAAW,QAAXA,KAAW;AAClCJ,MAAAA,aAAa,CAACG,GAAD,CAAb,GAAqBC,KAArB;AACD,KAFD;AAGA,WAAOJ,aAAP;AACD,GANM,CAAP;AAOD;;AAED,SAASK,cAAT,CAAwBtB,WAAxB,EAAkDuB,OAAlD,EAAkG;AAChG,MAAI,CAACvB,WAAL,EAAkB,OAAO,IAAP;AAClB,MAAMwB,WAAW,GAAGD,OAAO,IAAIA,OAAO,CAACE,SAAnB,IAAgCF,OAAO,CAACE,SAAR,CAAkBD,WAAtE;AACA,MAAIA,WAAW,KAAKE,4BAAaC,OAAjC,EAA0C,OAAO,0BAAgB5B,SAAS,CAACC,WAAD,CAAT,CAAuB4B,QAAvC,CAAP;AAE1C,MAAMnB,IAAI,GAAGJ,QAAQ,CAACL,WAAD,CAArB;AAEA,MAAO6B,MAAP,GAAkCpB,IAAlC,CAAOoB,MAAP;AAAA,MAAeC,KAAf,GAAkCrB,IAAlC,CAAeqB,KAAf;AAAA,MAAsBC,QAAtB,GAAkCtB,IAAlC,CAAsBsB,QAAtB;AACA,MAAMb,IAAI,GAAG;AACXW,IAAAA,MAAM,kCAAMA,MAAN;AAAchB,MAAAA,UAAU,EAAED,gBAAgB,CAACiB,MAAM,CAAChB,UAAR;AAA1C,MADK;AAEXiB,IAAAA,KAAK,kCAAMA,KAAN;AAAajB,MAAAA,UAAU,EAAED,gBAAgB,CAACkB,KAAK,CAACjB,UAAP;AAAzC,MAFM;AAGXkB,IAAAA,QAAQ,kCAAMA,QAAN;AAAgBlB,MAAAA,UAAU,EAAED,gBAAgB,CAACmB,QAAQ,CAAClB,UAAV;AAA5C;AAHG,GAAb;AAOA,SAAOK,IAAP;AACD;;AAED,IAAMc,iBAAiB,GAAGN,4BAAaO,MAAvC;AAEA,IAAMC,eAAiC,GAAG;AACxCC,EAAAA,IAAI,EAAE,YADkC;AAExCC,EAAAA,OAAO,EAAE,GAF+B;AAGxCC,EAAAA,EAAE,EAAE,WAHoC;AAIxCC,EAAAA,MAAM,EAAE,OAJgC;AAKxCC,EAAAA,UAAU,EAAE,CAAC,KAAD,CAL4B;AAMxCC,EAAAA,SAAS,EAAE,CAAC,wBAAD,CAN6B;AAOxCC,EAAAA,QAAQ,EAAE,UAP8B;AAQxCC,EAAAA,MAAM,EAAE,KARgC;AASxCxC,EAAAA,KAAK;AAAA,2EAAE,iBAAOF,WAAP,EAAoBuB,OAApB;AAAA;AAAA;AAAA;AAAA;AAAA,+CAAgCD,cAAc,CAACtB,WAAD,EAAcuB,OAAd,CAA9C;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,KAAF;;AAAA;AAAA;AAAA;;AAAA;AAAA,KATmC;AAUxCoB,EAAAA,SAAS,EAAErB,cAV6B;AAWxCC,EAAAA,OAAO,EAAE;AACPE,IAAAA,SAAS,EAAE;AACTD,MAAAA,WAAW,EAAEQ;AADJ;AADJ;AAX+B,CAA1C;;AAkBA,IAAMY,YAA+C,mCAChDC,oBAASD,YADuC;AAEnDpB,EAAAA,WAAW,EAAEQ,iBAFsC;AAGnDc,EAAAA,OAAO,EAAE,CAACZ,eAAD;AAH0C,EAArD;;IAqBqBa,c;;;;;;;;;;;;WAOnB,qBAAYtC,IAAZ,EAAiC;AAC/B,UAAMuC,GAAG,GAAG,oCAAoB,KAAKC,KAAL,CAAW/B,IAA/B,EAAqCT,IAArC,CAAZ;;AACA,UAAI,CAACuC,GAAL,EAAU;AACR,eAAOE,OAAO,CAACC,MAAR,CAAe,aAAf,CAAP;AACD;;AAED,UAAIC,WAAW,GAAG,KAAKC,cAAL,EAAlB;AACA,wBAA6B,KAAKC,KAAlC;AAAA,UAAOC,KAAP,eAAOA,KAAP;AAAA,UAAc/B,WAAd,eAAcA,WAAd;AACA,UAAOgC,MAAP,GAAiB/C,IAAjB,CAAO+C,MAAP;AAEAJ,MAAAA,WAAW,mCACNA,WADM;AAETK,QAAAA,QAAQ,EAAE;AAFD,QAAX;;AAKA,UAAIjC,WAAJ,EAAiB;AACfkC,kBAAIC,MAAJ,CACEC,MAAM,CAACC,MAAP,CAAcnC,2BAAd,EAA4BoC,QAA5B,CAAqCtC,WAArC,CADF,2CAEoCA,WAFpC;;AAIA4B,QAAAA,WAAW,CAAC3B,SAAZ,GAAwB;AAACD,UAAAA,WAAW,EAAXA;AAAD,SAAxB;AACD;;AAED,aAAO+B,KAAK,CAACP,GAAD,EAAM;AAACe,QAAAA,QAAQ,EAAE,MAAX;AAAmBC,QAAAA,KAAK,EAAE,IAA1B;AAAgCZ,QAAAA,WAAW,EAAXA,WAAhC;AAA6CI,QAAAA,MAAM,EAANA;AAA7C,OAAN,CAAZ;AACD;;;WAED,yBACEF,KADF,EAOuB;AACrB,UAAIA,KAAK,CAACpC,IAAN,KAAe,IAAnB,EAAyB;AACvB,eAAO,IAAP;AACD;;AAED,UAAM+C,QAAQ,GAAGX,KAAK,CAAC7C,IAAN,CAAWyD,IAA5B;AACA,UAAOC,IAAP,GAAmCF,QAAnC,CAAOE,IAAP;AAAA,UAAaC,KAAb,GAAmCH,QAAnC,CAAaG,KAAb;AAAA,UAAoBC,IAApB,GAAmCJ,QAAnC,CAAoBI,IAApB;AAAA,UAA0BC,KAA1B,GAAmCL,QAAnC,CAA0BK,KAA1B;;AAEA,UAAMC,aAAa,mCACdjB,KADc;AAEjBkB,QAAAA,aAAa,EAAE,KAFE;AAGjBjC,QAAAA,UAAU,GAAG,IAAIkC,yBAAJ,EAAH,0CAA4BnB,KAAK,CAACf,UAAN,IAAoB,EAAhD,EAHO;AAIjBmC,QAAAA,UAAU,EAAE,CAACP,IAAD,EAAOC,KAAP,EAAcC,IAAd,EAAoBC,KAApB;AAJK,QAAnB;;AAOA,UAAMK,QAAQ,GAAG,IAAIC,oBAAJ,CAAiBL,aAAjB,CAAjB;AACA,aAAOI,QAAP;AACD;;;EAtDO9B,mB;;;8BAHWE,c,eAIA,gB;8BAJAA,c,kBAKGH,Y","sourcesContent":["/* global TextDecoder */\nimport Protobuf from 'pbf';\nimport {log, DefaultProps} from '@deck.gl/core';\nimport {ClipExtension} from '@deck.gl/extensions';\nimport {\n MVTLayer,\n MVTLayerProps,\n TileLayer,\n _getURLFromTemplate,\n _Tile2DHeader,\n _TileLoadProps as TileLoadProps\n} from '@deck.gl/geo-layers';\nimport {GeoJsonLayer} from '@deck.gl/layers';\nimport {geojsonToBinary} from '@loaders.gl/gis';\nimport {Properties, Tile, TileReader} from './schema/carto-tile';\nimport {TileFormat, TILE_FORMATS} from '../api/maps-api-common';\nimport {LoaderOptions, LoaderWithParser} from '@loaders.gl/loader-utils';\nimport type {BinaryFeatures} from '@loaders.gl/schema';\nimport type {Feature} from 'geojson';\n\nfunction parseJSON(arrayBuffer: ArrayBuffer): any {\n return JSON.parse(new TextDecoder().decode(arrayBuffer));\n}\n\nfunction parsePbf(buffer: ArrayBuffer): Tile {\n const pbf = new Protobuf(buffer);\n const tile = TileReader.read(pbf);\n return tile;\n}\n\nfunction unpackProperties(properties: Properties[]) {\n if (!properties || !properties.length) {\n return [];\n }\n return properties.map(item => {\n const currentRecord: Record<string, unknown> = {};\n item.data.forEach(({key, value}) => {\n currentRecord[key] = value;\n });\n return currentRecord;\n });\n}\n\nfunction parseCartoTile(arrayBuffer: ArrayBuffer, options?: LoaderOptions): BinaryFeatures | null {\n if (!arrayBuffer) return null;\n const formatTiles = options && options.cartoTile && options.cartoTile.formatTiles;\n if (formatTiles === TILE_FORMATS.GEOJSON) return geojsonToBinary(parseJSON(arrayBuffer).features);\n\n const tile = parsePbf(arrayBuffer);\n\n const {points, lines, polygons} = tile;\n const data = {\n points: {...points, properties: unpackProperties(points.properties)},\n lines: {...lines, properties: unpackProperties(lines.properties)},\n polygons: {...polygons, properties: unpackProperties(polygons.properties)}\n };\n\n // Note: there is slight, difference in `numericProps` type, however geojson/mvtlayer can cope with this\n return data as unknown as BinaryFeatures;\n}\n\nconst defaultTileFormat = TILE_FORMATS.BINARY;\n\nconst CartoTileLoader: LoaderWithParser = {\n name: 'CARTO Tile',\n version: '1',\n id: 'cartoTile',\n module: 'carto',\n extensions: ['pbf'],\n mimeTypes: ['application/x-protobuf'],\n category: 'geometry',\n worker: false,\n parse: async (arrayBuffer, options) => parseCartoTile(arrayBuffer, options),\n parseSync: parseCartoTile,\n options: {\n cartoTile: {\n formatTiles: defaultTileFormat\n }\n }\n};\n\nconst defaultProps: DefaultProps<CartoTileLayerProps> = {\n ...MVTLayer.defaultProps,\n formatTiles: defaultTileFormat,\n loaders: [CartoTileLoader]\n};\n\n/** All properties supported by CartoTileLayer. */\nexport type CartoTileLayerProps<DataT extends Feature = Feature> = _CartoTileLayerProps &\n MVTLayerProps<DataT>;\n\n/** Properties added by CartoTileLayer. */\ntype _CartoTileLayerProps = {\n /** Use to override the default tile data format.\n *\n * Possible values are: `TILE_FORMATS.BINARY`, `TILE_FORMATS.GEOJSON` and `TILE_FORMATS.MVT`.\n *\n * Only supported when `apiVersion` is `API_VERSIONS.V3` and `format` is `FORMATS.TILEJSON`.\n */\n formatTiles?: TileFormat;\n};\n\nexport default class CartoTileLayer<\n DataT extends Feature = Feature,\n ExtraProps = {}\n> extends MVTLayer<DataT, Required<_CartoTileLayerProps> & ExtraProps> {\n static layerName = 'CartoTileLayer';\n static defaultProps = defaultProps;\n\n getTileData(tile: TileLoadProps) {\n const url = _getURLFromTemplate(this.state.data, tile);\n if (!url) {\n return Promise.reject('Invalid URL');\n }\n\n let loadOptions = this.getLoadOptions();\n const {fetch, formatTiles} = this.props;\n const {signal} = tile;\n\n loadOptions = {\n ...loadOptions,\n mimeType: 'application/x-protobuf'\n };\n\n if (formatTiles) {\n log.assert(\n Object.values(TILE_FORMATS).includes(formatTiles),\n `Invalid value for formatTiles: ${formatTiles}. Use value from TILE_FORMATS`\n );\n loadOptions.cartoTile = {formatTiles};\n }\n\n return fetch(url, {propName: 'data', layer: this, loadOptions, signal});\n }\n\n renderSubLayers(\n props: TileLayer['props'] & {\n id: string;\n data: any;\n _offset: number;\n tile: _Tile2DHeader;\n }\n ): GeoJsonLayer | null {\n if (props.data === null) {\n return null;\n }\n\n const tileBbox = props.tile.bbox as any;\n const {west, south, east, north} = tileBbox;\n\n const subLayerProps = {\n ...props,\n autoHighlight: false,\n extensions: [new ClipExtension(), ...(props.extensions || [])],\n clipBounds: [west, south, east, north]\n };\n\n const subLayer = new GeoJsonLayer(subLayerProps);\n return subLayer;\n }\n}\n"],"file":"carto-tile-layer.js"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../../../src/layers/h3-tile-layer.ts"],"names":["renderSubLayers","props","data","index","tile","length","H3HexagonLayer","getHexagon","d","id","centerHexagon","highPrecision","defaultProps","aggregationResLevel","H3TileLayer","setState","tileJSON","changeFlags","dataChanged","tiles","state","maxZoom","parseInt","maxresolution","SpatialIndexTileLayer","TilesetClass","H3Tileset2D","CompositeLayer"],"mappings":";;;;;;;;;;;;;;;;;;;;;;;AAAA;;
|
|
1
|
+
{"version":3,"sources":["../../../src/layers/h3-tile-layer.ts"],"names":["renderSubLayers","props","data","index","tile","length","H3HexagonLayer","getHexagon","d","id","centerHexagon","highPrecision","defaultProps","aggregationResLevel","H3TileLayer","setState","tileJSON","changeFlags","dataChanged","tiles","state","maxZoom","parseInt","maxresolution","SpatialIndexTileLayer","TilesetClass","H3Tileset2D","CompositeLayer"],"mappings":";;;;;;;;;;;;;;;;;;;;;;;AAAA;;AAQA;;AACA;;AACA;;;;;;AAEA,IAAMA,eAAe,GAAG,SAAlBA,eAAkB,CAAAC,KAAK,EAAI;AAC/B,MAAOC,IAAP,GAAeD,KAAf,CAAOC,IAAP;AACA,MAAOC,KAAP,GAAgBF,KAAK,CAACG,IAAtB,CAAOD,KAAP;AACA,MAAI,CAACD,IAAD,IAAS,CAACA,IAAI,CAACG,MAAnB,EAA2B,OAAO,IAAP;AAE3B,SAAO,IAAIC,yBAAJ,CAAmBL,KAAnB,EAA0B;AAC/BM,IAAAA,UAAU,EAAE,oBAAAC,CAAC;AAAA,aAAIA,CAAC,CAACC,EAAN;AAAA,KADkB;AAE/BC,IAAAA,aAAa,EAAEP,KAFgB;AAG/BQ,IAAAA,aAAa,EAAE;AAHgB,GAA1B,CAAP;AAKD,CAVD;;AAYA,IAAMC,YAA+C,GAAG;AACtDC,EAAAA,mBAAmB,EAAE;AADiC,CAAxD;;IAgBqBC,W;;;;;;;;;;;;;;;;;;;;;WAWnB,2BAAwB;AACtB,WAAKC,QAAL,CAAc;AAACb,QAAAA,IAAI,EAAE,IAAP;AAAac,QAAAA,QAAQ,EAAE;AAAvB,OAAd;AACD;;;WAED,2BAAyD;AAAA,UAA5CC,WAA4C,QAA5CA,WAA4C;;AACvD,UAAIA,WAAW,CAACC,WAAhB,EAA6B;AAC3B,YAAKhB,IAAL,GAAa,KAAKD,KAAlB,CAAKC,IAAL;AACA,YAAMc,QAAQ,GAAGd,IAAjB;AACAA,QAAAA,IAAI,GAAIc,QAAD,CAAkBG,KAAzB;AACA,aAAKJ,QAAL,CAAc;AAACb,UAAAA,IAAI,EAAJA,IAAD;AAAOc,UAAAA,QAAQ,EAARA;AAAP,SAAd;AACD;AACF;;;WAED,wBAA0C;AACxC,wBAAyB,KAAKI,KAA9B;AAAA,UAAOlB,IAAP,eAAOA,IAAP;AAAA,UAAac,QAAb,eAAaA,QAAb;AACA,UAAMK,OAAO,GAAGC,QAAQ,CAACN,QAAQ,CAACO,aAAV,CAAxB;AACA,aAAO,CACL,IAAIC,8BAAJ,CAA0B,KAAKvB,KAA/B,EAAsC;AACpCQ,QAAAA,EAAE,0BAAmB,KAAKR,KAAL,CAAWQ,EAA9B,CADkC;AAEpCP,QAAAA,IAAI,EAAJA,IAFoC;AAIpCuB,QAAAA,YAAY,EAAEC,oBAJsB;AAKpC1B,QAAAA,eAAe,EAAfA,eALoC;AAMpCqB,QAAAA,OAAO,EAAPA;AANoC,OAAtC,CADK,CAAP;AAUD;;;EArCqEM,oB;;;8BAAnDb,W,eAGA,a;8BAHAA,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 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<DataT>;\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 aggregationResLevel?: number;\n};\n\nexport default class H3TileLayer<DataT = any, ExtraPropsT = {}> 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 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: `h3-tile-layer-${this.props.id}`,\n data,\n // @ts-expect-error Tileset2D should be generic over TileIndex\n TilesetClass: H3Tileset2D,\n renderSubLayers,\n maxZoom\n })\n ];\n }\n}\n"],"file":"h3-tile-layer.js"}
|
|
@@ -35,12 +35,8 @@ function getHexagonsInBoundingBox(_ref, resolution) {
|
|
|
35
35
|
east = _ref.east,
|
|
36
36
|
south = _ref.south;
|
|
37
37
|
|
|
38
|
-
if (
|
|
39
|
-
return (0,
|
|
40
|
-
}
|
|
41
|
-
|
|
42
|
-
if (east - west > 180) {
|
|
43
|
-
return getHexagonsInBoundingBox({
|
|
38
|
+
if (Math.abs(east - west) > 180) {
|
|
39
|
+
return (0, _toConsumableArray2.default)(new Set(getHexagonsInBoundingBox({
|
|
44
40
|
west: west,
|
|
45
41
|
north: north,
|
|
46
42
|
east: 0,
|
|
@@ -50,7 +46,7 @@ function getHexagonsInBoundingBox(_ref, resolution) {
|
|
|
50
46
|
north: north,
|
|
51
47
|
east: east,
|
|
52
48
|
south: south
|
|
53
|
-
}, resolution));
|
|
49
|
+
}, resolution))));
|
|
54
50
|
}
|
|
55
51
|
|
|
56
52
|
var oversample = 2;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../../../src/layers/h3-tileset-2d.ts"],"names":["getHexagonsInBoundingBox","resolution","west","north","east","south","concat","oversample","h3Indices","
|
|
1
|
+
{"version":3,"sources":["../../../src/layers/h3-tileset-2d.ts"],"names":["getHexagonsInBoundingBox","resolution","west","north","east","south","Math","abs","Set","concat","oversample","h3Indices","map","i","tileToBoundingBox","index","coordinates","latitudes","c","longitudes","min","max","BIAS","getHexagonResolution","viewport","hexagonScaleFactor","zoom","latitudeScaleFactor","log","cos","PI","latitude","floor","H3Tileset2D","minZoom","maxZoom","getBounds","z","indices","Number","isFinite","center","longitude","bbox","Tileset2D"],"mappings":";;;;;;;;;;;;;;;;;;;;;;;AAAA;;AACA;;;;;;AAIA,SAASA,wBAAT,OAEEC,UAFF,EAGY;AAAA,MAFTC,IAES,QAFTA,IAES;AAAA,MAFHC,KAEG,QAFHA,KAEG;AAAA,MAFIC,IAEJ,QAFIA,IAEJ;AAAA,MAFUC,KAEV,QAFUA,KAEV;;AACV,MAAIC,IAAI,CAACC,GAAL,CAASH,IAAI,GAAGF,IAAhB,IAAwB,GAA5B,EAAiC;AAG/B,4CACK,IAAIM,GAAJ,CACDR,wBAAwB,CAAC;AAACE,MAAAA,IAAI,EAAJA,IAAD;AAAOC,MAAAA,KAAK,EAALA,KAAP;AAAcC,MAAAA,IAAI,EAAE,CAApB;AAAuBC,MAAAA,KAAK,EAALA;AAAvB,KAAD,EAAgCJ,UAAhC,CAAxB,CAAoEQ,MAApE,CACET,wBAAwB,CAAC;AAACE,MAAAA,IAAI,EAAE,CAAP;AAAUC,MAAAA,KAAK,EAALA,KAAV;AAAiBC,MAAAA,IAAI,EAAJA,IAAjB;AAAuBC,MAAAA,KAAK,EAALA;AAAvB,KAAD,EAAgCJ,UAAhC,CAD1B,CADC,CADL;AAOD;;AAID,MAAMS,UAAU,GAAG,CAAnB;AACA,MAAMC,SAAS,GAAG,oBAChB,CACE,CACE,CAACT,IAAD,EAAOC,KAAP,CADF,EAEE,CAACD,IAAD,EAAOG,KAAP,CAFF,EAGE,CAACD,IAAD,EAAOC,KAAP,CAHF,EAIE,CAACD,IAAD,EAAOD,KAAP,CAJF,EAKE,CAACD,IAAD,EAAOC,KAAP,CALF,CADF,CADgB,EAUhBF,UAAU,GAAGS,UAVG,EAWhB,IAXgB,CAAlB;AAcA,SAAOA,UAAU,oCAAO,IAAIF,GAAJ,CAAQG,SAAS,CAACC,GAAV,CAAc,UAAAC,CAAC;AAAA,WAAI,sBAAWA,CAAX,EAAcZ,UAAd,CAAJ;AAAA,GAAf,CAAR,CAAP,IAAiEU,SAAlF;AACD;;AAED,SAASG,iBAAT,CAA2BC,KAA3B,EAA0D;AACxD,MAAMC,WAAW,GAAG,2BAAgBD,KAAhB,CAApB;AACA,MAAME,SAAS,GAAGD,WAAW,CAACJ,GAAZ,CAAgB,UAAAM,CAAC;AAAA,WAAIA,CAAC,CAAC,CAAD,CAAL;AAAA,GAAjB,CAAlB;AACA,MAAMC,UAAU,GAAGH,WAAW,CAACJ,GAAZ,CAAgB,UAAAM,CAAC;AAAA,WAAIA,CAAC,CAAC,CAAD,CAAL;AAAA,GAAjB,CAAnB;AACA,MAAMhB,IAAI,GAAGI,IAAI,CAACc,GAAL,OAAAd,IAAI,mCAAQa,UAAR,EAAjB;AACA,MAAMd,KAAK,GAAGC,IAAI,CAACc,GAAL,OAAAd,IAAI,mCAAQW,SAAR,EAAlB;AACA,MAAMb,IAAI,GAAGE,IAAI,CAACe,GAAL,OAAAf,IAAI,mCAAQa,UAAR,EAAjB;AACA,MAAMhB,KAAK,GAAGG,IAAI,CAACe,GAAL,OAAAf,IAAI,mCAAQW,SAAR,EAAlB;AACA,SAAO;AAACf,IAAAA,IAAI,EAAJA,IAAD;AAAOG,IAAAA,KAAK,EAALA,KAAP;AAAcD,IAAAA,IAAI,EAAJA,IAAd;AAAoBD,IAAAA,KAAK,EAALA;AAApB,GAAP;AACD;;AAMD,IAAMmB,IAAI,GAAG,CAAb;;AACA,SAASC,oBAAT,CAA8BC,QAA9B,EAAgD;AAC9C,MAAMC,kBAAkB,GAAI,IAAI,CAAL,GAAUD,QAAQ,CAACE,IAA9C;AACA,MAAMC,mBAAmB,GAAGrB,IAAI,CAACsB,GAAL,CAAS,IAAItB,IAAI,CAACuB,GAAL,CAAUvB,IAAI,CAACwB,EAAL,GAAUN,QAAQ,CAACO,QAApB,GAAgC,GAAzC,CAAb,CAA5B;AAGA,SAAOzB,IAAI,CAACe,GAAL,CAAS,CAAT,EAAYf,IAAI,CAAC0B,KAAL,CAAWP,kBAAkB,GAAGE,mBAArB,GAA2CL,IAAtD,CAAZ,CAAP;AACD;;IAEoBW,W;;;;;;;;;;;;WAEnB,+BAA4D;AAAA,UAA5CT,QAA4C,SAA5CA,QAA4C;AAAA,UAAlCU,OAAkC,SAAlCA,OAAkC;AAAA,UAAzBC,OAAyB,SAAzBA,OAAyB;;AAC1D,gCAAmCX,QAAQ,CAACY,SAAT,EAAnC;AAAA;AAAA,UAAOhC,IAAP;AAAA,UAAaC,KAAb;AAAA,UAAoBH,IAApB;AAAA,UAA0BC,KAA1B;;AAEA,UAAIkC,CAAC,GAAGd,oBAAoB,CAACC,QAAD,CAA5B;AACA,UAAIc,OAAJ;;AACA,UAAI,OAAOJ,OAAP,KAAmB,QAAnB,IAA+BK,MAAM,CAACC,QAAP,CAAgBN,OAAhB,CAA/B,IAA2DG,CAAC,GAAGH,OAAnE,EAA4E;AAC1EG,QAAAA,CAAC,GAAGH,OAAJ;AACD;;AACD,UAAI,OAAOC,OAAP,KAAmB,QAAnB,IAA+BI,MAAM,CAACC,QAAP,CAAgBL,OAAhB,CAA/B,IAA2DE,CAAC,GAAGF,OAAnE,EAA4E;AAC1EE,QAAAA,CAAC,GAAGF,OAAJ;AAIA,YAAMM,MAAM,GAAG,mBAAQjB,QAAQ,CAACO,QAAjB,EAA2BP,QAAQ,CAACkB,SAApC,EAA+CP,OAA/C,CAAf;AACAG,QAAAA,OAAO,GAAG,iBAAMG,MAAN,EAAc,CAAd,CAAV;AACD,OAPD,MAOO;AACLH,QAAAA,OAAO,GAAGtC,wBAAwB,CAAC;AAACE,UAAAA,IAAI,EAAJA,IAAD;AAAOC,UAAAA,KAAK,EAALA,KAAP;AAAcC,UAAAA,IAAI,EAAJA,IAAd;AAAoBC,UAAAA,KAAK,EAALA;AAApB,SAAD,EAA6BgC,CAA7B,CAAlC;AACD;;AAED,aAAOC,OAAO,CAAC1B,GAAR,CAAY,UAAAC,CAAC;AAAA,eAAK;AAACA,UAAAA,CAAC,EAADA;AAAD,SAAL;AAAA,OAAb,CAAP;AACD;;;WAGD,0BAAoC;AAAA,UAAzBA,CAAyB,SAAzBA,CAAyB;AAClC,aAAOA,CAAP;AACD;;;WAGD,gCAAkC;AAAA,UAAjBA,CAAiB,SAAjBA,CAAiB;AAChC,aAAO;AAAC8B,QAAAA,IAAI,EAAE7B,iBAAiB,CAACD,CAAD;AAAxB,OAAP;AACD;;;WAGD,4BAAsC;AAAA,UAAzBA,CAAyB,SAAzBA,CAAyB;AACpC,aAAO,2BAAgBA,CAAhB,CAAP;AACD;;;WAGD,wBAAeE,KAAf,EAAgD;AAC9C,UAAMd,UAAU,GAAG,2BAAgBc,KAAK,CAACF,CAAtB,CAAnB;AACA,UAAMA,CAAC,GAAG,sBAAWE,KAAK,CAACF,CAAjB,EAAoBZ,UAAU,GAAG,CAAjC,CAAV;AACA,aAAO;AAACY,QAAAA,CAAC,EAADA;AAAD,OAAP;AACD;;;EA5CsC+B,qB","sourcesContent":["import {_Tileset2D as Tileset2D, GeoBoundingBox} from '@deck.gl/geo-layers';\nimport {polyfill, geoToH3, h3GetResolution, h3ToGeoBoundary, h3ToParent, kRing} from 'h3-js';\n\nexport type H3TileIndex = {i: string};\n\nfunction getHexagonsInBoundingBox(\n {west, north, east, south}: GeoBoundingBox,\n resolution: number\n): string[] {\n if (Math.abs(east - west) > 180) {\n // This is a known issue in h3-js: polyfill does not work correctly\n // when longitude span is larger than 180 degrees.\n return [\n ...new Set(\n getHexagonsInBoundingBox({west, north, east: 0, south}, resolution).concat(\n getHexagonsInBoundingBox({west: 0, north, east, south}, resolution)\n )\n )\n ];\n }\n\n // `polyfill()` fills based on hexagon center, which means tiles vanish\n // prematurely. Get more accurate coverage by oversampling\n const oversample = 2;\n const h3Indices = polyfill(\n [\n [\n [west, north],\n [west, south],\n [east, south],\n [east, north],\n [west, north]\n ]\n ],\n resolution + oversample,\n true\n );\n\n return oversample ? [...new Set(h3Indices.map(i => h3ToParent(i, resolution)))] : h3Indices;\n}\n\nfunction tileToBoundingBox(index: string): GeoBoundingBox {\n const coordinates = h3ToGeoBoundary(index);\n const latitudes = coordinates.map(c => c[0]);\n const longitudes = coordinates.map(c => c[1]);\n const west = Math.min(...longitudes);\n const south = Math.min(...latitudes);\n const east = Math.max(...longitudes);\n const north = Math.max(...latitudes);\n return {west, south, east, north};\n}\n\n// Resolution conversion function. Takes a WebMercatorViewport and returns\n// a H3 resolution such that the screen space size of the hexagons is\n// similar\n// Relative scale factor (0 = no biasing, 2 = a few hexagons cover view)\nconst BIAS = 2;\nfunction getHexagonResolution(viewport): number {\n const hexagonScaleFactor = (2 / 3) * viewport.zoom;\n const latitudeScaleFactor = Math.log(1 / Math.cos((Math.PI * viewport.latitude) / 180));\n\n // Clip and bias\n return Math.max(0, Math.floor(hexagonScaleFactor + latitudeScaleFactor - BIAS));\n}\n\nexport default class H3Tileset2D extends Tileset2D {\n // @ts-expect-error Tileset2D should be generic over TileIndex\n getTileIndices({viewport, minZoom, maxZoom}): H3TileIndex[] {\n const [east, south, west, north] = viewport.getBounds();\n\n let z = getHexagonResolution(viewport);\n let indices: string[];\n if (typeof minZoom === 'number' && Number.isFinite(minZoom) && z < minZoom) {\n z = minZoom;\n }\n if (typeof maxZoom === 'number' && Number.isFinite(maxZoom) && z > maxZoom) {\n z = maxZoom;\n\n // Once we are at max zoom, getHexagonsInBoundingBox doesn't work, simply\n // get a ring centered on the hexagon in the viewport center\n const center = geoToH3(viewport.latitude, viewport.longitude, maxZoom);\n indices = kRing(center, 1);\n } else {\n indices = getHexagonsInBoundingBox({west, north, east, south}, z);\n }\n\n return indices.map(i => ({i}));\n }\n\n // @ts-expect-error Tileset2D should be generic over TileIndex\n getTileId({i}: H3TileIndex): string {\n return i;\n }\n\n // @ts-expect-error Tileset2D should be generic over TileIndex\n getTileMetadata({i}: H3TileIndex) {\n return {bbox: tileToBoundingBox(i)};\n }\n\n // @ts-expect-error Tileset2D should be generic over TileIndex\n getTileZoom({i}: H3TileIndex): number {\n return h3GetResolution(i);\n }\n\n // @ts-expect-error Tileset2D should be generic over TileIndex\n getParentIndex(index: H3TileIndex): H3TileIndex {\n const resolution = h3GetResolution(index.i);\n const i = h3ToParent(index.i, resolution - 1);\n return {i};\n }\n}\n"],"file":"h3-tileset-2d.js"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../../../src/layers/quadkey-tile-layer.ts"],"names":["renderSubLayers","props","data","length","QuadkeyLayer","getQuadkey","d","id","defaultProps","aggregationResLevel","QuadkeyTileLayer","setState","tileJSON","changeFlags","dataChanged","tiles","state","maxZoom","parseInt","maxresolution","SpatialIndexTileLayer","TilesetClass","QuadkeyTileset2D","CompositeLayer"],"mappings":";;;;;;;;;;;;;;;;;;;;;;;AAAA;;
|
|
1
|
+
{"version":3,"sources":["../../../src/layers/quadkey-tile-layer.ts"],"names":["renderSubLayers","props","data","length","QuadkeyLayer","getQuadkey","d","id","defaultProps","aggregationResLevel","QuadkeyTileLayer","setState","tileJSON","changeFlags","dataChanged","tiles","state","maxZoom","parseInt","maxresolution","SpatialIndexTileLayer","TilesetClass","QuadkeyTileset2D","CompositeLayer"],"mappings":";;;;;;;;;;;;;;;;;;;;;;;AAAA;;AAQA;;AACA;;AACA;;;;;;AAEA,IAAMA,eAAe,GAAG,SAAlBA,eAAkB,CAAAC,KAAK,EAAI;AAC/B,MAAOC,IAAP,GAAeD,KAAf,CAAOC,IAAP;AACA,MAAI,CAACA,IAAD,IAAS,CAACA,IAAI,CAACC,MAAnB,EAA2B,OAAO,IAAP;AAC3B,SAAO,IAAIC,uBAAJ,CAAiBH,KAAjB,EAAwB;AAACI,IAAAA,UAAU,EAAE,oBAAAC,CAAC;AAAA,aAAIA,CAAC,CAACC,EAAN;AAAA;AAAd,GAAxB,CAAP;AACD,CAJD;;AAMA,IAAMC,YAAiD,GAAG;AACxDC,EAAAA,mBAAmB,EAAE;AADmC,CAA1D;;IAaqBC,gB;;;;;;;;;;;;;;;;;;;;;WAUnB,2BAAwB;AACtB,WAAKC,QAAL,CAAc;AAACT,QAAAA,IAAI,EAAE,IAAP;AAAaU,QAAAA,QAAQ,EAAE;AAAvB,OAAd;AACD;;;WAED,2BAAyD;AAAA,UAA5CC,WAA4C,QAA5CA,WAA4C;;AACvD,UAAIA,WAAW,CAACC,WAAhB,EAA6B;AAC3B,YAAKZ,IAAL,GAAa,KAAKD,KAAlB,CAAKC,IAAL;AACA,YAAMU,QAAQ,GAAGV,IAAjB;AACAA,QAAAA,IAAI,GAAIU,QAAD,CAAkBG,KAAzB;AACA,aAAKJ,QAAL,CAAc;AAACT,UAAAA,IAAI,EAAJA,IAAD;AAAOU,UAAAA,QAAQ,EAARA;AAAP,SAAd;AACD;AACF;;;WAED,wBAA0C;AACxC,wBAAyB,KAAKI,KAA9B;AAAA,UAAOd,IAAP,eAAOA,IAAP;AAAA,UAAaU,QAAb,eAAaA,QAAb;AACA,UAAMK,OAAO,GAAGC,QAAQ,CAACN,QAAD,aAACA,QAAD,uBAACA,QAAQ,CAAEO,aAAX,CAAxB;AACA,aAAO,CACL,IAAIC,8BAAJ,CAA0B,KAAKnB,KAA/B,EAAsC;AACpCM,QAAAA,EAAE,+BAAwB,KAAKN,KAAL,CAAWM,EAAnC,CADkC;AAEpCL,QAAAA,IAAI,EAAJA,IAFoC;AAIpCmB,QAAAA,YAAY,EAAEC,yBAJsB;AAKpCtB,QAAAA,eAAe,EAAfA,eALoC;AAMpCiB,QAAAA,OAAO,EAAPA;AANoC,OAAtC,CADK,CAAP;AAUD;;;EApCyEM,oB;;;8BAAvDb,gB,eAGA,kB;8BAHAA,gB,kBAIGF,Y","sourcesContent":["import {\n CompositeLayer,\n CompositeLayerProps,\n Layer,\n LayersList,\n UpdateParameters,\n DefaultProps\n} from '@deck.gl/core';\nimport {QuadkeyLayer, QuadkeyLayerProps} from '@deck.gl/geo-layers';\nimport QuadkeyTileset2D from './quadkey-tileset-2d';\nimport SpatialIndexTileLayer from './spatial-index-tile-layer';\n\nconst renderSubLayers = props => {\n const {data} = props;\n if (!data || !data.length) return null;\n return new QuadkeyLayer(props, {getQuadkey: d => d.id});\n};\n\nconst defaultProps: DefaultProps<QuadkeyTileLayerProps> = {\n aggregationResLevel: 6\n};\n\n/** All properties supported by QuadkeyTileLayer. */\nexport type QuadkeyTileLayerProps<DataT = any> = _QuadkeyTileLayerProps<DataT> &\n CompositeLayerProps<DataT>;\n\n/** Properties added by QuadkeyTileLayer. */\ntype _QuadkeyTileLayerProps<DataT> = QuadkeyLayerProps<DataT> & {\n aggregationResLevel?: number;\n};\n\nexport default class QuadkeyTileLayer<DataT = any, ExtraProps = {}> extends CompositeLayer<\n ExtraProps & Required<_QuadkeyTileLayerProps<DataT>>\n> {\n static layerName = 'QuadkeyTileLayer';\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: `quadkey-tile-layer-${this.props.id}`,\n data,\n // TODO: Tileset2D should be generic over TileIndex type\n TilesetClass: QuadkeyTileset2D as any,\n renderSubLayers,\n maxZoom\n })\n ];\n }\n}\n"],"file":"quadkey-tile-layer.js"}
|
|
@@ -41,6 +41,29 @@ function tileToQuadkey(tile) {
|
|
|
41
41
|
};
|
|
42
42
|
}
|
|
43
43
|
|
|
44
|
+
function quadkeyToTile(index) {
|
|
45
|
+
var quadkey = index.i;
|
|
46
|
+
var tile = {
|
|
47
|
+
x: 0,
|
|
48
|
+
y: 0,
|
|
49
|
+
z: quadkey.length
|
|
50
|
+
};
|
|
51
|
+
|
|
52
|
+
for (var i = tile.z; i > 0; i--) {
|
|
53
|
+
var mask = 1 << i - 1;
|
|
54
|
+
var q = Number(quadkey[tile.z - i]);
|
|
55
|
+
if (q === 1) tile.x |= mask;
|
|
56
|
+
if (q === 2) tile.y |= mask;
|
|
57
|
+
|
|
58
|
+
if (q === 3) {
|
|
59
|
+
tile.x |= mask;
|
|
60
|
+
tile.y |= mask;
|
|
61
|
+
}
|
|
62
|
+
}
|
|
63
|
+
|
|
64
|
+
return tile;
|
|
65
|
+
}
|
|
66
|
+
|
|
44
67
|
var QuadkeyTileset2D = function (_Tileset2D) {
|
|
45
68
|
(0, _inherits2.default)(QuadkeyTileset2D, _Tileset2D);
|
|
46
69
|
|
|
@@ -64,8 +87,8 @@ var QuadkeyTileset2D = function (_Tileset2D) {
|
|
|
64
87
|
}
|
|
65
88
|
}, {
|
|
66
89
|
key: "getTileMetadata",
|
|
67
|
-
value: function getTileMetadata() {
|
|
68
|
-
return
|
|
90
|
+
value: function getTileMetadata(index) {
|
|
91
|
+
return (0, _get2.default)((0, _getPrototypeOf2.default)(QuadkeyTileset2D.prototype), "getTileMetadata", this).call(this, quadkeyToTile(index));
|
|
69
92
|
}
|
|
70
93
|
}, {
|
|
71
94
|
key: "getTileZoom",
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../../../src/layers/quadkey-tileset-2d.ts"],"names":["tileToQuadkey","tile","index","z","b","mask","x","y","toString","i","QuadkeyTileset2D","opts","map","
|
|
1
|
+
{"version":3,"sources":["../../../src/layers/quadkey-tileset-2d.ts"],"names":["tileToQuadkey","tile","index","z","b","mask","x","y","toString","i","quadkeyToTile","quadkey","length","q","Number","QuadkeyTileset2D","opts","map","slice","Tileset2D"],"mappings":";;;;;;;;;;;;;;;;;;;;;AAAA;;;;;;AAGA,SAASA,aAAT,CAAuBC,IAAvB,EAA+C;AAC7C,MAAIC,KAAK,GAAG,EAAZ;;AACA,OAAK,IAAIC,CAAC,GAAGF,IAAI,CAACE,CAAlB,EAAqBA,CAAC,GAAG,CAAzB,EAA4BA,CAAC,EAA7B,EAAiC;AAC/B,QAAIC,CAAC,GAAG,CAAR;AACA,QAAMC,IAAI,GAAG,KAAMF,CAAC,GAAG,CAAvB;AACA,QAAI,CAACF,IAAI,CAACK,CAAL,GAASD,IAAV,MAAoB,CAAxB,EAA2BD,CAAC;AAC5B,QAAI,CAACH,IAAI,CAACM,CAAL,GAASF,IAAV,MAAoB,CAAxB,EAA2BD,CAAC,IAAI,CAAL;AAC3BF,IAAAA,KAAK,IAAIE,CAAC,CAACI,QAAF,EAAT;AACD;;AACD,SAAO;AAACC,IAAAA,CAAC,EAAEP;AAAJ,GAAP;AACD;;AAED,SAASQ,aAAT,CAAuBR,KAAvB,EAAgD;AAC9C,MAAMS,OAAO,GAAGT,KAAK,CAACO,CAAtB;AACA,MAAMR,IAAI,GAAG;AAACK,IAAAA,CAAC,EAAE,CAAJ;AAAOC,IAAAA,CAAC,EAAE,CAAV;AAAaJ,IAAAA,CAAC,EAAEQ,OAAO,CAACC;AAAxB,GAAb;;AAEA,OAAK,IAAIH,CAAC,GAAGR,IAAI,CAACE,CAAlB,EAAqBM,CAAC,GAAG,CAAzB,EAA4BA,CAAC,EAA7B,EAAiC;AAC/B,QAAMJ,IAAI,GAAG,KAAMI,CAAC,GAAG,CAAvB;AACA,QAAMI,CAAC,GAAGC,MAAM,CAACH,OAAO,CAACV,IAAI,CAACE,CAAL,GAASM,CAAV,CAAR,CAAhB;AACA,QAAII,CAAC,KAAK,CAAV,EAAaZ,IAAI,CAACK,CAAL,IAAUD,IAAV;AACb,QAAIQ,CAAC,KAAK,CAAV,EAAaZ,IAAI,CAACM,CAAL,IAAUF,IAAV;;AACb,QAAIQ,CAAC,KAAK,CAAV,EAAa;AACXZ,MAAAA,IAAI,CAACK,CAAL,IAAUD,IAAV;AACAJ,MAAAA,IAAI,CAACM,CAAL,IAAUF,IAAV;AACD;AACF;;AACD,SAAOJ,IAAP;AACD;;IAEoBc,gB;;;;;;;;;;;;WAEnB,wBAAeC,IAAf,EAAyC;AACvC,aAAO,iHAAqBA,IAArB,EAA2BC,GAA3B,CAA+BjB,aAA/B,CAAP;AACD;;;WAGD,yBAAiC;AAAA,UAAtBS,CAAsB,QAAtBA,CAAsB;AAC/B,aAAOA,CAAP;AACD;;;WAGD,yBAAgBP,KAAhB,EAAyC;AACvC,+HAA6BQ,aAAa,CAACR,KAAD,CAA1C;AACD;;;WAGD,4BAAmC;AAAA,UAAtBO,CAAsB,SAAtBA,CAAsB;AACjC,aAAOA,CAAC,CAACG,MAAT;AACD;;;WAGD,wBAAeV,KAAf,EAAwC;AACtC,UAAMO,CAAC,GAAGP,KAAK,CAACO,CAAN,CAAQS,KAAR,CAAc,CAAd,EAAiB,CAAC,CAAlB,CAAV;AACA,aAAO;AAACT,QAAAA,CAAC,EAADA;AAAD,OAAP;AACD;;;EAzB2CU,qB","sourcesContent":["import {_Tileset2D as Tileset2D} from '@deck.gl/geo-layers';\n\ntype QuadkeyTileIndex = {i: string};\nfunction tileToQuadkey(tile): QuadkeyTileIndex {\n let index = '';\n for (let z = tile.z; z > 0; z--) {\n let b = 0;\n const mask = 1 << (z - 1);\n if ((tile.x & mask) !== 0) b++;\n if ((tile.y & mask) !== 0) b += 2;\n index += b.toString();\n }\n return {i: index};\n}\n\nfunction quadkeyToTile(index: QuadkeyTileIndex) {\n const quadkey = index.i;\n const tile = {x: 0, y: 0, z: quadkey.length};\n\n for (let i = tile.z; i > 0; i--) {\n const mask = 1 << (i - 1);\n const q = Number(quadkey[tile.z - i]);\n if (q === 1) tile.x |= mask;\n if (q === 2) tile.y |= mask;\n if (q === 3) {\n tile.x |= mask;\n tile.y |= mask;\n }\n }\n return tile;\n}\n\nexport default class QuadkeyTileset2D extends Tileset2D {\n // @ts-expect-error for spatial indices, TileSet2d should be parametrized by TileIndexT\n getTileIndices(opts): QuadkeyTileIndex[] {\n return super.getTileIndices(opts).map(tileToQuadkey);\n }\n\n // @ts-expect-error TileIndex must be generic\n getTileId({i}: QuadkeyTileIndex) {\n return i;\n }\n\n // @ts-expect-error TileIndex must be generic\n getTileMetadata(index: QuadkeyTileIndex) {\n return super.getTileMetadata(quadkeyToTile(index));\n }\n\n // @ts-expect-error TileIndex must be generic\n getTileZoom({i}: QuadkeyTileIndex) {\n return i.length;\n }\n\n // @ts-expect-error TileIndex must be generic\n getParentIndex(index: QuadkeyTileIndex) {\n const i = index.i.slice(0, -1);\n return {i};\n }\n}\n"],"file":"quadkey-tileset-2d.js"}
|
|
@@ -17,6 +17,8 @@ var _possibleConstructorReturn2 = _interopRequireDefault(require("@babel/runtime
|
|
|
17
17
|
|
|
18
18
|
var _getPrototypeOf2 = _interopRequireDefault(require("@babel/runtime/helpers/getPrototypeOf"));
|
|
19
19
|
|
|
20
|
+
var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
|
|
21
|
+
|
|
20
22
|
var _geoLayers = require("@deck.gl/geo-layers");
|
|
21
23
|
|
|
22
24
|
function _createSuper(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct(); return function _createSuperInternal() { var Super = (0, _getPrototypeOf2.default)(Derived), result; if (hasNativeReflectConstruct) { var NewTarget = (0, _getPrototypeOf2.default)(this).constructor; result = Reflect.construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return (0, _possibleConstructorReturn2.default)(this, result); }; }
|
|
@@ -89,4 +91,5 @@ var SpatialIndexTileLayer = function (_TileLayer) {
|
|
|
89
91
|
}(_geoLayers.TileLayer);
|
|
90
92
|
|
|
91
93
|
exports.default = SpatialIndexTileLayer;
|
|
94
|
+
(0, _defineProperty2.default)(SpatialIndexTileLayer, "layerName", 'SpatialIndexTileLayer');
|
|
92
95
|
//# sourceMappingURL=spatial-index-tile-layer.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../../../src/layers/spatial-index-tile-layer.ts"],"names":["isFeatureIdDefined","value","undefined","SpatialIndexTileLayer","info","hoveredFeatureId","state","hoveredFeature","object","newHoveredFeatureId","id","highlightColor","props","setState","tile","highlightedObjectIndex","getHighlightedObjectIndex","data","content","isFeatureIdPresent","Array","isArray","findIndex","feature","TileLayer"],"mappings":"
|
|
1
|
+
{"version":3,"sources":["../../../src/layers/spatial-index-tile-layer.ts"],"names":["isFeatureIdDefined","value","undefined","SpatialIndexTileLayer","info","hoveredFeatureId","state","hoveredFeature","object","newHoveredFeatureId","id","highlightColor","props","setState","tile","highlightedObjectIndex","getHighlightedObjectIndex","data","content","isFeatureIdPresent","Array","isArray","findIndex","feature","TileLayer"],"mappings":";;;;;;;;;;;;;;;;;;;;;AACA;;;;;;AAEA,SAASA,kBAAT,CAA4BC,KAA5B,EAAqD;AACnD,SAAOA,KAAK,KAAKC,SAAV,IAAuBD,KAAK,KAAK,IAAjC,IAAyCA,KAAK,KAAK,EAA1D;AACD;;IAEoBE,qB;;;;;;;;;;;;WAGnB,8BAA+BC,IAA/B,EAAwD;AACtD,UAAOC,gBAAP,GAA2B,KAAKC,KAAhC,CAAOD,gBAAP;AACA,UAAME,cAAc,GAAGH,IAAI,CAACI,MAA5B;AACA,UAAIC,mBAAJ;;AAEA,UAAIF,cAAJ,EAAoB;AAClBE,QAAAA,mBAAmB,GAAGF,cAAc,CAACG,EAArC;AACD;;AAED,UAAIL,gBAAgB,KAAKI,mBAAzB,EAA8C;AAC5C,YAAKE,cAAL,GAAuB,KAAKC,KAA5B,CAAKD,cAAL;;AACA,YAAI,OAAOA,cAAP,KAA0B,UAA9B,EAA0C;AACxCA,UAAAA,cAAc,GAAGA,cAAc,CAACP,IAAD,CAA/B;AACD;;AAED,aAAKS,QAAL,CAAc;AACZF,UAAAA,cAAc,EAAdA,cADY;AAEZN,UAAAA,gBAAgB,EAAEI;AAFN,SAAd;AAID;AACF;;;WAED,gCAAuBK,IAAvB,EAA2C;AACzC,aAAO;AACLC,QAAAA,sBAAsB,EAAE,KAAKC,yBAAL,CAA+BF,IAA/B,CADnB;AAELH,QAAAA,cAAc,EAAE,KAAKL,KAAL,CAAWK;AAFtB,OAAP;AAID;;;WAED,mCAA0BG,IAA1B,EAA8C;AAC5C,UAAOT,gBAAP,GAA2B,KAAKC,KAAhC,CAAOD,gBAAP;AACA,UAAMY,IAAI,GAAGH,IAAI,CAACI,OAAlB;AAEA,UAAMC,kBAAkB,GAAGnB,kBAAkB,CAACK,gBAAD,CAA7C;;AACA,UAAI,CAACc,kBAAD,IAAuB,CAACC,KAAK,CAACC,OAAN,CAAcJ,IAAd,CAA5B,EAAiD;AAC/C,eAAO,CAAC,CAAR;AACD;;AAED,aAAOA,IAAI,CAACK,SAAL,CAAe,UAAAC,OAAO;AAAA,eAAIA,OAAO,CAACb,EAAR,KAAeL,gBAAnB;AAAA,OAAtB,CAAP;AACD;;;EA1CiEmB,oB;;;8BAA/CrB,qB,eACA,uB","sourcesContent":["import {PickingInfo} from '@deck.gl/core';\nimport {TileLayer, _Tile2DHeader as Tile2DHeader} from '@deck.gl/geo-layers';\n\nfunction isFeatureIdDefined(value: unknown): boolean {\n return value !== undefined && value !== null && value !== '';\n}\n\nexport default class SpatialIndexTileLayer<ExtraProps = {}> extends TileLayer<any, ExtraProps> {\n static layerName = 'SpatialIndexTileLayer';\n\n protected _updateAutoHighlight(info: PickingInfo): void {\n const {hoveredFeatureId} = this.state;\n const hoveredFeature = info.object;\n let newHoveredFeatureId;\n\n if (hoveredFeature) {\n newHoveredFeatureId = hoveredFeature.id;\n }\n\n if (hoveredFeatureId !== newHoveredFeatureId) {\n let {highlightColor} = this.props;\n if (typeof highlightColor === 'function') {\n highlightColor = highlightColor(info);\n }\n\n this.setState({\n highlightColor,\n hoveredFeatureId: newHoveredFeatureId\n });\n }\n }\n\n getSubLayerPropsByTile(tile: Tile2DHeader) {\n return {\n highlightedObjectIndex: this.getHighlightedObjectIndex(tile),\n highlightColor: this.state.highlightColor\n };\n }\n\n getHighlightedObjectIndex(tile: Tile2DHeader) {\n const {hoveredFeatureId} = this.state;\n const data = tile.content;\n\n const isFeatureIdPresent = isFeatureIdDefined(hoveredFeatureId);\n if (!isFeatureIdPresent || !Array.isArray(data)) {\n return -1;\n }\n\n return data.findIndex(feature => feature.id === hoveredFeatureId);\n }\n}\n"],"file":"spatial-index-tile-layer.js"}
|
|
@@ -95,7 +95,7 @@ export default class CartoLayer extends CompositeLayer {
|
|
|
95
95
|
}) {
|
|
96
96
|
this._checkProps(props);
|
|
97
97
|
|
|
98
|
-
const shouldUpdateData = changeFlags.dataChanged || props.connection !== oldProps.connection || props.geoColumn !== oldProps.geoColumn || props.format !== oldProps.format || props.formatTiles !== oldProps.formatTiles || props.type !== oldProps.type || JSON.stringify(props.columns) !== JSON.stringify(oldProps.columns) || JSON.stringify(props.credentials) !== JSON.stringify(oldProps.credentials);
|
|
98
|
+
const shouldUpdateData = changeFlags.dataChanged || props.aggregationExp !== oldProps.aggregationExp || props.aggregationResLevel !== oldProps.aggregationResLevel || props.connection !== oldProps.connection || props.geoColumn !== oldProps.geoColumn || props.format !== oldProps.format || props.formatTiles !== oldProps.formatTiles || props.type !== oldProps.type || JSON.stringify(props.columns) !== JSON.stringify(oldProps.columns) || JSON.stringify(props.credentials) !== JSON.stringify(oldProps.credentials);
|
|
99
99
|
|
|
100
100
|
if (shouldUpdateData) {
|
|
101
101
|
this.setState({
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../../../src/layers/carto-layer.ts"],"names":["CompositeLayer","log","CartoTileLayer","H3TileLayer","QuadkeyTileLayer","MVTLayer","GeoJsonLayer","fetchLayerData","getDataV2","API_VERSIONS","COLUMNS_SUPPORT","FORMATS","GEO_COLUMN_SUPPORT","MAP_TYPES","TILE_FORMATS","getDefaultCredentials","assert","defaultProps","data","type","onDataLoad","value","compare","onDataError","optional","uniqueIdProperty","credentials","connection","format","formatTiles","clientId","geoColumn","columns","aggregationExp","aggregationResLevel","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","propName","layer","err","_getSubLayerAndProps","_notUsed","propsNoData","TILEJSON","tileUrl","URL","tiles","searchParams","get","MVT","scheme","renderLayers","updateTriggers","getSubLayerProps","id","layerName"],"mappings":"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","sourcesContent":["import {CompositeLayer, Layer, log} from '@deck.gl/core';\nimport CartoTileLayer from './carto-tile-layer';\nimport H3TileLayer from './h3-tile-layer';\nimport QuadkeyTileLayer from './quadkey-tile-layer';\nimport {MVTLayer} from '@deck.gl/geo-layers';\nimport {GeoJsonLayer} from '@deck.gl/layers';\nimport {fetchLayerData, getDataV2, API_VERSIONS} from '../api';\nimport {\n COLUMNS_SUPPORT,\n Format,\n FORMATS,\n GEO_COLUMN_SUPPORT,\n MapType,\n MAP_TYPES,\n TileFormat,\n TILE_FORMATS\n} from '../api/maps-api-common';\nimport {\n ClassicCredentials,\n CloudNativeCredentials,\n Credentials,\n getDefaultCredentials\n} from '../config';\nimport {CompositeLayerProps, LayerProps} from 'modules/core/src/types/layer-props';\nimport {ChangeFlags} from 'modules/core/src/lib/layer-state';\nimport {FetchLayerDataResult} 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 => {}, compare: false},\n onDataError: {type: 'function', value: null, compare: false, optional: true},\n uniqueIdProperty: 'cartodb_id',\n\n // override carto credentials for the layer, set to null to read from default\n credentials: null,\n\n /*********************/\n /* API v3 PARAMETERS */\n /**********************/\n // (String, required): connection name at CARTO platform\n connection: null,\n\n // (String, optional): format of data\n format: null,\n\n // (String, optional): force format of data for tiles\n formatTiles: null,\n\n // (String, optional): clientId identifier used for internal tracing, place here a string to identify the client who is doing the request.\n clientId: null,\n\n // (String, optional): name of the `geo_column` in the CARTO platform. Use this override the default column ('geom'), from which the geometry information should be fetched.\n geoColumn: null,\n\n // (Array<String>, optional): names of columns to fetch. By default, all columns are fetched.\n columns: {type: 'array', value: null},\n\n // (String, optional): aggregration SQL expression. Only used for spatial index datasets\n aggregationExp: null,\n\n // (Number, optional): aggregration resolution level. Only used for spatial index datasets, defaults to 6 for quadkeys, 4 for h3\n aggregationResLevel: null\n};\n\n/** All properties supported by CartoLayer. */\nexport type CartoLayerProps<DataT = any> = _CartoLayerProps & CompositeLayerProps<DataT>;\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 data format.\n *\n * Only supported when apiVersion is `API_VERSIONS.V3`.\n *\n * Possible values are: `FORMATS.GEOJSON`, `FORMATS.JSON` and `FORMATS.TILEJSON`.\n */\n format?: Format;\n\n /**\n * Use to override the default tile data format.\n *\n * Only supported when apiVersion is `API_VERSIONS.V3` and format is `FORMATS.TILEJSON`.\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 Error is thrown.\n */\n onDataError?: (err: unknown) => void;\n\n clientId?: string;\n};\n\nexport default class CartoLayer<ExtraProps = {}> extends CompositeLayer<\n Required<_CartoLayerProps> & ExtraProps\n> {\n static layerName = 'CartoLayer';\n static defaultProps = defaultProps as any;\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({\n props,\n oldProps,\n changeFlags\n }: {\n props: CartoLayerProps;\n oldProps: CartoLayerProps;\n context: any;\n changeFlags: ChangeFlags;\n }): void {\n this._checkProps(props);\n const shouldUpdateData =\n changeFlags.dataChanged ||\n props.connection !== oldProps.connection ||\n props.geoColumn !== oldProps.geoColumn ||\n props.format !== oldProps.format ||\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\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, clientId, 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 clientId,\n credentials: credentials as CloudNativeCredentials,\n connection,\n ...rest\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 Error);\n } else {\n throw err;\n }\n }\n }\n\n _getSubLayerAndProps(): [any, LayerProps] {\n assert(this.state);\n\n const {data, format, 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 if (format === FORMATS.TILEJSON) {\n /* global URL */\n const tileUrl = new URL(data.tiles[0]);\n\n props.formatTiles =\n props.formatTiles ||\n (tileUrl.searchParams.get('formatTiles') as TileFormat) ||\n TILE_FORMATS.MVT;\n\n if (data.scheme === 'h3') {\n return [H3TileLayer, props];\n }\n if (data.scheme === 'quadkey') {\n return [QuadkeyTileLayer, props];\n }\n return props.formatTiles === TILE_FORMATS.MVT ? [MVTLayer, props] : [CartoTileLayer, props];\n }\n\n // It's a geojson layer\n return [GeoJsonLayer, props];\n }\n\n renderLayers(): Layer | null {\n assert(this.state);\n\n const {data} = this.state;\n\n if (!data) return null;\n\n const {updateTriggers} = this.props;\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 updateTriggers\n })\n );\n }\n}\n"],"file":"carto-layer.js"}
|
|
1
|
+
{"version":3,"sources":["../../../src/layers/carto-layer.ts"],"names":["CompositeLayer","log","CartoTileLayer","H3TileLayer","QuadkeyTileLayer","MVTLayer","GeoJsonLayer","fetchLayerData","getDataV2","API_VERSIONS","COLUMNS_SUPPORT","FORMATS","GEO_COLUMN_SUPPORT","MAP_TYPES","TILE_FORMATS","getDefaultCredentials","assert","defaultProps","data","type","onDataLoad","value","compare","onDataError","optional","uniqueIdProperty","credentials","connection","format","formatTiles","clientId","geoColumn","columns","aggregationExp","aggregationResLevel","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","propName","layer","err","_getSubLayerAndProps","_notUsed","propsNoData","TILEJSON","tileUrl","URL","tiles","searchParams","get","MVT","scheme","renderLayers","updateTriggers","getSubLayerProps","id","layerName"],"mappings":"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","sourcesContent":["import {\n CompositeLayer,\n Layer,\n log,\n CompositeLayerProps,\n LayerProps,\n ChangeFlags\n} from '@deck.gl/core';\nimport CartoTileLayer from './carto-tile-layer';\nimport H3TileLayer from './h3-tile-layer';\nimport QuadkeyTileLayer from './quadkey-tile-layer';\nimport {MVTLayer} from '@deck.gl/geo-layers';\nimport {GeoJsonLayer} from '@deck.gl/layers';\nimport {fetchLayerData, getDataV2, API_VERSIONS} from '../api';\nimport {\n COLUMNS_SUPPORT,\n Format,\n FORMATS,\n GEO_COLUMN_SUPPORT,\n MapType,\n MAP_TYPES,\n TileFormat,\n TILE_FORMATS\n} from '../api/maps-api-common';\nimport {\n ClassicCredentials,\n CloudNativeCredentials,\n Credentials,\n getDefaultCredentials\n} from '../config';\nimport {FetchLayerDataResult} 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 => {}, compare: false},\n onDataError: {type: 'function', value: null, compare: false, optional: true},\n uniqueIdProperty: 'cartodb_id',\n\n // override carto credentials for the layer, set to null to read from default\n credentials: null,\n\n /*********************/\n /* API v3 PARAMETERS */\n /**********************/\n // (String, required): connection name at CARTO platform\n connection: null,\n\n // (String, optional): format of data\n format: null,\n\n // (String, optional): force format of data for tiles\n formatTiles: null,\n\n // (String, optional): clientId identifier used for internal tracing, place here a string to identify the client who is doing the request.\n clientId: null,\n\n // (String, optional): name of the `geo_column` in the CARTO platform. Use this override the default column ('geom'), from which the geometry information should be fetched.\n geoColumn: null,\n\n // (Array<String>, optional): names of columns to fetch. By default, all columns are fetched.\n columns: {type: 'array', value: null},\n\n // (String, optional): aggregration SQL expression. Only used for spatial index datasets\n aggregationExp: null,\n\n // (Number, optional): aggregration resolution level. Only used for spatial index datasets, defaults to 6 for quadkeys, 4 for h3\n aggregationResLevel: null\n};\n\n/** All properties supported by CartoLayer. */\nexport type CartoLayerProps<DataT = any> = _CartoLayerProps & CompositeLayerProps<DataT>;\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 data format.\n *\n * Only supported when apiVersion is `API_VERSIONS.V3`.\n *\n * Possible values are: `FORMATS.GEOJSON`, `FORMATS.JSON` and `FORMATS.TILEJSON`.\n */\n format?: Format;\n\n /**\n * Use to override the default tile data format.\n *\n * Only supported when apiVersion is `API_VERSIONS.V3` and format is `FORMATS.TILEJSON`.\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 Error is thrown.\n */\n onDataError?: (err: unknown) => void;\n\n clientId?: string;\n\n /** Aggregration SQL expression. Only used for spatial index datasets **/\n aggregationExp?: string;\n\n /** Aggregration resolution level. Only used for spatial index datasets, defaults to 6 for quadkeys, 4 for h3. **/\n aggregationResLevel?: number;\n};\n\nexport default class CartoLayer<ExtraProps = {}> extends CompositeLayer<\n Required<_CartoLayerProps> & ExtraProps\n> {\n static layerName = 'CartoLayer';\n static defaultProps = defaultProps as any;\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({\n props,\n oldProps,\n changeFlags\n }: {\n props: CartoLayerProps;\n oldProps: CartoLayerProps;\n context: any;\n changeFlags: ChangeFlags;\n }): void {\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.format !== oldProps.format ||\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\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, clientId, 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 clientId,\n credentials: credentials as CloudNativeCredentials,\n connection,\n ...rest\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 Error);\n } else {\n throw err;\n }\n }\n }\n\n _getSubLayerAndProps(): [any, LayerProps] {\n assert(this.state);\n\n const {data, format, 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 if (format === FORMATS.TILEJSON) {\n /* global URL */\n const tileUrl = new URL(data.tiles[0]);\n\n props.formatTiles =\n props.formatTiles ||\n (tileUrl.searchParams.get('formatTiles') as TileFormat) ||\n TILE_FORMATS.MVT;\n\n if (data.scheme === 'h3') {\n return [H3TileLayer, props];\n }\n if (data.scheme === 'quadkey') {\n return [QuadkeyTileLayer, props];\n }\n return props.formatTiles === TILE_FORMATS.MVT ? [MVTLayer, props] : [CartoTileLayer, props];\n }\n\n // It's a geojson layer\n return [GeoJsonLayer, props];\n }\n\n renderLayers(): Layer | null {\n assert(this.state);\n\n const {data} = this.state;\n\n if (!data) return null;\n\n const {updateTriggers} = this.props;\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 updateTriggers\n })\n );\n }\n}\n"],"file":"carto-layer.js"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../../../src/layers/carto-tile-layer.ts"],"names":["Protobuf","log","ClipExtension","MVTLayer","_getURLFromTemplate","GeoJsonLayer","geojsonToBinary","TileReader","TILE_FORMATS","parseJSON","arrayBuffer","JSON","parse","TextDecoder","decode","parsePbf","buffer","pbf","tile","read","unpackProperties","properties","length","map","item","currentRecord","data","forEach","key","value","parseCartoTile","options","formatTiles","cartoTile","GEOJSON","features","points","lines","polygons","defaultTileFormat","BINARY","CartoTileLoader","name","version","id","module","extensions","mimeTypes","category","worker","parseSync","defaultProps","loaders","CartoTileLayer","getTileData","url","state","Promise","reject","loadOptions","getLoadOptions","fetch","props","signal","mimeType","assert","Object","values","includes","propName","layer","renderSubLayers","tileBbox","bbox","west","south","east","north","subLayerProps","autoHighlight","clipBounds","subLayer"],"mappings":";AACA,OAAOA,QAAP,MAAqB,KAArB;AACA,SAAQC,GAAR,
|
|
1
|
+
{"version":3,"sources":["../../../src/layers/carto-tile-layer.ts"],"names":["Protobuf","log","ClipExtension","MVTLayer","_getURLFromTemplate","GeoJsonLayer","geojsonToBinary","TileReader","TILE_FORMATS","parseJSON","arrayBuffer","JSON","parse","TextDecoder","decode","parsePbf","buffer","pbf","tile","read","unpackProperties","properties","length","map","item","currentRecord","data","forEach","key","value","parseCartoTile","options","formatTiles","cartoTile","GEOJSON","features","points","lines","polygons","defaultTileFormat","BINARY","CartoTileLoader","name","version","id","module","extensions","mimeTypes","category","worker","parseSync","defaultProps","loaders","CartoTileLayer","getTileData","url","state","Promise","reject","loadOptions","getLoadOptions","fetch","props","signal","mimeType","assert","Object","values","includes","propName","layer","renderSubLayers","tileBbox","bbox","west","south","east","north","subLayerProps","autoHighlight","clipBounds","subLayer"],"mappings":"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","sourcesContent":["/* global TextDecoder */\nimport Protobuf from 'pbf';\nimport {log, DefaultProps} from '@deck.gl/core';\nimport {ClipExtension} from '@deck.gl/extensions';\nimport {\n MVTLayer,\n MVTLayerProps,\n TileLayer,\n _getURLFromTemplate,\n _Tile2DHeader,\n _TileLoadProps as TileLoadProps\n} from '@deck.gl/geo-layers';\nimport {GeoJsonLayer} from '@deck.gl/layers';\nimport {geojsonToBinary} from '@loaders.gl/gis';\nimport {Properties, Tile, TileReader} from './schema/carto-tile';\nimport {TileFormat, TILE_FORMATS} from '../api/maps-api-common';\nimport {LoaderOptions, LoaderWithParser} from '@loaders.gl/loader-utils';\nimport type {BinaryFeatures} from '@loaders.gl/schema';\nimport type {Feature} from 'geojson';\n\nfunction parseJSON(arrayBuffer: ArrayBuffer): any {\n return JSON.parse(new TextDecoder().decode(arrayBuffer));\n}\n\nfunction parsePbf(buffer: ArrayBuffer): Tile {\n const pbf = new Protobuf(buffer);\n const tile = TileReader.read(pbf);\n return tile;\n}\n\nfunction unpackProperties(properties: Properties[]) {\n if (!properties || !properties.length) {\n return [];\n }\n return properties.map(item => {\n const currentRecord: Record<string, unknown> = {};\n item.data.forEach(({key, value}) => {\n currentRecord[key] = value;\n });\n return currentRecord;\n });\n}\n\nfunction parseCartoTile(arrayBuffer: ArrayBuffer, options?: LoaderOptions): BinaryFeatures | null {\n if (!arrayBuffer) return null;\n const formatTiles = options && options.cartoTile && options.cartoTile.formatTiles;\n if (formatTiles === TILE_FORMATS.GEOJSON) return geojsonToBinary(parseJSON(arrayBuffer).features);\n\n const tile = parsePbf(arrayBuffer);\n\n const {points, lines, polygons} = tile;\n const data = {\n points: {...points, properties: unpackProperties(points.properties)},\n lines: {...lines, properties: unpackProperties(lines.properties)},\n polygons: {...polygons, properties: unpackProperties(polygons.properties)}\n };\n\n // Note: there is slight, difference in `numericProps` type, however geojson/mvtlayer can cope with this\n return data as unknown as BinaryFeatures;\n}\n\nconst defaultTileFormat = TILE_FORMATS.BINARY;\n\nconst CartoTileLoader: LoaderWithParser = {\n name: 'CARTO Tile',\n version: '1',\n id: 'cartoTile',\n module: 'carto',\n extensions: ['pbf'],\n mimeTypes: ['application/x-protobuf'],\n category: 'geometry',\n worker: false,\n parse: async (arrayBuffer, options) => parseCartoTile(arrayBuffer, options),\n parseSync: parseCartoTile,\n options: {\n cartoTile: {\n formatTiles: defaultTileFormat\n }\n }\n};\n\nconst defaultProps: DefaultProps<CartoTileLayerProps> = {\n ...MVTLayer.defaultProps,\n formatTiles: defaultTileFormat,\n loaders: [CartoTileLoader]\n};\n\n/** All properties supported by CartoTileLayer. */\nexport type CartoTileLayerProps<DataT extends Feature = Feature> = _CartoTileLayerProps &\n MVTLayerProps<DataT>;\n\n/** Properties added by CartoTileLayer. */\ntype _CartoTileLayerProps = {\n /** Use to override the default tile data format.\n *\n * Possible values are: `TILE_FORMATS.BINARY`, `TILE_FORMATS.GEOJSON` and `TILE_FORMATS.MVT`.\n *\n * Only supported when `apiVersion` is `API_VERSIONS.V3` and `format` is `FORMATS.TILEJSON`.\n */\n formatTiles?: TileFormat;\n};\n\nexport default class CartoTileLayer<\n DataT extends Feature = Feature,\n ExtraProps = {}\n> extends MVTLayer<DataT, Required<_CartoTileLayerProps> & ExtraProps> {\n static layerName = 'CartoTileLayer';\n static defaultProps = defaultProps;\n\n getTileData(tile: TileLoadProps) {\n const url = _getURLFromTemplate(this.state.data, tile);\n if (!url) {\n return Promise.reject('Invalid URL');\n }\n\n let loadOptions = this.getLoadOptions();\n const {fetch, formatTiles} = this.props;\n const {signal} = tile;\n\n loadOptions = {\n ...loadOptions,\n mimeType: 'application/x-protobuf'\n };\n\n if (formatTiles) {\n log.assert(\n Object.values(TILE_FORMATS).includes(formatTiles),\n `Invalid value for formatTiles: ${formatTiles}. Use value from TILE_FORMATS`\n );\n loadOptions.cartoTile = {formatTiles};\n }\n\n return fetch(url, {propName: 'data', layer: this, loadOptions, signal});\n }\n\n renderSubLayers(\n props: TileLayer['props'] & {\n id: string;\n data: any;\n _offset: number;\n tile: _Tile2DHeader;\n }\n ): GeoJsonLayer | null {\n if (props.data === null) {\n return null;\n }\n\n const tileBbox = props.tile.bbox as any;\n const {west, south, east, north} = tileBbox;\n\n const subLayerProps = {\n ...props,\n autoHighlight: false,\n extensions: [new ClipExtension(), ...(props.extensions || [])],\n clipBounds: [west, south, east, north]\n };\n\n const subLayer = new GeoJsonLayer(subLayerProps);\n return subLayer;\n }\n}\n"],"file":"carto-tile-layer.js"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../../../src/layers/h3-tile-layer.ts"],"names":["CompositeLayer","H3HexagonLayer","H3Tileset2D","SpatialIndexTileLayer","renderSubLayers","props","data","index","tile","length","getHexagon","d","id","centerHexagon","highPrecision","defaultProps","aggregationResLevel","H3TileLayer","initializeState","setState","tileJSON","updateState","changeFlags","dataChanged","tiles","renderLayers","state","maxZoom","parseInt","maxresolution","TilesetClass"],"mappings":";AAAA,SACEA,cADF,
|
|
1
|
+
{"version":3,"sources":["../../../src/layers/h3-tile-layer.ts"],"names":["CompositeLayer","H3HexagonLayer","H3Tileset2D","SpatialIndexTileLayer","renderSubLayers","props","data","index","tile","length","getHexagon","d","id","centerHexagon","highPrecision","defaultProps","aggregationResLevel","H3TileLayer","initializeState","setState","tileJSON","updateState","changeFlags","dataChanged","tiles","renderLayers","state","maxZoom","parseInt","maxresolution","TilesetClass"],"mappings":";AAAA,SACEA,cADF,QAOO,eAPP;AAQA,SAAQC,cAAR,QAA6B,qBAA7B;AACA,OAAOC,WAAP,MAAwB,iBAAxB;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,IAAIR,cAAJ,CAAmBI,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;AAgBA,eAAe,MAAMC,WAAN,SAAyDjB,cAAzD,CAEb;AAAA;AAAA;;AAAA;AAAA;;AASAkB,EAAAA,eAAe,GAAS;AACtB,SAAKC,QAAL,CAAc;AAACb,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;AAACjB,QAAAA;AAAD,UAAS,KAAKD,KAAlB;AACA,YAAMe,QAAQ,GAAGd,IAAjB;AACAA,MAAAA,IAAI,GAAIc,QAAD,CAAkBI,KAAzB;AACA,WAAKL,QAAL,CAAc;AAACb,QAAAA,IAAD;AAAOc,QAAAA;AAAP,OAAd;AACD;AACF;;AAEDK,EAAAA,YAAY,GAA8B;AACxC,UAAM;AAACnB,MAAAA,IAAD;AAAOc,MAAAA;AAAP,QAAmB,KAAKM,KAA9B;AACA,UAAMC,OAAO,GAAGC,QAAQ,CAACR,QAAQ,CAACS,aAAV,CAAxB;AACA,WAAO,CACL,IAAI1B,qBAAJ,CAA0B,KAAKE,KAA/B,EAAsC;AACpCO,MAAAA,EAAE,0BAAmB,KAAKP,KAAL,CAAWO,EAA9B,CADkC;AAEpCN,MAAAA,IAFoC;AAIpCwB,MAAAA,YAAY,EAAE5B,WAJsB;AAKpCE,MAAAA,eALoC;AAMpCuB,MAAAA;AANoC,KAAtC,CADK,CAAP;AAUD;;AAnCD;;gBAFmBV,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 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<DataT>;\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 aggregationResLevel?: number;\n};\n\nexport default class H3TileLayer<DataT = any, ExtraPropsT = {}> 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 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: `h3-tile-layer-${this.props.id}`,\n data,\n // @ts-expect-error Tileset2D should be generic over TileIndex\n TilesetClass: H3Tileset2D,\n renderSubLayers,\n maxZoom\n })\n ];\n }\n}\n"],"file":"h3-tile-layer.js"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { _Tileset2D as Tileset2D } from '@deck.gl/geo-layers';
|
|
2
|
-
import { polyfill,
|
|
2
|
+
import { polyfill, geoToH3, h3GetResolution, h3ToGeoBoundary, h3ToParent, kRing } from 'h3-js';
|
|
3
3
|
|
|
4
4
|
function getHexagonsInBoundingBox({
|
|
5
5
|
west,
|
|
@@ -7,12 +7,8 @@ function getHexagonsInBoundingBox({
|
|
|
7
7
|
east,
|
|
8
8
|
south
|
|
9
9
|
}, resolution) {
|
|
10
|
-
if (
|
|
11
|
-
return
|
|
12
|
-
}
|
|
13
|
-
|
|
14
|
-
if (east - west > 180) {
|
|
15
|
-
return getHexagonsInBoundingBox({
|
|
10
|
+
if (Math.abs(east - west) > 180) {
|
|
11
|
+
return [...new Set(getHexagonsInBoundingBox({
|
|
16
12
|
west,
|
|
17
13
|
north,
|
|
18
14
|
east: 0,
|
|
@@ -22,7 +18,7 @@ function getHexagonsInBoundingBox({
|
|
|
22
18
|
north,
|
|
23
19
|
east,
|
|
24
20
|
south
|
|
25
|
-
}, resolution));
|
|
21
|
+
}, resolution)))];
|
|
26
22
|
}
|
|
27
23
|
|
|
28
24
|
const oversample = 2;
|