@deck.gl/aggregation-layers 8.9.0-beta.2 → 8.9.0-beta.4

package/dist.min.js

@@ -336,7 +336,7 @@ In order to be iterable, non-array objects must have a [Symbol.iterator]() metho
 In order to be iterable, non-array objects must have a [Symbol.iterator]() method.`)}var i=!0,o=!1,s;return{s:function(){e=e.call(t)},n:function(){var l=e.next();return i=l.done,l},e:function(l){o=!0,s=l},f:function(){try{!i&&e.return!=null&&e.return()}finally{if(o)throw s}}}}function Zs(t,a){if(t){if(typeof t=="string")return ta(t,a);var e=Object.prototype.toString.call(t).slice(8,-1);if(e==="Object"&&t.constructor&&(e=t.constructor.name),e==="Map"||e==="Set")return Array.from(t);if(e==="Arguments"||/^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(e))return ta(t,a)}}function ta(t,a){(a==null||a>t.length)&&(a=t.length);for(var e=0,n=new Array(a);e<a;e++)n[e]=t[e];return n}function Ee(t,a){var e=Js(t,a),n=eu(e);return{gridHash:e.gridHash,gridOffset:e.gridOffset,data:n}}function Js(t,a){var e=t.data,n=e===void 0?[]:e,r=t.cellSize,i=a.attributes,o=a.viewport,s=a.projectPoints,u=a.numInstances,l=i.positions.value,g=i.positions.getAccessor(),f=g.size,c=a.boundingBox||tu(i.positions,u),d=a.posOffset||[180,90],h=a.gridOffset||or(c,r);if(h.xOffset<=0||h.yOffset<=0)return{gridHash:{},gridOffset:h};var m=o.width,y=o.height,O=Math.ceil(m/h.xOffset),C=Math.ceil(y/h.yOffset),b={},P=(0,aa.createIterable)(n),w=P.iterable,M=P.objectInfo,D=new Array(3),N=Qs(w),V;try{for(N.s();!(V=N.n()).done;){var q=V.value;M.index++,D[0]=l[M.index*f],D[1]=l[M.index*f+1],D[2]=f>=3?l[M.index*f+2]:0;var te=s?o.project(D):D,W=(0,na.default)(te,2),xe=W[0],wr=W[1];if(Number.isFinite(xe)&&Number.isFinite(wr)){var ot=Math.floor((wr+d[1])/h.yOffset),st=Math.floor((xe+d[0])/h.xOffset);if(!s||st>=0&&st<O&&ot>=0&&ot<C){var ut="".concat(ot,"-").concat(st);b[ut]=b[ut]||{count:0,points:[],lonIdx:st,latIdx:ot},b[ut].count+=1,b[ut].points.push({source:q,index:M.index})}}}}catch(Do){N.e(Do)}finally{N.f()}return{gridHash:b,gridOffset:h,offsets:[d[0]*-1,d[1]*-1]}}function eu(t){var a=t.gridHash,e=t.gridOffset,n=t.offsets,r=new Array(Object.keys(a).length),i=0;for(var o in a){var s=o.split("-"),u=parseInt(s[0],10),l=parseInt(s[1],10),g=i++;r[g]=Ks({index:g,position:[n[0]+e.xOffset*l,n[1]+e.yOffset*u]},a[o])}return r}function tu(t,a){for(var e=t.value,n=t.getAccessor(),r=n.size,i=1/0,o=-1/0,s=1/0,u=-1/0,l,g,f=0;f<a;f++)g=e[f*r],l=e[f*r+1],Number.isFinite(g)&&Number.isFinite(l)&&(i=l<i?l:i,o=l>o?l:o,s=g<s?g:s,u=g>u?g:u);return{xMin:s,xMax:u,yMin:i,yMax:o}}function ru(t,a){var e=typeof Symbol<"u"&&t[Symbol.iterator]||t["@@iterator"];if(!e){if(Array.isArray(t)||(e=nu(t))||a&&t&&typeof t.length=="number"){e&&(t=e);var n=0,r=function(){};return{s:r,n:function(){return n>=t.length?{done:!0}:{done:!1,value:t[n++]}},e:function(l){throw l},f:r}}throw new TypeError(`Invalid attempt to iterate non-iterable instance.
 In order to be iterable, non-array objects must have a [Symbol.iterator]() method.`)}var i=!0,o=!1,s;return{s:function(){e=e.call(t)},n:function(){var l=e.next();return i=l.done,l},e:function(l){o=!0,s=l},f:function(){try{!i&&e.return!=null&&e.return()}finally{if(o)throw s}}}}function nu(t,a){if(t){if(typeof t=="string")return ia(t,a);var e=Object.prototype.toString.call(t).slice(8,-1);if(e==="Object"&&t.constructor&&(e=t.constructor.name),e==="Map"||e==="Set")return Array.from(t);if(e==="Arguments"||/^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(e))return ia(t,a)}}function ia(t,a){(a==null||a>t.length)&&(a=t.length);for(var e=0,n=new Array(a);e<a;e++)n[e]=t[e];return n}function au(t){var a=iu();return function(){var n=(0,Re.default)(t),r;if(a){var i=(0,Re.default)(this).constructor;r=Reflect.construct(n,arguments,i)}else r=n.apply(this,arguments);return(0,fa.default)(this,r)}}function iu(){if(typeof Reflect>"u"||!Reflect.construct||Reflect.construct.sham)return!1;if(typeof Proxy=="function")return!0;try{return Boolean.prototype.valueOf.call(Reflect.construct(Boolean,[],function(){})),!0}catch{return!1}}var ce=function(t){(0,la.default)(e,t);var a=au(e);function e(){var n;(0,oa.default)(this,e);for(var r=arguments.length,i=new Array(r),o=0;o<r;o++)i[o]=arguments[o];return n=a.call.apply(a,[this].concat(i)),(0,sr.default)((0,ua.default)(n),"state",void 0),n}return(0,sa.default)(e,[{key:"initializeAggregationLayer",value:function(r){var i=r.dimensions,o=this.context.gl;(0,Tt.default)((0,Re.default)(e.prototype),"initializeAggregationLayer",this).call(this,i),this.setState({layerData:{},gpuGridAggregator:new G(o,{id:"".concat(this.id,"-gpu-aggregator")}),cpuGridAggregator:Ee})}},{key:"updateState",value:function(r){(0,Tt.default)((0,Re.default)(e.prototype),"updateState",this).call(this,r),this.updateAggregationState(r);var i=this.state,o=i.aggregationDataDirty,s=i.aggregationWeightsDirty,u=i.gpuAggregation;if(!(this.getNumInstances()<=0)){var l=!1;(o||u&&s)&&(this._updateAggregation(r),l=!0),!u&&(o||s)&&(this._updateWeightBins(),this._uploadAggregationResults(),l=!0),this.setState({aggregationDirty:l})}}},{key:"finalizeState",value:function(r){var i,o=this.state.weights.count;o&&o.aggregationBuffer&&o.aggregationBuffer.delete(),(i=this.state.gpuGridAggregator)===null||i===void 0||i.delete(),(0,Tt.default)((0,Re.default)(e.prototype),"finalizeState",this).call(this,r)}},{key:"updateShaders",value:function(r){this.state.gpuAggregation&&this.state.gpuGridAggregator.updateShaders(r)}},{key:"updateAggregationState",value:function(r){ca.log.assert(!1)}},{key:"allocateResources",value:function(r,i){if(this.state.numRow!==r||this.state.numCol!==i){var o=i*r*4*4,s=this.context.gl,u=this.state.weights;for(var l in u){var g=u[l];g.aggregationBuffer&&g.aggregationBuffer.delete(),g.aggregationBuffer=new ga.Buffer(s,{byteLength:o,accessor:{size:4,type:5126,divisor:1}})}}}},{key:"updateResults",value:function(r){var i=r.aggregationData,o=r.maxMinData,s=r.maxData,u=r.minData,l=this.state.weights.count;l&&(l.aggregationData=i,l.maxMinData=o,l.maxData=s,l.minData=u)}},{key:"_updateAggregation",value:function(r){var i=this.state,o=i.cpuGridAggregator,s=i.gpuGridAggregator,u=i.gridOffset,l=i.posOffset,g=i.translation,f=g===void 0?[0,0]:g,c=i.scaling,d=c===void 0?[0,0,0]:c,h=i.boundingBox,m=i.projectPoints,y=i.gpuAggregation,O=i.numCol,C=i.numRow,b=r.props,P=this.context.viewport,w=this.getAttributes(),M=this.getNumInstances();if(y){var N=this.state.weights;s.run({weights:N,cellSize:[u.xOffset,u.yOffset],numCol:O,numRow:C,translation:f,scaling:d,vertexCount:M,projectPoints:m,attributes:w,moduleSettings:this.getModuleSettings()})}else{var D=o(b,{gridOffset:u,projectPoints:m,attributes:w,viewport:P,posOffset:l,boundingBox:h});this.setState({layerData:D})}}},{key:"_updateWeightBins",value:function(){var r=this.state.getValue,i=new Me(this.state.layerData.data||[],{getValue:r});this.setState({sortedBins:i})}},{key:"_uploadAggregationResults",value:function(){var r=this.state,i=r.numCol,o=r.numRow,s=this.state.layerData.data,u=this.state.sortedBins,l=u.aggregatedBins,g=u.minValue,f=u.maxValue,c=u.totalCount,d=4,h=i*o*d,m=new Float32Array(h).fill(0),y=ru(l),O;try{for(y.s();!(O=y.n()).done;){var C=O.value,b=s[C.i],P=b.lonIdx,w=b.latIdx,M=C.value,D=C.counts,N=(P+w*i)*d;m[N]=M,m[N+d-1]=D}}catch(W){y.e(W)}finally{y.f()}var V=new Float32Array([f,0,0,g]),q=new Float32Array([f,0,0,c]),te=new Float32Array([g,0,0,c]);this.updateResults({aggregationData:m,maxMinData:V,maxData:q,minData:te})}}]),e}(Z);(0,sr.default)(ce,"layerName","GridAggregationLayer");function ou(t){var a=su();return function(){var n=(0,Ne.default)(t),r;if(a){var i=(0,Ne.default)(this).constructor;r=Reflect.construct(n,arguments,i)}else r=n.apply(this,arguments);return(0,xa.default)(this,r)}}function su(){if(typeof Reflect>"u"||!Reflect.construct||Reflect.construct.sham)return!1;if(typeof Proxy=="function")return!0;try{return Boolean.prototype.valueOf.call(Reflect.construct(Boolean,[],function(){})),!0}catch{return!1}}function pa(t,a){var e=Object.keys(t);if(Object.getOwnPropertySymbols){var n=Object.getOwnPropertySymbols(t);a&&(n=n.filter(function(r){return Object.getOwnPropertyDescriptor(t,r).enumerable})),e.push.apply(e,n)}return e}function ur(t){for(var a=1;a<arguments.length;a++){var e=arguments[a]!=null?arguments[a]:{};a%2?pa(Object(e),!0).forEach(function(n){(0,pe.default)(t,n,e[n])}):Object.getOwnPropertyDescriptors?Object.defineProperties(t,Object.getOwnPropertyDescriptors(e)):pa(Object(e)).forEach(function(n){Object.defineProperty(t,n,Object.getOwnPropertyDescriptor(e,n))})}return t}var uu=ur(ur({},we.defaultProps),{},{getPosition:{type:"accessor",value:function(a){return a.position}},getWeight:{type:"accessor",value:1},gpuAggregation:!0,aggregation:"SUM"}),va="positions",lu={data:{props:["cellSizePixels"]},weights:{props:["aggregation"],accessors:["getWeight"]}},Pt=function(t){(0,ya.default)(e,t);var a=ou(e);function e(){var n;(0,ma.default)(this,e);for(var r=arguments.length,i=new Array(r),o=0;o<r;o++)i[o]=arguments[o];return n=a.call.apply(a,[this].concat(i)),(0,pe.default)((0,ha.default)(n),"state",void 0),n}return(0,da.default)(e,[{key:"initializeState",value:function(){var r,i=this.context.gl;if(!we.isSupported(i)){this.setState({supported:!1}),lr.log.error("ScreenGridLayer: ".concat(this.id," is not supported on this browser"))();return}(0,Ct.default)((0,Ne.default)(e.prototype),"initializeAggregationLayer",this).call(this,{dimensions:lu,getCellSize:function(l){return l.cellSizePixels}});var o={count:{size:1,operation:E.SUM,needMax:!0,maxTexture:Te(i,{id:"".concat(this.id,"-max-texture")})}};this.setState({supported:!0,projectPoints:!0,weights:o,subLayerData:{attributes:{}},maxTexture:o.count.maxTexture,positionAttributeName:"positions",posOffset:[0,0],translation:[1,-1]});var s=this.getAttributeManager();s.add((r={},(0,pe.default)(r,va,{size:3,accessor:"getPosition",type:5130,fp64:this.use64bitPositions()}),(0,pe.default)(r,"count",{size:3,accessor:"getWeight"}),r))}},{key:"shouldUpdateState",value:function(r){var i=r.changeFlags;return this.state.supported&&i.somethingChanged}},{key:"updateState",value:function(r){(0,Ct.default)((0,Ne.default)(e.prototype),"updateState",this).call(this,r)}},{key:"renderLayers",value:function(){if(!this.state.supported)return[];var r=this.state,i=r.maxTexture,o=r.numRow,s=r.numCol,u=r.weights,l=this.props.updateTriggers,g=u.count.aggregationBuffer,f=this.getSubLayerClass("cells",we);return new f(this.props,this.getSubLayerProps({id:"cell-layer",updateTriggers:l}),{data:{attributes:{instanceCounts:g}},maxTexture:i,numInstances:o*s})}},{key:"finalizeState",value:function(r){(0,Ct.default)((0,Ne.default)(e.prototype),"finalizeState",this).call(this,r);var i=this.state,o=i.aggregationBuffer,s=i.maxBuffer,u=i.maxTexture;o?.delete(),s?.delete(),u?.delete()}},{key:"getPickingInfo",value:function(r){var i=r.info,o=i.index;if(o>=0){var s=this.state,u=s.gpuGridAggregator,l=s.gpuAggregation,g=s.weights,f=l?u.getData("count"):g.count;i.object=G.getAggregationData(ur({pixelIndex:o},f))}return i}},{key:"updateResults",value:function(r){var i=r.aggregationData,o=r.maxData,s=this.state.weights.count;s.aggregationData=i,s.aggregationBuffer.setData({data:i}),s.maxData=o,s.maxTexture.setImageData({data:o})}},{key:"updateAggregationState",value:function(r){var i=r.props.cellSizePixels,o=r.oldProps.cellSizePixels!==i,s=r.changeFlags.viewportChanged,u=r.props.gpuAggregation;this.state.gpuAggregation!==r.props.gpuAggregation&&u&&!G.isSupported(this.context.gl)&&(lr.log.warn("GPU Grid Aggregation not supported, falling back to CPU")(),u=!1);var l=u!==this.state.gpuAggregation;this.setState({gpuAggregation:u});var g=this.isAttributeChanged(va),f=this.state.dimensions,c=f.data,d=f.weights,h=g||l||s||this.isAggregationDirty(r,{compareAll:u,dimension:c}),m=this.isAggregationDirty(r,{dimension:d});this.setState({aggregationDataDirty:h,aggregationWeightsDirty:m});var y=this.context.viewport;if(s||o){var O=y.width,C=y.height,b=Math.ceil(O/i),P=Math.ceil(C/i);this.allocateResources(P,b),this.setState({scaling:[O/2,-C/2,1],gridOffset:{xOffset:i,yOffset:i},width:O,height:C,numCol:b,numRow:P})}m&&this._updateAccessors(r),(h||m)&&this._resetResults()}},{key:"_updateAccessors",value:function(r){var i=r.props,o=i.getWeight,s=i.aggregation,u=i.data,l=this.state.weights.count;l&&(l.getWeight=o,l.operation=E[s]),this.setState({getValue:be(s,o,{data:u})})}},{key:"_resetResults",value:function(){var r=this.state.weights.count;r&&(r.aggregationData=null)}}]),e}(ce);(0,pe.default)(Pt,"layerName","ScreenGridLayer");(0,pe.default)(Pt,"defaultProps",uu);var Pa=v(z()),wa=v(U()),Da=v(K()),Ma=v(H()),Ea=v($()),wt=v(j()),cr=v(L()),Ra=v(Se());var fr=v(Zt()),gr=v(L()),Oa=v(z()),Ta=v(U());function Sa(t,a){var e=Object.keys(t);if(Object.getOwnPropertySymbols){var n=Object.getOwnPropertySymbols(t);a&&(n=n.filter(function(r){return Object.getOwnPropertyDescriptor(t,r).enumerable})),e.push.apply(e,n)}return e}function J(t){for(var a=1;a<arguments.length;a++){var e=arguments[a]!=null?arguments[a]:{};a%2?Sa(Object(e),!0).forEach(function(n){(0,gr.default)(t,n,e[n])}):Object.getOwnPropertyDescriptors?Object.defineProperties(t,Object.getOwnPropertyDescriptors(e)):Sa(Object(e)).forEach(function(n){Object.defineProperty(t,n,Object.getOwnPropertyDescriptor(e,n))})}return t}function _a(){}var ba=["getBins","getDomain","getScaleFunc"],Aa=[{key:"fillColor",accessor:"getFillColor",pickingInfo:"colorValue",getBins:{triggers:{value:{prop:"getColorValue",updateTrigger:"getColorValue"},weight:{prop:"getColorWeight",updateTrigger:"getColorWeight"},aggregation:{prop:"colorAggregation"},filterData:{prop:"_filterData",updateTrigger:"_filterData"}}},getDomain:{triggers:{lowerPercentile:{prop:"lowerPercentile"},upperPercentile:{prop:"upperPercentile"},scaleType:{prop:"colorScaleType"}}},getScaleFunc:{triggers:{domain:{prop:"colorDomain"},range:{prop:"colorRange"}},onSet:{props:"onSetColorDomain"}},nullValue:[0,0,0,0]},{key:"elevation",accessor:"getElevation",pickingInfo:"elevationValue",getBins:{triggers:{value:{prop:"getElevationValue",updateTrigger:"getElevationValue"},weight:{prop:"getElevationWeight",updateTrigger:"getElevationWeight"},aggregation:{prop:"elevationAggregation"},filterData:{prop:"_filterData",updateTrigger:"_filterData"}}},getDomain:{triggers:{lowerPercentile:{prop:"elevationLowerPercentile"},upperPercentile:{prop:"elevationUpperPercentile"},scaleType:{prop:"elevationScaleType"}}},getScaleFunc:{triggers:{domain:{prop:"elevationDomain"},range:{prop:"elevationRange"}},onSet:{props:"onSetElevationDomain"}},nullValue:-1}],fu=function(a){return a.cellSize},Ie=function(){function t(a){(0,Oa.default)(this,t),this.state={layerData:{},dimensions:{}},this.changeFlags={},this.dimensionUpdaters={},this._getCellSize=a.getCellSize||fu,this._getAggregator=a.getAggregator,this._addDimension(a.dimensions||Aa)}return(0,Ta.default)(t,[{key:"updateState",value:function(e,n){var r=e.oldProps,i=e.props,o=e.changeFlags;this.updateGetValueFuncs(r,i,o);var s=this.needsReProjectPoints(r,i,o),u=!1;if(o.dataChanged||s)this.getAggregatedData(i,n),u=!0;else{var l=this.getDimensionChanges(r,i,o)||[];l.forEach(function(g){return typeof g=="function"&&g()}),u=!0}return this.setState({aggregationDirty:u}),this.state}},{key:"setState",value:function(e){this.state=J(J({},this.state),e)}},{key:"setDimensionState",value:function(e,n){this.setState({dimensions:J(J({},this.state.dimensions),{},(0,gr.default)({},e,J(J({},this.state.dimensions[e]),n)))})}},{key:"normalizeResult",value:function(){var e=arguments.length>0&&arguments[0]!==void 0?arguments[0]:{};return e.hexagons?J({data:e.hexagons},e):e.layerData?J({data:e.layerData},e):e}},{key:"getAggregatedData",value:function(e,n){var r=this._getAggregator(e),i=r(e,n);this.setState({layerData:this.normalizeResult(i)}),this.changeFlags={layerData:!0},this.getSortedBins(e)}},{key:"updateGetValueFuncs",value:function(e,n,r){for(var i in this.dimensionUpdaters){var o=this.dimensionUpdaters[i].getBins.triggers,s=o.value,u=o.weight,l=o.aggregation,g=n[s.prop],f=this.needUpdateDimensionStep(this.dimensionUpdaters[i].getBins,e,n,r);f&&(g?g=en(g,{data:n.data}):g=be(n[l.prop],n[u.prop],{data:n.data})),g&&this.setDimensionState(i,{getValue:g})}}},{key:"needsReProjectPoints",value:function(e,n,r){return this._getCellSize(e)!==this._getCellSize(n)||this._getAggregator(e)!==this._getAggregator(n)||r.updateTriggersChanged&&(r.updateTriggersChanged.all||r.updateTriggersChanged.getPosition)}},{key:"addDimension",value:function(e){this._addDimension(e)}},{key:"_addDimension",value:function(){var e=this,n=arguments.length>0&&arguments[0]!==void 0?arguments[0]:[];n.forEach(function(r){var i=r.key;e.dimensionUpdaters[i]=e.getDimensionUpdaters(r),e.state.dimensions[i]={getValue:null,domain:null,sortedBins:null,scaleFunc:_a}})}},{key:"getDimensionUpdaters",value:function(e){var n=e.key,r=e.accessor,i=e.pickingInfo,o=e.getBins,s=e.getDomain,u=e.getScaleFunc,l=e.nullValue;return{key:n,accessor:r,pickingInfo:i,getBins:J({updater:this.getDimensionSortedBins},o),getDomain:J({updater:this.getDimensionValueDomain},s),getScaleFunc:J({updater:this.getDimensionScale},u),attributeAccessor:this.getSubLayerDimensionAttribute(n,l)}}},{key:"needUpdateDimensionStep",value:function(e,n,r,i){return Object.values(e.triggers).some(function(o){return o.updateTrigger?i.dataChanged||i.updateTriggersChanged&&(i.updateTriggersChanged.all||i.updateTriggersChanged[o.updateTrigger]):n[o.prop]!==r[o.prop]})}},{key:"getDimensionChanges",value:function(e,n,r){var i=this,o=[],s=function(g){var f=ba.find(function(c){return i.needUpdateDimensionStep(i.dimensionUpdaters[g][c],e,n,r)});f&&o.push(i.dimensionUpdaters[g][f].updater.bind(i,n,i.dimensionUpdaters[g]))};for(var u in this.dimensionUpdaters)s(u);return o.length?o:null}},{key:"getUpdateTriggers",value:function(e){var n=this,r=e.updateTriggers||{},i={},o=function(l){var g=n.dimensionUpdaters[l].accessor;i[g]={},ba.forEach(function(f){Object.values(n.dimensionUpdaters[l][f].triggers).forEach(function(c){var d=c.prop,h=c.updateTrigger;if(h){var m=r[h];(0,fr.default)(m)==="object"&&!Array.isArray(m)?Object.assign(i[g],m):m!==void 0&&(i[g][d]=m)}else i[g][d]=e[d]})})};for(var s in this.dimensionUpdaters)o(s);return i}},{key:"getSortedBins",value:function(e){for(var n in this.dimensionUpdaters)this.getDimensionSortedBins(e,this.dimensionUpdaters[n])}},{key:"getDimensionSortedBins",value:function(e,n){var r=n.key,i=this.state.dimensions[r].getValue,o=new Me(this.state.layerData.data||[],{getValue:i,filterData:e._filterData});this.setDimensionState(r,{sortedBins:o}),this.getDimensionValueDomain(e,n)}},{key:"getDimensionValueDomain",value:function(e,n){var r=n.getDomain,i=n.key,o=r.triggers,s=o.lowerPercentile,u=o.upperPercentile,l=o.scaleType,g=this.state.dimensions[i].sortedBins.getValueDomainByScale(e[l.prop],[e[s.prop],e[u.prop]]);this.setDimensionState(i,{valueDomain:g}),this.getDimensionScale(e,n)}},{key:"getDimensionScale",value:function(e,n){var r=n.key,i=n.getScaleFunc,o=n.getDomain,s=i.triggers,u=s.domain,l=s.range,g=o.triggers.scaleType,f=i.onSet,c=e[l.prop],d=e[u.prop]||this.state.dimensions[r].valueDomain,h=jn(g&&e[g.prop]),m=h(d,c);(0,fr.default)(f)==="object"&&typeof e[f.props]=="function"&&e[f.props](m.domain()),this.setDimensionState(r,{scaleFunc:m})}},{key:"getSubLayerDimensionAttribute",value:function(e,n){var r=this;return function(i){var o=r.state.dimensions[e],s=o.sortedBins,u=o.scaleFunc,l=s.binMap[i.index];if(l&&l.counts===0)return n;var g=l&&l.value,f=u.domain(),c=g>=f[0]&&g<=f[f.length-1];return c?u(g):n}}},{key:"getSubLayerAccessors",value:function(e){var n={};for(var r in this.dimensionUpdaters){var i=this.dimensionUpdaters[r].accessor;n[i]=this.getSubLayerDimensionAttribute(e,r)}return n}},{key:"getPickingInfo",value:function(e){var n=e.info,r=n.picked&&n.index>-1,i=null;if(r){var o=this.state.layerData.data[n.index],s={};for(var u in this.dimensionUpdaters){var l=this.dimensionUpdaters[u].pickingInfo,g=this.state.dimensions[u].sortedBins,f=g.binMap[o.index]&&g.binMap[o.index].value;s[l]=f}i=Object.assign(s,o,{points:o.filteredPoints||o.points})}return n.picked=Boolean(i),n.object=i,n}},{key:"getAccessor",value:function(e){return this.dimensionUpdaters.hasOwnProperty(e)?this.dimensionUpdaters[e].attributeAccessor:_a}}],[{key:"defaultDimensions",value:function(){return Aa}}]),t}();function gu(t){var a=cu();return function(){var n=(0,wt.default)(t),r;if(a){var i=(0,wt.default)(this).constructor;r=Reflect.construct(n,arguments,i)}else r=n.apply(this,arguments);return(0,Ea.default)(this,r)}}function cu(){if(typeof Reflect>"u"||!Reflect.construct||Reflect.construct.sham)return!1;if(typeof Proxy=="function")return!0;try{return Boolean.prototype.valueOf.call(Reflect.construct(Boolean,[],function(){})),!0}catch{return!1}}function Ca(){}var pu={colorDomain:null,colorRange:Y,getColorValue:{type:"accessor",value:null},getColorWeight:{type:"accessor",value:1},colorAggregation:"SUM",lowerPercentile:{type:"number",min:0,max:100,value:0},upperPercentile:{type:"number",min:0,max:100,value:100},colorScaleType:"quantize",onSetColorDomain:Ca,elevationDomain:null,elevationRange:[0,1e3],getElevationValue:{type:"accessor",value:null},getElevationWeight:{type:"accessor",value:1},elevationAggregation:"SUM",elevationLowerPercentile:{type:"number",min:0,max:100,value:0},elevationUpperPercentile:{type:"number",min:0,max:100,value:100},elevationScale:{type:"number",min:0,value:1},elevationScaleType:"linear",onSetElevationDomain:Ca,gridAggregator:Ee,cellSize:{type:"number",min:0,max:1e3,value:1e3},coverage:{type:"number",min:0,max:1,value:1},getPosition:{type:"accessor",value:function(a){return a.position}},extruded:!1,material:!0,_filterData:{type:"function",value:null,optional:!0}},ve=function(t){(0,Ma.default)(e,t);var a=gu(e);function e(){return(0,Pa.default)(this,e),a.apply(this,arguments)}return(0,wa.default)(e,[{key:"initializeState",value:function(){var r=new Ie({getAggregator:function(s){return s.gridAggregator},getCellSize:function(s){return s.cellSize}});this.state={cpuAggregator:r,aggregatorState:r.state};var i=this.getAttributeManager();i.add({positions:{size:3,type:5130,accessor:"getPosition"}})}},{key:"updateState",value:function(r){(0,Da.default)((0,wt.default)(e.prototype),"updateState",this).call(this,r),this.setState({aggregatorState:this.state.cpuAggregator.updateState(r,{viewport:this.context.viewport,attributes:this.getAttributes(),numInstances:this.getNumInstances()})})}},{key:"getPickingInfo",value:function(r){var i=r.info;return this.state.cpuAggregator.getPickingInfo({info:i})}},{key:"_onGetSublayerColor",value:function(r){return this.state.cpuAggregator.getAccessor("fillColor")(r)}},{key:"_onGetSublayerElevation",value:function(r){return this.state.cpuAggregator.getAccessor("elevation")(r)}},{key:"_getSublayerUpdateTriggers",value:function(){return this.state.cpuAggregator.getUpdateTriggers(this.props)}},{key:"renderLayers",value:function(){var r=this.props,i=r.elevationScale,o=r.extruded,s=r.cellSize,u=r.coverage,l=r.material,g=r.transitions,f=this.state.cpuAggregator,c=this.getSubLayerClass("grid-cell",Ra.GridCellLayer),d=this._getSublayerUpdateTriggers();return new c({cellSize:s,coverage:u,material:l,elevationScale:i,extruded:o,getFillColor:this._onGetSublayerColor.bind(this),getElevation:this._onGetSublayerElevation.bind(this),transitions:g&&{getFillColor:g.getColorValue||g.getColorWeight,getElevation:g.getElevationValue||g.getElevationWeight}},this.getSubLayerProps({id:"grid-cell",updateTriggers:d}),{data:f.state.layerData.data})}}]),e}(Z);(0,cr.default)(ve,"layerName","CPUGridLayer");(0,cr.default)(ve,"defaultProps",pu);var za=v(z()),Ua=v(U()),ka=v(ae()),Ga=v(K()),Wa=v(H()),ja=v($()),Mt=v(j()),Je=v(L()),Va=v(B()),Ha=v(Se());var Le=Math.PI/3,vu=[0,Le,2*Le,3*Le,4*Le,5*Le];function mu(t){return t[0]}function du(t){return t[1]}function pr(){var t=0,a=0,e=1,n=1,r=mu,i=du,o,s,u;function l(f){var c={},d=[],h,m=f.length;for(h=0;h<m;++h)if(!(isNaN(O=+r.call(null,y=f[h],h,f))||isNaN(C=+i.call(null,y,h,f)))){var y,O,C,b=Math.round(C=C/u),P=Math.round(O=O/s-(b&1)/2),w=C-b;if(Math.abs(w)*3>1){var M=O-P,D=P+(O<P?-1:1)/2,N=b+(C<b?-1:1),V=O-D,q=C-N;M*M+w*w>V*V+q*q&&(P=D+(b&1?1:-1)/2,b=N)}var te=P+"-"+b,W=c[te];W?W.push(y):(d.push(W=c[te]=[y]),W.x=(P+(b&1)/2)*s,W.y=b*u)}return d}function g(f){var c=0,d=0;return vu.map(function(h){var m=Math.sin(h)*f,y=-Math.cos(h)*f,O=m-c,C=y-d;return c=m,d=y,[O,C]})}return l.hexagon=function(f){return"m"+g(f==null?o:+f).join("l")+"z"},l.centers=function(){for(var f=[],c=Math.round(a/u),d=Math.round(t/s),h=c*u;h<n+o;h+=u,++c)for(var m=d*s+(c&1)*s/2;m<e+s/2;m+=s)f.push([m,h]);return f},l.mesh=function(){var f=g(o).slice(0,4).join("l");return l.centers().map(function(c){return"M"+c+"m"+f}).join("")},l.x=function(f){return arguments.length?(r=f,l):r},l.y=function(f){return arguments.length?(i=f,l):i},l.radius=function(f){return arguments.length?(o=+f,s=o*2*Math.sin(Le),u=o*1.5,l):o},l.size=function(f){return arguments.length?(t=a=0,e=+f[0],n=+f[1],l):[e-t,n-a]},l.extent=function(f){return arguments.length?(t=+f[0][0],a=+f[0][1],e=+f[1][0],n=+f[1][1],l):[[t,a],[e,n]]},l.radius(1)}var Dt=v(B());function hu(t,a){var e=typeof Symbol<"u"&&t[Symbol.iterator]||t["@@iterator"];if(!e){if(Array.isArray(t)||(e=yu(t))||a&&t&&typeof t.length=="number"){e&&(t=e);var n=0,r=function(){};return{s:r,n:function(){return n>=t.length?{done:!0}:{done:!1,value:t[n++]}},e:function(l){throw l},f:r}}throw new TypeError(`Invalid attempt to iterate non-iterable instance.
 In order to be iterable, non-array objects must have a [Symbol.iterator]() method.`)}var i=!0,o=!1,s;return{s:function(){e=e.call(t)},n:function(){var l=e.next();return i=l.done,l},e:function(l){o=!0,s=l},f:function(){try{!i&&e.return!=null&&e.return()}finally{if(o)throw s}}}}function yu(t,a){if(t){if(typeof t=="string")return Na(t,a);var e=Object.prototype.toString.call(t).slice(8,-1);if(e==="Object"&&t.constructor&&(e=t.constructor.name),e==="Map"||e==="Set")return Array.from(t);if(e==="Arguments"||/^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(e))return Na(t,a)}}function Na(t,a){(a==null||a>t.length)&&(a=t.length);for(var e=0,n=new Array(a);e<a;e++)n[e]=t[e];return n}function Ia(t,a){var e=t.data,n=t.radius,r=a.viewport,i=a.attributes,o=e.length?xu(e,a):null,s=Su(n,r,o),u=[],l=(0,Dt.createIterable)(e),g=l.iterable,f=l.objectInfo,c=i.positions.value,d=i.positions.getAccessor(),h=d.size,m=hu(g),y;try{for(m.s();!(y=m.n()).done;){var O=y.value;f.index++;var C=f.index*h,b=[c[C],c[C+1]],P=Number.isFinite(b[0])&&Number.isFinite(b[1]);P?u.push({screenCoord:r.projectFlat(b),source:O,index:f.index}):Dt.log.warn("HexagonLayer: invalid position")()}}catch(D){m.e(D)}finally{m.f()}var w=pr().radius(s).x(function(D){return D.screenCoord[0]}).y(function(D){return D.screenCoord[1]}),M=w(u);return{hexagons:M.map(function(D,N){return{position:r.unprojectFlat([D.x,D.y]),points:D,index:N}}),radiusCommon:s}}function xu(t,a){var e=a.attributes,n=e.positions.value,r=e.positions.getAccessor(),i=r.size,o=1/0,s=1/0,u=-1/0,l=-1/0,g;for(g=0;g<i*t.length;g+=i){var f=n[g],c=n[g+1],d=Number.isFinite(f)&&Number.isFinite(c);d&&(o=Math.min(f,o),u=Math.max(f,u),s=Math.min(c,s),l=Math.max(c,l))}return[o,s,u,l].every(Number.isFinite)?[(o+u)/2,(s+l)/2]:null}function Su(t,a,e){var n=a.getDistanceScales(e),r=n.unitsPerMeter;return t*r[0]}function La(t,a){var e=Object.keys(t);if(Object.getOwnPropertySymbols){var n=Object.getOwnPropertySymbols(t);a&&(n=n.filter(function(r){return Object.getOwnPropertyDescriptor(t,r).enumerable})),e.push.apply(e,n)}return e}function Fa(t){for(var a=1;a<arguments.length;a++){var e=arguments[a]!=null?arguments[a]:{};a%2?La(Object(e),!0).forEach(function(n){(0,Je.default)(t,n,e[n])}):Object.getOwnPropertyDescriptors?Object.defineProperties(t,Object.getOwnPropertyDescriptors(e)):La(Object(e)).forEach(function(n){Object.defineProperty(t,n,Object.getOwnPropertyDescriptor(e,n))})}return t}function _u(t){var a=bu();return function(){var n=(0,Mt.default)(t),r;if(a){var i=(0,Mt.default)(this).constructor;r=Reflect.construct(n,arguments,i)}else r=n.apply(this,arguments);return(0,ja.default)(this,r)}}function bu(){if(typeof Reflect>"u"||!Reflect.construct||Reflect.construct.sham)return!1;if(typeof Proxy=="function")return!0;try{return Boolean.prototype.valueOf.call(Reflect.construct(Boolean,[],function(){})),!0}catch{return!1}}function Ba(){}var Au={colorDomain:null,colorRange:Y,getColorValue:{type:"accessor",value:null},getColorWeight:{type:"accessor",value:1},colorAggregation:"SUM",lowerPercentile:{type:"number",value:0,min:0,max:100},upperPercentile:{type:"number",value:100,min:0,max:100},colorScaleType:"quantize",onSetColorDomain:Ba,elevationDomain:null,elevationRange:[0,1e3],getElevationValue:{type:"accessor",value:null},getElevationWeight:{type:"accessor",value:1},elevationAggregation:"SUM",elevationLowerPercentile:{type:"number",value:0,min:0,max:100},elevationUpperPercentile:{type:"number",value:100,min:0,max:100},elevationScale:{type:"number",min:0,value:1},elevationScaleType:"linear",onSetElevationDomain:Ba,radius:{type:"number",value:1e3,min:1},coverage:{type:"number",min:0,max:1,value:1},extruded:!1,hexagonAggregator:Ia,getPosition:{type:"accessor",value:function(a){return a.position}},material:!0,_filterData:{type:"function",value:null,optional:!0}},Et=function(t){(0,Wa.default)(e,t);var a=_u(e);function e(){var n;(0,za.default)(this,e);for(var r=arguments.length,i=new Array(r),o=0;o<r;o++)i[o]=arguments[o];return n=a.call.apply(a,[this].concat(i)),(0,Je.default)((0,ka.default)(n),"state",void 0),n}return(0,Ua.default)(e,[{key:"initializeState",value:function(){var r=new Ie({getAggregator:function(s){return s.hexagonAggregator},getCellSize:function(s){return s.radius}});this.state={cpuAggregator:r,aggregatorState:r.state,vertices:null};var i=this.getAttributeManager();i.add({positions:{size:3,type:5130,accessor:"getPosition"}})}},{key:"updateState",value:function(r){if((0,Ga.default)((0,Mt.default)(e.prototype),"updateState",this).call(this,r),r.changeFlags.propsOrDataChanged){var i=this.state.cpuAggregator.updateState(r,{viewport:this.context.viewport,attributes:this.getAttributes()});if(this.state.aggregatorState.layerData!==i.layerData){var o=i.layerData||{},s=o.hexagonVertices;this.setState({vertices:s&&this.convertLatLngToMeterOffset(s)})}this.setState({aggregatorState:i})}}},{key:"convertLatLngToMeterOffset",value:function(r){var i=this.context.viewport;if(Array.isArray(r)&&r.length===6){var o=r[0],s=r[3],u=[(o[0]+s[0])/2,(o[1]+s[1])/2],l=i.projectFlat(u),g=i.getDistanceScales(u),f=g.metersPerUnit,c=r.map(function(d){var h=i.projectFlat(d);return[(h[0]-l[0])*f[0],(h[1]-l[1])*f[1]]});return c}return Va.log.error("HexagonLayer: hexagonVertices needs to be an array of 6 points")(),null}},{key:"getPickingInfo",value:function(r){var i=r.info;return this.state.cpuAggregator.getPickingInfo({info:i})}},{key:"_onGetSublayerColor",value:function(r){return this.state.cpuAggregator.getAccessor("fillColor")(r)}},{key:"_onGetSublayerElevation",value:function(r){return this.state.cpuAggregator.getAccessor("elevation")(r)}},{key:"_getSublayerUpdateTriggers",value:function(){return this.state.cpuAggregator.getUpdateTriggers(this.props)}},{key:"renderLayers",value:function(){var r=this.props,i=r.elevationScale,o=r.extruded,s=r.coverage,u=r.material,l=r.transitions,g=this.state,f=g.aggregatorState,c=g.vertices,d=this.getSubLayerClass("hexagon-cell",Ha.ColumnLayer),h=this._getSublayerUpdateTriggers(),m=c?{vertices:c,radius:1}:{radius:f.layerData.radiusCommon||1,radiusUnits:"common",angle:90};return new d(Fa(Fa({},m),{},{diskResolution:6,elevationScale:i,extruded:o,coverage:s,material:u,getFillColor:this._onGetSublayerColor.bind(this),getElevation:this._onGetSublayerElevation.bind(this),transitions:l&&{getFillColor:l.getColorValue||l.getColorWeight,getElevation:l.getElevationValue||l.getElevationWeight}}),this.getSubLayerProps({id:"hexagon-cell",updateTriggers:h}),{data:f.layerData.data})}}]),e}(Z);(0,Je.default)(Et,"layerName","HexagonLayer");(0,Je.default)(Et,"defaultProps",Au);var Pi=v(z()),wi=v(U()),mr=v(K()),Di=v(H()),Mi=v($()),tt=v(j()),rt=v(L()),Ft=v(Se());var xi=v(L()),Si=v(B());var _=v(L()),S,x=.5,T=1/6,p={N:[0,x],E:[x,0],S:[0,-x],W:[-x,0],NE:[x,x],NW:[-x,x],SE:[x,-x],SW:[-x,-x]},Fe=[p.W,p.SW,p.S],Be=[p.S,p.SE,p.E],ze=[p.E,p.NE,p.N],Ue=[p.NW,p.W,p.N],ke=[[-x,T],[-x,-T],[-T,-x],[T,-x]],Ge=[[-T,-x],[T,-x],[x,-T],[x,T]],We=[[x,-T],[x,T],[T,x],[-T,x]],je=[[-x,T],[-x,-T],[T,x],[-T,x]],$a=[p.W,p.SW,p.SE,p.E],Xa=[p.S,p.SE,p.NE,p.N],qa=[p.NW,p.W,p.E,p.NE],Ya=[p.NW,p.SW,p.S,p.N],Ka=[[-x,T],[-x,-T],[x,-T],[x,T]],Qa=[[-T,-x],[T,-x],[T,x],[-T,x]],Ou=[p.NW,p.SW,p.SE,p.NE],Za=[p.NW,p.SW,p.SE,p.E,p.N],Ja=[p.W,p.SW,p.SE,p.NE,p.N],ei=[p.NW,p.W,p.S,p.SE,p.NE],ti=[p.NW,p.SW,p.S,p.E,p.NE],ri=[p.NW,p.W,[x,-T],[x,T],p.N],ni=[[-T,-x],[T,-x],p.E,p.NE,p.N],ai=[[-x,T],[-x,-T],p.S,p.SE,p.E],ii=[p.W,p.SW,p.S,[T,x],[-T,x]],oi=[p.NW,p.W,[-T,-x],[T,-x],p.N],si=[[-x,T],[-x,-T],p.E,p.NE,p.N],ui=[p.S,p.SE,p.E,[T,x],[-T,x]],li=[p.W,p.SW,p.S,[x,-T],[x,T]],fi=[p.W,p.SW,p.SE,p.E,[T,x],[-T,x]],gi=[[-x,T],[-x,-T],p.S,p.SE,p.NE,p.N],ci=[p.NW,p.W,[-T,-x],[T,-x],p.E,p.NE],pi=[p.NW,p.SW,p.S,[x,-T],[x,T],p.N],Ve=[p.W,p.SW,p.S,p.E,p.NE,p.N],He=[p.NW,p.W,p.S,p.SE,p.E,p.N],Rt=[[-x,T],[-x,-T],[-T,-x],[T,-x],p.E,p.NE,p.N],Nt=[p.W,p.SW,p.S,[x,-T],[x,T],[T,x],[-T,x]],It=[p.NW,p.W,[-T,-x],[T,-x],[x,-T],[x,T],p.N],Lt=[[-x,T],[-x,-T],p.S,p.SE,p.E,[T,x],[-T,x]],vi=[[-x,T],[-x,-T],[-T,-x],[T,-x],[x,-T],[x,T],[T,x],[-T,x]],mi={0:[],1:[[p.W,p.S]],2:[[p.S,p.E]],3:[[p.W,p.E]],4:[[p.N,p.E]],5:{0:[[p.W,p.S],[p.N,p.E]],1:[[p.W,p.N],[p.S,p.E]]},6:[[p.N,p.S]],7:[[p.W,p.N]],8:[[p.W,p.N]],9:[[p.N,p.S]],10:{0:[[p.W,p.N],[p.S,p.E]],1:[[p.W,p.S],[p.N,p.E]]},11:[[p.N,p.E]],12:[[p.W,p.E]],13:[[p.S,p.E]],14:[[p.W,p.S]],15:[]};function A(t){return parseInt(t,4)}var di=(S={},(0,_.default)(S,A("0000"),[]),(0,_.default)(S,A("2222"),[]),(0,_.default)(S,A("2221"),[Fe]),(0,_.default)(S,A("2212"),[Be]),(0,_.default)(S,A("2122"),[ze]),(0,_.default)(S,A("1222"),[Ue]),(0,_.default)(S,A("0001"),[Fe]),(0,_.default)(S,A("0010"),[Be]),(0,_.default)(S,A("0100"),[ze]),(0,_.default)(S,A("1000"),[Ue]),(0,_.default)(S,A("2220"),[ke]),(0,_.default)(S,A("2202"),[Ge]),(0,_.default)(S,A("2022"),[We]),(0,_.default)(S,A("0222"),[je]),(0,_.default)(S,A("0002"),[ke]),(0,_.default)(S,A("0020"),[Ge]),(0,_.default)(S,A("0200"),[We]),(0,_.default)(S,A("2000"),[je]),(0,_.default)(S,A("0011"),[$a]),(0,_.default)(S,A("0110"),[Xa]),(0,_.default)(S,A("1100"),[qa]),(0,_.default)(S,A("1001"),[Ya]),(0,_.default)(S,A("2211"),[$a]),(0,_.default)(S,A("2112"),[Xa]),(0,_.default)(S,A("1122"),[qa]),(0,_.default)(S,A("1221"),[Ya]),(0,_.default)(S,A("2200"),[Ka]),(0,_.default)(S,A("2002"),[Qa]),(0,_.default)(S,A("0022"),[Ka]),(0,_.default)(S,A("0220"),[Qa]),(0,_.default)(S,A("1111"),[Ou]),(0,_.default)(S,A("1211"),[Za]),(0,_.default)(S,A("2111"),[Ja]),(0,_.default)(S,A("1112"),[ei]),(0,_.default)(S,A("1121"),[ti]),(0,_.default)(S,A("1011"),[Za]),(0,_.default)(S,A("0111"),[Ja]),(0,_.default)(S,A("1110"),[ei]),(0,_.default)(S,A("1101"),[ti]),(0,_.default)(S,A("1200"),[ri]),(0,_.default)(S,A("0120"),[ni]),(0,_.default)(S,A("0012"),[ai]),(0,_.default)(S,A("2001"),[ii]),(0,_.default)(S,A("1022"),[ri]),(0,_.default)(S,A("2102"),[ni]),(0,_.default)(S,A("2210"),[ai]),(0,_.default)(S,A("0221"),[ii]),(0,_.default)(S,A("1002"),[oi]),(0,_.default)(S,A("2100"),[si]),(0,_.default)(S,A("0210"),[ui]),(0,_.default)(S,A("0021"),[li]),(0,_.default)(S,A("1220"),[oi]),(0,_.default)(S,A("0122"),[si]),(0,_.default)(S,A("2012"),[ui]),(0,_.default)(S,A("2201"),[li]),(0,_.default)(S,A("0211"),[fi]),(0,_.default)(S,A("2110"),[gi]),(0,_.default)(S,A("1102"),[ci]),(0,_.default)(S,A("1021"),[pi]),(0,_.default)(S,A("2011"),[fi]),(0,_.default)(S,A("0112"),[gi]),(0,_.default)(S,A("1120"),[ci]),(0,_.default)(S,A("1201"),[pi]),(0,_.default)(S,A("2101"),[Ve]),(0,_.default)(S,A("0121"),[Ve]),(0,_.default)(S,A("1012"),[He]),(0,_.default)(S,A("1210"),[He]),(0,_.default)(S,A("0101"),{0:[Fe,ze],1:[Ve],2:[Ve]}),(0,_.default)(S,A("1010"),{0:[Ue,Be],1:[He],2:[He]}),(0,_.default)(S,A("2121"),{0:[Ve],1:[Ve],2:[Fe,ze]}),(0,_.default)(S,A("1212"),{0:[He],1:[He],2:[Ue,Be]}),(0,_.default)(S,A("2120"),{0:[Rt],1:[Rt],2:[ke,ze]}),(0,_.default)(S,A("2021"),{0:[Nt],1:[Nt],2:[Fe,We]}),(0,_.default)(S,A("1202"),{0:[It],1:[It],2:[Ue,Ge]}),(0,_.default)(S,A("0212"),{0:[Lt],1:[Lt],2:[Be,je]}),(0,_.default)(S,A("0102"),{0:[ke,ze],1:[Rt],2:[Rt]}),(0,_.default)(S,A("0201"),{0:[Fe,We],1:[Nt],2:[Nt]}),(0,_.default)(S,A("1020"),{0:[Ue,Ge],1:[It],2:[It]}),(0,_.default)(S,A("2010"),{0:[Be,je],1:[Lt],2:[Lt]}),(0,_.default)(S,A("2020"),{0:[je,Ge],1:[vi],2:[ke,We]}),(0,_.default)(S,A("0202"),{0:[We,ke],1:[vi],2:[je,Ge]}),S);function hi(t,a){var e=Object.keys(t);if(Object.getOwnPropertySymbols){var n=Object.getOwnPropertySymbols(t);a&&(n=n.filter(function(r){return Object.getOwnPropertyDescriptor(t,r).enumerable})),e.push.apply(e,n)}return e}function yi(t){for(var a=1;a<arguments.length;a++){var e=arguments[a]!=null?arguments[a]:{};a%2?hi(Object(e),!0).forEach(function(n){(0,xi.default)(t,n,e[n])}):Object.getOwnPropertyDescriptors?Object.defineProperties(t,Object.getOwnPropertyDescriptors(e)):hi(Object(e)).forEach(function(n){Object.defineProperty(t,n,Object.getOwnPropertyDescriptor(e,n))})}return t}var me={ISO_LINES:1,ISO_BANDS:2},Tu={zIndex:0,zOffset:.005};function et(t,a){return Array.isArray(a)?t<a[0]?0:t<a[1]?1:2:t>=a?1:0}function _i(t){var a=t.cellWeights,e=t.x,n=t.y,r=t.width,i=t.height,o=t.threshold;t.thresholdValue&&(Si.log.deprecated("thresholdValue","threshold")(),o=t.thresholdValue);var s=e<0,u=e>=r-1,l=n<0,g=n>=i-1,f=s||u||l||g,c={},d={};s||g?d.top=0:(c.top=a[(n+1)*r+e],d.top=et(c.top,o)),u||g?d.topRight=0:(c.topRight=a[(n+1)*r+e+1],d.topRight=et(c.topRight,o)),u||l?d.right=0:(c.right=a[n*r+e+1],d.right=et(c.right,o)),s||l?d.current=0:(c.current=a[n*r+e],d.current=et(c.current,o));var h=d.top,m=d.topRight,y=d.right,O=d.current,C=-1;Number.isFinite(o)&&(C=h<<3|m<<2|y<<1|O),Array.isArray(o)&&(C=h<<6|m<<4|y<<2|O);var b=0;return f||(b=et((c.top+c.topRight+c.right+c.current)/4,o)),{code:C,meanCode:b}}function vr(t){var a=t.gridOrigin,e=t.cellSize,n=t.x,r=t.y,i=t.code,o=t.meanCode,s=t.type,u=s===void 0?me.ISO_LINES:s,l=yi(yi({},Tu),t.thresholdData),g=u===me.ISO_BANDS?di[i]:mi[i];Array.isArray(g)||(g=g[o]);var f=l.zIndex*l.zOffset,c=(n+1)*e[0],d=(r+1)*e[1],h=a[0]+c,m=a[1]+d;if(u===me.ISO_BANDS){var y=[];return g.forEach(function(C){var b=[];C.forEach(function(P){var w=h+P[0]*e[0],M=m+P[1]*e[1];b.push([w,M,f])}),y.push(b)}),y}var O=[];return g.forEach(function(C){C.forEach(function(b){var P=h+b[0]*e[0],w=m+b[1]*e[1];O.push([P,w,f])})}),O}function bi(t,a){var e=typeof Symbol<"u"&&t[Symbol.iterator]||t["@@iterator"];if(!e){if(Array.isArray(t)||(e=Cu(t))||a&&t&&typeof t.length=="number"){e&&(t=e);var n=0,r=function(){};return{s:r,n:function(){return n>=t.length?{done:!0}:{done:!1,value:t[n++]}},e:function(l){throw l},f:r}}throw new TypeError(`Invalid attempt to iterate non-iterable instance.
-In order to be iterable, non-array objects must have a [Symbol.iterator]() method.`)}var i=!0,o=!1,s;return{s:function(){e=e.call(t)},n:function(){var l=e.next();return i=l.done,l},e:function(l){o=!0,s=l},f:function(){try{!i&&e.return!=null&&e.return()}finally{if(o)throw s}}}}function Cu(t,a){if(t){if(typeof t=="string")return Ai(t,a);var e=Object.prototype.toString.call(t).slice(8,-1);if(e==="Object"&&t.constructor&&(e=t.constructor.name),e==="Map"||e==="Set")return Array.from(t);if(e==="Arguments"||/^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(e))return Ai(t,a)}}function Ai(t,a){(a==null||a>t.length)&&(a=t.length);for(var e=0,n=new Array(a);e<a;e++)n[e]=t[e];return n}function Oi(t){var a=t.thresholdData,e=t.cellWeights,n=t.gridSize,r=t.gridOrigin,i=t.cellSize,o=[],s=[],u=n[0],l=n[1],g=0,f=0,c=bi(a),d;try{for(c.s();!(d=c.n()).done;)for(var h=d.value,m=h.contour,y=m.threshold,O=-1;O<u;O++)for(var C=-1;C<l;C++){var b=_i({cellWeights:e,threshold:y,x:O,y:C,width:u,height:l}),P=b.code,w=b.meanCode,M={type:me.ISO_BANDS,gridOrigin:r,cellSize:i,x:O,y:C,width:u,height:l,code:P,meanCode:w,thresholdData:h};if(Array.isArray(y)){M.type=me.ISO_BANDS;var D=vr(M),N=bi(D),V;try{for(N.s();!(V=N.n()).done;){var q=V.value;s[f++]={vertices:q,contour:m}}}catch(xe){N.e(xe)}finally{N.f()}}else{M.type=me.ISO_LINES;for(var te=vr(M),W=0;W<te.length;W+=2)o[g++]={start:te[W],end:te[W+1],contour:m}}}}catch(xe){c.e(xe)}finally{c.f()}return{contourSegments:o,contourPolygons:s}}var Ei=v(B());function Pu(t){var a=wu();return function(){var n=(0,tt.default)(t),r;if(a){var i=(0,tt.default)(this).constructor;r=Reflect.construct(n,arguments,i)}else r=n.apply(this,arguments);return(0,Mi.default)(this,r)}}function wu(){if(typeof Reflect>"u"||!Reflect.construct||Reflect.construct.sham)return!1;if(typeof Proxy=="function")return!0;try{return Boolean.prototype.valueOf.call(Reflect.construct(Boolean,[],function(){})),!0}catch{return!1}}var Ti=[255,255,255,255],Du=1,Mu=1,Eu={cellSize:{type:"number",min:1,max:1e3,value:1e3},getPosition:{type:"accessor",value:function(a){return a.position}},getWeight:{type:"accessor",value:1},gpuAggregation:!0,aggregation:"SUM",contours:{type:"object",value:[{threshold:Mu}],optional:!0,compare:!0,depth:2},zOffset:.005},Ci="positions",Ru={data:{props:["cellSize"]},weights:{props:["aggregation"],accessors:["getWeight"]}},Bt=function(t){(0,Di.default)(e,t);var a=Pu(e);function e(){return(0,Pi.default)(this,e),a.apply(this,arguments)}return(0,wi.default)(e,[{key:"initializeState",value:function(){var r;(0,mr.default)((0,tt.default)(e.prototype),"initializeAggregationLayer",this).call(this,{dimensions:Ru}),this.setState({contourData:{},projectPoints:!1,weights:{count:{size:1,operation:E.SUM}}});var i=this.getAttributeManager();i.add((r={},(0,rt.default)(r,Ci,{size:3,accessor:"getPosition",type:5130,fp64:this.use64bitPositions()}),(0,rt.default)(r,"count",{size:3,accessor:"getWeight"}),r))}},{key:"updateState",value:function(r){(0,mr.default)((0,tt.default)(e.prototype),"updateState",this).call(this,r);var i=!1,o=r.oldProps,s=r.props,u=this.state.aggregationDirty;(o.contours!==s.contours||o.zOffset!==s.zOffset)&&(i=!0,this._updateThresholdData(r.props)),this.getNumInstances()>0&&(u||i)&&this._generateContours()}},{key:"renderLayers",value:function(){var r=this.state.contourData,i=r.contourSegments,o=r.contourPolygons,s=this.getSubLayerClass("lines",Ft.LineLayer),u=this.getSubLayerClass("bands",Ft.SolidPolygonLayer),l=i&&i.length>0&&new s(this.getSubLayerProps({id:"lines"}),{data:this.state.contourData.contourSegments,getSourcePosition:function(c){return c.start},getTargetPosition:function(c){return c.end},getColor:function(c){return c.contour.color||Ti},getWidth:function(c){return c.contour.strokeWidth||Du}}),g=o&&o.length>0&&new u(this.getSubLayerProps({id:"bands"}),{data:this.state.contourData.contourPolygons,getPolygon:function(c){return c.vertices},getFillColor:function(c){return c.contour.color||Ti}});return[l,g]}},{key:"updateAggregationState",value:function(r){var i=r.props,o=r.oldProps,s=i.cellSize,u=i.coordinateSystem,l=this.context.viewport,g=o.cellSize!==s,f=i.gpuAggregation;this.state.gpuAggregation!==i.gpuAggregation&&f&&!G.isSupported(this.context.gl)&&(Ei.log.warn("GPU Grid Aggregation not supported, falling back to CPU")(),f=!1);var c=f!==this.state.gpuAggregation;this.setState({gpuAggregation:f});var d=this.state.dimensions,h=this.isAttributeChanged(Ci),m=d.data,y=d.weights,O=this.state.boundingBox;if(h&&(O=At(this.getAttributes(),this.getNumInstances()),this.setState({boundingBox:O})),h||g){var C=Ot(O,s,l,u),b=C.gridOffset,P=C.translation,w=C.width,M=C.height,D=C.numCol,N=C.numRow;this.allocateResources(N,D),this.setState({gridOffset:b,boundingBox:O,translation:P,posOffset:P.slice(),gridOrigin:[-1*P[0],-1*P[1]],width:w,height:M,numCol:D,numRow:N})}var V=h||c||this.isAggregationDirty(r,{dimension:m,compareAll:f}),q=this.isAggregationDirty(r,{dimension:y});q&&this._updateAccessors(r),(V||q)&&this._resetResults(),this.setState({aggregationDataDirty:V,aggregationWeightsDirty:q})}},{key:"_updateAccessors",value:function(r){var i=r.props,o=i.getWeight,s=i.aggregation,u=i.data,l=this.state.weights.count;l&&(l.getWeight=o,l.operation=E[s]),this.setState({getValue:be(s,o,{data:u})})}},{key:"_resetResults",value:function(){var r=this.state.weights.count;r&&(r.aggregationData=null)}},{key:"_generateContours",value:function(){var r=this.state,i=r.numCol,o=r.numRow,s=r.gridOrigin,u=r.gridOffset,l=r.thresholdData,g=this.state.weights.count,f=g.aggregationData;f||(f=g.aggregationBuffer.getData(),g.aggregationData=f);var c=G.getCellData({countsData:f}),d=c.cellWeights,h=Oi({thresholdData:l,cellWeights:d,gridSize:[i,o],gridOrigin:s,cellSize:[u.xOffset,u.yOffset]});this.setState({contourData:h})}},{key:"_updateThresholdData",value:function(r){for(var i=r.contours,o=r.zOffset,s=i.length,u=new Array(s),l=0;l<s;l++){var g=i[l];u[l]={contour:g,zIndex:g.zIndex||l,zOffset:o}}this.setState({thresholdData:u})}}]),e}(ce);(0,rt.default)(Bt,"layerName","ContourLayer");(0,rt.default)(Bt,"defaultProps",Eu);var Ki=v(z()),Qi=v(U()),Zi=v(ae()),Ji=v(H()),eo=v($()),Sr=v(j()),nt=v(L()),to=v(B());var Vi=v(z()),Hi=v(U()),Wt=v(K()),$i=v(H()),Xi=v($()),$e=v(j()),de=v(L()),yr=v(Q()),qi=v(B());var Fi=v(z()),Bi=v(U()),zi=v(K()),Ui=v(H()),ki=v($()),zt=v(j()),Ut=v(L()),X=v(B()),kt=v(Q());var Ri=`#version 300 es
+In order to be iterable, non-array objects must have a [Symbol.iterator]() method.`)}var i=!0,o=!1,s;return{s:function(){e=e.call(t)},n:function(){var l=e.next();return i=l.done,l},e:function(l){o=!0,s=l},f:function(){try{!i&&e.return!=null&&e.return()}finally{if(o)throw s}}}}function Cu(t,a){if(t){if(typeof t=="string")return Ai(t,a);var e=Object.prototype.toString.call(t).slice(8,-1);if(e==="Object"&&t.constructor&&(e=t.constructor.name),e==="Map"||e==="Set")return Array.from(t);if(e==="Arguments"||/^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(e))return Ai(t,a)}}function Ai(t,a){(a==null||a>t.length)&&(a=t.length);for(var e=0,n=new Array(a);e<a;e++)n[e]=t[e];return n}function Oi(t){var a=t.thresholdData,e=t.cellWeights,n=t.gridSize,r=t.gridOrigin,i=t.cellSize,o=[],s=[],u=n[0],l=n[1],g=0,f=0,c=bi(a),d;try{for(c.s();!(d=c.n()).done;)for(var h=d.value,m=h.contour,y=m.threshold,O=-1;O<u;O++)for(var C=-1;C<l;C++){var b=_i({cellWeights:e,threshold:y,x:O,y:C,width:u,height:l}),P=b.code,w=b.meanCode,M={type:me.ISO_BANDS,gridOrigin:r,cellSize:i,x:O,y:C,width:u,height:l,code:P,meanCode:w,thresholdData:h};if(Array.isArray(y)){M.type=me.ISO_BANDS;var D=vr(M),N=bi(D),V;try{for(N.s();!(V=N.n()).done;){var q=V.value;s[f++]={vertices:q,contour:m}}}catch(xe){N.e(xe)}finally{N.f()}}else{M.type=me.ISO_LINES;for(var te=vr(M),W=0;W<te.length;W+=2)o[g++]={start:te[W],end:te[W+1],contour:m}}}}catch(xe){c.e(xe)}finally{c.f()}return{contourSegments:o,contourPolygons:s}}var Ei=v(B());function Pu(t){var a=wu();return function(){var n=(0,tt.default)(t),r;if(a){var i=(0,tt.default)(this).constructor;r=Reflect.construct(n,arguments,i)}else r=n.apply(this,arguments);return(0,Mi.default)(this,r)}}function wu(){if(typeof Reflect>"u"||!Reflect.construct||Reflect.construct.sham)return!1;if(typeof Proxy=="function")return!0;try{return Boolean.prototype.valueOf.call(Reflect.construct(Boolean,[],function(){})),!0}catch{return!1}}var Ti=[255,255,255,255],Du=1,Mu=1,Eu={cellSize:{type:"number",min:1,max:1e3,value:1e3},getPosition:{type:"accessor",value:function(a){return a.position}},getWeight:{type:"accessor",value:1},gpuAggregation:!0,aggregation:"SUM",contours:{type:"object",value:[{threshold:Mu}],optional:!0,compare:3},zOffset:.005},Ci="positions",Ru={data:{props:["cellSize"]},weights:{props:["aggregation"],accessors:["getWeight"]}},Bt=function(t){(0,Di.default)(e,t);var a=Pu(e);function e(){return(0,Pi.default)(this,e),a.apply(this,arguments)}return(0,wi.default)(e,[{key:"initializeState",value:function(){var r;(0,mr.default)((0,tt.default)(e.prototype),"initializeAggregationLayer",this).call(this,{dimensions:Ru}),this.setState({contourData:{},projectPoints:!1,weights:{count:{size:1,operation:E.SUM}}});var i=this.getAttributeManager();i.add((r={},(0,rt.default)(r,Ci,{size:3,accessor:"getPosition",type:5130,fp64:this.use64bitPositions()}),(0,rt.default)(r,"count",{size:3,accessor:"getWeight"}),r))}},{key:"updateState",value:function(r){(0,mr.default)((0,tt.default)(e.prototype),"updateState",this).call(this,r);var i=!1,o=r.oldProps,s=r.props,u=this.state.aggregationDirty;(o.contours!==s.contours||o.zOffset!==s.zOffset)&&(i=!0,this._updateThresholdData(r.props)),this.getNumInstances()>0&&(u||i)&&this._generateContours()}},{key:"renderLayers",value:function(){var r=this.state.contourData,i=r.contourSegments,o=r.contourPolygons,s=this.getSubLayerClass("lines",Ft.LineLayer),u=this.getSubLayerClass("bands",Ft.SolidPolygonLayer),l=i&&i.length>0&&new s(this.getSubLayerProps({id:"lines"}),{data:this.state.contourData.contourSegments,getSourcePosition:function(c){return c.start},getTargetPosition:function(c){return c.end},getColor:function(c){return c.contour.color||Ti},getWidth:function(c){return c.contour.strokeWidth||Du}}),g=o&&o.length>0&&new u(this.getSubLayerProps({id:"bands"}),{data:this.state.contourData.contourPolygons,getPolygon:function(c){return c.vertices},getFillColor:function(c){return c.contour.color||Ti}});return[l,g]}},{key:"updateAggregationState",value:function(r){var i=r.props,o=r.oldProps,s=i.cellSize,u=i.coordinateSystem,l=this.context.viewport,g=o.cellSize!==s,f=i.gpuAggregation;this.state.gpuAggregation!==i.gpuAggregation&&f&&!G.isSupported(this.context.gl)&&(Ei.log.warn("GPU Grid Aggregation not supported, falling back to CPU")(),f=!1);var c=f!==this.state.gpuAggregation;this.setState({gpuAggregation:f});var d=this.state.dimensions,h=this.isAttributeChanged(Ci),m=d.data,y=d.weights,O=this.state.boundingBox;if(h&&(O=At(this.getAttributes(),this.getNumInstances()),this.setState({boundingBox:O})),h||g){var C=Ot(O,s,l,u),b=C.gridOffset,P=C.translation,w=C.width,M=C.height,D=C.numCol,N=C.numRow;this.allocateResources(N,D),this.setState({gridOffset:b,boundingBox:O,translation:P,posOffset:P.slice(),gridOrigin:[-1*P[0],-1*P[1]],width:w,height:M,numCol:D,numRow:N})}var V=h||c||this.isAggregationDirty(r,{dimension:m,compareAll:f}),q=this.isAggregationDirty(r,{dimension:y});q&&this._updateAccessors(r),(V||q)&&this._resetResults(),this.setState({aggregationDataDirty:V,aggregationWeightsDirty:q})}},{key:"_updateAccessors",value:function(r){var i=r.props,o=i.getWeight,s=i.aggregation,u=i.data,l=this.state.weights.count;l&&(l.getWeight=o,l.operation=E[s]),this.setState({getValue:be(s,o,{data:u})})}},{key:"_resetResults",value:function(){var r=this.state.weights.count;r&&(r.aggregationData=null)}},{key:"_generateContours",value:function(){var r=this.state,i=r.numCol,o=r.numRow,s=r.gridOrigin,u=r.gridOffset,l=r.thresholdData,g=this.state.weights.count,f=g.aggregationData;f||(f=g.aggregationBuffer.getData(),g.aggregationData=f);var c=G.getCellData({countsData:f}),d=c.cellWeights,h=Oi({thresholdData:l,cellWeights:d,gridSize:[i,o],gridOrigin:s,cellSize:[u.xOffset,u.yOffset]});this.setState({contourData:h})}},{key:"_updateThresholdData",value:function(r){for(var i=r.contours,o=r.zOffset,s=i.length,u=new Array(s),l=0;l<s;l++){var g=i[l];u[l]={contour:g,zIndex:g.zIndex||l,zOffset:o}}this.setState({thresholdData:u})}}]),e}(ce);(0,rt.default)(Bt,"layerName","ContourLayer");(0,rt.default)(Bt,"defaultProps",Eu);var Ki=v(z()),Qi=v(U()),Zi=v(ae()),Ji=v(H()),eo=v($()),Sr=v(j()),nt=v(L()),to=v(B());var Vi=v(z()),Hi=v(U()),Wt=v(K()),$i=v(H()),Xi=v($()),$e=v(j()),de=v(L()),yr=v(Q()),qi=v(B());var Fi=v(z()),Bi=v(U()),zi=v(K()),Ui=v(H()),ki=v($()),zt=v(j()),Ut=v(L()),X=v(B()),kt=v(Q());var Ri=`#version 300 es
 #define SHADER_NAME gpu-grid-cell-layer-vertex-shader
 #define RANGE_COUNT 6
 

package/package.json

@@ -2,7 +2,7 @@
   "name": "@deck.gl/aggregation-layers",
   "description": "deck.gl layers that aggregate the input data into alternative representations",
   "license": "MIT",
-  "version": "8.9.0-beta.2",
+  "version": "8.9.0-beta.4",
   "publishConfig": {
     "access": "public"
   },
@@ -40,5 +40,5 @@
     "@deck.gl/layers": "^8.0.0",
     "@luma.gl/core": "^8.0.0"
   },
-  "gitHead": "5dae086e4f3eb46c30d8e761f9d600be4f68e949"
+  "gitHead": "f7c0eeaed1e62b0ae44ee45136b444f647e6cbd9"
 }

package/src/aggregation-layer.ts

@@ -21,6 +21,7 @@
 import {
   CompositeLayer,
   AttributeManager,
+  LayerDataSource,
   _compareProps as compareProps,
   UpdateParameters,
   CompositeLayerProps
@@ -28,11 +29,14 @@ import {
 import {cssToDeviceRatio} from '@luma.gl/core';
 import {filterProps} from './utils/prop-utils';
 
-export type AggregationLayerProps<DataT = any> = CompositeLayerProps<DataT>;
+export type AggregationLayerProps<DataT> = CompositeLayerProps & {
+  data: LayerDataSource<DataT>;
+};
 
 export default abstract class AggregationLayer<
+  DataT,
   ExtraPropsT extends {} = {}
-> extends CompositeLayer<ExtraPropsT> {
+> extends CompositeLayer<Required<AggregationLayer<DataT>> & ExtraPropsT> {
   static layerName = 'AggregationLayer';
 
   state!: CompositeLayer['state'] & {

package/src/contour-layer/contour-layer.ts

@@ -54,8 +54,7 @@ const defaultProps: DefaultProps<ContourLayerProps> = {
     type: 'object',
     value: [{threshold: DEFAULT_THRESHOLD}],
     optional: true,
-    compare: true,
-    depth: 2
+    compare: 3
   },
 
   zOffset: 0.005
@@ -148,7 +147,7 @@ export type _ContourLayerProps<DataT> = {
 export default class ContourLayer<
   DataT = any,
   ExtraPropsT extends {} = {}
-> extends GridAggregationLayer<ExtraPropsT & Required<_ContourLayerProps<DataT>>> {
+> extends GridAggregationLayer<DataT, ExtraPropsT & Required<_ContourLayerProps<DataT>>> {
   static layerName = 'ContourLayer';
   static defaultProps = defaultProps;
 

package/src/cpu-grid-layer/cpu-grid-layer.ts

@@ -77,7 +77,7 @@ export type CPUGridLayerProps<DataT = any> = _CPUGridLayerProps<DataT> &
   AggregationLayerProps<DataT>;
 
 /** Properties added by CPUGridLayer. */
-export type _CPUGridLayerProps<DataT> = {
+type _CPUGridLayerProps<DataT> = {
   /**
    * Size of each cell in meters.
    * @default 1000
@@ -240,7 +240,7 @@ export type _CPUGridLayerProps<DataT> = {
 export default class CPUGridLayer<
   DataT = any,
   ExtraPropsT extends {} = {}
-> extends AggregationLayer<ExtraPropsT & Required<_CPUGridLayerProps<DataT>>> {
+> extends AggregationLayer<DataT, ExtraPropsT & Required<_CPUGridLayerProps<DataT>>> {
   static layerName = 'CPUGridLayer';
   static defaultProps = defaultProps;
 

package/src/gpu-grid-layer/gpu-grid-layer.ts

@@ -172,7 +172,7 @@ export type _GPUGridLayerProps<DataT> = {
 export default class GPUGridLayer<
   DataT = any,
   ExtraPropsT extends {} = {}
-> extends GridAggregationLayer<ExtraPropsT & Required<_GPUGridLayerProps<DataT>>> {
+> extends GridAggregationLayer<DataT, ExtraPropsT & Required<_GPUGridLayerProps<DataT>>> {
   static layerName = 'GPUGridLayer';
   static defaultProps = defaultProps;
 

package/src/grid-aggregation-layer.ts

@@ -26,14 +26,15 @@ import GL from '@luma.gl/constants';
 import BinSorter from './utils/bin-sorter';
 import {pointToDensityGridDataCPU} from './cpu-grid-layer/grid-aggregator';
 
-export type GridAggregationLayerProps<DataT = any> = AggregationLayerProps<DataT>;
+export type GridAggregationLayerProps<DataT> = AggregationLayerProps<DataT>;
 
 export default abstract class GridAggregationLayer<
+  DataT,
   ExtraPropsT extends {} = {}
-> extends AggregationLayer<ExtraPropsT> {
+> extends AggregationLayer<DataT, ExtraPropsT> {
   static layerName = 'GridAggregationLayer';
 
-  state!: AggregationLayer['state'] & {
+  state!: AggregationLayer<DataT>['state'] & {
     aggregationDataDirty?: any;
     aggregationWeightsDirty?: any;
     gpuAggregation?: any;

package/src/grid-layer/grid-layer.ts

@@ -6,8 +6,8 @@ import {
   DefaultProps
 } from '@deck.gl/core';
 import GPUGridAggregator from '../utils/gpu-grid-aggregation/gpu-grid-aggregator';
-import GPUGridLayer, {_GPUGridLayerProps} from '../gpu-grid-layer/gpu-grid-layer';
-import CPUGridLayer, {_CPUGridLayerProps} from '../cpu-grid-layer/cpu-grid-layer';
+import GPUGridLayer, {GPUGridLayerProps} from '../gpu-grid-layer/gpu-grid-layer';
+import CPUGridLayer, {CPUGridLayerProps} from '../cpu-grid-layer/cpu-grid-layer';
 
 const defaultProps: DefaultProps<GridLayerProps> = {
   ...GPUGridLayer.defaultProps,
@@ -16,11 +16,11 @@ const defaultProps: DefaultProps<GridLayerProps> = {
 };
 
 /** All properties supported by GridLayer. */
-export type GridLayerProps<DataT = any> = _GridLayerProps<DataT> & CompositeLayerProps<DataT>;
+export type GridLayerProps<DataT = any> = _GridLayerProps<DataT> & CompositeLayerProps;
 
 /** Properties added by GridLayer. */
-type _GridLayerProps<DataT> = _CPUGridLayerProps<DataT> &
-  _GPUGridLayerProps<DataT> & {
+type _GridLayerProps<DataT> = CPUGridLayerProps<DataT> &
+  GPUGridLayerProps<DataT> & {
     /**
      * Whether the aggregation should be performed in high-precision 64-bit mode.
      * @default false

package/src/heatmap-layer/heatmap-layer.ts

@@ -190,11 +190,11 @@ type _HeatmapLayerProps<DataT> = {
 export default class HeatmapLayer<
   DataT = any,
   ExtraPropsT extends {} = {}
-> extends AggregationLayer<ExtraPropsT & Required<_HeatmapLayerProps<DataT>>> {
+> extends AggregationLayer<DataT, ExtraPropsT & Required<_HeatmapLayerProps<DataT>>> {
   static layerName = 'HeatmapLayer';
   static defaultProps = defaultProps;
 
-  state!: AggregationLayer['state'] & {
+  state!: AggregationLayer<DataT>['state'] & {
     supported: boolean;
     colorDomain?: number[];
     isWeightMapDirty?: boolean;

package/src/hexagon-layer/hexagon-layer.ts

@@ -247,13 +247,14 @@ type _HexagonLayerProps<DataT = any> = {
 };
 
 /** Aggregates data into a hexagon-based heatmap. The color and height of a hexagon are determined based on the objects it contains. */
-export default class HexagonLayer<ExtraPropsT extends {} = {}> extends AggregationLayer<
+export default class HexagonLayer<DataT, ExtraPropsT extends {} = {}> extends AggregationLayer<
+  DataT,
   ExtraPropsT & Required<_HexagonLayerProps>
 > {
   static layerName = 'HexagonLayer';
   static defaultProps = defaultProps;
 
-  state!: AggregationLayer['state'] & {
+  state!: AggregationLayer<DataT>['state'] & {
     cpuAggregator: CPUAggregator;
     aggregatorState: any;
   };

package/src/screen-grid-layer/screen-grid-cell-layer.ts

@@ -39,8 +39,7 @@ const defaultProps: DefaultProps<ScreenGridCellLayerProps> = {
 };
 
 /** All properties supported by ScreenGridCellLayer. */
-export type ScreenGridCellLayerProps<DataT = any> = _ScreenGridCellLayerProps<DataT> &
-  LayerProps<DataT>;
+export type ScreenGridCellLayerProps<DataT = any> = _ScreenGridCellLayerProps<DataT> & LayerProps;
 
 /** Proprties added by ScreenGridCellLayer. */
 export type _ScreenGridCellLayerProps<DataT> = _ScreenGridLayerProps<DataT> & {

package/src/screen-grid-layer/screen-grid-layer.ts

@@ -142,11 +142,11 @@ export type _ScreenGridLayerProps<DataT> = {
 export default class ScreenGridLayer<
   DataT = any,
   ExtraProps extends {} = {}
-> extends GridAggregationLayer<ExtraProps & Required<_ScreenGridLayerProps<DataT>>> {
+> extends GridAggregationLayer<DataT, ExtraProps & Required<_ScreenGridLayerProps<DataT>>> {
   static layerName = 'ScreenGridLayer';
   static defaultProps = defaultProps;
 
-  state!: GridAggregationLayer['state'] & {
+  state!: GridAggregationLayer<DataT>['state'] & {
     supported: boolean;
     gpuGridAggregator?: any;
     gpuAggregation?: any;

package/typed/aggregation-layer.d.ts

@@ -1,6 +1,8 @@
-import { CompositeLayer, AttributeManager, UpdateParameters, CompositeLayerProps } from '@deck.gl/core/typed';
-export declare type AggregationLayerProps<DataT = any> = CompositeLayerProps<DataT>;
-export default abstract class AggregationLayer<ExtraPropsT extends {} = {}> extends CompositeLayer<ExtraPropsT> {
+import { CompositeLayer, AttributeManager, LayerDataSource, UpdateParameters, CompositeLayerProps } from '@deck.gl/core/typed';
+export declare type AggregationLayerProps<DataT> = CompositeLayerProps & {
+    data: LayerDataSource<DataT>;
+};
+export default abstract class AggregationLayer<DataT, ExtraPropsT extends {} = {}> extends CompositeLayer<Required<AggregationLayer<DataT>> & ExtraPropsT> {
     static layerName: string;
     state: CompositeLayer['state'] & {
         ignoreProps?: Record<string, any>;

package/typed/aggregation-layer.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"aggregation-layer.d.ts","sourceRoot":"","sources":["../src/aggregation-layer.ts"],"names":[],"mappings":"AAoBA,OAAO,EACL,cAAc,EACd,gBAAgB,EAEhB,gBAAgB,EAChB,mBAAmB,EACpB,MAAM,eAAe,CAAC;AAIvB,oBAAY,qBAAqB,CAAC,KAAK,GAAG,GAAG,IAAI,mBAAmB,CAAC,KAAK,CAAC,CAAC;AAE5E,MAAM,CAAC,OAAO,CAAC,QAAQ,OAAO,gBAAgB,CAC5C,WAAW,SAAS,EAAE,GAAG,EAAE,CAC3B,SAAQ,cAAc,CAAC,WAAW,CAAC;IACnC,MAAM,CAAC,SAAS,SAAsB;IAEtC,KAAK,EAAG,cAAc,CAAC,OAAO,CAAC,GAAG;QAChC,WAAW,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;QAClC,UAAU,CAAC,EAAE,GAAG,CAAC;KAClB,CAAC;IAEF,0BAA0B,CAAC,UAAU,EAAE,GAAG;IAU1C,WAAW,CAAC,IAAI,EAAE,gBAAgB,CAAC,IAAI,CAAC;IAexC,gBAAgB,CAAC,iBAAiB,KAAA;IAMlC,aAAa;;;IAIb,iBAAiB;IAcjB,aAAa,CAAC,OAAO,KAAA;IAIrB;;;;;;;QAOI;IACJ,kBAAkB,CAChB,UAAU,KAAA,EACV,MAAM,GAAE;QAAC,UAAU,CAAC,EAAE,OAAO,CAAC;QAAC,SAAS,CAAC,EAAE,GAAG,CAAA;KAAM,GACnD,MAAM,GAAG,OAAO;IAyCnB;;;;;QAKI;IACJ,kBAAkB,CAAC,IAAI,CAAC,EAAE,MAAM;IAYhC,oBAAoB;CAMrB"}
+{"version":3,"file":"aggregation-layer.d.ts","sourceRoot":"","sources":["../src/aggregation-layer.ts"],"names":[],"mappings":"AAoBA,OAAO,EACL,cAAc,EACd,gBAAgB,EAChB,eAAe,EAEf,gBAAgB,EAChB,mBAAmB,EACpB,MAAM,eAAe,CAAC;AAIvB,oBAAY,qBAAqB,CAAC,KAAK,IAAI,mBAAmB,GAAG;IAC/D,IAAI,EAAE,eAAe,CAAC,KAAK,CAAC,CAAC;CAC9B,CAAC;AAEF,MAAM,CAAC,OAAO,CAAC,QAAQ,OAAO,gBAAgB,CAC5C,KAAK,EACL,WAAW,SAAS,EAAE,GAAG,EAAE,CAC3B,SAAQ,cAAc,CAAC,QAAQ,CAAC,gBAAgB,CAAC,KAAK,CAAC,CAAC,GAAG,WAAW,CAAC;IACvE,MAAM,CAAC,SAAS,SAAsB;IAEtC,KAAK,EAAG,cAAc,CAAC,OAAO,CAAC,GAAG;QAChC,WAAW,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;QAClC,UAAU,CAAC,EAAE,GAAG,CAAC;KAClB,CAAC;IAEF,0BAA0B,CAAC,UAAU,EAAE,GAAG;IAU1C,WAAW,CAAC,IAAI,EAAE,gBAAgB,CAAC,IAAI,CAAC;IAexC,gBAAgB,CAAC,iBAAiB,KAAA;IAMlC,aAAa;;;IAIb,iBAAiB;IAcjB,aAAa,CAAC,OAAO,KAAA;IAIrB;;;;;;;QAOI;IACJ,kBAAkB,CAChB,UAAU,KAAA,EACV,MAAM,GAAE;QAAC,UAAU,CAAC,EAAE,OAAO,CAAC;QAAC,SAAS,CAAC,EAAE,GAAG,CAAA;KAAM,GACnD,MAAM,GAAG,OAAO;IAyCnB;;;;;QAKI;IACJ,kBAAkB,CAAC,IAAI,CAAC,EAAE,MAAM;IAYhC,oBAAoB;CAMrB"}

package/typed/contour-layer/contour-layer.d.ts

@@ -60,7 +60,7 @@ export declare type _ContourLayerProps<DataT> = {
     getWeight?: Accessor<DataT, number>;
 };
 /** Aggregate data into iso-lines or iso-bands for a given threshold and cell size. */
-export default class ContourLayer<DataT = any, ExtraPropsT extends {} = {}> extends GridAggregationLayer<ExtraPropsT & Required<_ContourLayerProps<DataT>>> {
+export default class ContourLayer<DataT = any, ExtraPropsT extends {} = {}> extends GridAggregationLayer<DataT, ExtraPropsT & Required<_ContourLayerProps<DataT>>> {
     static layerName: string;
     static defaultProps: DefaultProps<ContourLayerProps<any>>;
     initializeState(): void;

package/typed/contour-layer/contour-layer.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"contour-layer.d.ts","sourceRoot":"","sources":["../../src/contour-layer/contour-layer.ts"],"names":[],"mappings":"AAuBA,OAAO,EACL,QAAQ,EACR,gBAAgB,EAChB,KAAK,EACL,KAAK,EAEL,QAAQ,EACR,gBAAgB,EAChB,YAAY,EACb,MAAM,eAAe,CAAC;AAKvB,OAAO,oBAAoB,EAAE,EAAC,yBAAyB,EAAC,MAAM,2BAA2B,CAAC;AAsC1F,gDAAgD;AAChD,oBAAY,iBAAiB,CAAC,KAAK,GAAG,GAAG,IAAI,kBAAkB,CAAC,KAAK,CAAC,GACpE,yBAAyB,CAAC,KAAK,CAAC,CAAC;AAEnC,wCAAwC;AACxC,oBAAY,kBAAkB,CAAC,KAAK,IAAI;IACtC;;;OAGG;IACH,QAAQ,CAAC,EAAE,MAAM,CAAC;IAElB;;;OAGG;IACH,cAAc,CAAC,EAAE,OAAO,CAAC;IAEzB;;;OAGG;IACH,WAAW,CAAC,EAAE,KAAK,GAAG,MAAM,GAAG,KAAK,GAAG,KAAK,CAAC;IAE7C;;;OAGG;IACH,QAAQ,EAAE;QACR;;;;WAIG;QACH,SAAS,EAAE,MAAM,GAAG,MAAM,EAAE,CAAC;QAE7B;;;WAGG;QACH,KAAK,CAAC,EAAE,KAAK,CAAC;QAEd;;;WAGG;QACH,WAAW,CAAC,EAAE,MAAM,CAAC;QAErB,sCAAsC;QACtC,MAAM,CAAC,EAAE,MAAM,CAAC;KACjB,EAAE,CAAC;IAEJ;;;OAGG;IACH,OAAO,CAAC,EAAE,MAAM,CAAC;IAEjB;;;OAGG;IACH,WAAW,CAAC,EAAE,gBAAgB,CAAC,KAAK,EAAE,QAAQ,CAAC,CAAC;IAEhD;;;OAGG;IACH,SAAS,CAAC,EAAE,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC;CACrC,CAAC;AAEF,sFAAsF;AACtF,MAAM,CAAC,OAAO,OAAO,YAAY,CAC/B,KAAK,GAAG,GAAG,EACX,WAAW,SAAS,EAAE,GAAG,EAAE,CAC3B,SAAQ,oBAAoB,CAAC,WAAW,GAAG,QAAQ,CAAC,kBAAkB,CAAC,KAAK,CAAC,CAAC,CAAC;IAC/E,MAAM,CAAC,SAAS,SAAkB;IAClC,MAAM,CAAC,YAAY,uCAAgB;IAEnC,eAAe,IAAI,IAAI;IA2BvB,WAAW,CAAC,IAAI,EAAE,gBAAgB,CAAC,IAAI,CAAC,GAAG,IAAI;IAgB/C,YAAY,IAAI,KAAK,EAAE;IA4CvB,sBAAsB,CAAC,IAAI,KAAA;IAyE3B,OAAO,CAAC,gBAAgB;IAUxB,OAAO,CAAC,aAAa;IASrB,OAAO,CAAC,iBAAiB;IAsBzB,OAAO,CAAC,oBAAoB;CAc7B"}
+{"version":3,"file":"contour-layer.d.ts","sourceRoot":"","sources":["../../src/contour-layer/contour-layer.ts"],"names":[],"mappings":"AAuBA,OAAO,EACL,QAAQ,EACR,gBAAgB,EAChB,KAAK,EACL,KAAK,EAEL,QAAQ,EACR,gBAAgB,EAChB,YAAY,EACb,MAAM,eAAe,CAAC;AAKvB,OAAO,oBAAoB,EAAE,EAAC,yBAAyB,EAAC,MAAM,2BAA2B,CAAC;AAqC1F,gDAAgD;AAChD,oBAAY,iBAAiB,CAAC,KAAK,GAAG,GAAG,IAAI,kBAAkB,CAAC,KAAK,CAAC,GACpE,yBAAyB,CAAC,KAAK,CAAC,CAAC;AAEnC,wCAAwC;AACxC,oBAAY,kBAAkB,CAAC,KAAK,IAAI;IACtC;;;OAGG;IACH,QAAQ,CAAC,EAAE,MAAM,CAAC;IAElB;;;OAGG;IACH,cAAc,CAAC,EAAE,OAAO,CAAC;IAEzB;;;OAGG;IACH,WAAW,CAAC,EAAE,KAAK,GAAG,MAAM,GAAG,KAAK,GAAG,KAAK,CAAC;IAE7C;;;OAGG;IACH,QAAQ,EAAE;QACR;;;;WAIG;QACH,SAAS,EAAE,MAAM,GAAG,MAAM,EAAE,CAAC;QAE7B;;;WAGG;QACH,KAAK,CAAC,EAAE,KAAK,CAAC;QAEd;;;WAGG;QACH,WAAW,CAAC,EAAE,MAAM,CAAC;QAErB,sCAAsC;QACtC,MAAM,CAAC,EAAE,MAAM,CAAC;KACjB,EAAE,CAAC;IAEJ;;;OAGG;IACH,OAAO,CAAC,EAAE,MAAM,CAAC;IAEjB;;;OAGG;IACH,WAAW,CAAC,EAAE,gBAAgB,CAAC,KAAK,EAAE,QAAQ,CAAC,CAAC;IAEhD;;;OAGG;IACH,SAAS,CAAC,EAAE,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC;CACrC,CAAC;AAEF,sFAAsF;AACtF,MAAM,CAAC,OAAO,OAAO,YAAY,CAC/B,KAAK,GAAG,GAAG,EACX,WAAW,SAAS,EAAE,GAAG,EAAE,CAC3B,SAAQ,oBAAoB,CAAC,KAAK,EAAE,WAAW,GAAG,QAAQ,CAAC,kBAAkB,CAAC,KAAK,CAAC,CAAC,CAAC;IACtF,MAAM,CAAC,SAAS,SAAkB;IAClC,MAAM,CAAC,YAAY,uCAAgB;IAEnC,eAAe,IAAI,IAAI;IA2BvB,WAAW,CAAC,IAAI,EAAE,gBAAgB,CAAC,IAAI,CAAC,GAAG,IAAI;IAgB/C,YAAY,IAAI,KAAK,EAAE;IA4CvB,sBAAsB,CAAC,IAAI,KAAA;IAyE3B,OAAO,CAAC,gBAAgB;IAUxB,OAAO,CAAC,aAAa;IASrB,OAAO,CAAC,iBAAiB;IAsBzB,OAAO,CAAC,oBAAoB;CAc7B"}

package/typed/cpu-grid-layer/cpu-grid-layer.d.ts

@@ -5,7 +5,7 @@ import { AggregateAccessor } from '../types';
 /** All properties supported by CPUGridLayer. */
 export declare type CPUGridLayerProps<DataT = any> = _CPUGridLayerProps<DataT> & AggregationLayerProps<DataT>;
 /** Properties added by CPUGridLayer. */
-export declare type _CPUGridLayerProps<DataT> = {
+declare type _CPUGridLayerProps<DataT> = {
     /**
      * Size of each cell in meters.
      * @default 1000
@@ -138,7 +138,7 @@ export declare type _CPUGridLayerProps<DataT> = {
     _filterData: null | ((d: DataT) => boolean);
 };
 /** Aggregate data into a grid-based heatmap. Aggregation is performed on CPU. */
-export default class CPUGridLayer<DataT = any, ExtraPropsT extends {} = {}> extends AggregationLayer<ExtraPropsT & Required<_CPUGridLayerProps<DataT>>> {
+export default class CPUGridLayer<DataT = any, ExtraPropsT extends {} = {}> extends AggregationLayer<DataT, ExtraPropsT & Required<_CPUGridLayerProps<DataT>>> {
     static layerName: string;
     static defaultProps: DefaultProps<CPUGridLayerProps<any>>;
     initializeState(): void;
@@ -149,4 +149,5 @@ export default class CPUGridLayer<DataT = any, ExtraPropsT extends {} = {}> exte
     _getSublayerUpdateTriggers(): any;
     renderLayers(): Layer;
 }
+export {};
 //# sourceMappingURL=cpu-grid-layer.d.ts.map

package/typed/cpu-grid-layer/cpu-grid-layer.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"cpu-grid-layer.d.ts","sourceRoot":"","sources":["../../src/cpu-grid-layer/cpu-grid-layer.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"cpu-grid-layer.d.ts","sourceRoot":"","sources":["../../src/cpu-grid-layer/cpu-grid-layer.ts"],"names":[],"mappings":"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"}

package/typed/gpu-grid-layer/gpu-grid-cell-layer.d.ts

@@ -18,7 +18,7 @@ export default class GPUGridCellLayer extends Layer<_GPUGridCellLayerProps> {
         gridOffset: number[];
         colorMaxMinBuffer: Buffer;
         elevationMaxMinBuffer: Buffer;
-    } & LayerProps<any>>;
+    } & LayerProps>;
     getShaders(): any;
     initializeState({ gl }: LayerContext): void;
     _getModel(gl: WebGLRenderingContext): Model;

package/typed/gpu-grid-layer/gpu-grid-cell-layer.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"gpu-grid-cell-layer.d.ts","sourceRoot":"","sources":["../../src/gpu-grid-layer/gpu-grid-cell-layer.ts"],"names":[],"mappings":"AAoBA,OAAO,EACL,KAAK,EAKL,YAAY,EACZ,UAAU,EACV,YAAY,EACb,MAAM,eAAe,CAAC;AAEvB,OAAO,EAAC,KAAK,EAAgB,MAAM,EAAC,MAAM,eAAe,CAAC;AAG1D,OAAO,KAAK,EAAC,kBAAkB,EAAC,MAAM,kBAAkB,CAAC;AA8BzD,aAAK,sBAAsB,GAAG,kBAAkB,CAAC,GAAG,CAAC,GAAG;IACtD,MAAM,EAAE,MAAM,EAAE,CAAC;IACjB,QAAQ,EAAE,MAAM,EAAE,CAAC;IACnB,UAAU,EAAE,MAAM,EAAE,CAAC;IACrB,UAAU,EAAE,MAAM,EAAE,CAAC;IACrB,iBAAiB,EAAE,MAAM,CAAC;IAC1B,qBAAqB,EAAE,MAAM,CAAC;CAC/B,CAAC;AAEF,MAAM,CAAC,OAAO,OAAO,gBAAiB,SAAQ,KAAK,CAAC,sBAAsB,CAAC;IACzE,MAAM,CAAC,SAAS,SAAsB;IACtC,MAAM,CAAC,YAAY;;;;;;;yBAAgB;IAEnC,UAAU;IAQV,eAAe,CAAC,EAAC,EAAE,EAAC,EAAE,YAAY;IAiBlC,SAAS,CAAC,EAAE,EAAE,qBAAqB,GAAG,KAAK;IAS3C,IAAI,CAAC,EAAC,QAAQ,EAAC;;KAAA;IAyCf,kBAAkB,CAAC,iBAAiB,KAAA,EAAE,qBAAqB,KAAA;IAK3D,oBAAoB,CAAC,iBAAiB,KAAA,EAAE,qBAAqB,KAAA;IAK7D,iBAAiB;IAkBjB,OAAO,CAAC,mBAAmB;CAS5B"}
+{"version":3,"file":"gpu-grid-cell-layer.d.ts","sourceRoot":"","sources":["../../src/gpu-grid-layer/gpu-grid-cell-layer.ts"],"names":[],"mappings":"AAoBA,OAAO,EACL,KAAK,EAKL,YAAY,EACZ,UAAU,EACV,YAAY,EACb,MAAM,eAAe,CAAC;AAEvB,OAAO,EAAC,KAAK,EAAgB,MAAM,EAAC,MAAM,eAAe,CAAC;AAG1D,OAAO,KAAK,EAAC,kBAAkB,EAAC,MAAM,kBAAkB,CAAC;AA8BzD,aAAK,sBAAsB,GAAG,kBAAkB,CAAC,GAAG,CAAC,GAAG;IACtD,MAAM,EAAE,MAAM,EAAE,CAAC;IACjB,QAAQ,EAAE,MAAM,EAAE,CAAC;IACnB,UAAU,EAAE,MAAM,EAAE,CAAC;IACrB,UAAU,EAAE,MAAM,EAAE,CAAC;IACrB,iBAAiB,EAAE,MAAM,CAAC;IAC1B,qBAAqB,EAAE,MAAM,CAAC;CAC/B,CAAC;AAEF,MAAM,CAAC,OAAO,OAAO,gBAAiB,SAAQ,KAAK,CAAC,sBAAsB,CAAC;IACzE,MAAM,CAAC,SAAS,SAAsB;IACtC,MAAM,CAAC,YAAY;;;;;;;oBAAgB;IAEnC,UAAU;IAQV,eAAe,CAAC,EAAC,EAAE,EAAC,EAAE,YAAY;IAiBlC,SAAS,CAAC,EAAE,EAAE,qBAAqB,GAAG,KAAK;IAS3C,IAAI,CAAC,EAAC,QAAQ,EAAC;;KAAA;IAyCf,kBAAkB,CAAC,iBAAiB,KAAA,EAAE,qBAAqB,KAAA;IAK3D,oBAAoB,CAAC,iBAAiB,KAAA,EAAE,qBAAqB,KAAA;IAK7D,iBAAiB;IAkBjB,OAAO,CAAC,mBAAmB;CAS5B"}

package/typed/gpu-grid-layer/gpu-grid-layer.d.ts

@@ -78,7 +78,7 @@ export declare type _GPUGridLayerProps<DataT> = {
     getElevationWeight?: Accessor<DataT, number>;
 };
 /** Aggregate data into a grid-based heatmap. Aggregation is performed on GPU (WebGL2 only). */
-export default class GPUGridLayer<DataT = any, ExtraPropsT extends {} = {}> extends GridAggregationLayer<ExtraPropsT & Required<_GPUGridLayerProps<DataT>>> {
+export default class GPUGridLayer<DataT = any, ExtraPropsT extends {} = {}> extends GridAggregationLayer<DataT, ExtraPropsT & Required<_GPUGridLayerProps<DataT>>> {
     static layerName: string;
     static defaultProps: DefaultProps<GPUGridLayerProps<any>>;
     initializeState({ gl }: LayerContext): void;

package/typed/gpu-grid-layer/gpu-grid-layer.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"gpu-grid-layer.d.ts","sourceRoot":"","sources":["../../src/gpu-grid-layer/gpu-grid-layer.ts"],"names":[],"mappings":"AAsBA,OAAO,EACL,QAAQ,EACR,gBAAgB,EAChB,KAAK,EACL,QAAQ,EACR,oBAAoB,EACpB,YAAY,EAEZ,WAAW,EACX,QAAQ,EACR,YAAY,EACb,MAAM,eAAe,CAAC;AAKvB,OAAO,gBAAgB,MAAM,uBAAuB,CAAC;AAErD,OAAO,oBAAoB,EAAE,EAAC,yBAAyB,EAAC,MAAM,2BAA2B,CAAC;AAsC1F,gDAAgD;AAChD,oBAAY,iBAAiB,CAAC,KAAK,GAAG,GAAG,IAAI,kBAAkB,CAAC,KAAK,CAAC,GACpE,yBAAyB,CAAC,KAAK,CAAC,CAAC;AAEnC,wCAAwC;AACxC,oBAAY,kBAAkB,CAAC,KAAK,IAAI;IACtC;;;OAGG;IACH,QAAQ,CAAC,EAAE,MAAM,CAAC;IAElB;;;OAGG;IACH,WAAW,CAAC,EAAE,CAAC,MAAM,EAAE,MAAM,CAAC,GAAG,IAAI,CAAC;IAEtC;;OAEG;IACH,UAAU,CAAC,EAAE,KAAK,EAAE,CAAC;IAErB;;;OAGG;IACH,QAAQ,CAAC,EAAE,MAAM,CAAC;IAElB;;;OAGG;IACH,eAAe,CAAC,EAAE,CAAC,MAAM,EAAE,MAAM,CAAC,GAAG,IAAI,CAAC;IAE1C;;;OAGG;IACH,cAAc,CAAC,EAAE,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAElC;;;OAGG;IACH,cAAc,CAAC,EAAE,MAAM,CAAC;IAExB;;;OAGG;IACH,QAAQ,CAAC,EAAE,OAAO,CAAC;IAEnB;;;;;OAKG;IACH,QAAQ,CAAC,EAAE,QAAQ,CAAC;IAEpB;;;OAGG;IACH,gBAAgB,CAAC,EAAE,KAAK,GAAG,MAAM,GAAG,KAAK,GAAG,KAAK,CAAC;IAElD;;;OAGG;IACH,oBAAoB,CAAC,EAAE,KAAK,GAAG,MAAM,GAAG,KAAK,GAAG,KAAK,CAAC;IAEtD;;;OAGG;IACH,WAAW,CAAC,EAAE,gBAAgB,CAAC,KAAK,EAAE,QAAQ,CAAC,CAAC;IAEhD;;;OAGG;IACH,cAAc,CAAC,EAAE,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC;IAEzC;;;OAGG;IACH,kBAAkB,CAAC,EAAE,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC;CAC9C,CAAC;AAEF,+FAA+F;AAC/F,MAAM,CAAC,OAAO,OAAO,YAAY,CAC/B,KAAK,GAAG,GAAG,EACX,WAAW,SAAS,EAAE,GAAG,EAAE,CAC3B,SAAQ,oBAAoB,CAAC,WAAW,GAAG,QAAQ,CAAC,kBAAkB,CAAC,KAAK,CAAC,CAAC,CAAC;IAC/E,MAAM,CAAC,SAAS,SAAkB;IAClC,MAAM,CAAC,YAAY,uCAAgB;IAEnC,eAAe,CAAC,EAAC,EAAE,EAAC,EAAE,YAAY,GAAG,IAAI;IA+CzC,WAAW,CAAC,IAAI,KAAA;IAehB,kBAAkB,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM;IAkBzC,mBAAmB,CAAC,KAAK,EAAE,MAAM,GAAG,QAAQ;IAa5C,cAAc,CAAC,EAAC,IAAI,EAAE,IAAI,EAAC,EAAE,oBAAoB,GAAG,WAAW;IAqD/D,YAAY;IAsDZ,aAAa,CAAC,OAAO,EAAE,YAAY;IAYnC,sBAAsB,CAAC,IAAI,KAAA;IAoD3B,gBAAgB,CAAC,IAAI,KAAA;CAMtB"}
+{"version":3,"file":"gpu-grid-layer.d.ts","sourceRoot":"","sources":["../../src/gpu-grid-layer/gpu-grid-layer.ts"],"names":[],"mappings":"AAsBA,OAAO,EACL,QAAQ,EACR,gBAAgB,EAChB,KAAK,EACL,QAAQ,EACR,oBAAoB,EACpB,YAAY,EAEZ,WAAW,EACX,QAAQ,EACR,YAAY,EACb,MAAM,eAAe,CAAC;AAKvB,OAAO,gBAAgB,MAAM,uBAAuB,CAAC;AAErD,OAAO,oBAAoB,EAAE,EAAC,yBAAyB,EAAC,MAAM,2BAA2B,CAAC;AAsC1F,gDAAgD;AAChD,oBAAY,iBAAiB,CAAC,KAAK,GAAG,GAAG,IAAI,kBAAkB,CAAC,KAAK,CAAC,GACpE,yBAAyB,CAAC,KAAK,CAAC,CAAC;AAEnC,wCAAwC;AACxC,oBAAY,kBAAkB,CAAC,KAAK,IAAI;IACtC;;;OAGG;IACH,QAAQ,CAAC,EAAE,MAAM,CAAC;IAElB;;;OAGG;IACH,WAAW,CAAC,EAAE,CAAC,MAAM,EAAE,MAAM,CAAC,GAAG,IAAI,CAAC;IAEtC;;OAEG;IACH,UAAU,CAAC,EAAE,KAAK,EAAE,CAAC;IAErB;;;OAGG;IACH,QAAQ,CAAC,EAAE,MAAM,CAAC;IAElB;;;OAGG;IACH,eAAe,CAAC,EAAE,CAAC,MAAM,EAAE,MAAM,CAAC,GAAG,IAAI,CAAC;IAE1C;;;OAGG;IACH,cAAc,CAAC,EAAE,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAElC;;;OAGG;IACH,cAAc,CAAC,EAAE,MAAM,CAAC;IAExB;;;OAGG;IACH,QAAQ,CAAC,EAAE,OAAO,CAAC;IAEnB;;;;;OAKG;IACH,QAAQ,CAAC,EAAE,QAAQ,CAAC;IAEpB;;;OAGG;IACH,gBAAgB,CAAC,EAAE,KAAK,GAAG,MAAM,GAAG,KAAK,GAAG,KAAK,CAAC;IAElD;;;OAGG;IACH,oBAAoB,CAAC,EAAE,KAAK,GAAG,MAAM,GAAG,KAAK,GAAG,KAAK,CAAC;IAEtD;;;OAGG;IACH,WAAW,CAAC,EAAE,gBAAgB,CAAC,KAAK,EAAE,QAAQ,CAAC,CAAC;IAEhD;;;OAGG;IACH,cAAc,CAAC,EAAE,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC;IAEzC;;;OAGG;IACH,kBAAkB,CAAC,EAAE,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC;CAC9C,CAAC;AAEF,+FAA+F;AAC/F,MAAM,CAAC,OAAO,OAAO,YAAY,CAC/B,KAAK,GAAG,GAAG,EACX,WAAW,SAAS,EAAE,GAAG,EAAE,CAC3B,SAAQ,oBAAoB,CAAC,KAAK,EAAE,WAAW,GAAG,QAAQ,CAAC,kBAAkB,CAAC,KAAK,CAAC,CAAC,CAAC;IACtF,MAAM,CAAC,SAAS,SAAkB;IAClC,MAAM,CAAC,YAAY,uCAAgB;IAEnC,eAAe,CAAC,EAAC,EAAE,EAAC,EAAE,YAAY,GAAG,IAAI;IA+CzC,WAAW,CAAC,IAAI,KAAA;IAehB,kBAAkB,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM;IAkBzC,mBAAmB,CAAC,KAAK,EAAE,MAAM,GAAG,QAAQ;IAa5C,cAAc,CAAC,EAAC,IAAI,EAAE,IAAI,EAAC,EAAE,oBAAoB,GAAG,WAAW;IAqD/D,YAAY;IAsDZ,aAAa,CAAC,OAAO,EAAE,YAAY;IAYnC,sBAAsB,CAAC,IAAI,KAAA;IAoD3B,gBAAgB,CAAC,IAAI,KAAA;CAMtB"}

package/typed/grid-aggregation-layer.d.ts

@@ -1,10 +1,10 @@
 import AggregationLayer, { AggregationLayerProps } from './aggregation-layer';
 import { LayerContext, UpdateParameters } from '@deck.gl/core/typed';
 import BinSorter from './utils/bin-sorter';
-export declare type GridAggregationLayerProps<DataT = any> = AggregationLayerProps<DataT>;
-export default abstract class GridAggregationLayer<ExtraPropsT extends {} = {}> extends AggregationLayer<ExtraPropsT> {
+export declare type GridAggregationLayerProps<DataT> = AggregationLayerProps<DataT>;
+export default abstract class GridAggregationLayer<DataT, ExtraPropsT extends {} = {}> extends AggregationLayer<DataT, ExtraPropsT> {
     static layerName: string;
-    state: AggregationLayer['state'] & {
+    state: AggregationLayer<DataT>['state'] & {
         aggregationDataDirty?: any;
         aggregationWeightsDirty?: any;
         gpuAggregation?: any;

package/typed/grid-aggregation-layer.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"grid-aggregation-layer.d.ts","sourceRoot":"","sources":["../src/grid-aggregation-layer.ts"],"names":[],"mappings":"AAoBA,OAAO,gBAAgB,EAAE,EAAC,qBAAqB,EAAC,MAAM,qBAAqB,CAAC;AAG5E,OAAO,EAAC,YAAY,EAAO,gBAAgB,EAAC,MAAM,eAAe,CAAC;AAElE,OAAO,SAAS,MAAM,oBAAoB,CAAC;AAG3C,oBAAY,yBAAyB,CAAC,KAAK,GAAG,GAAG,IAAI,qBAAqB,CAAC,KAAK,CAAC,CAAC;AAElF,MAAM,CAAC,OAAO,CAAC,QAAQ,OAAO,oBAAoB,CAChD,WAAW,SAAS,EAAE,GAAG,EAAE,CAC3B,SAAQ,gBAAgB,CAAC,WAAW,CAAC;IACrC,MAAM,CAAC,SAAS,SAA0B;IAE1C,KAAK,EAAG,gBAAgB,CAAC,OAAO,CAAC,GAAG;QAClC,oBAAoB,CAAC,EAAE,GAAG,CAAC;QAC3B,uBAAuB,CAAC,EAAE,GAAG,CAAC;QAC9B,cAAc,CAAC,EAAE,GAAG,CAAC;QACrB,QAAQ,CAAC,EAAE,MAAM,GAAG,CAAC;QACrB,UAAU,CAAC,EAAE,SAAS,CAAC;KACxB,CAAC;IAEF,0BAA0B,CAAC,EAAC,UAAU,EAAC;;KAAA;IAWvC,WAAW,CAAC,IAAI,EAAE,gBAAgB,CAAC,IAAI,CAAC;IA8BxC,aAAa,CAAC,OAAO,EAAE,YAAY;IASnC,aAAa,CAAC,OAAO,EAAE,GAAG,GAAG,IAAI;IAQjC,sBAAsB,CAAC,IAAI,KAAA;IAK3B,iBAAiB,CAAC,MAAM,KAAA,EAAE,MAAM,KAAA;IAsBhC,aAAa,CAAC,EAAC,eAAe,EAAE,UAAU,EAAE,OAAO,EAAE,OAAO,EAAC;;;;;KAAA;IAY7D,kBAAkB,CAAC,IAAI,KAAA;IAgDvB,iBAAiB;IAOjB,yBAAyB,IAAI,IAAI;CAoBlC"}
+{"version":3,"file":"grid-aggregation-layer.d.ts","sourceRoot":"","sources":["../src/grid-aggregation-layer.ts"],"names":[],"mappings":"AAoBA,OAAO,gBAAgB,EAAE,EAAC,qBAAqB,EAAC,MAAM,qBAAqB,CAAC;AAG5E,OAAO,EAAC,YAAY,EAAO,gBAAgB,EAAC,MAAM,eAAe,CAAC;AAElE,OAAO,SAAS,MAAM,oBAAoB,CAAC;AAG3C,oBAAY,yBAAyB,CAAC,KAAK,IAAI,qBAAqB,CAAC,KAAK,CAAC,CAAC;AAE5E,MAAM,CAAC,OAAO,CAAC,QAAQ,OAAO,oBAAoB,CAChD,KAAK,EACL,WAAW,SAAS,EAAE,GAAG,EAAE,CAC3B,SAAQ,gBAAgB,CAAC,KAAK,EAAE,WAAW,CAAC;IAC5C,MAAM,CAAC,SAAS,SAA0B;IAE1C,KAAK,EAAG,gBAAgB,CAAC,KAAK,CAAC,CAAC,OAAO,CAAC,GAAG;QACzC,oBAAoB,CAAC,EAAE,GAAG,CAAC;QAC3B,uBAAuB,CAAC,EAAE,GAAG,CAAC;QAC9B,cAAc,CAAC,EAAE,GAAG,CAAC;QACrB,QAAQ,CAAC,EAAE,MAAM,GAAG,CAAC;QACrB,UAAU,CAAC,EAAE,SAAS,CAAC;KACxB,CAAC;IAEF,0BAA0B,CAAC,EAAC,UAAU,EAAC;;KAAA;IAWvC,WAAW,CAAC,IAAI,EAAE,gBAAgB,CAAC,IAAI,CAAC;IA8BxC,aAAa,CAAC,OAAO,EAAE,YAAY;IASnC,aAAa,CAAC,OAAO,EAAE,GAAG,GAAG,IAAI;IAQjC,sBAAsB,CAAC,IAAI,KAAA;IAK3B,iBAAiB,CAAC,MAAM,KAAA,EAAE,MAAM,KAAA;IAsBhC,aAAa,CAAC,EAAC,eAAe,EAAE,UAAU,EAAE,OAAO,EAAE,OAAO,EAAC;;;;;KAAA;IAY7D,kBAAkB,CAAC,IAAI,KAAA;IAgDvB,iBAAiB;IAOjB,yBAAyB,IAAI,IAAI;CAoBlC"}

package/typed/grid-layer/grid-layer.d.ts

@@ -1,10 +1,10 @@
 import { CompositeLayer, CompositeLayerProps, Layer, UpdateParameters, DefaultProps } from '@deck.gl/core/typed';
-import { _GPUGridLayerProps } from '../gpu-grid-layer/gpu-grid-layer';
-import { _CPUGridLayerProps } from '../cpu-grid-layer/cpu-grid-layer';
+import { GPUGridLayerProps } from '../gpu-grid-layer/gpu-grid-layer';
+import { CPUGridLayerProps } from '../cpu-grid-layer/cpu-grid-layer';
 /** All properties supported by GridLayer. */
-export declare type GridLayerProps<DataT = any> = _GridLayerProps<DataT> & CompositeLayerProps<DataT>;
+export declare type GridLayerProps<DataT = any> = _GridLayerProps<DataT> & CompositeLayerProps;
 /** Properties added by GridLayer. */
-declare type _GridLayerProps<DataT> = _CPUGridLayerProps<DataT> & _GPUGridLayerProps<DataT> & {
+declare type _GridLayerProps<DataT> = CPUGridLayerProps<DataT> & GPUGridLayerProps<DataT> & {
     /**
      * Whether the aggregation should be performed in high-precision 64-bit mode.
      * @default false

package/typed/grid-layer/grid-layer.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"grid-layer.d.ts","sourceRoot":"","sources":["../../src/grid-layer/grid-layer.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,cAAc,EACd,mBAAmB,EACnB,KAAK,EACL,gBAAgB,EAChB,YAAY,EACb,MAAM,eAAe,CAAC;AAEvB,OAAqB,EAAC,kBAAkB,EAAC,MAAM,kCAAkC,CAAC;AAClF,OAAqB,EAAC,kBAAkB,EAAC,MAAM,kCAAkC,CAAC;AAQlF,6CAA6C;AAC7C,oBAAY,cAAc,CAAC,KAAK,GAAG,GAAG,IAAI,eAAe,CAAC,KAAK,CAAC,GAAG,mBAAmB,CAAC,KAAK,CAAC,CAAC;AAE9F,qCAAqC;AACrC,aAAK,eAAe,CAAC,KAAK,IAAI,kBAAkB,CAAC,KAAK,CAAC,GACrD,kBAAkB,CAAC,KAAK,CAAC,GAAG;IAC1B;;;OAGG;IACH,IAAI,CAAC,EAAE,OAAO,CAAC;IAEf;;;OAGG;IACH,cAAc,CAAC,EAAE,OAAO,CAAC;CAC1B,CAAC;AAEJ,gIAAgI;AAChI,MAAM,CAAC,OAAO,OAAO,SAAS,CAAC,KAAK,GAAG,GAAG,EAAE,WAAW,SAAS,EAAE,GAAG,EAAE,CAAE,SAAQ,cAAc,CAC7F,WAAW,GAAG,QAAQ,CAAC,eAAe,CAAC,KAAK,CAAC,CAAC,CAC/C;IACC,MAAM,CAAC,SAAS,SAAe;IAC/B,MAAM,CAAC,YAAY,oCAAgB;IAEnC,KAAK,EAAG,cAAc,CAAC,OAAO,CAAC,GAAG;QAChC,iBAAiB,EAAE,OAAO,CAAC;KAC5B,CAAC;IAEF,eAAe;IAMf,WAAW,CAAC,EAAC,KAAK,EAAC,EAAE,gBAAgB,CAAC,IAAI,CAAC;IAM3C,YAAY,IAAI,KAAK;IAoBrB,oBAAoB,CAAC,KAAK,EAAE,SAAS,CAAC,OAAO,CAAC;CA8B/C"}
+{"version":3,"file":"grid-layer.d.ts","sourceRoot":"","sources":["../../src/grid-layer/grid-layer.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,cAAc,EACd,mBAAmB,EACnB,KAAK,EACL,gBAAgB,EAChB,YAAY,EACb,MAAM,eAAe,CAAC;AAEvB,OAAqB,EAAC,iBAAiB,EAAC,MAAM,kCAAkC,CAAC;AACjF,OAAqB,EAAC,iBAAiB,EAAC,MAAM,kCAAkC,CAAC;AAQjF,6CAA6C;AAC7C,oBAAY,cAAc,CAAC,KAAK,GAAG,GAAG,IAAI,eAAe,CAAC,KAAK,CAAC,GAAG,mBAAmB,CAAC;AAEvF,qCAAqC;AACrC,aAAK,eAAe,CAAC,KAAK,IAAI,iBAAiB,CAAC,KAAK,CAAC,GACpD,iBAAiB,CAAC,KAAK,CAAC,GAAG;IACzB;;;OAGG;IACH,IAAI,CAAC,EAAE,OAAO,CAAC;IAEf;;;OAGG;IACH,cAAc,CAAC,EAAE,OAAO,CAAC;CAC1B,CAAC;AAEJ,gIAAgI;AAChI,MAAM,CAAC,OAAO,OAAO,SAAS,CAAC,KAAK,GAAG,GAAG,EAAE,WAAW,SAAS,EAAE,GAAG,EAAE,CAAE,SAAQ,cAAc,CAC7F,WAAW,GAAG,QAAQ,CAAC,eAAe,CAAC,KAAK,CAAC,CAAC,CAC/C;IACC,MAAM,CAAC,SAAS,SAAe;IAC/B,MAAM,CAAC,YAAY,oCAAgB;IAEnC,KAAK,EAAG,cAAc,CAAC,OAAO,CAAC,GAAG;QAChC,iBAAiB,EAAE,OAAO,CAAC;KAC5B,CAAC;IAEF,eAAe;IAMf,WAAW,CAAC,EAAC,KAAK,EAAC,EAAE,gBAAgB,CAAC,IAAI,CAAC;IAM3C,YAAY,IAAI,KAAK;IAoBrB,oBAAoB,CAAC,KAAK,EAAE,SAAS,CAAC,OAAO,CAAC;CA8B/C"}

package/typed/heatmap-layer/heatmap-layer.d.ts

@@ -69,10 +69,10 @@ declare type _HeatmapLayerProps<DataT> = {
     getWeight?: Accessor<DataT, number>;
 };
 /** Visualizes the spatial distribution of data. */
-export default class HeatmapLayer<DataT = any, ExtraPropsT extends {} = {}> extends AggregationLayer<ExtraPropsT & Required<_HeatmapLayerProps<DataT>>> {
+export default class HeatmapLayer<DataT = any, ExtraPropsT extends {} = {}> extends AggregationLayer<DataT, ExtraPropsT & Required<_HeatmapLayerProps<DataT>>> {
     static layerName: string;
     static defaultProps: DefaultProps<HeatmapLayerProps<any>>;
-    state: AggregationLayer['state'] & {
+    state: AggregationLayer<DataT>['state'] & {
         supported: boolean;
         colorDomain?: number[];
         isWeightMapDirty?: boolean;

package/typed/heatmap-layer/heatmap-layer.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"heatmap-layer.d.ts","sourceRoot":"","sources":["../../src/heatmap-layer/heatmap-layer.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"heatmap-layer.d.ts","sourceRoot":"","sources":["../../src/heatmap-layer/heatmap-layer.ts"],"names":[],"mappings":"AA8BA,OAAO,EACL,MAAM,EACN,SAAS,EAMV,MAAM,eAAe,CAAC;AACvB,OAAO,EACL,QAAQ,EACR,gBAAgB,EAChB,gBAAgB,EAChB,WAAW,EACX,KAAK,EAEL,KAAK,EACL,YAAY,EACZ,UAAU,EAEV,QAAQ,EACR,gBAAgB,EAChB,YAAY,EACb,MAAM,eAAe,CAAC;AAEvB,OAAO,gBAAgB,EAAE,EAAC,qBAAqB,EAAC,MAAM,sBAAsB,CAAC;AAsD7E,oBAAY,iBAAiB,CAAC,KAAK,GAAG,GAAG,IAAI,kBAAkB,CAAC,KAAK,CAAC,GACpE,qBAAqB,CAAC,KAAK,CAAC,CAAC;AAE/B,aAAK,kBAAkB,CAAC,KAAK,IAAI;IAC/B;;;;OAIG;IACH,YAAY,CAAC,EAAE,MAAM,CAAC;IAEtB;;;;OAIG;IACH,UAAU,CAAC,EAAE,KAAK,EAAE,CAAC;IAErB;;;;OAIG;IACH,SAAS,CAAC,EAAE,MAAM,CAAC;IAEnB;;;;;;;OAOG;IACH,SAAS,CAAC,EAAE,MAAM,CAAC;IAEnB;;;;OAIG;IACH,WAAW,CAAC,EAAE,CAAC,MAAM,EAAE,MAAM,CAAC,GAAG,IAAI,CAAC;IAEtC;;;;;;OAMG;IACH,WAAW,CAAC,EAAE,KAAK,GAAG,MAAM,CAAC;IAE7B;;;OAGG;IACH,kBAAkB,CAAC,EAAE,MAAM,CAAC;IAE5B;;;;OAIG;IACH,eAAe,CAAC,EAAE,MAAM,CAAC;IAEzB;;;;OAIG;IACH,WAAW,CAAC,EAAE,gBAAgB,CAAC,KAAK,EAAE,QAAQ,CAAC,CAAC;IAEhD;;;;OAIG;IACH,SAAS,CAAC,EAAE,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC;CACrC,CAAC;AAEF,mDAAmD;AACnD,MAAM,CAAC,OAAO,OAAO,YAAY,CAC/B,KAAK,GAAG,GAAG,EACX,WAAW,SAAS,EAAE,GAAG,EAAE,CAC3B,SAAQ,gBAAgB,CAAC,KAAK,EAAE,WAAW,GAAG,QAAQ,CAAC,kBAAkB,CAAC,KAAK,CAAC,CAAC,CAAC;IAClF,MAAM,CAAC,SAAS,SAAkB;IAClC,MAAM,CAAC,YAAY,uCAAgB;IAEnC,KAAK,EAAG,gBAAgB,CAAC,KAAK,CAAC,CAAC,OAAO,CAAC,GAAG;QACzC,SAAS,EAAE,OAAO,CAAC;QACnB,WAAW,CAAC,EAAE,MAAM,EAAE,CAAC;QACvB,gBAAgB,CAAC,EAAE,OAAO,CAAC;QAC3B,cAAc,CAAC,EAAE,SAAS,CAAC;QAC3B,IAAI,CAAC,EAAE,MAAM,CAAC;QACd,WAAW,CAAC,EAAE,MAAM,EAAE,CAAC;QACvB,sBAAsB,CAAC,EAAE,MAAM,EAAE,CAAC;QAClC,WAAW,CAAC,EAAE,GAAG,CAAC;QAClB,iBAAiB,CAAC,EAAE,MAAM,CAAC;QAC3B,iBAAiB,CAAC,EAAE,MAAM,CAAC;KAC5B,CAAC;IAEF,eAAe;IAcf,iBAAiB,CAAC,EAAC,WAAW,EAAC,EAAE,gBAAgB,CAAC,IAAI,CAAC;IAMvD,WAAW,CAAC,IAAI,EAAE,gBAAgB,CAAC,IAAI,CAAC;IAQxC,mBAAmB,CAAC,IAAI,EAAE,gBAAgB,CAAC,IAAI,CAAC;IA8BhD,YAAY,IAAI,UAAU,GAAG,KAAK;IA2ClC,aAAa,CAAC,OAAO,EAAE,YAAY;IA2BnC,oBAAoB;IAOpB,eAAe,CAAC,IAAI,EAAE,gBAAgB,CAAC,IAAI,CAAC;;;;IAsB5C,eAAe;IAgBf,gBAAgB;IAShB,mBAAmB;IAgBnB,UAAU,CAAC,IAAI,KAAA;IAcf,uBAAuB,CAAC,OAAO,KAAK;IAgBpC,eAAe;IAqCf,aAAa,CAAC,aAAa,KAAA;IAK3B,qBAAqB;IAarB,aAAa,CAAC,WAAW,GAAE,GAAW,GAAG,OAAO;IAkDhD,6BAA6B;IAe7B,mBAAmB,CAAC,IAAI,KAAA;IAqBxB,gBAAgB;IAwDhB,yBAAyB,CAAC,SAAS,UAAQ;IAsB3C,oBAAoB,CAAC,WAAW,KAAA,EAAE,IAAI,GAAE;QAAC,wBAAwB,CAAC,EAAE,OAAO,CAAA;KAAM;IA0CjF,oBAAoB,CAAC,YAAY,KAAA;CAQlC"}

package/typed/hexagon-layer/hexagon-layer.d.ts

@@ -144,10 +144,10 @@ declare type _HexagonLayerProps<DataT = any> = {
     _filterData: null | ((d: DataT) => boolean);
 };
 /** Aggregates data into a hexagon-based heatmap. The color and height of a hexagon are determined based on the objects it contains. */
-export default class HexagonLayer<ExtraPropsT extends {} = {}> extends AggregationLayer<ExtraPropsT & Required<_HexagonLayerProps>> {
+export default class HexagonLayer<DataT, ExtraPropsT extends {} = {}> extends AggregationLayer<DataT, ExtraPropsT & Required<_HexagonLayerProps>> {
     static layerName: string;
     static defaultProps: DefaultProps<HexagonLayerProps<any>>;
-    state: AggregationLayer['state'] & {
+    state: AggregationLayer<DataT>['state'] & {
         cpuAggregator: CPUAggregator;
         aggregatorState: any;
     };

package/typed/hexagon-layer/hexagon-layer.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"hexagon-layer.d.ts","sourceRoot":"","sources":["../../src/hexagon-layer/hexagon-layer.ts"],"names":[],"mappings":"AAoBA,OAAO,EACL,QAAQ,EACR,gBAAgB,EAChB,KAAK,EAEL,QAAQ,EACR,QAAQ,EACR,gBAAgB,EAChB,YAAY,EACb,MAAM,eAAe,CAAC;AACvB,OAAO,EAAC,WAAW,EAAC,MAAM,iBAAiB,CAAC;AAK5C,OAAO,aAAa,MAAM,yBAAyB,CAAC;AACpD,OAAO,gBAAgB,EAAE,EAAC,qBAAqB,EAAC,MAAM,sBAAsB,CAAC;AAG7E,OAAO,EAAC,iBAAiB,EAAC,MAAM,UAAU,CAAC;AAyC3C,mDAAmD;AACnD,oBAAY,iBAAiB,CAAC,KAAK,GAAG,GAAG,IAAI,kBAAkB,CAAC,KAAK,CAAC,GACpE,qBAAqB,CAAC,KAAK,CAAC,CAAC;AAE/B,wCAAwC;AACxC,aAAK,kBAAkB,CAAC,KAAK,GAAG,GAAG,IAAI;IACrC;;;OAGG;IACH,MAAM,CAAC,EAAE,MAAM,CAAC;IAEhB;;;OAGG;IACH,iBAAiB,CAAC,EAAE,CAAC,KAAK,EAAE,GAAG,EAAE,MAAM,EAAE,GAAG,KAAK,GAAG,CAAC;IAErD;;;OAGG;IACH,WAAW,CAAC,EAAE,CAAC,MAAM,EAAE,MAAM,CAAC,GAAG,IAAI,CAAC;IAEtC;;;OAGG;IACH,UAAU,CAAC,EAAE,KAAK,EAAE,CAAC;IAErB;;;OAGG;IACH,QAAQ,CAAC,EAAE,MAAM,CAAC;IAElB;;;OAGG;IACH,eAAe,CAAC,EAAE,CAAC,MAAM,EAAE,MAAM,CAAC,GAAG,IAAI,CAAC;IAE1C;;;OAGG;IACH,cAAc,CAAC,EAAE,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAElC;;;OAGG;IACH,cAAc,CAAC,EAAE,MAAM,CAAC;IAExB;;;OAGG;IACH,QAAQ,CAAC,EAAE,OAAO,CAAC;IAEnB;;;;OAIG;IACH,eAAe,CAAC,EAAE,MAAM,CAAC;IAEzB;;;;OAIG;IACH,eAAe,CAAC,EAAE,MAAM,CAAC;IAEzB;;;;OAIG;IACH,wBAAwB,CAAC,EAAE,MAAM,CAAC;IAElC;;;;OAIG;IACH,wBAAwB,CAAC,EAAE,MAAM,CAAC;IAElC;;;;OAIG;IACH,cAAc,CAAC,EAAE,UAAU,GAAG,UAAU,GAAG,SAAS,CAAC;IAErD;;OAEG;IACH,kBAAkB,CAAC,EAAE,QAAQ,CAAC;IAE9B;;;;;OAKG;IACH,QAAQ,CAAC,EAAE,QAAQ,CAAC;IAEpB;;;OAGG;IACH,gBAAgB,CAAC,EAAE,KAAK,GAAG,MAAM,GAAG,KAAK,GAAG,KAAK,CAAC;IAElD;;;OAGG;IACH,oBAAoB,CAAC,EAAE,KAAK,GAAG,MAAM,GAAG,KAAK,GAAG,KAAK,CAAC;IAEtD;;;OAGG;IACH,WAAW,CAAC,EAAE,gBAAgB,CAAC,KAAK,EAAE,QAAQ,CAAC,CAAC;IAEhD;;;OAGG;IACH,cAAc,CAAC,EAAE,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC;IAEzC;;;OAGG;IACH,aAAa,CAAC,EAAE,iBAAiB,CAAC,KAAK,CAAC,GAAG,IAAI,CAAC;IAEhD;;;OAGG;IACH,kBAAkB,CAAC,EAAE,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC;IAE7C;;;OAGG;IACH,iBAAiB,CAAC,EAAE,iBAAiB,CAAC,KAAK,CAAC,GAAG,IAAI,CAAC;IAEpD;;;OAGG;IACH,gBAAgB,CAAC,EAAE,CAAC,MAAM,EAAE,CAAC,MAAM,EAAE,MAAM,CAAC,KAAK,IAAI,CAAC;IAEtD;;;OAGG;IACH,oBAAoB,CAAC,EAAE,CAAC,MAAM,EAAE,CAAC,MAAM,EAAE,MAAM,CAAC,KAAK,IAAI,CAAC;IAE1D;;OAEG;IACH,WAAW,EAAE,IAAI,GAAG,CAAC,CAAC,CAAC,EAAE,KAAK,KAAK,OAAO,CAAC,CAAC;CAC7C,CAAC;AAEF,uIAAuI;AACvI,MAAM,CAAC,OAAO,OAAO,YAAY,CAAC,WAAW,SAAS,EAAE,GAAG,EAAE,CAAE,SAAQ,gBAAgB,CACrF,WAAW,GAAG,QAAQ,CAAC,kBAAkB,CAAC,CAC3C;IACC,MAAM,CAAC,SAAS,SAAkB;IAClC,MAAM,CAAC,YAAY,uCAAgB;IAEnC,KAAK,EAAG,gBAAgB,CAAC,OAAO,CAAC,GAAG;QAClC,aAAa,EAAE,aAAa,CAAC;QAC7B,eAAe,EAAE,GAAG,CAAC;KACtB,CAAC;IACF,eAAe;IAmBf,WAAW,CAAC,IAAI,EAAE,gBAAgB,CAAC,IAAI,CAAC;IAwBxC,0BAA0B,CAAC,eAAe,KAAA;IA6B1C,cAAc,CAAC,EAAC,IAAI,EAAC;;KAAA;IAKrB,mBAAmB,CAAC,IAAI,KAAA;IAKxB,uBAAuB,CAAC,IAAI,KAAA;IAI5B,0BAA0B;IAI1B,YAAY;CAwCb"}
+{"version":3,"file":"hexagon-layer.d.ts","sourceRoot":"","sources":["../../src/hexagon-layer/hexagon-layer.ts"],"names":[],"mappings":"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"}

package/typed/screen-grid-layer/screen-grid-cell-layer.d.ts

@@ -2,7 +2,7 @@ import { Model, Texture2D } from '@luma.gl/core';
 import { Layer, LayerProps, UpdateParameters } from '@deck.gl/core/typed';
 import type { _ScreenGridLayerProps } from './screen-grid-layer';
 /** All properties supported by ScreenGridCellLayer. */
-export declare type ScreenGridCellLayerProps<DataT = any> = _ScreenGridCellLayerProps<DataT> & LayerProps<DataT>;
+export declare type ScreenGridCellLayerProps<DataT = any> = _ScreenGridCellLayerProps<DataT> & LayerProps;
 /** Proprties added by ScreenGridCellLayer. */
 export declare type _ScreenGridCellLayerProps<DataT> = _ScreenGridLayerProps<DataT> & {
     maxTexture: Texture2D;

package/typed/screen-grid-layer/screen-grid-cell-layer.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"screen-grid-cell-layer.d.ts","sourceRoot":"","sources":["../../src/screen-grid-layer/screen-grid-cell-layer.ts"],"names":[],"mappings":"AAqBA,OAAO,EAAC,KAAK,EAAmC,SAAS,EAAe,MAAM,eAAe,CAAC;AAC9F,OAAO,EAAC,KAAK,EAAE,UAAU,EAAgB,gBAAgB,EAAC,MAAM,eAAe,CAAC;AAIhF,OAAO,KAAK,EAAC,qBAAqB,EAAC,MAAM,qBAAqB,CAAC;AAc/D,uDAAuD;AACvD,oBAAY,wBAAwB,CAAC,KAAK,GAAG,GAAG,IAAI,yBAAyB,CAAC,KAAK,CAAC,GAClF,UAAU,CAAC,KAAK,CAAC,CAAC;AAEpB,8CAA8C;AAC9C,oBAAY,yBAAyB,CAAC,KAAK,IAAI,qBAAqB,CAAC,KAAK,CAAC,GAAG;IAC5E,UAAU,EAAE,SAAS,CAAC;CACvB,CAAC;AAEF,MAAM,CAAC,OAAO,OAAO,mBAAmB,CAAC,KAAK,GAAG,GAAG,EAAE,WAAW,SAAS,EAAE,GAAG,EAAE,CAAE,SAAQ,KAAK,CAC9F,WAAW,GAAG,QAAQ,CAAC,yBAAyB,CAAC,KAAK,CAAC,CAAC,CACzD;IACC,MAAM,CAAC,SAAS,SAAyB;IACzC,MAAM,CAAC,YAAY,8CAAgB;IAEnC,MAAM,CAAC,WAAW,CAAC,EAAE,KAAA;IAIrB,KAAK,EAAG,KAAK,CAAC,OAAO,CAAC,GAAG;QACvB,KAAK,EAAE,KAAK,CAAC;KACd,CAAC;IACF,UAAU;;;;;;;;;;IAIV,eAAe;IAaf,iBAAiB,CAAC,EAAC,WAAW,EAAC;;KAAA;IAK/B,WAAW,CAAC,MAAM,EAAE,gBAAgB,CAAC,IAAI,CAAC;IAe1C,IAAI,CAAC,EAAC,QAAQ,EAAC;;KAAA;IA0Bf,0BAA0B,CAAC,SAAS,KAAA,EAAE,EAAC,YAAY,EAAC;;KAAA;IAkBpD,SAAS,CAAC,EAAE,EAAE,qBAAqB,GAAG,KAAK;IAc3C,gBAAgB,IAAI,OAAO;IAe3B,eAAe,CAAC,QAAQ,KAAA,EAAE,KAAK,KAAA,EAAE,WAAW,KAAA,GAAG,IAAI;CA2BpD"}
+{"version":3,"file":"screen-grid-cell-layer.d.ts","sourceRoot":"","sources":["../../src/screen-grid-layer/screen-grid-cell-layer.ts"],"names":[],"mappings":"AAqBA,OAAO,EAAC,KAAK,EAAmC,SAAS,EAAe,MAAM,eAAe,CAAC;AAC9F,OAAO,EAAC,KAAK,EAAE,UAAU,EAAgB,gBAAgB,EAAC,MAAM,eAAe,CAAC;AAIhF,OAAO,KAAK,EAAC,qBAAqB,EAAC,MAAM,qBAAqB,CAAC;AAc/D,uDAAuD;AACvD,oBAAY,wBAAwB,CAAC,KAAK,GAAG,GAAG,IAAI,yBAAyB,CAAC,KAAK,CAAC,GAAG,UAAU,CAAC;AAElG,8CAA8C;AAC9C,oBAAY,yBAAyB,CAAC,KAAK,IAAI,qBAAqB,CAAC,KAAK,CAAC,GAAG;IAC5E,UAAU,EAAE,SAAS,CAAC;CACvB,CAAC;AAEF,MAAM,CAAC,OAAO,OAAO,mBAAmB,CAAC,KAAK,GAAG,GAAG,EAAE,WAAW,SAAS,EAAE,GAAG,EAAE,CAAE,SAAQ,KAAK,CAC9F,WAAW,GAAG,QAAQ,CAAC,yBAAyB,CAAC,KAAK,CAAC,CAAC,CACzD;IACC,MAAM,CAAC,SAAS,SAAyB;IACzC,MAAM,CAAC,YAAY,8CAAgB;IAEnC,MAAM,CAAC,WAAW,CAAC,EAAE,KAAA;IAIrB,KAAK,EAAG,KAAK,CAAC,OAAO,CAAC,GAAG;QACvB,KAAK,EAAE,KAAK,CAAC;KACd,CAAC;IACF,UAAU;;;;;;;;;;IAIV,eAAe;IAaf,iBAAiB,CAAC,EAAC,WAAW,EAAC;;KAAA;IAK/B,WAAW,CAAC,MAAM,EAAE,gBAAgB,CAAC,IAAI,CAAC;IAe1C,IAAI,CAAC,EAAC,QAAQ,EAAC;;KAAA;IA0Bf,0BAA0B,CAAC,SAAS,KAAA,EAAE,EAAC,YAAY,EAAC;;KAAA;IAkBpD,SAAS,CAAC,EAAE,EAAE,qBAAqB,GAAG,KAAK;IAc3C,gBAAgB,IAAI,OAAO;IAe3B,eAAe,CAAC,QAAQ,KAAA,EAAE,KAAK,KAAA,EAAE,WAAW,KAAA,GAAG,IAAI;CA2BpD"}