@antv/l7-layers 2.10.6 → 2.10.7

package/es/earth/models/base.js

@@ -1,3 +1,4 @@
+import _asyncToGenerator from "@babel/runtime/helpers/esm/asyncToGenerator";
 import _classCallCheck from "@babel/runtime/helpers/esm/classCallCheck";
 import _createClass from "@babel/runtime/helpers/esm/createClass";
 import _assertThisInitialized from "@babel/runtime/helpers/esm/assertThisInitialized";
@@ -5,6 +6,7 @@ import _inherits from "@babel/runtime/helpers/esm/inherits";
 import _possibleConstructorReturn from "@babel/runtime/helpers/esm/possibleConstructorReturn";
 import _getPrototypeOf from "@babel/runtime/helpers/esm/getPrototypeOf";
 import _defineProperty from "@babel/runtime/helpers/esm/defineProperty";
+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); }; }
 
@@ -90,33 +92,57 @@ var BaseEarthModel = /*#__PURE__*/function (_BaseModel) {
     }
   }, {
     key: "initModels",
-    value: function initModels(callbackModel) {
-      var _this2 = this;
-
-      var _this$layer$getLayerC2 = this.layer.getLayerConfig(),
-          globalOptions = _this$layer$getLayerC2.globalOptions;
+    value: function () {
+      var _initModels = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee() {
+        var _this2 = this;
+
+        var _this$layer$getLayerC2, globalOptions, source, createTexture2D;
+
+        return _regeneratorRuntime.wrap(function _callee$(_context) {
+          while (1) {
+            switch (_context.prev = _context.next) {
+              case 0:
+                _this$layer$getLayerC2 = this.layer.getLayerConfig(), globalOptions = _this$layer$getLayerC2.globalOptions;
+
+                if ((globalOptions === null || globalOptions === void 0 ? void 0 : globalOptions.earthTime) !== undefined) {
+                  this.setEarthTime(globalOptions.earthTime);
+                }
+
+                source = this.layer.getSource();
+                createTexture2D = this.rendererService.createTexture2D;
+                this.texture = createTexture2D({
+                  height: 0,
+                  width: 0
+                });
+                source.data.images.then(function (imageData) {
+                  _this2.texture = createTexture2D({
+                    data: imageData[0],
+                    width: imageData[0].width,
+                    height: imageData[0].height
+                  });
+
+                  _this2.layerService.reRender();
+                });
+                _context.next = 8;
+                return this.buildModels();
+
+              case 8:
+                return _context.abrupt("return", _context.sent);
+
+              case 9:
+              case "end":
+                return _context.stop();
+            }
+          }
+        }, _callee, this);
+      }));
 
-      if ((globalOptions === null || globalOptions === void 0 ? void 0 : globalOptions.earthTime) !== undefined) {
-        this.setEarthTime(globalOptions.earthTime);
+      function initModels() {
+        return _initModels.apply(this, arguments);
       }
 
-      var source = this.layer.getSource();
-      var createTexture2D = this.rendererService.createTexture2D;
-      this.texture = createTexture2D({
-        height: 0,
-        width: 0
-      });
-      source.data.images.then(function (imageData) {
-        _this2.texture = createTexture2D({
-          data: imageData[0],
-          width: imageData[0].width,
-          height: imageData[0].height
-        });
-
-        _this2.layerService.reRender();
-      });
-      this.buildModels(callbackModel);
-    }
+      return initModels;
+    }()
   }, {
     key: "clearModels",
     value: function clearModels() {
@@ -124,25 +150,45 @@ var BaseEarthModel = /*#__PURE__*/function (_BaseModel) {
     }
   }, {
     key: "buildModels",
-    value: function buildModels(callbackModel) {
-      // Tip: 调整图层的绘制顺序 地球大气层
-      this.layer.zIndex = -998;
-      this.layer.buildLayerModel({
-        moduleName: 'earthBase',
-        vertexShader: baseVert,
-        fragmentShader: baseFrag,
-        triangulation: earthTriangulation,
-        depth: {
-          enable: true
-        },
-        blend: this.getBlend()
-      }).then(function (model) {
-        callbackModel([model]);
-      }).catch(function (err) {
-        console.warn(err);
-        callbackModel([]);
-      });
-    }
+    value: function () {
+      var _buildModels = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee2() {
+        var model;
+        return _regeneratorRuntime.wrap(function _callee2$(_context2) {
+          while (1) {
+            switch (_context2.prev = _context2.next) {
+              case 0:
+                // Tip: 调整图层的绘制顺序 地球大气层
+                this.layer.zIndex = -998;
+                _context2.next = 3;
+                return this.layer.buildLayerModel({
+                  moduleName: 'earthBase',
+                  vertexShader: baseVert,
+                  fragmentShader: baseFrag,
+                  triangulation: earthTriangulation,
+                  depth: {
+                    enable: true
+                  },
+                  blend: this.getBlend()
+                });
+
+              case 3:
+                model = _context2.sent;
+                return _context2.abrupt("return", [model]);
+
+              case 5:
+              case "end":
+                return _context2.stop();
+            }
+          }
+        }, _callee2, this);
+      }));
+
+      function buildModels() {
+        return _buildModels.apply(this, arguments);
+      }
+
+      return buildModels;
+    }()
   }, {
     key: "registerBuiltinAttributes",
     value: function registerBuiltinAttributes() {

package/es/earth/models/bloomsphere.d.ts

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

package/es/earth/models/bloomsphere.js

@@ -1,8 +1,10 @@
+import _asyncToGenerator from "@babel/runtime/helpers/esm/asyncToGenerator";
 import _classCallCheck from "@babel/runtime/helpers/esm/classCallCheck";
 import _createClass from "@babel/runtime/helpers/esm/createClass";
 import _inherits from "@babel/runtime/helpers/esm/inherits";
 import _possibleConstructorReturn from "@babel/runtime/helpers/esm/possibleConstructorReturn";
 import _getPrototypeOf from "@babel/runtime/helpers/esm/getPrototypeOf";
+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); }; }
 
@@ -43,9 +45,32 @@ var EarthBloomSphereModel = /*#__PURE__*/function (_BaseModel) {
     }
   }, {
     key: "initModels",
-    value: function initModels(callbackModel) {
-      this.buildModels(callbackModel);
-    }
+    value: function () {
+      var _initModels = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee() {
+        return _regeneratorRuntime.wrap(function _callee$(_context) {
+          while (1) {
+            switch (_context.prev = _context.next) {
+              case 0:
+                _context.next = 2;
+                return this.buildModels();
+
+              case 2:
+                return _context.abrupt("return", _context.sent);
+
+              case 3:
+              case "end":
+                return _context.stop();
+            }
+          }
+        }, _callee, this);
+      }));
+
+      function initModels() {
+        return _initModels.apply(this, arguments);
+      }
+
+      return initModels;
+    }()
   }, {
     key: "clearModels",
     value: function clearModels() {
@@ -53,25 +78,45 @@ var EarthBloomSphereModel = /*#__PURE__*/function (_BaseModel) {
     }
   }, {
     key: "buildModels",
-    value: function buildModels(callbackModel) {
-      // Tip: 调整图层的绘制顺序，让它保持在地球后面（减少锯齿现象）
-      this.layer.zIndex = -999;
-      this.layer.buildLayerModel({
-        moduleName: 'earthBloom',
-        vertexShader: bloomSphereVert,
-        fragmentShader: bloomSphereFrag,
-        triangulation: earthOuterTriangulation,
-        depth: {
-          enable: false
-        },
-        blend: this.getBlend()
-      }).then(function (model) {
-        callbackModel([model]);
-      }).catch(function (err) {
-        console.warn(err);
-        callbackModel([]);
-      });
-    }
+    value: function () {
+      var _buildModels = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee2() {
+        var model;
+        return _regeneratorRuntime.wrap(function _callee2$(_context2) {
+          while (1) {
+            switch (_context2.prev = _context2.next) {
+              case 0:
+                // Tip: 调整图层的绘制顺序，让它保持在地球后面（减少锯齿现象）
+                this.layer.zIndex = -999;
+                _context2.next = 3;
+                return this.layer.buildLayerModel({
+                  moduleName: 'earthBloom',
+                  vertexShader: bloomSphereVert,
+                  fragmentShader: bloomSphereFrag,
+                  triangulation: earthOuterTriangulation,
+                  depth: {
+                    enable: false
+                  },
+                  blend: this.getBlend()
+                });
+
+              case 3:
+                model = _context2.sent;
+                return _context2.abrupt("return", [model]);
+
+              case 5:
+              case "end":
+                return _context2.stop();
+            }
+          }
+        }, _callee2, this);
+      }));
+
+      function buildModels() {
+        return _buildModels.apply(this, arguments);
+      }
+
+      return buildModels;
+    }()
   }, {
     key: "registerBuiltinAttributes",
     value: function registerBuiltinAttributes() {

package/es/heatmap/index.d.ts

@@ -4,9 +4,8 @@ import { IHeatMapLayerStyleOptions } from '../core/interface';
 import { HeatMapModelType } from './models';
 export default class HeatMapLayer extends BaseLayer<IHeatMapLayerStyleOptions> {
     type: string;
-    buildModels(): void;
-    rebuildModels(): void;
+    buildModels(): Promise<void>;
     renderModels(): this;
     updateModelData(data: IAttributeAndElements): void;
-    protected getModelType(): HeatMapModelType;
+    getModelType(): HeatMapModelType;
 }

package/es/heatmap/index.js

@@ -1,3 +1,4 @@
+import _asyncToGenerator from "@babel/runtime/helpers/esm/asyncToGenerator";
 import _classCallCheck from "@babel/runtime/helpers/esm/classCallCheck";
 import _createClass from "@babel/runtime/helpers/esm/createClass";
 import _assertThisInitialized from "@babel/runtime/helpers/esm/assertThisInitialized";
@@ -5,6 +6,7 @@ import _inherits from "@babel/runtime/helpers/esm/inherits";
 import _possibleConstructorReturn from "@babel/runtime/helpers/esm/possibleConstructorReturn";
 import _getPrototypeOf from "@babel/runtime/helpers/esm/getPrototypeOf";
 import _defineProperty from "@babel/runtime/helpers/esm/defineProperty";
+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); }; }
 
@@ -36,28 +38,36 @@ var HeatMapLayer = /*#__PURE__*/function (_BaseLayer) {
 
   _createClass(HeatMapLayer, [{
     key: "buildModels",
-    value: function buildModels() {
-      var _this2 = this;
-
-      var shape = this.getModelType();
-      this.layerModel = new HeatMapModels[shape](this);
-      this.layerModel.initModels(function (models) {
-        _this2.dispatchModelLoad(models);
-      });
-    }
-  }, {
-    key: "rebuildModels",
-    value: function rebuildModels() {
-      var _this3 = this;
+    value: function () {
+      var _buildModels = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee() {
+        var shape;
+        return _regeneratorRuntime.wrap(function _callee$(_context) {
+          while (1) {
+            switch (_context.prev = _context.next) {
+              case 0:
+                shape = this.getModelType();
+                this.layerModel = new HeatMapModels[shape](this);
+                _context.next = 4;
+                return this.initLayerModels();
+
+              case 4:
+              case "end":
+                return _context.stop();
+            }
+          }
+        }, _callee, this);
+      }));
+
+      function buildModels() {
+        return _buildModels.apply(this, arguments);
+      }
 
-      this.layerModel.buildModels(function (models) {
-        _this3.dispatchModelLoad(models);
-      });
-    }
+      return buildModels;
+    }()
   }, {
     key: "renderModels",
     value: function renderModels() {
-      var _this4 = this;
+      var _this2 = this;
 
       var shape = this.getModelType();
 
@@ -69,18 +79,17 @@ var HeatMapLayer = /*#__PURE__*/function (_BaseLayer) {
         return this;
       }
 
-      if (this.layerModelNeedUpdate) {
-        this.layerModel.buildModels(function (models) {
-          return _this4.models = models;
-        });
-        this.layerModelNeedUpdate = false;
+      if (this.encodeDataLength <= 0 && !this.forceRender) {
+        return this;
       }
 
+      this.hooks.beforeRender.call();
       this.models.forEach(function (model) {
         return model.draw({
-          uniforms: _this4.layerModel.getUninforms()
+          uniforms: _this2.layerModel.getUninforms()
         });
       });
+      this.hooks.afterRender.call();
       return this;
     }
   }, {

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(callbackModel: (models: IModel[]) => void): void;
-    buildModels(callbackModel: (models: IModel[]) => void): void;
+    initModels(): Promise<IModel[]>;
+    buildModels(): Promise<IModel[]>;
     protected registerBuiltinAttributes(): void;
 }

package/es/heatmap/models/grid.js

@@ -1,8 +1,10 @@
+import _asyncToGenerator from "@babel/runtime/helpers/esm/asyncToGenerator";
 import _classCallCheck from "@babel/runtime/helpers/esm/classCallCheck";
 import _createClass from "@babel/runtime/helpers/esm/createClass";
 import _inherits from "@babel/runtime/helpers/esm/inherits";
 import _possibleConstructorReturn from "@babel/runtime/helpers/esm/possibleConstructorReturn";
 import _getPrototypeOf from "@babel/runtime/helpers/esm/getPrototypeOf";
+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); }; }
 
@@ -47,35 +49,74 @@ var GridModel = /*#__PURE__*/function (_BaseModel) {
     }
   }, {
     key: "initModels",
-    value: function initModels(callbackModel) {
-      this.buildModels(callbackModel);
-    }
+    value: function () {
+      var _initModels = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee() {
+        return _regeneratorRuntime.wrap(function _callee$(_context) {
+          while (1) {
+            switch (_context.prev = _context.next) {
+              case 0:
+                _context.next = 2;
+                return this.buildModels();
+
+              case 2:
+                return _context.abrupt("return", _context.sent);
+
+              case 3:
+              case "end":
+                return _context.stop();
+            }
+          }
+        }, _callee, this);
+      }));
+
+      function initModels() {
+        return _initModels.apply(this, arguments);
+      }
+
+      return initModels;
+    }()
   }, {
     key: "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;
-
-      this.layer.buildLayerModel({
-        moduleName: 'heatmapGrid',
-        vertexShader: heatmapGridVert,
-        fragmentShader: heatmapGridFrag,
-        triangulation: HeatmapGridTriangulation,
-        primitive: gl.TRIANGLES,
-        depth: {
-          enable: false
-        },
-        stencil: getMask(mask, maskInside)
-      }).then(function (model) {
-        callbackModel([model]);
-      }).catch(function (err) {
-        console.warn(err);
-        callbackModel([]);
-      });
-    }
+    value: function () {
+      var _buildModels = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee2() {
+        var _ref2, _ref2$mask, mask, _ref2$maskInside, maskInside, model;
+
+        return _regeneratorRuntime.wrap(function _callee2$(_context2) {
+          while (1) {
+            switch (_context2.prev = _context2.next) {
+              case 0:
+                _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;
+                _context2.next = 3;
+                return this.layer.buildLayerModel({
+                  moduleName: 'heatmapGrid',
+                  vertexShader: heatmapGridVert,
+                  fragmentShader: heatmapGridFrag,
+                  triangulation: HeatmapGridTriangulation,
+                  primitive: gl.TRIANGLES,
+                  depth: {
+                    enable: false
+                  },
+                  stencil: getMask(mask, maskInside)
+                });
+
+              case 3:
+                model = _context2.sent;
+                return _context2.abrupt("return", [model]);
+
+              case 5:
+              case "end":
+                return _context2.stop();
+            }
+          }
+        }, _callee2, this);
+      }));
+
+      function buildModels() {
+        return _buildModels.apply(this, arguments);
+      }
+
+      return buildModels;
+    }()
   }, {
     key: "registerBuiltinAttributes",
     value: function registerBuiltinAttributes() {

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(callbackModel: (models: IModel[]) => void): void;
-    buildModels(callbackModel: (models: IModel[]) => void): void;
+    initModels(): Promise<IModel[]>;
+    buildModels(): Promise<IModel[]>;
     protected registerBuiltinAttributes(): void;
 }

package/es/heatmap/models/grid3d.js

@@ -1,8 +1,10 @@
+import _asyncToGenerator from "@babel/runtime/helpers/esm/asyncToGenerator";
 import _classCallCheck from "@babel/runtime/helpers/esm/classCallCheck";
 import _createClass from "@babel/runtime/helpers/esm/createClass";
 import _inherits from "@babel/runtime/helpers/esm/inherits";
 import _possibleConstructorReturn from "@babel/runtime/helpers/esm/possibleConstructorReturn";
 import _getPrototypeOf from "@babel/runtime/helpers/esm/getPrototypeOf";
+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); }; }
 
@@ -14,7 +16,7 @@ import BaseModel from "../../core/BaseModel";
 import { PointExtrudeTriangulation } from "../../core/triangulation";
 
 /* babel-plugin-inline-import '../shaders/hexagon_3d_vert.glsl' */
-var heatmapGrid3dVert = "precision highp float;\n// \u591A\u8FB9\u5F62\u9876\u70B9\u5750\u6807\nattribute vec3 a_Position;\n// \u591A\u8FB9\u5F62\u7ECF\u7EAC\u5EA6\u5750\u6807\nattribute vec3 a_Pos;\n\nattribute vec3 a_Normal;\nattribute float a_Size;\nattribute vec4 a_Color;\nuniform vec2 u_radius;\nuniform float u_coverage: 0.9;\nuniform float u_angle: 0;\nuniform mat4 u_ModelMatrix;\nuniform mat4 u_Mvp;\nvarying vec4 v_color;\n\nuniform vec2 u_SceneCenterMKT;\n\n#pragma include \"projection\"\n#pragma include \"project\"\n#pragma include \"light\"\n#pragma include \"picking\"\n\n\nvoid main() {\n  mat2 rotationMatrix = mat2(cos(u_angle), sin(u_angle), -sin(u_angle), cos(u_angle));\n  vec2 offset =(vec2(a_Position.xy * u_radius * rotationMatrix * u_coverage));\n  // vec2 lnglat = unProjectFlat(a_Pos.xy + offset); // \u5B9E\u9645\u7684\u7ECF\u7EAC\u5EA6\n  // vec2 lnglat = (a_Pos.xy + offset); \n  // vec4 project_pos = project_position(vec4(lnglat, a_Position.z * a_Size, 1.0));\n  // gl_Position = project_common_position_to_clipspace(project_pos);\n  // float lightWeight = calc_lighting(project_pos);\n  // v_color =vec4(a_Color.rgb*lightWeight, a_Color.w);\n\n  if(u_CoordinateSystem == COORDINATE_SYSTEM_P20_2) { // gaode2.x\n    // vec2 lnglat = (a_Pos.xy + offset); \n    // vec4 project_pos = project_position(vec4(lnglat, a_Position.z * a_Size, 1.0));\n\n    // float lightWeight = calc_lighting(project_pos);\n    // v_color =vec4(a_Color.rgb*lightWeight, a_Color.w);\n  \n    // gl_Position = u_Mvp * vec4(lnglat , a_Position.z * a_Size, 1.0);\n    vec2 lnglat = unProjectFlat(a_Pos.xy + offset); // \u7ECF\u7EAC\u5EA6\n    vec2 customLnglat = customProject(lnglat) - u_SceneCenterMKT; // \u5C06\u7ECF\u7EAC\u5EA6\u8F6C\u6362\u4E3A\u9AD8\u5FB72.0\u9700\u8981\u7684\u5E73\u9762\u5750\u6807\n    vec4 project_pos = project_position(vec4(customLnglat, a_Position.z * a_Size, 1.0));\n\n    float lightWeight = calc_lighting(project_pos);\n    v_color =vec4(a_Color.rgb*lightWeight, a_Color.w);\n  \n    gl_Position = u_Mvp * vec4(customLnglat , a_Position.z * a_Size, 1.0);\n  } else {\n    vec2 lnglat = unProjectFlat(a_Pos.xy + offset); // \u5B9E\u9645\u7684\u7ECF\u7EAC\u5EA6\n    vec4 project_pos = project_position(vec4(lnglat, a_Position.z * a_Size, 1.0));\n    \n    float lightWeight = calc_lighting(project_pos);\n    v_color =vec4(a_Color.rgb*lightWeight, a_Color.w);\n    \n    gl_Position = project_common_position_to_clipspace(project_pos);\n  }\n\n\n\n  setPickingColor(a_PickingColor);\n}\n";
+var heatmapGrid3dVert = "precision highp float;\n// \u591A\u8FB9\u5F62\u9876\u70B9\u5750\u6807\nattribute vec3 a_Position;\n// \u591A\u8FB9\u5F62\u7ECF\u7EAC\u5EA6\u5750\u6807\nattribute vec3 a_Pos;\n\nattribute vec3 a_Normal;\nattribute float a_Size;\nattribute vec4 a_Color;\nuniform vec2 u_radius;\nuniform float u_coverage: 0.9;\nuniform float u_angle: 0;\nuniform mat4 u_ModelMatrix;\nuniform mat4 u_Mvp;\nvarying vec4 v_color;\n\nuniform vec2 u_SceneCenterMKT;\n\n#pragma include \"projection\"\n#pragma include \"project\"\n#pragma include \"light\"\n#pragma include \"picking\"\n\n\nvoid main() {\n  mat2 rotationMatrix = mat2(cos(u_angle), sin(u_angle), -sin(u_angle), cos(u_angle));\n  vec2 offset =(vec2(a_Position.xy * u_radius * rotationMatrix * u_coverage));\n\n\n  if(u_CoordinateSystem == COORDINATE_SYSTEM_P20_2) { // gaode2.x\n \n    vec2 lnglat = unProjectFlat(a_Pos.xy + offset); // \u7ECF\u7EAC\u5EA6\n    vec2 customLnglat = customProject(lnglat) - u_SceneCenterMKT; // \u5C06\u7ECF\u7EAC\u5EA6\u8F6C\u6362\u4E3A\u9AD8\u5FB72.0\u9700\u8981\u7684\u5E73\u9762\u5750\u6807\n    vec4 project_pos = project_position(vec4(customLnglat, a_Position.z * a_Size, 1.0));\n\n    float lightWeight = calc_lighting(project_pos);\n    v_color =vec4(a_Color.rgb*lightWeight, a_Color.w);\n  \n    gl_Position = u_Mvp * vec4(customLnglat , a_Position.z * a_Size, 1.0);\n  } else {\n    vec2 lnglat = unProjectFlat(a_Pos.xy + offset); // \u5B9E\u9645\u7684\u7ECF\u7EAC\u5EA6\n    vec4 project_pos = project_position(vec4(lnglat, a_Position.z * a_Size, 1.0));\n    \n    float lightWeight = calc_lighting(project_pos);\n    v_color =vec4(a_Color.rgb*lightWeight, a_Color.w);\n    \n    gl_Position = project_common_position_to_clipspace(project_pos);\n  }\n\n\n\n  setPickingColor(a_PickingColor);\n}\n";
 
 /* babel-plugin-inline-import '../shaders/hexagon_frag.glsl' */
 var heatmapGridFrag = "precision highp float;\nvarying vec4 v_color;\nuniform float u_opacity: 1;\n\n#pragma include \"picking\"\n\nvoid main() {\n  gl_FragColor = v_color;\n  gl_FragColor.a *= u_opacity;\n\n  gl_FragColor = filterColor(gl_FragColor);\n}\n";
@@ -47,36 +49,75 @@ var Grid3DModel = /*#__PURE__*/function (_BaseModel) {
     }
   }, {
     key: "initModels",
-    value: function initModels(callbackModel) {
-      this.buildModels(callbackModel);
-    }
+    value: function () {
+      var _initModels = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee() {
+        return _regeneratorRuntime.wrap(function _callee$(_context) {
+          while (1) {
+            switch (_context.prev = _context.next) {
+              case 0:
+                _context.next = 2;
+                return this.buildModels();
+
+              case 2:
+                return _context.abrupt("return", _context.sent);
+
+              case 3:
+              case "end":
+                return _context.stop();
+            }
+          }
+        }, _callee, this);
+      }));
+
+      function initModels() {
+        return _initModels.apply(this, arguments);
+      }
+
+      return initModels;
+    }()
   }, {
     key: "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;
-
-      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([]);
-      });
-    }
+    value: function () {
+      var _buildModels = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee2() {
+        var _ref2, _ref2$mask, mask, _ref2$maskInside, maskInside, model;
+
+        return _regeneratorRuntime.wrap(function _callee2$(_context2) {
+          while (1) {
+            switch (_context2.prev = _context2.next) {
+              case 0:
+                _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;
+                _context2.next = 3;
+                return this.layer.buildLayerModel({
+                  moduleName: 'heatmapGrid3d',
+                  vertexShader: heatmapGrid3dVert,
+                  fragmentShader: heatmapGridFrag,
+                  triangulation: PointExtrudeTriangulation,
+                  primitive: gl.TRIANGLES,
+                  depth: {
+                    enable: true
+                  },
+                  blend: this.getBlend(),
+                  stencil: getMask(mask, maskInside)
+                });
+
+              case 3:
+                model = _context2.sent;
+                return _context2.abrupt("return", [model]);
+
+              case 5:
+              case "end":
+                return _context2.stop();
+            }
+          }
+        }, _callee2, this);
+      }));
+
+      function buildModels() {
+        return _buildModels.apply(this, arguments);
+      }
+
+      return buildModels;
+    }()
   }, {
     key: "registerBuiltinAttributes",
     value: function registerBuiltinAttributes() {