@deck.gl/carto 8.8.0-beta.4 → 8.8.0-beta.5

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.
Files changed (86) hide show
  1. package/dist/dist.dev.js +2257 -1119
  2. package/dist/es5/index.js +3 -3
  3. package/dist/es5/index.js.map +1 -1
  4. package/dist/es5/layers/carto-layer.js +3 -3
  5. package/dist/es5/layers/carto-layer.js.map +1 -1
  6. package/dist/es5/layers/h3-tile-layer.js +26 -3
  7. package/dist/es5/layers/h3-tile-layer.js.map +1 -1
  8. package/dist/es5/layers/h3-tileset-2d.js +19 -13
  9. package/dist/es5/layers/h3-tileset-2d.js.map +1 -1
  10. package/dist/es5/layers/quadbin-layer.js +71 -0
  11. package/dist/es5/layers/quadbin-layer.js.map +1 -0
  12. package/dist/es5/layers/{quadkey-tile-layer.js → quadbin-tile-layer.js} +17 -17
  13. package/dist/es5/layers/quadbin-tile-layer.js.map +1 -0
  14. package/dist/es5/layers/{quadkey-tileset-2d.js → quadbin-tileset-2d.js} +25 -57
  15. package/dist/es5/layers/quadbin-tileset-2d.js.map +1 -0
  16. package/dist/es5/layers/quadbin-utils.js +122 -0
  17. package/dist/es5/layers/quadbin-utils.js.map +1 -0
  18. package/dist/esm/index.js +1 -1
  19. package/dist/esm/index.js.map +1 -1
  20. package/dist/esm/layers/carto-layer.js +3 -3
  21. package/dist/esm/layers/carto-layer.js.map +1 -1
  22. package/dist/esm/layers/h3-tile-layer.js +20 -3
  23. package/dist/esm/layers/h3-tile-layer.js.map +1 -1
  24. package/dist/esm/layers/h3-tileset-2d.js +20 -16
  25. package/dist/esm/layers/h3-tileset-2d.js.map +1 -1
  26. package/dist/esm/layers/quadbin-layer.js +29 -0
  27. package/dist/esm/layers/quadbin-layer.js.map +1 -0
  28. package/dist/esm/layers/{quadkey-tile-layer.js → quadbin-tile-layer.js} +10 -10
  29. package/dist/esm/layers/quadbin-tile-layer.js.map +1 -0
  30. package/dist/esm/layers/quadbin-tileset-2d.js +37 -0
  31. package/dist/esm/layers/quadbin-tileset-2d.js.map +1 -0
  32. package/dist/esm/layers/quadbin-utils.js +88 -0
  33. package/dist/esm/layers/quadbin-utils.js.map +1 -0
  34. package/dist.min.js +138 -138
  35. package/package.json +2 -2
  36. package/src/index.ts +1 -1
  37. package/src/layers/carto-layer.ts +7 -7
  38. package/src/layers/h3-tile-layer.ts +24 -3
  39. package/src/layers/h3-tileset-2d.ts +20 -10
  40. package/src/layers/quadbin-layer.ts +43 -0
  41. package/src/layers/{quadkey-tile-layer.ts → quadbin-tile-layer.ts} +15 -13
  42. package/src/layers/quadbin-tileset-2d.ts +34 -0
  43. package/src/layers/quadbin-utils.ts +102 -0
  44. package/typed/index.d.ts +1 -1
  45. package/typed/layers/carto-layer.d.ts +2 -2
  46. package/typed/layers/carto-layer.d.ts.map +1 -1
  47. package/typed/layers/h3-tile-layer.d.ts.map +1 -1
  48. package/typed/layers/h3-tileset-2d.d.ts +6 -0
  49. package/typed/layers/h3-tileset-2d.d.ts.map +1 -1
  50. package/typed/layers/quadbin-layer.d.ts +20 -0
  51. package/typed/layers/quadbin-layer.d.ts.map +1 -0
  52. package/typed/layers/quadbin-tile-layer.d.ts +21 -0
  53. package/typed/layers/quadbin-tile-layer.d.ts.map +1 -0
  54. package/typed/layers/quadbin-tileset-2d.d.ts +13 -0
  55. package/typed/layers/quadbin-tileset-2d.d.ts.map +1 -0
  56. package/typed/layers/quadbin-utils.d.ts +11 -0
  57. package/typed/layers/quadbin-utils.d.ts.map +1 -0
  58. package/dist/es5/layers/quadkey-tile-layer.js.map +0 -1
  59. package/dist/es5/layers/quadkey-tileset-2d.js.map +0 -1
  60. package/dist/esm/layers/quadkey-tile-layer.js.map +0 -1
  61. package/dist/esm/layers/quadkey-tileset-2d.js +0 -71
  62. package/dist/esm/layers/quadkey-tileset-2d.js.map +0 -1
  63. package/src/layers/quadkey-tileset-2d.ts +0 -59
  64. package/typed/api/index.js +0 -3
  65. package/typed/api/layer-map.js +0 -264
  66. package/typed/api/maps-api-common.js +0 -50
  67. package/typed/api/maps-client.js +0 -125
  68. package/typed/api/maps-v3-client.js +0 -304
  69. package/typed/api/parseMap.js +0 -178
  70. package/typed/basemap.js +0 -9
  71. package/typed/config.js +0 -35
  72. package/typed/index.js +0 -10
  73. package/typed/layers/carto-layer.js +0 -173
  74. package/typed/layers/carto-tile-layer.js +0 -105
  75. package/typed/layers/h3-tile-layer.js +0 -47
  76. package/typed/layers/h3-tileset-2d.js +0 -85
  77. package/typed/layers/quadkey-tile-layer.js +0 -42
  78. package/typed/layers/quadkey-tileset-2d.js +0 -36
  79. package/typed/layers/schema/carto-tile.js +0 -161
  80. package/typed/layers/spatial-index-tile-layer.js +0 -40
  81. package/typed/style/color-bins-style.js +0 -12
  82. package/typed/style/color-categories-style.js +0 -16
  83. package/typed/style/color-continuous-style.js +0 -12
  84. package/typed/style/palette.js +0 -62
  85. package/typed/style/utils.js +0 -15
  86. package/typed/utils.js +0 -4
@@ -1,71 +0,0 @@
1
- import { _Tileset2D as Tileset2D } from '@deck.gl/geo-layers';
2
-
3
- function tileToQuadkey(tile) {
4
- let index = '';
5
-
6
- for (let z = tile.z; z > 0; z--) {
7
- let b = 0;
8
- const mask = 1 << z - 1;
9
- if ((tile.x & mask) !== 0) b++;
10
- if ((tile.y & mask) !== 0) b += 2;
11
- index += b.toString();
12
- }
13
-
14
- return {
15
- i: index
16
- };
17
- }
18
-
19
- function quadkeyToTile(index) {
20
- const quadkey = index.i;
21
- const tile = {
22
- x: 0,
23
- y: 0,
24
- z: quadkey.length
25
- };
26
-
27
- for (let i = tile.z; i > 0; i--) {
28
- const mask = 1 << i - 1;
29
- const q = Number(quadkey[tile.z - i]);
30
- if (q === 1) tile.x |= mask;
31
- if (q === 2) tile.y |= mask;
32
-
33
- if (q === 3) {
34
- tile.x |= mask;
35
- tile.y |= mask;
36
- }
37
- }
38
-
39
- return tile;
40
- }
41
-
42
- export default class QuadkeyTileset2D extends Tileset2D {
43
- getTileIndices(opts) {
44
- return super.getTileIndices(opts).map(tileToQuadkey);
45
- }
46
-
47
- getTileId({
48
- i
49
- }) {
50
- return i;
51
- }
52
-
53
- getTileMetadata(index) {
54
- return super.getTileMetadata(quadkeyToTile(index));
55
- }
56
-
57
- getTileZoom({
58
- i
59
- }) {
60
- return i.length;
61
- }
62
-
63
- getParentIndex(index) {
64
- const i = index.i.slice(0, -1);
65
- return {
66
- i
67
- };
68
- }
69
-
70
- }
71
- //# sourceMappingURL=quadkey-tileset-2d.js.map
@@ -1 +0,0 @@
1
- {"version":3,"sources":["../../../src/layers/quadkey-tileset-2d.ts"],"names":["_Tileset2D","Tileset2D","tileToQuadkey","tile","index","z","b","mask","x","y","toString","i","quadkeyToTile","quadkey","length","q","Number","QuadkeyTileset2D","getTileIndices","opts","map","getTileId","getTileMetadata","getTileZoom","getParentIndex","slice"],"mappings":"AAAA,SAAQA,UAAU,IAAIC,SAAtB,QAAsC,qBAAtC;;AAGA,SAASC,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,UAAMC,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,QAAMS,OAAO,GAAGT,KAAK,CAACO,CAAtB;AACA,QAAMR,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,UAAMJ,IAAI,GAAG,KAAMI,CAAC,GAAG,CAAvB;AACA,UAAMI,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;;AAED,eAAe,MAAMc,gBAAN,SAA+BhB,SAA/B,CAAyC;AAEtDiB,EAAAA,cAAc,CAACC,IAAD,EAA2B;AACvC,WAAO,MAAMD,cAAN,CAAqBC,IAArB,EAA2BC,GAA3B,CAA+BlB,aAA/B,CAAP;AACD;;AAGDmB,EAAAA,SAAS,CAAC;AAACV,IAAAA;AAAD,GAAD,EAAwB;AAC/B,WAAOA,CAAP;AACD;;AAGDW,EAAAA,eAAe,CAAClB,KAAD,EAA0B;AACvC,WAAO,MAAMkB,eAAN,CAAsBV,aAAa,CAACR,KAAD,CAAnC,CAAP;AACD;;AAGDmB,EAAAA,WAAW,CAAC;AAACZ,IAAAA;AAAD,GAAD,EAAwB;AACjC,WAAOA,CAAC,CAACG,MAAT;AACD;;AAGDU,EAAAA,cAAc,CAACpB,KAAD,EAA0B;AACtC,UAAMO,CAAC,GAAGP,KAAK,CAACO,CAAN,CAAQc,KAAR,CAAc,CAAd,EAAiB,CAAC,CAAlB,CAAV;AACA,WAAO;AAACd,MAAAA;AAAD,KAAP;AACD;;AAzBqD","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"}
@@ -1,59 +0,0 @@
1
- import {_Tileset2D as Tileset2D} from '@deck.gl/geo-layers';
2
-
3
- type QuadkeyTileIndex = {i: string};
4
- function tileToQuadkey(tile): QuadkeyTileIndex {
5
- let index = '';
6
- for (let z = tile.z; z > 0; z--) {
7
- let b = 0;
8
- const mask = 1 << (z - 1);
9
- if ((tile.x & mask) !== 0) b++;
10
- if ((tile.y & mask) !== 0) b += 2;
11
- index += b.toString();
12
- }
13
- return {i: index};
14
- }
15
-
16
- function quadkeyToTile(index: QuadkeyTileIndex) {
17
- const quadkey = index.i;
18
- const tile = {x: 0, y: 0, z: quadkey.length};
19
-
20
- for (let i = tile.z; i > 0; i--) {
21
- const mask = 1 << (i - 1);
22
- const q = Number(quadkey[tile.z - i]);
23
- if (q === 1) tile.x |= mask;
24
- if (q === 2) tile.y |= mask;
25
- if (q === 3) {
26
- tile.x |= mask;
27
- tile.y |= mask;
28
- }
29
- }
30
- return tile;
31
- }
32
-
33
- export default class QuadkeyTileset2D extends Tileset2D {
34
- // @ts-expect-error for spatial indices, TileSet2d should be parametrized by TileIndexT
35
- getTileIndices(opts): QuadkeyTileIndex[] {
36
- return super.getTileIndices(opts).map(tileToQuadkey);
37
- }
38
-
39
- // @ts-expect-error TileIndex must be generic
40
- getTileId({i}: QuadkeyTileIndex) {
41
- return i;
42
- }
43
-
44
- // @ts-expect-error TileIndex must be generic
45
- getTileMetadata(index: QuadkeyTileIndex) {
46
- return super.getTileMetadata(quadkeyToTile(index));
47
- }
48
-
49
- // @ts-expect-error TileIndex must be generic
50
- getTileZoom({i}: QuadkeyTileIndex) {
51
- return i.length;
52
- }
53
-
54
- // @ts-expect-error TileIndex must be generic
55
- getParentIndex(index: QuadkeyTileIndex) {
56
- const i = index.i.slice(0, -1);
57
- return {i};
58
- }
59
- }
@@ -1,3 +0,0 @@
1
- export { FORMATS, TILE_FORMATS, MAP_TYPES, API_VERSIONS } from './maps-api-common';
2
- export { getDataV2, CONNECTIONS } from './maps-client';
3
- export { fetchLayerData, fetchMap, getData, mapInstantiation } from './maps-v3-client';
@@ -1,264 +0,0 @@
1
- import { deviation, extent, groupSort, median, variance } from 'd3-array';
2
- import { rgb } from 'd3-color';
3
- import { scaleLinear, scaleOrdinal, scaleLog, scalePoint, scaleQuantile, scaleQuantize, scaleSqrt, scaleThreshold } from 'd3-scale';
4
- import { format as d3Format } from 'd3-format';
5
- import moment from 'moment-timezone';
6
- import { CPUGridLayer, HeatmapLayer, HexagonLayer } from '@deck.gl/aggregation-layers';
7
- import { GeoJsonLayer } from '@deck.gl/layers';
8
- import { H3HexagonLayer, MVTLayer } from '@deck.gl/geo-layers';
9
- import CartoTileLayer from '../layers/carto-tile-layer';
10
- import { TILE_FORMATS } from './maps-api-common';
11
- import { assert } from '../utils';
12
- const SCALE_FUNCS = {
13
- linear: scaleLinear,
14
- ordinal: scaleOrdinal,
15
- log: scaleLog,
16
- point: scalePoint,
17
- quantile: scaleQuantile,
18
- quantize: scaleQuantize,
19
- sqrt: scaleSqrt,
20
- custom: scaleThreshold
21
- };
22
- const UNKNOWN_COLOR = '#868d91';
23
- export const AGGREGATION = {
24
- average: 'MEAN',
25
- maximum: 'MAX',
26
- minimum: 'MIN',
27
- sum: 'SUM'
28
- };
29
- export const OPACITY_MAP = {
30
- getFillColor: 'opacity',
31
- getLineColor: 'strokeOpacity',
32
- getTextColor: 'opacity'
33
- };
34
- const AGGREGATION_FUNC = {
35
- 'count unique': (values, accessor) => groupSort(values, v => v.length, accessor).length,
36
- median,
37
- // Unfortunately mode() is only available in d3-array@3+ which is ESM only
38
- mode: (values, accessor) => groupSort(values, v => v.length, accessor).pop(),
39
- stddev: deviation,
40
- variance
41
- };
42
- const hexToRGBA = c => {
43
- const { r, g, b, opacity } = rgb(c);
44
- return [r, g, b, 255 * opacity];
45
- };
46
- // Kepler -> Deck.gl
47
- const sharedPropMap = {
48
- color: 'getFillColor',
49
- isVisible: 'visible',
50
- label: 'cartoLabel',
51
- textLabel: {
52
- alignment: 'getTextAlignmentBaseline',
53
- anchor: 'getTextAnchor',
54
- color: 'getTextColor',
55
- size: 'getTextSize'
56
- },
57
- visConfig: {
58
- enable3d: 'extruded',
59
- elevationScale: 'elevationScale',
60
- filled: 'filled',
61
- strokeColor: 'getLineColor',
62
- stroked: 'stroked',
63
- thickness: 'getLineWidth',
64
- radius: 'getPointRadius',
65
- wireframe: 'wireframe'
66
- }
67
- };
68
- const aggregationVisConfig = {
69
- colorAggregation: x => ({ colorAggregation: AGGREGATION[x] || AGGREGATION.sum }),
70
- colorRange: x => ({ colorRange: x.colors.map(hexToRGBA) }),
71
- coverage: 'coverage',
72
- elevationPercentile: ['elevationLowerPercentile', 'elevationUpperPercentile'],
73
- percentile: ['lowerPercentile', 'upperPercentile']
74
- };
75
- const defaultProps = {
76
- lineMiterLimit: 2,
77
- lineWidthUnits: 'pixels',
78
- pointRadiusUnits: 'pixels',
79
- rounded: true,
80
- wrapLongitude: false
81
- };
82
- function mergePropMaps(a = {}, b = {}) {
83
- return { ...a, ...b, visConfig: { ...a.visConfig, ...b.visConfig } };
84
- }
85
- export function getLayer(type, config, dataset) {
86
- if (type === 'mvt' || type === 'tileset') {
87
- return getTileLayer(dataset);
88
- }
89
- const geoColumn = dataset?.geoColumn;
90
- const getPosition = d => d[geoColumn].coordinates;
91
- const hexagonId = config.columns?.hex_id;
92
- const layerTypeDefs = {
93
- point: {
94
- Layer: GeoJsonLayer,
95
- propMap: { visConfig: { outline: 'stroked' } }
96
- },
97
- geojson: {
98
- Layer: GeoJsonLayer
99
- },
100
- grid: {
101
- Layer: CPUGridLayer,
102
- propMap: { visConfig: { ...aggregationVisConfig, worldUnitSize: x => ({ cellSize: 1000 * x }) } },
103
- defaultProps: { getPosition }
104
- },
105
- heatmap: {
106
- Layer: HeatmapLayer,
107
- propMap: { visConfig: { ...aggregationVisConfig, radius: 'radiusPixels' } },
108
- defaultProps: { getPosition }
109
- },
110
- hexagon: {
111
- Layer: HexagonLayer,
112
- propMap: { visConfig: { ...aggregationVisConfig, worldUnitSize: x => ({ radius: 1000 * x }) } },
113
- defaultProps: { getPosition }
114
- },
115
- hexagonId: {
116
- Layer: H3HexagonLayer,
117
- propMap: { visConfig: { coverage: 'coverage' } },
118
- defaultProps: { getHexagon: d => d[hexagonId], stroked: false }
119
- }
120
- };
121
- const layer = layerTypeDefs[type];
122
- assert(layer, `Unsupported layer type: ${type}`);
123
- return {
124
- ...layer,
125
- propMap: mergePropMaps(sharedPropMap, layer.propMap),
126
- defaultProps: { ...defaultProps, ...layer.defaultProps }
127
- };
128
- }
129
- function getTileLayer(dataset) {
130
- const { data: { tiles: [tileUrl] } } = dataset;
131
- /* global URL */
132
- const formatTiles = new URL(tileUrl).searchParams.get('formatTiles') || TILE_FORMATS.MVT;
133
- return {
134
- Layer: formatTiles === TILE_FORMATS.MVT ? MVTLayer : CartoTileLayer,
135
- propMap: sharedPropMap,
136
- defaultProps: {
137
- ...defaultProps,
138
- uniqueIdProperty: 'geoid',
139
- formatTiles
140
- }
141
- };
142
- }
143
- function domainFromAttribute(attribute, scaleType) {
144
- if (scaleType === 'ordinal' || scaleType === 'point') {
145
- return attribute.categories.map(c => c.category).filter(c => c !== undefined && c !== null);
146
- }
147
- let { min } = attribute;
148
- if (scaleType === 'log' && min === 0) {
149
- min = 1e-5;
150
- }
151
- return [min, attribute.max];
152
- }
153
- function domainFromValues(values, scaleType) {
154
- if (scaleType === 'ordinal') {
155
- return groupSort(values, g => -g.length, d => d);
156
- }
157
- else if (scaleType === 'quantile') {
158
- return values.sort((a, b) => a - b);
159
- }
160
- else if (scaleType === 'log') {
161
- const [d0, d1] = extent(values);
162
- return [d0 === 0 ? 1e-5 : d0, d1];
163
- }
164
- return extent(values);
165
- }
166
- function calculateDomain(data, name, scaleType) {
167
- if (data.tilestats) {
168
- // Tileset data type
169
- const { attributes } = data.tilestats.layers[0];
170
- const attribute = attributes.find(a => a.attribute === name);
171
- return domainFromAttribute(attribute, scaleType);
172
- }
173
- else if (data.features) {
174
- // GeoJSON data type
175
- const values = data.features.map(({ properties }) => properties[name]);
176
- return domainFromValues(values, scaleType);
177
- }
178
- else if (Array.isArray(data) && data[0][name] !== undefined) {
179
- // JSON data type
180
- const values = data.map(properties => properties[name]);
181
- return domainFromValues(values, scaleType);
182
- }
183
- return [0, 1];
184
- }
185
- function normalizeAccessor(accessor, data) {
186
- if (data.features || data.tilestats) {
187
- return ({ properties }) => {
188
- return accessor(properties);
189
- };
190
- }
191
- return accessor;
192
- }
193
- export function opacityToAlpha(opacity) {
194
- return opacity !== undefined ? Math.round(255 * Math.pow(opacity, 1 / 2.2)) : 255;
195
- }
196
- export function getColorValueAccessor({ name }, colorAggregation, data) {
197
- const aggregator = AGGREGATION_FUNC[colorAggregation];
198
- const accessor = values => aggregator(values, p => p[name]);
199
- return normalizeAccessor(accessor, data);
200
- }
201
- export function getColorAccessor({ name }, scaleType, { colors, colorMap }, opacity, data) {
202
- const scale = SCALE_FUNCS[scaleType]();
203
- let domain = [];
204
- let scaleColor = [];
205
- if (Array.isArray(colorMap)) {
206
- colorMap.forEach(([value, color]) => {
207
- domain.push(value);
208
- scaleColor.push(color);
209
- });
210
- }
211
- else {
212
- domain = calculateDomain(data, name, scaleType);
213
- scaleColor = colors;
214
- }
215
- if (scaleType === 'ordinal') {
216
- domain = domain.slice(0, scaleColor.length);
217
- }
218
- scale.domain(domain);
219
- scale.range(scaleColor);
220
- scale.unknown(UNKNOWN_COLOR);
221
- const alpha = opacityToAlpha(opacity);
222
- const accessor = properties => {
223
- const propertyValue = properties[name];
224
- const { r, g, b } = rgb(scale(propertyValue));
225
- return [r, g, b, propertyValue === null ? 0 : alpha];
226
- };
227
- return normalizeAccessor(accessor, data);
228
- }
229
- export function getSizeAccessor({ name }, scaleType, range, data) {
230
- const scale = SCALE_FUNCS[scaleType]();
231
- scale.domain(calculateDomain(data, name, scaleType));
232
- scale.range(range);
233
- const accessor = properties => {
234
- return scale(properties[name]);
235
- };
236
- return normalizeAccessor(accessor, data);
237
- }
238
- const FORMATS = {
239
- date: s => moment.utc(s).format('MM/DD/YY HH:mm:ssa'),
240
- integer: d3Format('i'),
241
- float: d3Format('.5f'),
242
- timestamp: s => moment.utc(s).format('X'),
243
- default: String
244
- };
245
- export function getTextAccessor({ name, type }, data) {
246
- const format = FORMATS[type] || FORMATS.default;
247
- const accessor = properties => {
248
- return format(properties[name]);
249
- };
250
- return normalizeAccessor(accessor, data);
251
- }
252
- export function getTextPixelOffsetAccessor({ alignment, anchor, size }, radius) {
253
- const padding = 20;
254
- const signX = anchor === 'middle' ? 0 : anchor === 'start' ? 1 : -1;
255
- const signY = alignment === 'center' ? 0 : alignment === 'bottom' ? 1 : -1;
256
- const sizeOffset = alignment === 'center' ? 0 : size;
257
- const calculateOffset = r => [signX * (r + padding), signY * (r + padding + sizeOffset)];
258
- return typeof radius === 'function'
259
- ? d => {
260
- return calculateOffset(radius(d));
261
- }
262
- : calculateOffset(radius);
263
- }
264
- export { domainFromValues as _domainFromValues };
@@ -1,50 +0,0 @@
1
- export const DEFAULT_USER_COMPONENT_IN_URL = '{user}';
2
- export const DEFAULT_REGION_COMPONENT_IN_URL = '{region}';
3
- export const API_VERSIONS = {
4
- V1: 'v1',
5
- V2: 'v2',
6
- V3: 'v3'
7
- };
8
- export const DEFAULT_MAPS_URL_FORMAT = {
9
- [API_VERSIONS.V1]: `https://${DEFAULT_USER_COMPONENT_IN_URL}.carto.com/api/v1/map`,
10
- [API_VERSIONS.V2]: `https://maps-api-v2.${DEFAULT_REGION_COMPONENT_IN_URL}.carto.com/user/${DEFAULT_USER_COMPONENT_IN_URL}`
11
- };
12
- export const MAP_TYPES = {
13
- QUERY: 'query',
14
- TABLE: 'table',
15
- TILESET: 'tileset'
16
- };
17
- export const COLUMNS_SUPPORT = [MAP_TYPES.TABLE];
18
- export const GEO_COLUMN_SUPPORT = [MAP_TYPES.QUERY, MAP_TYPES.TABLE];
19
- // AVAILABLE FORMATS
20
- export const FORMATS = {
21
- GEOJSON: 'geojson',
22
- NDJSON: 'ndjson',
23
- TILEJSON: 'tilejson',
24
- JSON: 'json'
25
- };
26
- // AVAILABLE FORMATS FOR TILES
27
- export const TILE_FORMATS = {
28
- MVT: 'mvt',
29
- JSON: 'json',
30
- GEOJSON: 'geojson',
31
- BINARY: 'binary'
32
- };
33
- export var SchemaFieldType;
34
- (function (SchemaFieldType) {
35
- SchemaFieldType["Number"] = "number";
36
- SchemaFieldType["Bigint"] = "bigint";
37
- SchemaFieldType["String"] = "string";
38
- SchemaFieldType["Geometry"] = "geometry";
39
- SchemaFieldType["Timestamp"] = "timestamp";
40
- SchemaFieldType["Object"] = "object";
41
- SchemaFieldType["Boolean"] = "boolean";
42
- SchemaFieldType["Variant"] = "variant";
43
- SchemaFieldType["Unknown"] = "unknown";
44
- })(SchemaFieldType || (SchemaFieldType = {}));
45
- /**
46
- * Simple encode parameter
47
- */
48
- export function encodeParameter(name, value) {
49
- return `${name}=${encodeURIComponent(value)}`;
50
- }
@@ -1,125 +0,0 @@
1
- /**
2
- * Maps API Client for Maps API v1 and Maps API v2
3
- */
4
- import { defaultClassicCredentials, defaultCloudNativeCredentials, getDefaultCredentials } from '../config';
5
- import { API_VERSIONS, DEFAULT_MAPS_URL_FORMAT, DEFAULT_REGION_COMPONENT_IN_URL, DEFAULT_USER_COMPONENT_IN_URL, encodeParameter, MAP_TYPES } from './maps-api-common';
6
- export const CONNECTIONS = {
7
- BIGQUERY: 'bigquery',
8
- CARTO: 'carto'
9
- };
10
- const BUFFER_SIZE = 16;
11
- const TILE_EXTENT = 4096;
12
- /**
13
- * Obtain a TileJson from Maps API v1 and v2
14
- */
15
- export async function getDataV2({ type, source, credentials }) {
16
- const defaultCredentials = getDefaultCredentials();
17
- const apiVersion = credentials?.apiVersion || defaultCredentials.apiVersion;
18
- // Only pick up default credentials if they have been defined for
19
- // correct API version
20
- const localCreds = {
21
- ...(apiVersion === API_VERSIONS.V3 ? defaultCloudNativeCredentials : defaultClassicCredentials),
22
- mapsUrl: DEFAULT_MAPS_URL_FORMAT[apiVersion],
23
- ...(defaultCredentials.apiVersion === apiVersion && defaultCredentials),
24
- ...credentials
25
- };
26
- let url;
27
- const connection = type === MAP_TYPES.TILESET ? CONNECTIONS.BIGQUERY : CONNECTIONS.CARTO;
28
- switch (apiVersion) {
29
- case API_VERSIONS.V1:
30
- // Maps API v1
31
- const mapConfig = createMapConfig(source);
32
- url = buildURLMapsAPIv1({ mapConfig, credentials: localCreds });
33
- const layergroup = await request({ url, credentials: localCreds });
34
- return layergroup.metadata.tilejson.vector;
35
- case API_VERSIONS.V2:
36
- // Maps API v2
37
- url = buildURLMapsAPIv2({ connection, type, source, credentials: localCreds });
38
- return await request({ url, credentials: localCreds });
39
- default:
40
- throw new Error(`Invalid maps API version. It should be ${API_VERSIONS.V1} or ${API_VERSIONS.V2}`);
41
- }
42
- }
43
- /**
44
- * Request against Maps API
45
- */
46
- async function request({ url, credentials }) {
47
- let response;
48
- try {
49
- /* global fetch */
50
- response = await fetch(url, {
51
- headers: {
52
- Accept: 'application/json'
53
- }
54
- });
55
- }
56
- catch (error) {
57
- throw new Error(`Failed to connect to Maps API: ${error}`);
58
- }
59
- const json = await response.json();
60
- if (!response.ok) {
61
- dealWithError({ response, json, credentials });
62
- }
63
- return json;
64
- }
65
- /**
66
- * Display proper message from Maps API error
67
- */
68
- function dealWithError({ response, json, credentials }) {
69
- switch (response.status) {
70
- case 401:
71
- throw new Error(`Unauthorized access to Maps API: invalid combination of user ('${credentials.username}') and apiKey ('${credentials.apiKey}')`);
72
- case 403:
73
- throw new Error(`Unauthorized access to dataset: the provided apiKey('${credentials.apiKey}') doesn't provide access to the requested data`);
74
- default:
75
- const e = credentials.apiVersion === API_VERSIONS.V1 ? JSON.stringify(json.errors) : json.error;
76
- throw new Error(e);
77
- }
78
- }
79
- function initURLParameters(credentials) {
80
- const encodedApiKey = encodeParameter('api_key', credentials.apiKey);
81
- const encodedClient = encodeParameter('client', 'deck-gl-carto');
82
- return [encodedApiKey, encodedClient];
83
- }
84
- /**
85
- * Build a URL with all required parameters
86
- */
87
- function buildURLMapsAPIv1({ mapConfig, credentials }) {
88
- const parameters = initURLParameters(credentials);
89
- const cfg = JSON.stringify(mapConfig);
90
- return `${mapsUrl(credentials)}?${parameters.join('&')}&${encodeParameter('config', cfg)}`;
91
- }
92
- function buildURLMapsAPIv2({ connection, type, source, credentials }) {
93
- const parameters = initURLParameters(credentials);
94
- // Query type is mapped to 'sql' at maps api v1
95
- const mapsApiType = type === MAP_TYPES.QUERY ? 'sql' : type;
96
- let url = `${mapsUrl(credentials)}/${connection}/${mapsApiType}?`;
97
- url += `${encodeParameter('source', source)}&format=tilejson&${parameters.join('&')}`;
98
- return url;
99
- }
100
- /**
101
- * Prepare a url valid for the specified user
102
- */
103
- function mapsUrl(credentials) {
104
- return credentials.mapsUrl
105
- .replace(DEFAULT_USER_COMPONENT_IN_URL, credentials.username)
106
- .replace(DEFAULT_REGION_COMPONENT_IN_URL, credentials.region);
107
- }
108
- function createMapConfig(sql) {
109
- return {
110
- version: '1.3.1',
111
- buffersize: {
112
- mvt: BUFFER_SIZE
113
- },
114
- layers: [
115
- {
116
- type: 'mapnik',
117
- options: {
118
- sql,
119
- // eslint-disable-next-line camelcase
120
- vector_extent: TILE_EXTENT
121
- }
122
- }
123
- ]
124
- };
125
- }