@deck.gl/carto 8.10.0-alpha.4 → 8.10.0-alpha.6
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/cartoRasterTile-worker.js +1 -1
- package/dist/cartoSpatialTile-worker.js +1 -1
- package/dist/cartoVectorTile-worker.js +1 -1
- package/dist/dist.dev.js +64 -715
- package/dist/es5/api/carto-api-error.js +3 -7
- package/dist/es5/api/carto-api-error.js.map +1 -1
- package/dist/es5/layers/carto-layer.js +196 -200
- package/dist/es5/layers/carto-layer.js.map +1 -1
- package/dist/es5/layers/h3-tile-layer.js +50 -54
- package/dist/es5/layers/h3-tile-layer.js.map +1 -1
- package/dist/es5/layers/h3-tileset-2d.js +62 -68
- package/dist/es5/layers/h3-tileset-2d.js.map +1 -1
- package/dist/es5/layers/point-label-layer.js +160 -165
- package/dist/es5/layers/point-label-layer.js.map +1 -1
- package/dist/es5/layers/quadbin-layer.js +23 -27
- package/dist/es5/layers/quadbin-layer.js.map +1 -1
- package/dist/es5/layers/quadbin-tile-layer.js +31 -34
- package/dist/es5/layers/quadbin-tile-layer.js.map +1 -1
- package/dist/es5/layers/quadbin-tileset-2d.js +32 -38
- package/dist/es5/layers/quadbin-tileset-2d.js.map +1 -1
- package/dist/es5/layers/raster-layer.js +94 -98
- package/dist/es5/layers/raster-layer.js.map +1 -1
- package/dist/es5/layers/raster-tile-layer.js +28 -33
- package/dist/es5/layers/raster-tile-layer.js.map +1 -1
- package/dist/es5/layers/schema/carto-raster-tile-loader.js +1 -1
- package/dist/es5/layers/schema/carto-raster-tile.js +31 -39
- package/dist/es5/layers/schema/carto-raster-tile.js.map +1 -1
- package/dist/es5/layers/schema/carto-spatial-tile-loader.js +1 -1
- package/dist/es5/layers/schema/carto-spatial-tile.js +36 -47
- package/dist/es5/layers/schema/carto-spatial-tile.js.map +1 -1
- package/dist/es5/layers/schema/carto-tile.js +161 -196
- package/dist/es5/layers/schema/carto-tile.js.map +1 -1
- package/dist/es5/layers/schema/carto-vector-tile-loader.js +1 -1
- package/dist/es5/layers/spatial-index-tile-layer.js +67 -73
- package/dist/es5/layers/spatial-index-tile-layer.js.map +1 -1
- package/dist/es5/layers/vector-tile-layer.js +83 -90
- package/dist/es5/layers/vector-tile-layer.js.map +1 -1
- package/dist/esm/api/carto-api-error.js +8 -13
- package/dist/esm/api/carto-api-error.js.map +1 -1
- package/dist/esm/api/layer-map.js +4 -4
- package/dist/esm/api/layer-map.js.map +1 -1
- package/dist/esm/api/maps-api-common.js +3 -3
- package/dist/esm/api/maps-api-common.js.map +1 -1
- package/dist/esm/api/maps-client.js +7 -7
- package/dist/esm/api/maps-client.js.map +1 -1
- package/dist/esm/api/maps-v3-client.js +12 -12
- package/dist/esm/api/maps-v3-client.js.map +1 -1
- package/dist/esm/api/parseMap.js +4 -4
- package/dist/esm/api/parseMap.js.map +1 -1
- package/dist/esm/config.js +3 -3
- package/dist/esm/config.js.map +1 -1
- package/dist/esm/layers/carto-layer.js +12 -15
- package/dist/esm/layers/carto-layer.js.map +1 -1
- package/dist/esm/layers/h3-tile-layer.js +3 -6
- package/dist/esm/layers/h3-tile-layer.js.map +1 -1
- package/dist/esm/layers/point-label-layer.js +6 -10
- package/dist/esm/layers/point-label-layer.js.map +1 -1
- package/dist/esm/layers/quadbin-layer.js +2 -5
- package/dist/esm/layers/quadbin-layer.js.map +1 -1
- package/dist/esm/layers/quadbin-tile-layer.js +3 -6
- package/dist/esm/layers/quadbin-tile-layer.js.map +1 -1
- package/dist/esm/layers/raster-layer-vertex.glsl.js +98 -1
- package/dist/esm/layers/raster-layer-vertex.glsl.js.map +1 -1
- package/dist/esm/layers/raster-layer.js +4 -8
- package/dist/esm/layers/raster-layer.js.map +1 -1
- package/dist/esm/layers/raster-tile-layer.js +3 -6
- package/dist/esm/layers/raster-tile-layer.js.map +1 -1
- package/dist/esm/layers/schema/carto-raster-tile-loader.js +1 -1
- package/dist/esm/layers/schema/carto-raster-tile.js +1 -1
- package/dist/esm/layers/schema/carto-raster-tile.js.map +1 -1
- package/dist/esm/layers/schema/carto-spatial-tile-loader.js +1 -1
- package/dist/esm/layers/schema/carto-vector-tile-loader.js +1 -1
- package/dist/esm/layers/spatial-index-tile-layer.js +2 -5
- package/dist/esm/layers/spatial-index-tile-layer.js.map +1 -1
- package/dist/esm/layers/utils.js +1 -1
- package/dist/esm/layers/utils.js.map +1 -1
- package/dist/esm/layers/vector-tile-layer.js +2 -5
- package/dist/esm/layers/vector-tile-layer.js.map +1 -1
- package/dist/esm/sources/base-source.js +1 -1
- package/dist/esm/sources/base-source.js.map +1 -1
- package/dist/esm/sources/utils.js +2 -2
- package/dist/esm/sources/utils.js.map +1 -1
- package/dist/esm/style/palette.js +2 -2
- package/dist/esm/style/palette.js.map +1 -1
- package/dist/esm/style/utils.js +1 -1
- package/dist/esm/style/utils.js.map +1 -1
- package/dist/esm/utils.js +1 -1
- package/dist/esm/utils.js.map +1 -1
- package/dist.min.js +46 -25
- package/package.json +2 -2
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../../../src/layers/quadbin-tile-layer.ts"],"names":["renderSubLayers","props","data","length","isBigInt","id","QuadbinLayer","getQuadbin","d","defaultProps","aggregationResLevel","TilejsonPropType","QuadbinTileLayer","loadOptions","tileJSON","accessToken","cartoSpatialTile","scheme","tiles","maxZoom","maxresolution","SpatialIndexTileLayer","TilesetClass","QuadbinTileset2D","
|
|
1
|
+
{"version":3,"sources":["../../../src/layers/quadbin-tile-layer.ts"],"names":["renderSubLayers","props","data","length","isBigInt","id","QuadbinLayer","getQuadbin","d","defaultProps","aggregationResLevel","TilejsonPropType","QuadbinTileLayer","getLoadOptions","loadOptions","tileJSON","accessToken","cartoSpatialTile","scheme","renderLayers","tiles","maxZoom","maxresolution","SpatialIndexTileLayer","TilesetClass","QuadbinTileset2D","CompositeLayer","layerName"],"mappings":";;;;;;;;;;;;;;;;;;;;;AAAA;;AACA;;AACA;;AACA;;AACA;;AACA;;AACA;;;;;;;;;;AAEO,IAAMA,eAAe,GAAG,SAAlBA,eAAkB,CAAAC,KAAK,EAAI;AACtC,MAAOC,IAAP,GAAeD,KAAf,CAAOC,IAAP;AACA,MAAI,CAACA,IAAD,IAAS,CAACA,IAAI,CAACC,MAAnB,EAA2B,OAAO,IAAP;AAC3B,MAAMC,QAAQ,GAAG,OAAOF,IAAI,CAAC,CAAD,CAAJ,CAAQG,EAAf,KAAsB,QAAvC;AACA,SAAO,IAAIC,qBAAJ,CAAiBL,KAAjB,EAAwB;AAC7BM,IAAAA,UAAU,EAAEH,QAAQ,GAAG,UAAAI,CAAC;AAAA,aAAIA,CAAC,CAACH,EAAN;AAAA,KAAJ,GAAe,UAAAG,CAAC;AAAA,aAAI,0BAAYA,CAAC,CAACH,EAAd,CAAJ;AAAA;AADP,GAAxB,CAAP;AAGD,CAPM;;;AASP,IAAMI,YAAiD,GAAG;AACxDC,EAAAA,mBAAmB,EAAE,CADmC;AAExDR,EAAAA,IAAI,EAAES;AAFkD,CAA1D;;IAeqBC,gB;;;;;;;;;;;;SAOnBC,c,GAAA,0BAAsB;AACpB,QAAMC,WAAW,GAAG,oHAA0B,EAA9C;AACA,QAAMC,QAAQ,GAAG,KAAKd,KAAL,CAAWC,IAA5B;AACA,kCAAkBY,WAAlB,EAA+BC,QAAQ,CAACC,WAAxC;AACAF,IAAAA,WAAW,CAACG,gBAAZ,mCAAmCH,WAAW,CAACG,gBAA/C;AAAiEC,MAAAA,MAAM,EAAE;AAAzE;AACA,WAAOJ,WAAP;AACD,G;;SAEDK,Y,GAAA,wBAA0C;AACxC,QAAMJ,QAAQ,GAAG,KAAKd,KAAL,CAAWC,IAA5B;AACA,QAAI,CAACa,QAAL,EAAe,OAAO,IAAP;AAEf,QAAcb,IAAd,GAA8Ca,QAA9C,CAAOK,KAAP;AAAA,QAAmCC,OAAnC,GAA8CN,QAA9C,CAAoBO,aAApB;AACA,WAAO,CAEL,IAAIC,8BAAJ,CAA0B,KAAKtB,KAA/B,EAAsC;AACpCI,MAAAA,EAAE,+BAAwB,KAAKJ,KAAL,CAAWI,EAAnC,CADkC;AAEpCH,MAAAA,IAAI,EAAJA,IAFoC;AAIpCsB,MAAAA,YAAY,EAAEC,yBAJsB;AAKpCzB,MAAAA,eAAe,EAAfA,eALoC;AAMpCqB,MAAAA,OAAO,EAAPA,OANoC;AAOpCP,MAAAA,WAAW,EAAE,KAAKD,cAAL;AAPuB,KAAtC,CAFK,CAAP;AAYD,G;;;EA7BOa,oB;;;AAHWd,gB,CAIZe,S,GAAY,kB;AAJAf,gB,CAKZH,Y,GAAeA,Y","sourcesContent":["import {CompositeLayer, CompositeLayerProps, Layer, LayersList, DefaultProps} from '@deck.gl/core';\nimport QuadbinLayer, {QuadbinLayerProps} from './quadbin-layer';\nimport QuadbinTileset2D from './quadbin-tileset-2d';\nimport SpatialIndexTileLayer from './spatial-index-tile-layer';\nimport {hexToBigInt} from 'quadbin';\nimport {TilejsonPropType, CartoTilejsonResult} from '../sources/common';\nimport {injectAccessToken} from './utils';\n\nexport const renderSubLayers = props => {\n const {data} = props;\n if (!data || !data.length) return null;\n const isBigInt = typeof data[0].id === 'bigint';\n return new QuadbinLayer(props, {\n getQuadbin: isBigInt ? d => d.id : d => hexToBigInt(d.id)\n });\n};\n\nconst defaultProps: DefaultProps<QuadbinTileLayerProps> = {\n aggregationResLevel: 6,\n data: TilejsonPropType\n};\n\n/** All properties supported by QuadbinTileLayer. */\nexport type QuadbinTileLayerProps<DataT = any> = _QuadbinTileLayerProps<DataT> &\n CompositeLayerProps;\n\n/** Properties added by QuadbinTileLayer. */\ntype _QuadbinTileLayerProps<DataT> = Omit<QuadbinLayerProps<DataT>, 'data'> & {\n data: null | CartoTilejsonResult | Promise<CartoTilejsonResult>;\n aggregationResLevel?: number;\n};\n\nexport default class QuadbinTileLayer<\n DataT = any,\n ExtraProps extends {} = {}\n> extends CompositeLayer<ExtraProps & Required<_QuadbinTileLayerProps<DataT>>> {\n static layerName = 'QuadbinTileLayer';\n static defaultProps = defaultProps;\n\n getLoadOptions(): any {\n const loadOptions = super.getLoadOptions() || {};\n const tileJSON = this.props.data as CartoTilejsonResult;\n injectAccessToken(loadOptions, tileJSON.accessToken);\n loadOptions.cartoSpatialTile = {...loadOptions.cartoSpatialTile, scheme: 'quadbin'};\n return loadOptions;\n }\n\n renderLayers(): Layer | null | LayersList {\n const tileJSON = this.props.data as CartoTilejsonResult;\n if (!tileJSON) return null;\n\n const {tiles: data, maxresolution: maxZoom} = tileJSON;\n return [\n // @ts-ignore\n new SpatialIndexTileLayer(this.props, {\n id: `quadbin-tile-layer-${this.props.id}`,\n data,\n // TODO: Tileset2D should be generic over TileIndex type\n TilesetClass: QuadbinTileset2D as any,\n renderSubLayers,\n maxZoom,\n loadOptions: this.getLoadOptions()\n })\n ];\n }\n}\n"],"file":"quadbin-tile-layer.js"}
|
|
@@ -9,8 +9,6 @@ exports.default = void 0;
|
|
|
9
9
|
|
|
10
10
|
var _classCallCheck2 = _interopRequireDefault(require("@babel/runtime/helpers/classCallCheck"));
|
|
11
11
|
|
|
12
|
-
var _createClass2 = _interopRequireDefault(require("@babel/runtime/helpers/createClass"));
|
|
13
|
-
|
|
14
12
|
var _get2 = _interopRequireDefault(require("@babel/runtime/helpers/get"));
|
|
15
13
|
|
|
16
14
|
var _inherits2 = _interopRequireDefault(require("@babel/runtime/helpers/inherits"));
|
|
@@ -37,44 +35,40 @@ var QuadbinTileset2D = function (_Tileset2D) {
|
|
|
37
35
|
return _super.apply(this, arguments);
|
|
38
36
|
}
|
|
39
37
|
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
return {
|
|
45
|
-
q: q,
|
|
46
|
-
i: (0, _quadbin.bigIntToHex)(q)
|
|
47
|
-
};
|
|
48
|
-
});
|
|
49
|
-
}
|
|
50
|
-
}, {
|
|
51
|
-
key: "getTileId",
|
|
52
|
-
value: function getTileId(_ref) {
|
|
53
|
-
var q = _ref.q,
|
|
54
|
-
i = _ref.i;
|
|
55
|
-
return i || (0, _quadbin.bigIntToHex)(q);
|
|
56
|
-
}
|
|
57
|
-
}, {
|
|
58
|
-
key: "getTileMetadata",
|
|
59
|
-
value: function getTileMetadata(_ref2) {
|
|
60
|
-
var q = _ref2.q;
|
|
61
|
-
return (0, _get2.default)((0, _getPrototypeOf2.default)(QuadbinTileset2D.prototype), "getTileMetadata", this).call(this, (0, _quadbin.cellToTile)(q));
|
|
62
|
-
}
|
|
63
|
-
}, {
|
|
64
|
-
key: "getTileZoom",
|
|
65
|
-
value: function getTileZoom(_ref3) {
|
|
66
|
-
var q = _ref3.q;
|
|
67
|
-
return Number((0, _quadbin.getResolution)(q));
|
|
68
|
-
}
|
|
69
|
-
}, {
|
|
70
|
-
key: "getParentIndex",
|
|
71
|
-
value: function getParentIndex(_ref4) {
|
|
72
|
-
var q = _ref4.q;
|
|
38
|
+
var _proto = QuadbinTileset2D.prototype;
|
|
39
|
+
|
|
40
|
+
_proto.getTileIndices = function getTileIndices(opts) {
|
|
41
|
+
return (0, _get2.default)((0, _getPrototypeOf2.default)(QuadbinTileset2D.prototype), "getTileIndices", this).call(this, opts).map(_quadbin.tileToCell).map(function (q) {
|
|
73
42
|
return {
|
|
74
|
-
q:
|
|
43
|
+
q: q,
|
|
44
|
+
i: (0, _quadbin.bigIntToHex)(q)
|
|
75
45
|
};
|
|
76
|
-
}
|
|
77
|
-
}
|
|
46
|
+
});
|
|
47
|
+
};
|
|
48
|
+
|
|
49
|
+
_proto.getTileId = function getTileId(_ref) {
|
|
50
|
+
var q = _ref.q,
|
|
51
|
+
i = _ref.i;
|
|
52
|
+
return i || (0, _quadbin.bigIntToHex)(q);
|
|
53
|
+
};
|
|
54
|
+
|
|
55
|
+
_proto.getTileMetadata = function getTileMetadata(_ref2) {
|
|
56
|
+
var q = _ref2.q;
|
|
57
|
+
return (0, _get2.default)((0, _getPrototypeOf2.default)(QuadbinTileset2D.prototype), "getTileMetadata", this).call(this, (0, _quadbin.cellToTile)(q));
|
|
58
|
+
};
|
|
59
|
+
|
|
60
|
+
_proto.getTileZoom = function getTileZoom(_ref3) {
|
|
61
|
+
var q = _ref3.q;
|
|
62
|
+
return Number((0, _quadbin.getResolution)(q));
|
|
63
|
+
};
|
|
64
|
+
|
|
65
|
+
_proto.getParentIndex = function getParentIndex(_ref4) {
|
|
66
|
+
var q = _ref4.q;
|
|
67
|
+
return {
|
|
68
|
+
q: (0, _quadbin.cellToParent)(q)
|
|
69
|
+
};
|
|
70
|
+
};
|
|
71
|
+
|
|
78
72
|
return QuadbinTileset2D;
|
|
79
73
|
}(_geoLayers._Tileset2D);
|
|
80
74
|
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../../../src/layers/quadbin-tileset-2d.ts"],"names":["QuadbinTileset2D","opts","map","tileToCell","q","i","Number","Tileset2D"],"mappings":"
|
|
1
|
+
{"version":3,"sources":["../../../src/layers/quadbin-tileset-2d.ts"],"names":["QuadbinTileset2D","getTileIndices","opts","map","tileToCell","q","i","getTileId","getTileMetadata","getTileZoom","Number","getParentIndex","Tileset2D"],"mappings":";;;;;;;;;;;;;;;;;;;AAAA;;AACA;;;;;;IAMqBA,gB;;;;;;;;;;;;SAEnBC,c,GAAA,wBAAeC,IAAf,EAAyC;AACvC,WAAO,iHACWA,IADX,EAEJC,GAFI,CAEAC,mBAFA,EAGJD,GAHI,CAGA,UAAAE,CAAC;AAAA,aAAK;AAACA,QAAAA,CAAC,EAADA,CAAD;AAAIC,QAAAA,CAAC,EAAE,0BAAYD,CAAZ;AAAP,OAAL;AAAA,KAHD,CAAP;AAID,G;;SAGDE,S,GAAA,yBAA4C;AAAA,QAAjCF,CAAiC,QAAjCA,CAAiC;AAAA,QAA9BC,CAA8B,QAA9BA,CAA8B;AAC1C,WAAOA,CAAC,IAAI,0BAAYD,CAAZ,CAAZ;AACD,G;;SAGDG,e,GAAA,gCAAuC;AAAA,QAAtBH,CAAsB,SAAtBA,CAAsB;AACrC,6HAA6B,yBAAWA,CAAX,CAA7B;AACD,G;;SAGDI,W,GAAA,4BAA2C;AAAA,QAA9BJ,CAA8B,SAA9BA,CAA8B;AACzC,WAAOK,MAAM,CAAC,4BAAcL,CAAd,CAAD,CAAb;AACD,G;;SAGDM,c,GAAA,+BAAwD;AAAA,QAAxCN,CAAwC,SAAxCA,CAAwC;AACtD,WAAO;AAACA,MAAAA,CAAC,EAAE,2BAAaA,CAAb;AAAJ,KAAP;AACD,G;;;EA3B2CO,qB","sourcesContent":["import {_Tileset2D as Tileset2D} from '@deck.gl/geo-layers';\nimport {bigIntToHex, cellToParent, cellToTile, getResolution, tileToCell} from 'quadbin';\n\n// For calculations bigint representation is used, but\n// for constructing URL also provide the hexidecimal value\ntype QuadbinTileIndex = {q: bigint; i?: string};\n\nexport default class QuadbinTileset2D extends Tileset2D {\n // @ts-expect-error for spatial indices, TileSet2d should be parametrized by TileIndexT\n getTileIndices(opts): QuadbinTileIndex[] {\n return super\n .getTileIndices(opts)\n .map(tileToCell)\n .map(q => ({q, i: bigIntToHex(q)}));\n }\n\n // @ts-expect-error TileIndex must be generic\n getTileId({q, i}: QuadbinTileIndex): string {\n return i || bigIntToHex(q);\n }\n\n // @ts-expect-error TileIndex must be generic\n getTileMetadata({q}: QuadbinTileIndex) {\n return super.getTileMetadata(cellToTile(q));\n }\n\n // @ts-expect-error TileIndex must be generic\n getTileZoom({q}: QuadbinTileIndex): number {\n return Number(getResolution(q));\n }\n\n // @ts-expect-error TileIndex must be generic\n getParentIndex({q}: QuadbinTileIndex): QuadbinTileIndex {\n return {q: cellToParent(q)};\n }\n}\n"],"file":"quadbin-tileset-2d.js"}
|
|
@@ -11,8 +11,6 @@ var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/sli
|
|
|
11
11
|
|
|
12
12
|
var _classCallCheck2 = _interopRequireDefault(require("@babel/runtime/helpers/classCallCheck"));
|
|
13
13
|
|
|
14
|
-
var _createClass2 = _interopRequireDefault(require("@babel/runtime/helpers/createClass"));
|
|
15
|
-
|
|
16
14
|
var _get2 = _interopRequireDefault(require("@babel/runtime/helpers/get"));
|
|
17
15
|
|
|
18
16
|
var _inherits2 = _interopRequireDefault(require("@babel/runtime/helpers/inherits"));
|
|
@@ -57,47 +55,46 @@ var RasterColumnLayer = function (_ColumnLayer) {
|
|
|
57
55
|
return _super.apply(this, arguments);
|
|
58
56
|
}
|
|
59
57
|
|
|
60
|
-
|
|
61
|
-
|
|
62
|
-
|
|
63
|
-
|
|
64
|
-
|
|
65
|
-
|
|
66
|
-
|
|
67
|
-
|
|
68
|
-
|
|
69
|
-
|
|
70
|
-
|
|
71
|
-
|
|
72
|
-
|
|
73
|
-
|
|
74
|
-
|
|
75
|
-
|
|
76
|
-
|
|
77
|
-
|
|
78
|
-
|
|
79
|
-
|
|
80
|
-
|
|
81
|
-
|
|
82
|
-
|
|
83
|
-
|
|
84
|
-
|
|
85
|
-
|
|
86
|
-
|
|
87
|
-
|
|
88
|
-
|
|
89
|
-
|
|
90
|
-
|
|
91
|
-
|
|
92
|
-
|
|
93
|
-
|
|
94
|
-
|
|
95
|
-
|
|
96
|
-
}]);
|
|
58
|
+
var _proto = RasterColumnLayer.prototype;
|
|
59
|
+
|
|
60
|
+
_proto.getShaders = function getShaders() {
|
|
61
|
+
var shaders = (0, _get2.default)((0, _getPrototypeOf2.default)(RasterColumnLayer.prototype), "getShaders", this).call(this);
|
|
62
|
+
return _objectSpread(_objectSpread({}, shaders), {}, {
|
|
63
|
+
vs: _rasterLayerVertex.default
|
|
64
|
+
});
|
|
65
|
+
};
|
|
66
|
+
|
|
67
|
+
_proto.initializeState = function initializeState() {
|
|
68
|
+
var attributeManager = this.getAttributeManager();
|
|
69
|
+
attributeManager.addInstanced({
|
|
70
|
+
instanceElevations: {
|
|
71
|
+
size: 1,
|
|
72
|
+
transition: true,
|
|
73
|
+
accessor: 'getElevation'
|
|
74
|
+
},
|
|
75
|
+
instanceFillColors: {
|
|
76
|
+
size: this.props.colorFormat.length,
|
|
77
|
+
type: 5121,
|
|
78
|
+
normalized: true,
|
|
79
|
+
transition: true,
|
|
80
|
+
accessor: 'getFillColor',
|
|
81
|
+
defaultValue: [0, 0, 0, 255]
|
|
82
|
+
},
|
|
83
|
+
instanceLineColors: {
|
|
84
|
+
size: this.props.colorFormat.length,
|
|
85
|
+
type: 5121,
|
|
86
|
+
normalized: true,
|
|
87
|
+
transition: true,
|
|
88
|
+
accessor: 'getLineColor',
|
|
89
|
+
defaultValue: [255, 255, 255, 255]
|
|
90
|
+
}
|
|
91
|
+
});
|
|
92
|
+
};
|
|
93
|
+
|
|
97
94
|
return RasterColumnLayer;
|
|
98
95
|
}(_layers.ColumnLayer);
|
|
99
96
|
|
|
100
|
-
|
|
97
|
+
RasterColumnLayer.layerName = 'RasterColumnLayer';
|
|
101
98
|
|
|
102
99
|
var RasterLayer = function (_CompositeLayer) {
|
|
103
100
|
(0, _inherits2.default)(RasterLayer, _CompositeLayer);
|
|
@@ -109,68 +106,67 @@ var RasterLayer = function (_CompositeLayer) {
|
|
|
109
106
|
return _super2.apply(this, arguments);
|
|
110
107
|
}
|
|
111
108
|
|
|
112
|
-
|
|
113
|
-
|
|
114
|
-
|
|
115
|
-
|
|
116
|
-
|
|
117
|
-
|
|
118
|
-
|
|
119
|
-
|
|
120
|
-
|
|
121
|
-
|
|
122
|
-
|
|
123
|
-
|
|
124
|
-
|
|
125
|
-
|
|
126
|
-
|
|
127
|
-
|
|
128
|
-
|
|
129
|
-
|
|
130
|
-
|
|
131
|
-
|
|
132
|
-
|
|
133
|
-
|
|
134
|
-
|
|
135
|
-
|
|
136
|
-
|
|
137
|
-
|
|
138
|
-
|
|
139
|
-
|
|
140
|
-
|
|
141
|
-
|
|
142
|
-
|
|
143
|
-
|
|
144
|
-
|
|
145
|
-
|
|
146
|
-
|
|
147
|
-
|
|
148
|
-
|
|
149
|
-
|
|
150
|
-
|
|
109
|
+
var _proto2 = RasterLayer.prototype;
|
|
110
|
+
|
|
111
|
+
_proto2.renderLayers = function renderLayers() {
|
|
112
|
+
var _this$props = this.props,
|
|
113
|
+
data = _this$props.data,
|
|
114
|
+
getElevation = _this$props.getElevation,
|
|
115
|
+
getFillColor = _this$props.getFillColor,
|
|
116
|
+
getLineColor = _this$props.getLineColor,
|
|
117
|
+
getLineWidth = _this$props.getLineWidth,
|
|
118
|
+
tileIndex = _this$props.tileIndex,
|
|
119
|
+
updateTriggers = _this$props.updateTriggers;
|
|
120
|
+
if (!data || !tileIndex) return null;
|
|
121
|
+
var _ref = data,
|
|
122
|
+
blockWidth = _ref.blockWidth,
|
|
123
|
+
blockHeight = _ref.blockHeight;
|
|
124
|
+
(0, _utils.assert)(blockWidth === blockHeight, "blockWidth (".concat(blockWidth, ") must equal blockHeight (").concat(blockHeight, ")"));
|
|
125
|
+
|
|
126
|
+
var _quadbinToOffset = (0, _quadbinUtils.quadbinToOffset)(tileIndex),
|
|
127
|
+
_quadbinToOffset2 = (0, _slicedToArray2.default)(_quadbinToOffset, 3),
|
|
128
|
+
xOffset = _quadbinToOffset2[0],
|
|
129
|
+
yOffset = _quadbinToOffset2[1],
|
|
130
|
+
scale = _quadbinToOffset2[2];
|
|
131
|
+
|
|
132
|
+
var offset = [xOffset, yOffset, scale / blockWidth];
|
|
133
|
+
var CellLayer = this.getSubLayerClass('column', RasterColumnLayer);
|
|
134
|
+
return new CellLayer(this.props, this.getSubLayerProps({
|
|
135
|
+
id: 'cell',
|
|
136
|
+
updateTriggers: updateTriggers,
|
|
137
|
+
getElevation: this.getSubLayerAccessor(getElevation),
|
|
138
|
+
getFillColor: this.getSubLayerAccessor(getFillColor),
|
|
139
|
+
getLineColor: this.getSubLayerAccessor(getLineColor),
|
|
140
|
+
getLineWidth: this.getSubLayerAccessor(getLineWidth)
|
|
141
|
+
}), {
|
|
142
|
+
data: {
|
|
143
|
+
data: data,
|
|
144
|
+
length: blockWidth * blockHeight
|
|
145
|
+
},
|
|
146
|
+
offset: offset
|
|
147
|
+
});
|
|
148
|
+
};
|
|
149
|
+
|
|
150
|
+
_proto2.getSubLayerAccessor = function getSubLayerAccessor(accessor) {
|
|
151
|
+
if (typeof accessor !== 'function') {
|
|
152
|
+
return (0, _get2.default)((0, _getPrototypeOf2.default)(RasterLayer.prototype), "getSubLayerAccessor", this).call(this, accessor);
|
|
151
153
|
}
|
|
152
|
-
}, {
|
|
153
|
-
key: "getSubLayerAccessor",
|
|
154
|
-
value: function getSubLayerAccessor(accessor) {
|
|
155
|
-
if (typeof accessor !== 'function') {
|
|
156
|
-
return (0, _get2.default)((0, _getPrototypeOf2.default)(RasterLayer.prototype), "getSubLayerAccessor", this).call(this, accessor);
|
|
157
|
-
}
|
|
158
154
|
|
|
159
|
-
|
|
160
|
-
|
|
161
|
-
|
|
162
|
-
|
|
163
|
-
|
|
164
|
-
|
|
165
|
-
|
|
166
|
-
|
|
167
|
-
|
|
168
|
-
|
|
169
|
-
|
|
155
|
+
return function (object, info) {
|
|
156
|
+
var data = info.data,
|
|
157
|
+
index = info.index;
|
|
158
|
+
var binaryData = data.data;
|
|
159
|
+
var proxy = (0, _utils.createBinaryProxy)(binaryData.cells, index);
|
|
160
|
+
return accessor({
|
|
161
|
+
properties: proxy
|
|
162
|
+
}, info);
|
|
163
|
+
};
|
|
164
|
+
};
|
|
165
|
+
|
|
170
166
|
return RasterLayer;
|
|
171
167
|
}(_core.CompositeLayer);
|
|
172
168
|
|
|
173
169
|
exports.default = RasterLayer;
|
|
174
|
-
|
|
175
|
-
|
|
170
|
+
RasterLayer.layerName = 'RasterLayer';
|
|
171
|
+
RasterLayer.defaultProps = defaultProps;
|
|
176
172
|
//# sourceMappingURL=raster-layer.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../../../src/layers/raster-layer.ts"],"names":["defaultProps","ColumnLayer","extruded","diskResolution","vertices","RasterColumnLayer","shaders","vs","attributeManager","getAttributeManager","addInstanced","instanceElevations","size","transition","accessor","instanceFillColors","props","colorFormat","length","type","normalized","defaultValue","instanceLineColors","RasterLayer","data","getElevation","getFillColor","getLineColor","getLineWidth","tileIndex","updateTriggers","blockWidth","blockHeight","xOffset","yOffset","scale","offset","CellLayer","getSubLayerClass","getSubLayerProps","id","getSubLayerAccessor","object","info","index","binaryData","proxy","cells","properties","CompositeLayer"],"mappings":"
|
|
1
|
+
{"version":3,"sources":["../../../src/layers/raster-layer.ts"],"names":["defaultProps","ColumnLayer","extruded","diskResolution","vertices","RasterColumnLayer","getShaders","shaders","vs","initializeState","attributeManager","getAttributeManager","addInstanced","instanceElevations","size","transition","accessor","instanceFillColors","props","colorFormat","length","type","normalized","defaultValue","instanceLineColors","layerName","RasterLayer","renderLayers","data","getElevation","getFillColor","getLineColor","getLineWidth","tileIndex","updateTriggers","blockWidth","blockHeight","xOffset","yOffset","scale","offset","CellLayer","getSubLayerClass","getSubLayerProps","id","getSubLayerAccessor","object","info","index","binaryData","proxy","cells","properties","CompositeLayer"],"mappings":"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","sourcesContent":["import GL from '@luma.gl/constants';\nimport {\n Accessor,\n CompositeLayer,\n CompositeLayerProps,\n Layer,\n LayersList,\n DefaultProps\n} from '@deck.gl/core';\nimport {ColumnLayer, ColumnLayerProps} from '@deck.gl/layers';\nimport {quadbinToOffset} from './quadbin-utils';\nimport {Raster} from './schema/carto-raster-tile-loader';\nimport vs from './raster-layer-vertex.glsl';\nimport {assert, createBinaryProxy} from '../utils';\n\nconst defaultProps: DefaultProps<RasterLayerProps> = {\n ...ColumnLayer.defaultProps,\n extruded: false,\n diskResolution: 4,\n vertices: [\n [-0.5, -0.5],\n [0.5, -0.5],\n [0.5, 0.5],\n [-0.5, 0.5]\n ]\n};\n\n// Modified ColumnLayer with custom vertex shader\nclass RasterColumnLayer extends ColumnLayer {\n static layerName = 'RasterColumnLayer';\n\n getShaders() {\n const shaders = super.getShaders();\n return {...shaders, vs};\n }\n\n initializeState() {\n // Only add attributes needed by shader\n const attributeManager = this.getAttributeManager()!;\n /* eslint-disable max-len */\n attributeManager.addInstanced({\n instanceElevations: {\n size: 1,\n transition: true,\n accessor: 'getElevation'\n },\n instanceFillColors: {\n size: this.props.colorFormat.length,\n type: GL.UNSIGNED_BYTE,\n normalized: true,\n transition: true,\n accessor: 'getFillColor',\n defaultValue: [0, 0, 0, 255]\n },\n instanceLineColors: {\n size: this.props.colorFormat.length,\n type: GL.UNSIGNED_BYTE,\n normalized: true,\n transition: true,\n accessor: 'getLineColor',\n defaultValue: [255, 255, 255, 255]\n }\n });\n }\n}\n\n/** All properties supported by RasterLayer. */\nexport type RasterLayerProps<DataT = any> = _RasterLayerProps &\n ColumnLayerProps<DataT> &\n CompositeLayerProps;\n\n/** Properties added by RasterLayer. */\ntype _RasterLayerProps = {\n /**\n * Quadbin index of tile\n */\n tileIndex: bigint;\n};\n\n// Adapter layer around RasterColumnLayer that converts data & accessors into correct format\nexport default class RasterLayer<DataT = any, ExtraProps = {}> extends CompositeLayer<\n Required<RasterLayerProps<DataT>> & ExtraProps\n> {\n static layerName = 'RasterLayer';\n static defaultProps = defaultProps;\n\n renderLayers(): Layer | null | LayersList {\n // Rendering props underlying layer\n const {\n data,\n getElevation,\n getFillColor,\n getLineColor,\n getLineWidth,\n tileIndex,\n updateTriggers\n } = this.props;\n if (!data || !tileIndex) return null;\n\n const {blockWidth, blockHeight} = data as unknown as Raster;\n assert(\n blockWidth === blockHeight,\n `blockWidth (${blockWidth}) must equal blockHeight (${blockHeight})`\n );\n\n const [xOffset, yOffset, scale] = quadbinToOffset(tileIndex);\n const offset = [xOffset, yOffset, scale / blockWidth];\n\n // Filled Column Layer\n const CellLayer = this.getSubLayerClass('column', RasterColumnLayer);\n return new CellLayer(\n this.props,\n this.getSubLayerProps({\n id: 'cell',\n updateTriggers,\n\n getElevation: this.getSubLayerAccessor(getElevation),\n getFillColor: this.getSubLayerAccessor(getFillColor),\n getLineColor: this.getSubLayerAccessor(getLineColor),\n getLineWidth: this.getSubLayerAccessor(getLineWidth)\n }),\n {\n data: {\n data, // Pass through data for getSubLayerAccessor()\n length: blockWidth * blockHeight\n },\n offset\n }\n );\n }\n\n protected getSubLayerAccessor<In, Out>(accessor: Accessor<In, Out>): Accessor<In, Out> {\n if (typeof accessor !== 'function') {\n return super.getSubLayerAccessor(accessor);\n }\n\n // Proxy values back in standard feature format\n return (object, info) => {\n const {data, index} = info;\n const binaryData = (data as unknown as {data: Raster}).data;\n const proxy = createBinaryProxy(binaryData.cells, index);\n // @ts-ignore (TS2349) accessor is always function\n return accessor({properties: proxy}, info);\n };\n }\n}\n"],"file":"raster-layer.js"}
|
|
@@ -9,8 +9,6 @@ exports.default = exports.renderSubLayers = void 0;
|
|
|
9
9
|
|
|
10
10
|
var _classCallCheck2 = _interopRequireDefault(require("@babel/runtime/helpers/classCallCheck"));
|
|
11
11
|
|
|
12
|
-
var _createClass2 = _interopRequireDefault(require("@babel/runtime/helpers/createClass"));
|
|
13
|
-
|
|
14
12
|
var _get2 = _interopRequireDefault(require("@babel/runtime/helpers/get"));
|
|
15
13
|
|
|
16
14
|
var _inherits2 = _interopRequireDefault(require("@babel/runtime/helpers/inherits"));
|
|
@@ -19,8 +17,6 @@ var _possibleConstructorReturn2 = _interopRequireDefault(require("@babel/runtime
|
|
|
19
17
|
|
|
20
18
|
var _getPrototypeOf2 = _interopRequireDefault(require("@babel/runtime/helpers/getPrototypeOf"));
|
|
21
19
|
|
|
22
|
-
var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
|
|
23
|
-
|
|
24
20
|
var _core = require("@deck.gl/core");
|
|
25
21
|
|
|
26
22
|
var _rasterLayer = _interopRequireDefault(require("./raster-layer"));
|
|
@@ -62,37 +58,36 @@ var RasterTileLayer = function (_CompositeLayer) {
|
|
|
62
58
|
return _super.apply(this, arguments);
|
|
63
59
|
}
|
|
64
60
|
|
|
65
|
-
|
|
66
|
-
|
|
67
|
-
|
|
68
|
-
|
|
69
|
-
|
|
70
|
-
|
|
71
|
-
|
|
72
|
-
|
|
73
|
-
|
|
74
|
-
|
|
75
|
-
|
|
76
|
-
|
|
77
|
-
|
|
78
|
-
|
|
79
|
-
|
|
80
|
-
|
|
81
|
-
|
|
82
|
-
|
|
83
|
-
|
|
84
|
-
|
|
85
|
-
|
|
86
|
-
|
|
87
|
-
|
|
88
|
-
|
|
89
|
-
|
|
90
|
-
|
|
91
|
-
}]);
|
|
61
|
+
var _proto = RasterTileLayer.prototype;
|
|
62
|
+
|
|
63
|
+
_proto.getLoadOptions = function getLoadOptions() {
|
|
64
|
+
var loadOptions = (0, _get2.default)((0, _getPrototypeOf2.default)(RasterTileLayer.prototype), "getLoadOptions", this).call(this) || {};
|
|
65
|
+
var tileJSON = this.props.data;
|
|
66
|
+
(0, _utils.injectAccessToken)(loadOptions, tileJSON.accessToken);
|
|
67
|
+
return loadOptions;
|
|
68
|
+
};
|
|
69
|
+
|
|
70
|
+
_proto.renderLayers = function renderLayers() {
|
|
71
|
+
var tileJSON = this.props.data;
|
|
72
|
+
if (!tileJSON) return null;
|
|
73
|
+
var data = tileJSON.tiles,
|
|
74
|
+
minZoom = tileJSON.minzoom,
|
|
75
|
+
maxZoom = tileJSON.maxzoom;
|
|
76
|
+
return [new _spatialIndexTileLayer.default(this.props, {
|
|
77
|
+
id: "raster-tile-layer-".concat(this.props.id),
|
|
78
|
+
data: data,
|
|
79
|
+
TilesetClass: _quadbinTileset2d.default,
|
|
80
|
+
renderSubLayers: renderSubLayers,
|
|
81
|
+
minZoom: minZoom,
|
|
82
|
+
maxZoom: maxZoom,
|
|
83
|
+
loadOptions: this.getLoadOptions()
|
|
84
|
+
})];
|
|
85
|
+
};
|
|
86
|
+
|
|
92
87
|
return RasterTileLayer;
|
|
93
88
|
}(_core.CompositeLayer);
|
|
94
89
|
|
|
95
90
|
exports.default = RasterTileLayer;
|
|
96
|
-
|
|
97
|
-
|
|
91
|
+
RasterTileLayer.layerName = 'RasterTileLayer';
|
|
92
|
+
RasterTileLayer.defaultProps = defaultProps;
|
|
98
93
|
//# sourceMappingURL=raster-tile-layer.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../../../src/layers/raster-tile-layer.ts"],"names":["renderSubLayers","props","tileIndex","tile","index","q","RasterLayer","defaultProps","data","TilejsonPropType","RasterTileLayer","loadOptions","tileJSON","accessToken","tiles","minZoom","minzoom","maxZoom","maxzoom","SpatialIndexTileLayer","id","TilesetClass","QuadbinTileset2D","
|
|
1
|
+
{"version":3,"sources":["../../../src/layers/raster-tile-layer.ts"],"names":["renderSubLayers","props","tileIndex","tile","index","q","RasterLayer","defaultProps","data","TilejsonPropType","RasterTileLayer","getLoadOptions","loadOptions","tileJSON","accessToken","renderLayers","tiles","minZoom","minzoom","maxZoom","maxzoom","SpatialIndexTileLayer","id","TilesetClass","QuadbinTileset2D","CompositeLayer","layerName"],"mappings":";;;;;;;;;;;;;;;;;;;AAAA;;AACA;;AACA;;AACA;;AACA;;AACA;;;;;;AAEO,IAAMA,eAAe,GAAG,SAAlBA,eAAkB,CAAAC,KAAK,EAAI;AAAA;;AACtC,MAAMC,SAAS,kBAAGD,KAAK,CAACE,IAAT,qEAAG,YAAYC,KAAf,sDAAG,kBAAmBC,CAArC;AACA,MAAI,CAACH,SAAL,EAAgB,OAAO,IAAP;AAChB,SAAO,IAAII,oBAAJ,CAAgBL,KAAhB,EAAuB;AAACC,IAAAA,SAAS,EAATA;AAAD,GAAvB,CAAP;AACD,CAJM;;;AAMP,IAAMK,YAAgD,GAAG;AACvDC,EAAAA,IAAI,EAAEC;AADiD,CAAzD;;IAYqBC,e;;;;;;;;;;;;SAOnBC,c,GAAA,0BAAsB;AACpB,QAAMC,WAAW,GAAG,mHAA0B,EAA9C;AACA,QAAMC,QAAQ,GAAG,KAAKZ,KAAL,CAAWO,IAA5B;AACA,kCAAkBI,WAAlB,EAA+BC,QAAQ,CAACC,WAAxC;AACA,WAAOF,WAAP;AACD,G;;SAEDG,Y,GAAA,wBAA0C;AACxC,QAAMF,QAAQ,GAAG,KAAKZ,KAAL,CAAWO,IAA5B;AACA,QAAI,CAACK,QAAL,EAAe,OAAO,IAAP;AAEf,QAAcL,IAAd,GAA0DK,QAA1D,CAAOG,KAAP;AAAA,QAA6BC,OAA7B,GAA0DJ,QAA1D,CAAoBK,OAApB;AAAA,QAA+CC,OAA/C,GAA0DN,QAA1D,CAAsCO,OAAtC;AACA,WAAO,CAEL,IAAIC,8BAAJ,CAA0B,KAAKpB,KAA/B,EAAsC;AACpCqB,MAAAA,EAAE,8BAAuB,KAAKrB,KAAL,CAAWqB,EAAlC,CADkC;AAEpCd,MAAAA,IAAI,EAAJA,IAFoC;AAIpCe,MAAAA,YAAY,EAAEC,yBAJsB;AAKpCxB,MAAAA,eAAe,EAAfA,eALoC;AAMpCiB,MAAAA,OAAO,EAAPA,OANoC;AAOpCE,MAAAA,OAAO,EAAPA,OAPoC;AAQpCP,MAAAA,WAAW,EAAE,KAAKD,cAAL;AARuB,KAAtC,CAFK,CAAP;AAaD,G;;;EA7BOc,oB;;;AAHWf,e,CAIZgB,S,GAAY,iB;AAJAhB,e,CAKZH,Y,GAAeA,Y","sourcesContent":["import {CompositeLayer, CompositeLayerProps, DefaultProps, Layer, LayersList} from '@deck.gl/core';\nimport RasterLayer, {RasterLayerProps} from './raster-layer';\nimport QuadbinTileset2D from './quadbin-tileset-2d';\nimport SpatialIndexTileLayer from './spatial-index-tile-layer';\nimport {TilejsonPropType, CartoTilejsonResult} from '../sources/common';\nimport {injectAccessToken} from './utils';\n\nexport const renderSubLayers = props => {\n const tileIndex = props.tile?.index?.q;\n if (!tileIndex) return null;\n return new RasterLayer(props, {tileIndex});\n};\n\nconst defaultProps: DefaultProps<RasterTileLayerProps> = {\n data: TilejsonPropType\n};\n\n/** All properties supported by RasterTileLayer. */\nexport type RasterTileLayerProps<DataT = any> = _RasterTileLayerProps<DataT> & CompositeLayerProps;\n\n/** Properties added by RasterTileLayer. */\ntype _RasterTileLayerProps<DataT> = Omit<RasterLayerProps<DataT>, 'data'> & {\n data: null | CartoTilejsonResult | Promise<CartoTilejsonResult>;\n};\n\nexport default class RasterTileLayer<\n DataT = any,\n ExtraProps extends {} = {}\n> extends CompositeLayer<ExtraProps & Required<_RasterTileLayerProps<DataT>>> {\n static layerName = 'RasterTileLayer';\n static defaultProps = defaultProps;\n\n getLoadOptions(): any {\n const loadOptions = super.getLoadOptions() || {};\n const tileJSON = this.props.data as CartoTilejsonResult;\n injectAccessToken(loadOptions, tileJSON.accessToken);\n return loadOptions;\n }\n\n renderLayers(): Layer | null | LayersList {\n const tileJSON = this.props.data as CartoTilejsonResult;\n if (!tileJSON) return null;\n\n const {tiles: data, minzoom: minZoom, maxzoom: maxZoom} = tileJSON;\n return [\n // @ts-ignore\n new SpatialIndexTileLayer(this.props, {\n id: `raster-tile-layer-${this.props.id}`,\n data,\n // TODO: Tileset2D should be generic over TileIndex type\n TilesetClass: QuadbinTileset2D as any,\n renderSubLayers,\n minZoom,\n maxZoom,\n loadOptions: this.getLoadOptions()\n })\n ];\n }\n}\n"],"file":"raster-tile-layer.js"}
|
|
@@ -17,7 +17,7 @@ var _tileLoaderUtils = require("./tile-loader-utils");
|
|
|
17
17
|
|
|
18
18
|
var _utils = require("../../utils");
|
|
19
19
|
|
|
20
|
-
var VERSION = typeof "8.10.0-alpha.
|
|
20
|
+
var VERSION = typeof "8.10.0-alpha.6" !== 'undefined' ? "8.10.0-alpha.6" : 'latest';
|
|
21
21
|
var id = 'cartoRasterTile';
|
|
22
22
|
var DEFAULT_OPTIONS = {
|
|
23
23
|
cartoRasterTile: {
|
|
@@ -9,8 +9,6 @@ exports.TileReader = exports.BandReader = void 0;
|
|
|
9
9
|
|
|
10
10
|
var _classCallCheck2 = _interopRequireDefault(require("@babel/runtime/helpers/classCallCheck"));
|
|
11
11
|
|
|
12
|
-
var _createClass2 = _interopRequireDefault(require("@babel/runtime/helpers/createClass"));
|
|
13
|
-
|
|
14
12
|
var _fastPbf = require("./fast-pbf");
|
|
15
13
|
|
|
16
14
|
var ARRAY_TYPES = {
|
|
@@ -31,30 +29,27 @@ var BandReader = function () {
|
|
|
31
29
|
(0, _classCallCheck2.default)(this, BandReader);
|
|
32
30
|
}
|
|
33
31
|
|
|
34
|
-
(
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
if (
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
if (!TypedArray) {
|
|
50
|
-
throw Error("Invalid data type: ".concat(obj.type));
|
|
51
|
-
}
|
|
52
|
-
|
|
53
|
-
obj.data = {};
|
|
54
|
-
(0, _fastPbf.readPackedTypedArray)(TypedArray, pbf, obj.data);
|
|
32
|
+
BandReader.read = function read(pbf, end) {
|
|
33
|
+
return pbf.readFields(BandReader._readField, {
|
|
34
|
+
name: '',
|
|
35
|
+
type: '',
|
|
36
|
+
data: null
|
|
37
|
+
}, end);
|
|
38
|
+
};
|
|
39
|
+
|
|
40
|
+
BandReader._readField = function _readField(tag, obj, pbf) {
|
|
41
|
+
if (tag === 1) obj.name = pbf.readString();else if (tag === 2) obj.type = pbf.readString();else if (tag === 3) {
|
|
42
|
+
var TypedArray = ARRAY_TYPES[obj.type];
|
|
43
|
+
|
|
44
|
+
if (!TypedArray) {
|
|
45
|
+
throw Error("Invalid data type: ".concat(obj.type));
|
|
55
46
|
}
|
|
47
|
+
|
|
48
|
+
obj.data = {};
|
|
49
|
+
(0, _fastPbf.readPackedTypedArray)(TypedArray, pbf, obj.data);
|
|
56
50
|
}
|
|
57
|
-
}
|
|
51
|
+
};
|
|
52
|
+
|
|
58
53
|
return BandReader;
|
|
59
54
|
}();
|
|
60
55
|
|
|
@@ -65,21 +60,18 @@ var TileReader = function () {
|
|
|
65
60
|
(0, _classCallCheck2.default)(this, TileReader);
|
|
66
61
|
}
|
|
67
62
|
|
|
68
|
-
(
|
|
69
|
-
|
|
70
|
-
|
|
71
|
-
|
|
72
|
-
|
|
73
|
-
|
|
74
|
-
|
|
75
|
-
|
|
76
|
-
|
|
77
|
-
|
|
78
|
-
|
|
79
|
-
|
|
80
|
-
if (tag === 1) obj.blockWidth = pbf.readVarint();else if (tag === 2) obj.blockHeight = pbf.readVarint();else if (tag === 3) obj.bands.push(BandReader.read(pbf, pbf.readVarint() + pbf.pos));
|
|
81
|
-
}
|
|
82
|
-
}]);
|
|
63
|
+
TileReader.read = function read(pbf, end) {
|
|
64
|
+
return pbf.readFields(TileReader._readField, {
|
|
65
|
+
blockWidth: 0,
|
|
66
|
+
blockHeight: 0,
|
|
67
|
+
bands: []
|
|
68
|
+
}, end);
|
|
69
|
+
};
|
|
70
|
+
|
|
71
|
+
TileReader._readField = function _readField(tag, obj, pbf) {
|
|
72
|
+
if (tag === 1) obj.blockWidth = pbf.readVarint();else if (tag === 2) obj.blockHeight = pbf.readVarint();else if (tag === 3) obj.bands.push(BandReader.read(pbf, pbf.readVarint() + pbf.pos));
|
|
73
|
+
};
|
|
74
|
+
|
|
83
75
|
return TileReader;
|
|
84
76
|
}();
|
|
85
77
|
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../../../../src/layers/schema/carto-raster-tile.ts"],"names":["ARRAY_TYPES","uint8","Uint8Array","uint16","Uint16Array","uint32","Uint32Array","uint64","BigUint64Array","int8","Int8Array","int16","Int16Array","int32","Int32Array","int64","BigInt64Array","float32","Float32Array","float64","Float64Array","BandReader","pbf","end","readFields","_readField","name","type","data","tag","obj","readString","TypedArray","Error","TileReader","blockWidth","blockHeight","bands","readVarint","push","
|
|
1
|
+
{"version":3,"sources":["../../../../src/layers/schema/carto-raster-tile.ts"],"names":["ARRAY_TYPES","uint8","Uint8Array","uint16","Uint16Array","uint32","Uint32Array","uint64","BigUint64Array","int8","Int8Array","int16","Int16Array","int32","Int32Array","int64","BigInt64Array","float32","Float32Array","float64","Float64Array","BandReader","read","pbf","end","readFields","_readField","name","type","data","tag","obj","readString","TypedArray","Error","TileReader","blockWidth","blockHeight","bands","readVarint","push","pos"],"mappings":";;;;;;;;;;;AAAA;;AAEA,IAAMA,WAAW,GAAG;AAClBC,EAAAA,KAAK,EAAEC,UADW;AAElBC,EAAAA,MAAM,EAAEC,WAFU;AAGlBC,EAAAA,MAAM,EAAEC,WAHU;AAIlBC,EAAAA,MAAM,EAAEC,cAJU;AAKlBC,EAAAA,IAAI,EAAEC,SALY;AAMlBC,EAAAA,KAAK,EAAEC,UANW;AAOlBC,EAAAA,KAAK,EAAEC,UAPW;AAQlBC,EAAAA,KAAK,EAAEC,aARW;AASlBC,EAAAA,OAAO,EAAEC,YATS;AAUlBC,EAAAA,OAAO,EAAEC;AAVS,CAApB;;IAeaC,U;;;;;aACJC,I,GAAP,cAAYC,GAAZ,EAAiBC,GAAjB,EAA+B;AAC7B,WAAOD,GAAG,CAACE,UAAJ,CAAeJ,UAAU,CAACK,UAA1B,EAAsC;AAACC,MAAAA,IAAI,EAAE,EAAP;AAAWC,MAAAA,IAAI,EAAE,EAAjB;AAAqBC,MAAAA,IAAI,EAAE;AAA3B,KAAtC,EAAwEL,GAAxE,CAAP;AACD,G;;aAEME,U,GAAP,oBAA8BI,GAA9B,EAAmCC,GAAnC,EAAwCR,GAAxC,EAA6C;AAC3C,QAAIO,GAAG,KAAK,CAAZ,EAAeC,GAAG,CAACJ,IAAJ,GAAWJ,GAAG,CAACS,UAAJ,EAAX,CAAf,KACK,IAAIF,GAAG,KAAK,CAAZ,EAAeC,GAAG,CAACH,IAAJ,GAAWL,GAAG,CAACS,UAAJ,EAAX,CAAf,KACA,IAAIF,GAAG,KAAK,CAAZ,EAAe;AAClB,UAAMG,UAAU,GAAGjC,WAAW,CAAC+B,GAAG,CAACH,IAAL,CAA9B;;AACA,UAAI,CAACK,UAAL,EAAiB;AACf,cAAMC,KAAK,8BAAuBH,GAAG,CAACH,IAA3B,EAAX;AACD;;AACDG,MAAAA,GAAG,CAACF,IAAJ,GAAW,EAAX;AACA,yCAAqBI,UAArB,EAAiCV,GAAjC,EAAsCQ,GAAG,CAACF,IAA1C;AACD;AACF,G;;;;;;;IAGUM,U;;;;;aACJb,I,GAAP,cAAYC,GAAZ,EAAiBC,GAAjB,EAAsB;AACpB,WAAOD,GAAG,CAACE,UAAJ,CAAeU,UAAU,CAACT,UAA1B,EAAsC;AAACU,MAAAA,UAAU,EAAE,CAAb;AAAgBC,MAAAA,WAAW,EAAE,CAA7B;AAAgCC,MAAAA,KAAK,EAAE;AAAvC,KAAtC,EAAkFd,GAAlF,CAAP;AACD,G;;aACME,U,GAAP,oBAA8BI,GAA9B,EAAmCC,GAAnC,EAAwCR,GAAxC,EAA6C;AAC3C,QAAIO,GAAG,KAAK,CAAZ,EAAeC,GAAG,CAACK,UAAJ,GAAiBb,GAAG,CAACgB,UAAJ,EAAjB,CAAf,KACK,IAAIT,GAAG,KAAK,CAAZ,EAAeC,GAAG,CAACM,WAAJ,GAAkBd,GAAG,CAACgB,UAAJ,EAAlB,CAAf,KACA,IAAIT,GAAG,KAAK,CAAZ,EAAeC,GAAG,CAACO,KAAJ,CAAUE,IAAV,CAAenB,UAAU,CAACC,IAAX,CAAgBC,GAAhB,EAAqBA,GAAG,CAACgB,UAAJ,KAAmBhB,GAAG,CAACkB,GAA5C,CAAf;AACrB,G","sourcesContent":["import {readPackedTypedArray} from './fast-pbf';\n\nconst ARRAY_TYPES = {\n uint8: Uint8Array,\n uint16: Uint16Array,\n uint32: Uint32Array,\n uint64: BigUint64Array,\n int8: Int8Array,\n int16: Int16Array,\n int32: Int32Array,\n int64: BigInt64Array,\n float32: Float32Array,\n float64: Float64Array\n};\n\n// Band ========================================\n\nexport class BandReader {\n static read(pbf, end?: number) {\n return pbf.readFields(BandReader._readField, {name: '', type: '', data: null}, end);\n }\n\n static _readField(this: void, tag, obj, pbf) {\n if (tag === 1) obj.name = pbf.readString();\n else if (tag === 2) obj.type = pbf.readString();\n else if (tag === 3) {\n const TypedArray = ARRAY_TYPES[obj.type];\n if (!TypedArray) {\n throw Error(`Invalid data type: ${obj.type}`);\n }\n obj.data = {};\n readPackedTypedArray(TypedArray, pbf, obj.data);\n }\n }\n}\n\nexport class TileReader {\n static read(pbf, end) {\n return pbf.readFields(TileReader._readField, {blockWidth: 0, blockHeight: 0, bands: []}, end);\n }\n static _readField(this: void, tag, obj, pbf) {\n if (tag === 1) obj.blockWidth = pbf.readVarint();\n else if (tag === 2) obj.blockHeight = pbf.readVarint();\n else if (tag === 3) obj.bands.push(BandReader.read(pbf, pbf.readVarint() + pbf.pos));\n }\n}\n"],"file":"carto-raster-tile.js"}
|