@antv/l7-layers 2.9.18 → 2.9.21

package/es/heatmap/index.js

@@ -37,19 +37,29 @@ var HeatMapLayer = function (_BaseLayer) {
   _createClass(HeatMapLayer, [{
     key: "buildModels",
     value: function buildModels() {
+      var _this2 = this;
+
       var shape = this.getModelType();
       this.layerModel = new HeatMapModels[shape](this);
-      this.models = this.layerModel.initModels();
+      this.layerModel.initModels(function (models) {
+        _this2.models = models;
+
+        _this2.renderLayers();
+      });
     }
   }, {
     key: "rebuildModels",
     value: function rebuildModels() {
-      this.models = this.layerModel.buildModels();
+      var _this3 = this;
+
+      this.layerModel.buildModels(function (models) {
+        return _this3.models = models;
+      });
     }
   }, {
     key: "renderModels",
     value: function renderModels() {
-      var _this2 = this;
+      var _this4 = this;
 
       var shape = this.getModelType();
 
@@ -62,13 +72,15 @@ var HeatMapLayer = function (_BaseLayer) {
       }
 
       if (this.layerModelNeedUpdate) {
-        this.models = this.layerModel.buildModels();
+        this.layerModel.buildModels(function (models) {
+          return _this4.models = models;
+        });
         this.layerModelNeedUpdate = false;
       }
 
       this.models.forEach(function (model) {
         return model.draw({
-          uniforms: _this2.layerModel.getUninforms()
+          uniforms: _this4.layerModel.getUninforms()
         });
       });
       return this;

package/es/heatmap/index.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/heatmap/index.ts"],"names":["BaseLayer","HeatMapModels","HeatMapLayer","shape","getModelType","layerModel","models","initModels","buildModels","render","layerModelNeedUpdate","forEach","model","draw","uniforms","getUninforms","data","attributes","elements","updateAttributesAndElements","console","warn","properties","opacity","type","minimum","maximum","shapeAttribute","styleAttributeService","getLayerStyleAttribute","getLayerConfig","shape3d","source","getSource","sourceType","scale","field","indexOf"],"mappings":";;;;;;;;;;;;AACA,OAAOA,SAAP,MAAsB,mBAAtB;AAEA,OAAOC,aAAP,MAAgD,UAAhD;;IACqBC,Y;;;;;;;;;;;;;;;;2DACG,c;;;;;;;WAEtB,uBAAqB;AACnB,UAAMC,KAAK,GAAG,KAAKC,YAAL,EAAd;AACA,WAAKC,UAAL,GAAkB,IAAIJ,aAAa,CAACE,KAAD,CAAjB,CAAyB,IAAzB,CAAlB;AACA,WAAKG,MAAL,GAAc,KAAKD,UAAL,CAAgBE,UAAhB,EAAd;AACD;;;WACD,yBAAuB;AACrB,WAAKD,MAAL,GAAc,KAAKD,UAAL,CAAgBG,WAAhB,EAAd;AACD;;;WACD,wBAAsB;AAAA;;AACpB,UAAML,KAAK,GAAG,KAAKC,YAAL,EAAd;;AACA,UAAID,KAAK,KAAK,SAAd,EAAyB;AACvB,YAAI,KAAKE,UAAT,EAAqB;AACnB,eAAKA,UAAL,CAAgBI,MAAhB;AACD;;AAED,eAAO,IAAP;AACD;;AACD,UAAI,KAAKC,oBAAT,EAA+B;AAC7B,aAAKJ,MAAL,GAAc,KAAKD,UAAL,CAAgBG,WAAhB,EAAd;AACA,aAAKE,oBAAL,GAA4B,KAA5B;AACD;;AACD,WAAKJ,MAAL,CAAYK,OAAZ,CAAoB,UAACC,KAAD;AAAA,eAClBA,KAAK,CAACC,IAAN,CAAW;AACTC,UAAAA,QAAQ,EAAE,MAAI,CAACT,UAAL,CAAgBU,YAAhB;AADD,SAAX,CADkB;AAAA,OAApB;AAKA,aAAO,IAAP;AACD;;;WAED,yBAAuBC,IAAvB,EAAoD;AAClD,UAAIA,IAAI,CAACC,UAAL,IAAmBD,IAAI,CAACE,QAA5B,EAAsC;AACpC,aAAKZ,MAAL,CAAY,CAAZ,EAAea,2BAAf,CACEH,IAAI,CAACC,UADP,EAEED,IAAI,CAACE,QAFP;AAID,OALD,MAKO;AACLE,QAAAA,OAAO,CAACC,IAAR,CAAa,YAAb;AACD;AACF;;;WAED,2BAA4B;AAC1B,aAAO;AACLC,QAAAA,UAAU,EAAE;AACVC,UAAAA,OAAO,EAAE;AACPC,YAAAA,IAAI,EAAE,QADC;AAEPC,YAAAA,OAAO,EAAE,CAFF;AAGPC,YAAAA,OAAO,EAAE;AAHF;AADC;AADP,OAAP;AASD;;;WAED,wBAA2C;AAAA;;AACzC,UAAMC,cAAc,GAAG,KAAKC,qBAAL,CAA2BC,sBAA3B,CACrB,OADqB,CAAvB;;AAGA,iCAAoB,KAAKC,cAAL,EAApB;AAAA,UAAQC,OAAR,wBAAQA,OAAR;;AACA,UAAMC,MAAM,GAAG,KAAKC,SAAL,EAAf;AACA,UAAMC,UAAU,GAAGF,MAAM,CAAChB,IAAP,CAAYQ,IAA/B;AACA,UAAMrB,KAAK,GACT,CAACwB,cAAD,aAACA,cAAD,gDAACA,cAAc,CAAEQ,KAAjB,0DAAC,sBAAuBC,KAAxB,KAAsD,SADxD;;AAEA,UAAIjC,KAAK,KAAK,SAAV,IAAuBA,KAAK,KAAK,WAArC,EAAkD;AAChD,eAAO,SAAP;AACD;;AACD,UAAI+B,UAAU,KAAK,SAAnB,EAA8B;AAC5B,eAAO,CAAAH,OAAO,SAAP,IAAAA,OAAO,WAAP,YAAAA,OAAO,CAAEM,OAAT,CAAiBlC,KAAjB,OAA4B,CAAC,CAA7B,GAAiC,SAAjC,GAA6C,QAApD;AACD;;AACD,UAAI+B,UAAU,KAAK,MAAnB,EAA2B;AACzB,eAAO,CAAAH,OAAO,SAAP,IAAAA,OAAO,WAAP,YAAAA,OAAO,CAAEM,OAAT,CAAiBlC,KAAjB,OAA4B,CAAC,CAA7B,GAAiC,MAAjC,GAA0C,QAAjD;AACD;;AACD,aAAO,SAAP;AACD;;;;EA1EuCH,S;;SAArBE,Y","sourcesContent":["import { IAttrubuteAndElements } from '@antv/l7-core';\nimport BaseLayer from '../core/BaseLayer';\nimport { IHeatMapLayerStyleOptions } from '../core/interface';\nimport HeatMapModels, { HeatMapModelType } from './models';\nexport default class HeatMapLayer extends BaseLayer<IHeatMapLayerStyleOptions> {\n  public type: string = 'HeatMapLayer';\n\n  public buildModels() {\n    const shape = this.getModelType();\n    this.layerModel = new HeatMapModels[shape](this);\n    this.models = this.layerModel.initModels();\n  }\n  public rebuildModels() {\n    this.models = this.layerModel.buildModels();\n  }\n  public renderModels() {\n    const shape = this.getModelType();\n    if (shape === 'heatmap') {\n      if (this.layerModel) {\n        this.layerModel.render(); // 独立的渲染流程\n      }\n\n      return this;\n    }\n    if (this.layerModelNeedUpdate) {\n      this.models = this.layerModel.buildModels();\n      this.layerModelNeedUpdate = false;\n    }\n    this.models.forEach((model) =>\n      model.draw({\n        uniforms: this.layerModel.getUninforms(),\n      }),\n    );\n    return this;\n  }\n\n  public updateModelData(data: IAttrubuteAndElements) {\n    if (data.attributes && data.elements) {\n      this.models[0].updateAttributesAndElements(\n        data.attributes,\n        data.elements,\n      );\n    } else {\n      console.warn('data error');\n    }\n  }\n\n  protected getConfigSchema() {\n    return {\n      properties: {\n        opacity: {\n          type: 'number',\n          minimum: 0,\n          maximum: 1,\n        },\n      },\n    };\n  }\n\n  protected getModelType(): HeatMapModelType {\n    const shapeAttribute = this.styleAttributeService.getLayerStyleAttribute(\n      'shape',\n    );\n    const { shape3d } = this.getLayerConfig();\n    const source = this.getSource();\n    const sourceType = source.data.type;\n    const shape =\n      (shapeAttribute?.scale?.field as HeatMapModelType) || 'heatmap';\n    if (shape === 'heatmap' || shape === 'heatmap3d') {\n      return 'heatmap';\n    }\n    if (sourceType === 'hexagon') {\n      return shape3d?.indexOf(shape) === -1 ? 'hexagon' : 'grid3d';\n    }\n    if (sourceType === 'grid') {\n      return shape3d?.indexOf(shape) === -1 ? 'grid' : 'grid3d';\n    }\n    return 'heatmap';\n  }\n}\n"],"file":"index.js"}
+{"version":3,"sources":["../../src/heatmap/index.ts"],"names":["BaseLayer","HeatMapModels","HeatMapLayer","shape","getModelType","layerModel","initModels","models","renderLayers","buildModels","render","layerModelNeedUpdate","forEach","model","draw","uniforms","getUninforms","data","attributes","elements","updateAttributesAndElements","console","warn","properties","opacity","type","minimum","maximum","shapeAttribute","styleAttributeService","getLayerStyleAttribute","getLayerConfig","shape3d","source","getSource","sourceType","scale","field","indexOf"],"mappings":"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","sourcesContent":["import { IAttrubuteAndElements } from '@antv/l7-core';\nimport BaseLayer from '../core/BaseLayer';\nimport { IHeatMapLayerStyleOptions } from '../core/interface';\nimport HeatMapModels, { HeatMapModelType } from './models';\nexport default class HeatMapLayer extends BaseLayer<IHeatMapLayerStyleOptions> {\n  public type: string = 'HeatMapLayer';\n\n  public buildModels() {\n    const shape = this.getModelType();\n    this.layerModel = new HeatMapModels[shape](this);\n    this.layerModel.initModels((models) => {\n      this.models = models;\n      this.renderLayers();\n    });\n  }\n  public rebuildModels() {\n    this.layerModel.buildModels((models) => (this.models = models));\n  }\n  public renderModels() {\n    const shape = this.getModelType();\n    if (shape === 'heatmap') {\n      if (this.layerModel) {\n        this.layerModel.render(); // 独立的渲染流程\n      }\n\n      return this;\n    }\n    if (this.layerModelNeedUpdate) {\n      this.layerModel.buildModels((models) => (this.models = models));\n      // @ts-ignore\n      // this.models = this.layerModel.buildModels();\n      this.layerModelNeedUpdate = false;\n    }\n    this.models.forEach((model) =>\n      model.draw({\n        uniforms: this.layerModel.getUninforms(),\n      }),\n    );\n    return this;\n  }\n\n  public updateModelData(data: IAttrubuteAndElements) {\n    if (data.attributes && data.elements) {\n      this.models[0].updateAttributesAndElements(\n        data.attributes,\n        data.elements,\n      );\n    } else {\n      console.warn('data error');\n    }\n  }\n\n  protected getConfigSchema() {\n    return {\n      properties: {\n        opacity: {\n          type: 'number',\n          minimum: 0,\n          maximum: 1,\n        },\n      },\n    };\n  }\n\n  protected getModelType(): HeatMapModelType {\n    const shapeAttribute = this.styleAttributeService.getLayerStyleAttribute(\n      'shape',\n    );\n    const { shape3d } = this.getLayerConfig();\n    const source = this.getSource();\n    const sourceType = source.data.type;\n    const shape =\n      (shapeAttribute?.scale?.field as HeatMapModelType) || 'heatmap';\n    if (shape === 'heatmap' || shape === 'heatmap3d') {\n      return 'heatmap';\n    }\n    if (sourceType === 'hexagon') {\n      return shape3d?.indexOf(shape) === -1 ? 'hexagon' : 'grid3d';\n    }\n    if (sourceType === 'grid') {\n      return shape3d?.indexOf(shape) === -1 ? 'grid' : 'grid3d';\n    }\n    return 'heatmap';\n  }\n}\n"],"file":"index.js"}

package/es/heatmap/models/grid.d.ts

@@ -2,7 +2,7 @@ import { IModel, IModelUniform } from '@antv/l7-core';
 import BaseModel from '../../core/BaseModel';
 export default class GridModel extends BaseModel {
     getUninforms(): IModelUniform;
-    initModels(): IModel[];
-    buildModels(): IModel[];
+    initModels(callbackModel: (models: IModel[]) => void): void;
+    buildModels(callbackModel: (models: IModel[]) => void): void;
     protected registerBuiltinAttributes(): void;
 }

package/es/heatmap/models/grid.js

@@ -43,30 +43,34 @@ var GridModel = function (_BaseModel) {
     }
   }, {
     key: "initModels",
-    value: function initModels() {
-      return this.buildModels();
+    value: function initModels(callbackModel) {
+      this.buildModels(callbackModel);
     }
   }, {
     key: "buildModels",
-    value: function buildModels() {
+    value: function buildModels(callbackModel) {
       var _ref2 = this.layer.getLayerConfig(),
           _ref2$mask = _ref2.mask,
           mask = _ref2$mask === void 0 ? false : _ref2$mask,
           _ref2$maskInside = _ref2.maskInside,
           maskInside = _ref2$maskInside === void 0 ? true : _ref2$maskInside;
 
-      return [this.layer.buildLayerModel({
-        moduleName: 'gridheatmap',
+      this.layer.buildLayerModel({
+        moduleName: 'heatmapGrid',
         vertexShader: heatmapGridVert,
         fragmentShader: heatmapGridFrag,
         triangulation: HeatmapGridTriangulation,
+        primitive: gl.TRIANGLES,
         depth: {
           enable: false
         },
-        primitive: gl.TRIANGLES,
-        blend: this.getBlend(),
         stencil: getMask(mask, maskInside)
-      })];
+      }).then(function (model) {
+        callbackModel([model]);
+      }).catch(function (err) {
+        console.warn(err);
+        callbackModel([]);
+      });
     }
   }, {
     key: "registerBuiltinAttributes",

package/es/heatmap/models/grid.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../src/heatmap/models/grid.ts"],"names":["AttributeType","gl","getMask","BaseModel","HeatmapGridTriangulation","GridModel","layer","getLayerConfig","opacity","coverage","angle","u_opacity","u_coverage","u_angle","u_radius","getSource","data","xOffset","yOffset","buildModels","mask","maskInside","buildLayerModel","moduleName","vertexShader","heatmapGridVert","fragmentShader","heatmapGridFrag","triangulation","depth","enable","primitive","TRIANGLES","blend","getBlend","stencil","styleAttributeService","registerStyleAttribute","name","type","Attribute","descriptor","buffer","usage","DYNAMIC_DRAW","FLOAT","size","update","feature","featureIdx","coordinates","version","originCoordinates"],"mappings":";;;;;;;;;;AAAA,SACEA,aADF,EAEEC,EAFF,QAMO,eANP;AAOA,SAASC,OAAT,QAAwB,gBAAxB;AACA,OAAOC,SAAP,MAAsB,sBAAtB;AAEA,SAASC,wBAAT,QAAyC,0BAAzC;;;;IAGqBC,S;;;;;;;;;;;;;WACnB,wBAAqC;AACnC,iBAII,KAAKC,KAAL,CAAWC,cAAX,EAJJ;AAAA,UACEC,OADF,QACEA,OADF;AAAA,UAEEC,QAFF,QAEEA,QAFF;AAAA,UAGEC,KAHF,QAGEA,KAHF;;AAKA,aAAO;AACLC,QAAAA,SAAS,EAAEH,OAAO,IAAI,GADjB;AAELI,QAAAA,UAAU,EAAEH,QAAQ,IAAI,GAFnB;AAGLI,QAAAA,OAAO,EAAEH,KAAK,IAAI,CAHb;AAILI,QAAAA,QAAQ,EAAE,CACR,KAAKR,KAAL,CAAWS,SAAX,GAAuBC,IAAvB,CAA4BC,OADpB,EAER,KAAKX,KAAL,CAAWS,SAAX,GAAuBC,IAAvB,CAA4BE,OAFpB;AAJL,OAAP;AASD;;;WAED,sBAA8B;AAC5B,aAAO,KAAKC,WAAL,EAAP;AACD;;;WAED,uBAA+B;AAC7B,kBAGI,KAAKb,KAAL,CAAWC,cAAX,EAHJ;AAAA,6BACEa,IADF;AAAA,UACEA,IADF,2BACS,KADT;AAAA,mCAEEC,UAFF;AAAA,UAEEA,UAFF,iCAEe,IAFf;;AAIA,aAAO,CACL,KAAKf,KAAL,CAAWgB,eAAX,CAA2B;AACzBC,QAAAA,UAAU,EAAE,aADa;AAEzBC,QAAAA,YAAY,EAAEC,eAFW;AAGzBC,QAAAA,cAAc,EAAEC,eAHS;AAIzBC,QAAAA,aAAa,EAAExB,wBAJU;AAKzByB,QAAAA,KAAK,EAAE;AAAEC,UAAAA,MAAM,EAAE;AAAV,SALkB;AAMzBC,QAAAA,SAAS,EAAE9B,EAAE,CAAC+B,SANW;AAOzBC,QAAAA,KAAK,EAAE,KAAKC,QAAL,EAPkB;AAQzBC,QAAAA,OAAO,EAAEjC,OAAO,CAACkB,IAAD,EAAOC,UAAP;AARS,OAA3B,CADK,CAAP;AAYD;;;WACD,qCAAsC;AACpC,WAAKe,qBAAL,CAA2BC,sBAA3B,CAAkD;AAChDC,QAAAA,IAAI,EAAE,KAD0C;AAEhDC,QAAAA,IAAI,EAAEvC,aAAa,CAACwC,SAF4B;AAGhDC,QAAAA,UAAU,EAAE;AACVH,UAAAA,IAAI,EAAE,OADI;AAEVI,UAAAA,MAAM,EAAE;AAENC,YAAAA,KAAK,EAAE1C,EAAE,CAAC2C,YAFJ;AAGN5B,YAAAA,IAAI,EAAE,EAHA;AAINuB,YAAAA,IAAI,EAAEtC,EAAE,CAAC4C;AAJH,WAFE;AAQVC,UAAAA,IAAI,EAAE,CARI;AASVC,UAAAA,MAAM,EAAE,gBAACC,OAAD,EAA0BC,UAA1B,EAAiD;AAEvD,gBAAMC,WAAW,GAAIF,OAAO,CAACG,OAAR,KAAoB,UAApB,GACjBH,OAAO,CAACI,iBADS,GAEjBJ,OAAO,CAACE,WAFZ;AAGA,mBAAO,CAACA,WAAW,CAAC,CAAD,CAAZ,EAAiBA,WAAW,CAAC,CAAD,CAA5B,EAAiC,CAAjC,CAAP;AACD;AAfS;AAHoC,OAAlD;AAqBD;;;;EA9DoC/C,S;;SAAlBE,S","sourcesContent":["import {\n  AttributeType,\n  gl,\n  IEncodeFeature,\n  IModel,\n  IModelUniform,\n} from '@antv/l7-core';\nimport { getMask } from '@antv/l7-utils';\nimport BaseModel from '../../core/BaseModel';\nimport { IHeatMapLayerStyleOptions } from '../../core/interface';\nimport { HeatmapGridTriangulation } from '../../core/triangulation';\nimport heatmapGridVert from '../shaders/grid_vert.glsl';\nimport heatmapGridFrag from '../shaders/hexagon_frag.glsl';\nexport default class GridModel extends BaseModel {\n  public getUninforms(): IModelUniform {\n    const {\n      opacity,\n      coverage,\n      angle,\n    } = this.layer.getLayerConfig() as IHeatMapLayerStyleOptions;\n    return {\n      u_opacity: opacity || 1.0,\n      u_coverage: coverage || 0.9,\n      u_angle: angle || 0,\n      u_radius: [\n        this.layer.getSource().data.xOffset,\n        this.layer.getSource().data.yOffset,\n      ],\n    };\n  }\n\n  public initModels(): IModel[] {\n    return this.buildModels();\n  }\n\n  public buildModels(): IModel[] {\n    const {\n      mask = false,\n      maskInside = true,\n    } = this.layer.getLayerConfig() as IHeatMapLayerStyleOptions;\n    return [\n      this.layer.buildLayerModel({\n        moduleName: 'gridheatmap',\n        vertexShader: heatmapGridVert,\n        fragmentShader: heatmapGridFrag,\n        triangulation: HeatmapGridTriangulation,\n        depth: { enable: false },\n        primitive: gl.TRIANGLES,\n        blend: this.getBlend(),\n        stencil: getMask(mask, maskInside),\n      }),\n    ];\n  }\n  protected registerBuiltinAttributes() {\n    this.styleAttributeService.registerStyleAttribute({\n      name: 'pos', // 顶点经纬度位置\n      type: AttributeType.Attribute,\n      descriptor: {\n        name: 'a_Pos',\n        buffer: {\n          // give the WebGL driver a hint that this buffer may change\n          usage: gl.DYNAMIC_DRAW,\n          data: [],\n          type: gl.FLOAT,\n        },\n        size: 3,\n        update: (feature: IEncodeFeature, featureIdx: number) => {\n          // const coordinates = feature.coordinates as number[];\n          const coordinates = (feature.version === 'GAODE2.x'\n            ? feature.originCoordinates\n            : feature.coordinates) as number[];\n          return [coordinates[0], coordinates[1], 0];\n        },\n      },\n    });\n  }\n}\n"],"file":"grid.js"}
+{"version":3,"sources":["../../../src/heatmap/models/grid.ts"],"names":["AttributeType","gl","getMask","BaseModel","HeatmapGridTriangulation","GridModel","layer","getLayerConfig","opacity","coverage","angle","u_opacity","u_coverage","u_angle","u_radius","getSource","data","xOffset","yOffset","callbackModel","buildModels","mask","maskInside","buildLayerModel","moduleName","vertexShader","heatmapGridVert","fragmentShader","heatmapGridFrag","triangulation","primitive","TRIANGLES","depth","enable","stencil","then","model","catch","err","console","warn","styleAttributeService","registerStyleAttribute","name","type","Attribute","descriptor","buffer","usage","DYNAMIC_DRAW","FLOAT","size","update","feature","featureIdx","coordinates","version","originCoordinates"],"mappings":";;;;;;;;;;AAAA,SACEA,aADF,EAEEC,EAFF,QAMO,eANP;AAOA,SAASC,OAAT,QAAwB,gBAAxB;AACA,OAAOC,SAAP,MAAsB,sBAAtB;AAEA,SAASC,wBAAT,QAAyC,0BAAzC;;;;IAGqBC,S;;;;;;;;;;;;;WACnB,wBAAqC;AACnC,iBAII,KAAKC,KAAL,CAAWC,cAAX,EAJJ;AAAA,UACEC,OADF,QACEA,OADF;AAAA,UAEEC,QAFF,QAEEA,QAFF;AAAA,UAGEC,KAHF,QAGEA,KAHF;;AAKA,aAAO;AACLC,QAAAA,SAAS,EAAEH,OAAO,IAAI,GADjB;AAELI,QAAAA,UAAU,EAAEH,QAAQ,IAAI,GAFnB;AAGLI,QAAAA,OAAO,EAAEH,KAAK,IAAI,CAHb;AAILI,QAAAA,QAAQ,EAAE,CACR,KAAKR,KAAL,CAAWS,SAAX,GAAuBC,IAAvB,CAA4BC,OADpB,EAER,KAAKX,KAAL,CAAWS,SAAX,GAAuBC,IAAvB,CAA4BE,OAFpB;AAJL,OAAP;AASD;;;WAED,oBAAkBC,aAAlB,EAA6D;AAC3D,WAAKC,WAAL,CAAiBD,aAAjB;AACD;;;WAED,qBAAmBA,aAAnB,EAA8D;AAC5D,kBAGI,KAAKb,KAAL,CAAWC,cAAX,EAHJ;AAAA,6BACEc,IADF;AAAA,UACEA,IADF,2BACS,KADT;AAAA,mCAEEC,UAFF;AAAA,UAEEA,UAFF,iCAEe,IAFf;;AAIA,WAAKhB,KAAL,CACGiB,eADH,CACmB;AACfC,QAAAA,UAAU,EAAE,aADG;AAEfC,QAAAA,YAAY,EAAEC,eAFC;AAGfC,QAAAA,cAAc,EAAEC,eAHD;AAIfC,QAAAA,aAAa,EAAEzB,wBAJA;AAKf0B,QAAAA,SAAS,EAAE7B,EAAE,CAAC8B,SALC;AAMfC,QAAAA,KAAK,EAAE;AAAEC,UAAAA,MAAM,EAAE;AAAV,SANQ;AAOfC,QAAAA,OAAO,EAAEhC,OAAO,CAACmB,IAAD,EAAOC,UAAP;AAPD,OADnB,EAUGa,IAVH,CAUQ,UAACC,KAAD,EAAW;AACfjB,QAAAA,aAAa,CAAC,CAACiB,KAAD,CAAD,CAAb;AACD,OAZH,EAaGC,KAbH,CAaS,UAACC,GAAD,EAAS;AACdC,QAAAA,OAAO,CAACC,IAAR,CAAaF,GAAb;AACAnB,QAAAA,aAAa,CAAC,EAAD,CAAb;AACD,OAhBH;AAiBD;;;WACD,qCAAsC;AACpC,WAAKsB,qBAAL,CAA2BC,sBAA3B,CAAkD;AAChDC,QAAAA,IAAI,EAAE,KAD0C;AAEhDC,QAAAA,IAAI,EAAE5C,aAAa,CAAC6C,SAF4B;AAGhDC,QAAAA,UAAU,EAAE;AACVH,UAAAA,IAAI,EAAE,OADI;AAEVI,UAAAA,MAAM,EAAE;AAENC,YAAAA,KAAK,EAAE/C,EAAE,CAACgD,YAFJ;AAGNjC,YAAAA,IAAI,EAAE,EAHA;AAIN4B,YAAAA,IAAI,EAAE3C,EAAE,CAACiD;AAJH,WAFE;AAQVC,UAAAA,IAAI,EAAE,CARI;AASVC,UAAAA,MAAM,EAAE,gBAACC,OAAD,EAA0BC,UAA1B,EAAiD;AAEvD,gBAAMC,WAAW,GAAIF,OAAO,CAACG,OAAR,KAAoB,UAApB,GACjBH,OAAO,CAACI,iBADS,GAEjBJ,OAAO,CAACE,WAFZ;AAGA,mBAAO,CAACA,WAAW,CAAC,CAAD,CAAZ,EAAiBA,WAAW,CAAC,CAAD,CAA5B,EAAiC,CAAjC,CAAP;AACD;AAfS;AAHoC,OAAlD;AAqBD;;;;EAnEoCpD,S;;SAAlBE,S","sourcesContent":["import {\n  AttributeType,\n  gl,\n  IEncodeFeature,\n  IModel,\n  IModelUniform,\n} from '@antv/l7-core';\nimport { getMask } from '@antv/l7-utils';\nimport BaseModel from '../../core/BaseModel';\nimport { IHeatMapLayerStyleOptions } from '../../core/interface';\nimport { HeatmapGridTriangulation } from '../../core/triangulation';\nimport heatmapGridVert from '../shaders/grid_vert.glsl';\nimport heatmapGridFrag from '../shaders/hexagon_frag.glsl';\nexport default class GridModel extends BaseModel {\n  public getUninforms(): IModelUniform {\n    const {\n      opacity,\n      coverage,\n      angle,\n    } = this.layer.getLayerConfig() as IHeatMapLayerStyleOptions;\n    return {\n      u_opacity: opacity || 1.0,\n      u_coverage: coverage || 0.9,\n      u_angle: angle || 0,\n      u_radius: [\n        this.layer.getSource().data.xOffset,\n        this.layer.getSource().data.yOffset,\n      ],\n    };\n  }\n\n  public initModels(callbackModel: (models: IModel[]) => void) {\n    this.buildModels(callbackModel);\n  }\n\n  public buildModels(callbackModel: (models: IModel[]) => void) {\n    const {\n      mask = false,\n      maskInside = true,\n    } = this.layer.getLayerConfig() as IHeatMapLayerStyleOptions;\n    this.layer\n      .buildLayerModel({\n        moduleName: 'heatmapGrid',\n        vertexShader: heatmapGridVert,\n        fragmentShader: heatmapGridFrag,\n        triangulation: HeatmapGridTriangulation,\n        primitive: gl.TRIANGLES,\n        depth: { enable: false },\n        stencil: getMask(mask, maskInside),\n      })\n      .then((model) => {\n        callbackModel([model]);\n      })\n      .catch((err) => {\n        console.warn(err);\n        callbackModel([]);\n      });\n  }\n  protected registerBuiltinAttributes() {\n    this.styleAttributeService.registerStyleAttribute({\n      name: 'pos', // 顶点经纬度位置\n      type: AttributeType.Attribute,\n      descriptor: {\n        name: 'a_Pos',\n        buffer: {\n          // give the WebGL driver a hint that this buffer may change\n          usage: gl.DYNAMIC_DRAW,\n          data: [],\n          type: gl.FLOAT,\n        },\n        size: 3,\n        update: (feature: IEncodeFeature, featureIdx: number) => {\n          // const coordinates = feature.coordinates as number[];\n          const coordinates = (feature.version === 'GAODE2.x'\n            ? feature.originCoordinates\n            : feature.coordinates) as number[];\n          return [coordinates[0], coordinates[1], 0];\n        },\n      },\n    });\n  }\n}\n"],"file":"grid.js"}

package/es/heatmap/models/grid3d.d.ts

@@ -2,7 +2,7 @@ import { IModel, IModelUniform } from '@antv/l7-core';
 import BaseModel from '../../core/BaseModel';
 export default class Grid3DModel extends BaseModel {
     getUninforms(): IModelUniform;
-    initModels(): IModel[];
-    buildModels(): IModel[];
+    initModels(callbackModel: (models: IModel[]) => void): void;
+    buildModels(callbackModel: (models: IModel[]) => void): void;
     protected registerBuiltinAttributes(): void;
 }

package/es/heatmap/models/grid3d.js

@@ -43,29 +43,35 @@ var Grid3DModel = function (_BaseModel) {
     }
   }, {
     key: "initModels",
-    value: function initModels() {
-      return this.buildModels();
+    value: function initModels(callbackModel) {
+      this.buildModels(callbackModel);
     }
   }, {
     key: "buildModels",
-    value: function buildModels() {
+    value: function buildModels(callbackModel) {
       var _ref2 = this.layer.getLayerConfig(),
           _ref2$mask = _ref2.mask,
           mask = _ref2$mask === void 0 ? false : _ref2$mask,
           _ref2$maskInside = _ref2.maskInside,
           maskInside = _ref2$maskInside === void 0 ? true : _ref2$maskInside;
 
-      return [this.layer.buildLayerModel({
-        moduleName: 'grid3dheatmap',
+      this.layer.buildLayerModel({
+        moduleName: 'heatmapGrid3d',
         vertexShader: heatmapGrid3dVert,
         fragmentShader: heatmapGridFrag,
         triangulation: PointExtrudeTriangulation,
+        primitive: gl.TRIANGLES,
         depth: {
           enable: true
         },
         blend: this.getBlend(),
         stencil: getMask(mask, maskInside)
-      })];
+      }).then(function (model) {
+        callbackModel([model]);
+      }).catch(function (err) {
+        console.warn(err);
+        callbackModel([]);
+      });
     }
   }, {
     key: "registerBuiltinAttributes",

package/es/heatmap/models/grid3d.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../src/heatmap/models/grid3d.ts"],"names":["AttributeType","gl","getMask","BaseModel","PointExtrudeTriangulation","Grid3DModel","layer","getLayerConfig","opacity","coverage","angle","u_opacity","u_coverage","u_angle","u_radius","getSource","data","xOffset","yOffset","buildModels","mask","maskInside","buildLayerModel","moduleName","vertexShader","heatmapGrid3dVert","fragmentShader","heatmapGridFrag","triangulation","depth","enable","blend","getBlend","stencil","styleAttributeService","registerStyleAttribute","name","type","Attribute","descriptor","buffer","usage","DYNAMIC_DRAW","FLOAT","size","update","feature","featureIdx","vertex","attributeIdx","Array","isArray","STATIC_DRAW","normal","coordinates","version","originCoordinates"],"mappings":"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","sourcesContent":["import {\n  AttributeType,\n  gl,\n  IEncodeFeature,\n  IModel,\n  IModelUniform,\n} from '@antv/l7-core';\nimport { getMask } from '@antv/l7-utils';\nimport BaseModel from '../../core/BaseModel';\nimport { IHeatMapLayerStyleOptions } from '../../core/interface';\nimport { PointExtrudeTriangulation } from '../../core/triangulation';\nimport heatmapGrid3dVert from '../shaders/hexagon_3d_vert.glsl';\nimport heatmapGridFrag from '../shaders/hexagon_frag.glsl';\nexport default class Grid3DModel extends BaseModel {\n  public getUninforms(): IModelUniform {\n    const {\n      opacity,\n      coverage,\n      angle,\n    } = this.layer.getLayerConfig() as IHeatMapLayerStyleOptions;\n    return {\n      u_opacity: opacity || 1.0,\n      u_coverage: coverage || 1.0,\n      u_angle: angle || 0,\n      u_radius: [\n        this.layer.getSource().data.xOffset,\n        this.layer.getSource().data.yOffset,\n      ],\n    };\n  }\n\n  public initModels(): IModel[] {\n    return this.buildModels();\n  }\n\n  public buildModels(): IModel[] {\n    const {\n      mask = false,\n      maskInside = true,\n    } = this.layer.getLayerConfig() as IHeatMapLayerStyleOptions;\n    return [\n      this.layer.buildLayerModel({\n        moduleName: 'grid3dheatmap',\n        vertexShader: heatmapGrid3dVert,\n        fragmentShader: heatmapGridFrag,\n        triangulation: PointExtrudeTriangulation,\n        depth: { enable: true },\n        blend: this.getBlend(),\n        stencil: getMask(mask, maskInside),\n      }),\n    ];\n  }\n  protected registerBuiltinAttributes() {\n    // point layer size;\n    this.styleAttributeService.registerStyleAttribute({\n      name: 'size',\n      type: AttributeType.Attribute,\n      descriptor: {\n        name: 'a_Size',\n        buffer: {\n          // give the WebGL driver a hint that this buffer may change\n          usage: gl.DYNAMIC_DRAW,\n          data: [],\n          type: gl.FLOAT,\n        },\n        size: 1,\n        update: (\n          feature: IEncodeFeature,\n          featureIdx: number,\n          vertex: number[],\n          attributeIdx: number,\n        ) => {\n          const { size } = feature;\n          return Array.isArray(size) ? [size[0]] : [size as number];\n        },\n      },\n    });\n\n    // point layer size;\n    this.styleAttributeService.registerStyleAttribute({\n      name: 'normal',\n      type: AttributeType.Attribute,\n      descriptor: {\n        name: 'a_Normal',\n        buffer: {\n          // give the WebGL driver a hint that this buffer may change\n          usage: gl.STATIC_DRAW,\n          data: [],\n          type: gl.FLOAT,\n        },\n        size: 3,\n        update: (\n          feature: IEncodeFeature,\n          featureIdx: number,\n          vertex: number[],\n          attributeIdx: number,\n          normal: number[],\n        ) => {\n          return normal;\n        },\n      },\n    });\n    this.styleAttributeService.registerStyleAttribute({\n      name: 'pos', // 顶点经纬度位置\n      type: AttributeType.Attribute,\n      descriptor: {\n        name: 'a_Pos',\n        buffer: {\n          // give the WebGL driver a hint that this buffer may change\n          usage: gl.DYNAMIC_DRAW,\n          data: [],\n          type: gl.FLOAT,\n        },\n        size: 3,\n        update: (feature: IEncodeFeature, featureIdx: number) => {\n          const coordinates = (feature.version === 'GAODE2.x'\n            ? feature.originCoordinates\n            : feature.coordinates) as number[];\n          // const coordinates = feature.coordinates as number[];\n          // const coordinates = feature.originCoordinates as number[];\n          return [coordinates[0], coordinates[1], 0];\n        },\n      },\n    });\n  }\n}\n"],"file":"grid3d.js"}
+{"version":3,"sources":["../../../src/heatmap/models/grid3d.ts"],"names":["AttributeType","gl","getMask","BaseModel","PointExtrudeTriangulation","Grid3DModel","layer","getLayerConfig","opacity","coverage","angle","u_opacity","u_coverage","u_angle","u_radius","getSource","data","xOffset","yOffset","callbackModel","buildModels","mask","maskInside","buildLayerModel","moduleName","vertexShader","heatmapGrid3dVert","fragmentShader","heatmapGridFrag","triangulation","primitive","TRIANGLES","depth","enable","blend","getBlend","stencil","then","model","catch","err","console","warn","styleAttributeService","registerStyleAttribute","name","type","Attribute","descriptor","buffer","usage","DYNAMIC_DRAW","FLOAT","size","update","feature","featureIdx","vertex","attributeIdx","Array","isArray","STATIC_DRAW","normal","coordinates","version","originCoordinates"],"mappings":";;;;;;;;;;AAAA,SACEA,aADF,EAEEC,EAFF,QAMO,eANP;AAOA,SAASC,OAAT,QAAwB,gBAAxB;AACA,OAAOC,SAAP,MAAsB,sBAAtB;AAEA,SAASC,yBAAT,QAA0C,0BAA1C;;;;IAGqBC,W;;;;;;;;;;;;;WACnB,wBAAqC;AACnC,iBAII,KAAKC,KAAL,CAAWC,cAAX,EAJJ;AAAA,UACEC,OADF,QACEA,OADF;AAAA,UAEEC,QAFF,QAEEA,QAFF;AAAA,UAGEC,KAHF,QAGEA,KAHF;;AAKA,aAAO;AACLC,QAAAA,SAAS,EAAEH,OAAO,IAAI,GADjB;AAELI,QAAAA,UAAU,EAAEH,QAAQ,IAAI,GAFnB;AAGLI,QAAAA,OAAO,EAAEH,KAAK,IAAI,CAHb;AAILI,QAAAA,QAAQ,EAAE,CACR,KAAKR,KAAL,CAAWS,SAAX,GAAuBC,IAAvB,CAA4BC,OADpB,EAER,KAAKX,KAAL,CAAWS,SAAX,GAAuBC,IAAvB,CAA4BE,OAFpB;AAJL,OAAP;AASD;;;WAED,oBAAkBC,aAAlB,EAA6D;AAC3D,WAAKC,WAAL,CAAiBD,aAAjB;AACD;;;WAED,qBAAmBA,aAAnB,EAA8D;AAC5D,kBAGI,KAAKb,KAAL,CAAWC,cAAX,EAHJ;AAAA,6BACEc,IADF;AAAA,UACEA,IADF,2BACS,KADT;AAAA,mCAEEC,UAFF;AAAA,UAEEA,UAFF,iCAEe,IAFf;;AAIA,WAAKhB,KAAL,CACGiB,eADH,CACmB;AACfC,QAAAA,UAAU,EAAE,eADG;AAEfC,QAAAA,YAAY,EAAEC,iBAFC;AAGfC,QAAAA,cAAc,EAAEC,eAHD;AAIfC,QAAAA,aAAa,EAAEzB,yBAJA;AAKf0B,QAAAA,SAAS,EAAE7B,EAAE,CAAC8B,SALC;AAMfC,QAAAA,KAAK,EAAE;AAAEC,UAAAA,MAAM,EAAE;AAAV,SANQ;AAOfC,QAAAA,KAAK,EAAE,KAAKC,QAAL,EAPQ;AAQfC,QAAAA,OAAO,EAAElC,OAAO,CAACmB,IAAD,EAAOC,UAAP;AARD,OADnB,EAWGe,IAXH,CAWQ,UAACC,KAAD,EAAW;AACfnB,QAAAA,aAAa,CAAC,CAACmB,KAAD,CAAD,CAAb;AACD,OAbH,EAcGC,KAdH,CAcS,UAACC,GAAD,EAAS;AACdC,QAAAA,OAAO,CAACC,IAAR,CAAaF,GAAb;AACArB,QAAAA,aAAa,CAAC,EAAD,CAAb;AACD,OAjBH;AAkBD;;;WACD,qCAAsC;AAEpC,WAAKwB,qBAAL,CAA2BC,sBAA3B,CAAkD;AAChDC,QAAAA,IAAI,EAAE,MAD0C;AAEhDC,QAAAA,IAAI,EAAE9C,aAAa,CAAC+C,SAF4B;AAGhDC,QAAAA,UAAU,EAAE;AACVH,UAAAA,IAAI,EAAE,QADI;AAEVI,UAAAA,MAAM,EAAE;AAENC,YAAAA,KAAK,EAAEjD,EAAE,CAACkD,YAFJ;AAGNnC,YAAAA,IAAI,EAAE,EAHA;AAIN8B,YAAAA,IAAI,EAAE7C,EAAE,CAACmD;AAJH,WAFE;AAQVC,UAAAA,IAAI,EAAE,CARI;AASVC,UAAAA,MAAM,EAAE,gBACNC,OADM,EAENC,UAFM,EAGNC,MAHM,EAINC,YAJM,EAKH;AACH,gBAAQL,IAAR,GAAiBE,OAAjB,CAAQF,IAAR;AACA,mBAAOM,KAAK,CAACC,OAAN,CAAcP,IAAd,IAAsB,CAACA,IAAI,CAAC,CAAD,CAAL,CAAtB,GAAkC,CAACA,IAAD,CAAzC;AACD;AAjBS;AAHoC,OAAlD;AAyBA,WAAKV,qBAAL,CAA2BC,sBAA3B,CAAkD;AAChDC,QAAAA,IAAI,EAAE,QAD0C;AAEhDC,QAAAA,IAAI,EAAE9C,aAAa,CAAC+C,SAF4B;AAGhDC,QAAAA,UAAU,EAAE;AACVH,UAAAA,IAAI,EAAE,UADI;AAEVI,UAAAA,MAAM,EAAE;AAENC,YAAAA,KAAK,EAAEjD,EAAE,CAAC4D,WAFJ;AAGN7C,YAAAA,IAAI,EAAE,EAHA;AAIN8B,YAAAA,IAAI,EAAE7C,EAAE,CAACmD;AAJH,WAFE;AAQVC,UAAAA,IAAI,EAAE,CARI;AASVC,UAAAA,MAAM,EAAE,gBACNC,OADM,EAENC,UAFM,EAGNC,MAHM,EAINC,YAJM,EAKNI,MALM,EAMH;AACH,mBAAOA,MAAP;AACD;AAjBS;AAHoC,OAAlD;AAuBA,WAAKnB,qBAAL,CAA2BC,sBAA3B,CAAkD;AAChDC,QAAAA,IAAI,EAAE,KAD0C;AAEhDC,QAAAA,IAAI,EAAE9C,aAAa,CAAC+C,SAF4B;AAGhDC,QAAAA,UAAU,EAAE;AACVH,UAAAA,IAAI,EAAE,OADI;AAEVI,UAAAA,MAAM,EAAE;AAENC,YAAAA,KAAK,EAAEjD,EAAE,CAACkD,YAFJ;AAGNnC,YAAAA,IAAI,EAAE,EAHA;AAIN8B,YAAAA,IAAI,EAAE7C,EAAE,CAACmD;AAJH,WAFE;AAQVC,UAAAA,IAAI,EAAE,CARI;AASVC,UAAAA,MAAM,EAAE,gBAACC,OAAD,EAA0BC,UAA1B,EAAiD;AACvD,gBAAMO,WAAW,GAAIR,OAAO,CAACS,OAAR,KAAoB,UAApB,GACjBT,OAAO,CAACU,iBADS,GAEjBV,OAAO,CAACQ,WAFZ;AAKA,mBAAO,CAACA,WAAW,CAAC,CAAD,CAAZ,EAAiBA,WAAW,CAAC,CAAD,CAA5B,EAAiC,CAAjC,CAAP;AACD;AAhBS;AAHoC,OAAlD;AAsBD;;;;EAtHsC5D,S;;SAApBE,W","sourcesContent":["import {\n  AttributeType,\n  gl,\n  IEncodeFeature,\n  IModel,\n  IModelUniform,\n} from '@antv/l7-core';\nimport { getMask } from '@antv/l7-utils';\nimport BaseModel from '../../core/BaseModel';\nimport { IHeatMapLayerStyleOptions } from '../../core/interface';\nimport { PointExtrudeTriangulation } from '../../core/triangulation';\nimport heatmapGrid3dVert from '../shaders/hexagon_3d_vert.glsl';\nimport heatmapGridFrag from '../shaders/hexagon_frag.glsl';\nexport default class Grid3DModel extends BaseModel {\n  public getUninforms(): IModelUniform {\n    const {\n      opacity,\n      coverage,\n      angle,\n    } = this.layer.getLayerConfig() as IHeatMapLayerStyleOptions;\n    return {\n      u_opacity: opacity || 1.0,\n      u_coverage: coverage || 1.0,\n      u_angle: angle || 0,\n      u_radius: [\n        this.layer.getSource().data.xOffset,\n        this.layer.getSource().data.yOffset,\n      ],\n    };\n  }\n\n  public initModels(callbackModel: (models: IModel[]) => void) {\n    this.buildModels(callbackModel);\n  }\n\n  public buildModels(callbackModel: (models: IModel[]) => void) {\n    const {\n      mask = false,\n      maskInside = true,\n    } = this.layer.getLayerConfig() as IHeatMapLayerStyleOptions;\n    this.layer\n      .buildLayerModel({\n        moduleName: 'heatmapGrid3d',\n        vertexShader: heatmapGrid3dVert,\n        fragmentShader: heatmapGridFrag,\n        triangulation: PointExtrudeTriangulation,\n        primitive: gl.TRIANGLES,\n        depth: { enable: true },\n        blend: this.getBlend(),\n        stencil: getMask(mask, maskInside),\n      })\n      .then((model) => {\n        callbackModel([model]);\n      })\n      .catch((err) => {\n        console.warn(err);\n        callbackModel([]);\n      });\n  }\n  protected registerBuiltinAttributes() {\n    // point layer size;\n    this.styleAttributeService.registerStyleAttribute({\n      name: 'size',\n      type: AttributeType.Attribute,\n      descriptor: {\n        name: 'a_Size',\n        buffer: {\n          // give the WebGL driver a hint that this buffer may change\n          usage: gl.DYNAMIC_DRAW,\n          data: [],\n          type: gl.FLOAT,\n        },\n        size: 1,\n        update: (\n          feature: IEncodeFeature,\n          featureIdx: number,\n          vertex: number[],\n          attributeIdx: number,\n        ) => {\n          const { size } = feature;\n          return Array.isArray(size) ? [size[0]] : [size as number];\n        },\n      },\n    });\n\n    // point layer size;\n    this.styleAttributeService.registerStyleAttribute({\n      name: 'normal',\n      type: AttributeType.Attribute,\n      descriptor: {\n        name: 'a_Normal',\n        buffer: {\n          // give the WebGL driver a hint that this buffer may change\n          usage: gl.STATIC_DRAW,\n          data: [],\n          type: gl.FLOAT,\n        },\n        size: 3,\n        update: (\n          feature: IEncodeFeature,\n          featureIdx: number,\n          vertex: number[],\n          attributeIdx: number,\n          normal: number[],\n        ) => {\n          return normal;\n        },\n      },\n    });\n    this.styleAttributeService.registerStyleAttribute({\n      name: 'pos', // 顶点经纬度位置\n      type: AttributeType.Attribute,\n      descriptor: {\n        name: 'a_Pos',\n        buffer: {\n          // give the WebGL driver a hint that this buffer may change\n          usage: gl.DYNAMIC_DRAW,\n          data: [],\n          type: gl.FLOAT,\n        },\n        size: 3,\n        update: (feature: IEncodeFeature, featureIdx: number) => {\n          const coordinates = (feature.version === 'GAODE2.x'\n            ? feature.originCoordinates\n            : feature.coordinates) as number[];\n          // const coordinates = feature.coordinates as number[];\n          // const coordinates = feature.originCoordinates as number[];\n          return [coordinates[0], coordinates[1], 0];\n        },\n      },\n    });\n  }\n}\n"],"file":"grid3d.js"}

package/es/heatmap/models/heatmap.d.ts

@@ -10,8 +10,8 @@ export default class HeatMapModel extends BaseModel {
     private shapeType;
     render(): void;
     getUninforms(): IModelUniform;
-    initModels(): IModel[];
-    buildModels(): IModel[];
+    initModels(callbackModel: (models: IModel[]) => void): Promise<void>;
+    buildModels(callbackModel: (models: IModel[]) => void): void;
     protected registerBuiltinAttributes(): void;
     private buildHeatMapIntensity;
     private buildHeatmapColor;

package/es/heatmap/models/heatmap.js

@@ -1,4 +1,5 @@
 import _toConsumableArray from "@babel/runtime/helpers/toConsumableArray";
+import _asyncToGenerator from "@babel/runtime/helpers/asyncToGenerator";
 import _classCallCheck from "@babel/runtime/helpers/classCallCheck";
 import _createClass from "@babel/runtime/helpers/createClass";
 import _assertThisInitialized from "@babel/runtime/helpers/assertThisInitialized";
@@ -13,6 +14,8 @@ function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (O
 
 function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
 
+import _regeneratorRuntime from "@babel/runtime/regenerator";
+
 function _createSuper(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct(); return function _createSuperInternal() { var Super = _getPrototypeOf(Derived), result; if (hasNativeReflectConstruct) { var NewTarget = _getPrototypeOf(this).constructor; result = Reflect.construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return _possibleConstructorReturn(this, result); }; }
 
 function _isNativeReflectConstruct() { if (typeof Reflect === "undefined" || !Reflect.construct) return false; if (Reflect.construct.sham) return false; if (typeof Proxy === "function") return true; try { Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); return true; } catch (e) { return false; } }
@@ -94,43 +97,59 @@ var HeatMapModel = (_dec = injectable(), _dec(_class = function (_BaseModel) {
     }
   }, {
     key: "initModels",
-    value: function initModels() {
-      var _shapeAttr$scale;
-
-      var _this$rendererService2 = this.rendererService,
-          createFramebuffer = _this$rendererService2.createFramebuffer,
-          clear = _this$rendererService2.clear,
-          getViewportSize = _this$rendererService2.getViewportSize,
-          createTexture2D = _this$rendererService2.createTexture2D,
-          useFramebuffer = _this$rendererService2.useFramebuffer;
-      var shapeAttr = this.styleAttributeService.getLayerStyleAttribute('shape');
-      var shapeType = (shapeAttr === null || shapeAttr === void 0 ? void 0 : (_shapeAttr$scale = shapeAttr.scale) === null || _shapeAttr$scale === void 0 ? void 0 : _shapeAttr$scale.field) || 'heatmap';
-      this.shapeType = shapeType;
-      this.intensityModel = this.buildHeatMapIntensity();
-      this.colorModel = shapeType === 'heatmap' ? this.buildHeatmapColor() : this.build3dHeatMap();
-
-      var _getViewportSize = getViewportSize(),
-          width = _getViewportSize.width,
-          height = _getViewportSize.height;
-
-      this.heatmapFramerBuffer = createFramebuffer({
-        color: createTexture2D({
-          width: Math.floor(width / 4),
-          height: Math.floor(height / 4),
-          wrapS: gl.CLAMP_TO_EDGE,
-          wrapT: gl.CLAMP_TO_EDGE,
-          min: gl.LINEAR,
-          mag: gl.LINEAR
-        }),
-        depth: false
-      });
-      this.updateColorTexture();
-      return [this.intensityModel, this.colorModel];
-    }
+    value: function () {
+      var _initModels = _asyncToGenerator(_regeneratorRuntime.mark(function _callee(callbackModel) {
+        var _shapeAttr$scale;
+
+        var _this$rendererService2, createFramebuffer, clear, getViewportSize, createTexture2D, useFramebuffer, shapeAttr, shapeType, _getViewportSize, width, height;
+
+        return _regeneratorRuntime.wrap(function _callee$(_context) {
+          while (1) {
+            switch (_context.prev = _context.next) {
+              case 0:
+                _this$rendererService2 = this.rendererService, createFramebuffer = _this$rendererService2.createFramebuffer, clear = _this$rendererService2.clear, getViewportSize = _this$rendererService2.getViewportSize, createTexture2D = _this$rendererService2.createTexture2D, useFramebuffer = _this$rendererService2.useFramebuffer;
+                shapeAttr = this.styleAttributeService.getLayerStyleAttribute('shape');
+                shapeType = (shapeAttr === null || shapeAttr === void 0 ? void 0 : (_shapeAttr$scale = shapeAttr.scale) === null || _shapeAttr$scale === void 0 ? void 0 : _shapeAttr$scale.field) || 'heatmap';
+                this.shapeType = shapeType;
+                _context.next = 6;
+                return this.buildHeatMapIntensity();
+
+              case 6:
+                this.intensityModel = _context.sent;
+                this.colorModel = shapeType === 'heatmap' ? this.buildHeatmapColor() : this.build3dHeatMap();
+                _getViewportSize = getViewportSize(), width = _getViewportSize.width, height = _getViewportSize.height;
+                this.heatmapFramerBuffer = createFramebuffer({
+                  color: createTexture2D({
+                    width: Math.floor(width / 4),
+                    height: Math.floor(height / 4),
+                    wrapS: gl.CLAMP_TO_EDGE,
+                    wrapT: gl.CLAMP_TO_EDGE,
+                    min: gl.LINEAR,
+                    mag: gl.LINEAR
+                  }),
+                  depth: false
+                });
+                this.updateColorTexture();
+                callbackModel([this.intensityModel, this.colorModel]);
+
+              case 12:
+              case "end":
+                return _context.stop();
+            }
+          }
+        }, _callee, this);
+      }));
+
+      function initModels(_x) {
+        return _initModels.apply(this, arguments);
+      }
+
+      return initModels;
+    }()
   }, {
     key: "buildModels",
-    value: function buildModels() {
-      return this.initModels();
+    value: function buildModels(callbackModel) {
+      this.initModels(callbackModel);
     }
   }, {
     key: "registerBuiltinAttributes",
@@ -172,31 +191,56 @@ var HeatMapModel = (_dec = injectable(), _dec(_class = function (_BaseModel) {
     }
   }, {
     key: "buildHeatMapIntensity",
-    value: function buildHeatMapIntensity() {
-      this.layer.triangulation = HeatmapTriangulation;
-      return this.layer.buildLayerModel({
-        moduleName: 'heatmapintensity',
-        vertexShader: heatmapFramebufferVert,
-        fragmentShader: heatmapFramebufferFrag,
-        triangulation: HeatmapTriangulation,
-        depth: {
-          enable: false
-        },
-        cull: {
-          enable: true,
-          face: getCullFace(this.mapService.version)
-        },
-        blend: {
-          enable: true,
-          func: {
-            srcRGB: gl.ONE,
-            srcAlpha: 1,
-            dstRGB: gl.ONE,
-            dstAlpha: 1
+    value: function () {
+      var _buildHeatMapIntensity = _asyncToGenerator(_regeneratorRuntime.mark(function _callee2() {
+        var model;
+        return _regeneratorRuntime.wrap(function _callee2$(_context2) {
+          while (1) {
+            switch (_context2.prev = _context2.next) {
+              case 0:
+                this.layer.triangulation = HeatmapTriangulation;
+                _context2.next = 3;
+                return this.layer.buildLayerModel({
+                  moduleName: 'heatmapIntensity',
+                  vertexShader: heatmapFramebufferVert,
+                  fragmentShader: heatmapFramebufferFrag,
+                  triangulation: HeatmapTriangulation,
+                  depth: {
+                    enable: false
+                  },
+                  cull: {
+                    enable: true,
+                    face: getCullFace(this.mapService.version)
+                  },
+                  blend: {
+                    enable: true,
+                    func: {
+                      srcRGB: gl.ONE,
+                      srcAlpha: 1,
+                      dstRGB: gl.ONE,
+                      dstAlpha: 1
+                    }
+                  }
+                });
+
+              case 3:
+                model = _context2.sent;
+                return _context2.abrupt("return", model);
+
+              case 5:
+              case "end":
+                return _context2.stop();
+            }
           }
-        }
-      });
-    }
+        }, _callee2, this);
+      }));
+
+      function buildHeatMapIntensity() {
+        return _buildHeatMapIntensity.apply(this, arguments);
+      }
+
+      return buildHeatMapIntensity;
+    }()
   }, {
     key: "buildHeatmapColor",
     value: function buildHeatmapColor() {
@@ -257,6 +301,8 @@ var HeatMapModel = (_dec = injectable(), _dec(_class = function (_BaseModel) {
   }, {
     key: "drawIntensityMode",
     value: function drawIntensityMode() {
+      var _this$intensityModel;
+
       var _ref2 = this.layer.getLayerConfig(),
           opacity = _ref2.opacity,
           _ref2$intensity = _ref2.intensity,
@@ -264,7 +310,7 @@ var HeatMapModel = (_dec = injectable(), _dec(_class = function (_BaseModel) {
           _ref2$radius = _ref2.radius,
           radius = _ref2$radius === void 0 ? 5 : _ref2$radius;
 
-      this.intensityModel.draw({
+      (_this$intensityModel = this.intensityModel) === null || _this$intensityModel === void 0 ? void 0 : _this$intensityModel.draw({
         uniforms: {
           u_opacity: opacity || 1.0,
           u_radius: radius,
@@ -275,10 +321,12 @@ var HeatMapModel = (_dec = injectable(), _dec(_class = function (_BaseModel) {
   }, {
     key: "drawColorMode",
     value: function drawColorMode() {
+      var _this$colorModel;
+
       var _ref3 = this.layer.getLayerConfig(),
           opacity = _ref3.opacity;
 
-      this.colorModel.draw({
+      (_this$colorModel = this.colorModel) === null || _this$colorModel === void 0 ? void 0 : _this$colorModel.draw({
         uniforms: {
           u_opacity: opacity || 1.0,
           u_colorTexture: this.colorTexture,
@@ -289,12 +337,14 @@ var HeatMapModel = (_dec = injectable(), _dec(_class = function (_BaseModel) {
   }, {
     key: "draw3DHeatMap",
     value: function draw3DHeatMap() {
+      var _this$colorModel2;
+
       var _ref4 = this.layer.getLayerConfig(),
           opacity = _ref4.opacity;
 
       var invert = mat4.create();
       mat4.invert(invert, this.cameraService.getViewProjectionMatrixUncentered());
-      this.colorModel.draw({
+      (_this$colorModel2 = this.colorModel) === null || _this$colorModel2 === void 0 ? void 0 : _this$colorModel2.draw({
         uniforms: {
           u_opacity: opacity || 1.0,
           u_colorTexture: this.colorTexture,