@antv/l7-layers 2.10.1 → 2.10.3

package/es/point/models/fill.js

@@ -1,12 +1,12 @@
-import _asyncToGenerator from "@babel/runtime/helpers/asyncToGenerator";
-import _slicedToArray from "@babel/runtime/helpers/slicedToArray";
-import _classCallCheck from "@babel/runtime/helpers/classCallCheck";
-import _createClass from "@babel/runtime/helpers/createClass";
-import _assertThisInitialized from "@babel/runtime/helpers/assertThisInitialized";
-import _inherits from "@babel/runtime/helpers/inherits";
-import _possibleConstructorReturn from "@babel/runtime/helpers/possibleConstructorReturn";
-import _getPrototypeOf from "@babel/runtime/helpers/getPrototypeOf";
-import _defineProperty from "@babel/runtime/helpers/defineProperty";
+import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
+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";
+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); }; }
@@ -162,10 +162,33 @@ var FillModel = /*#__PURE__*/function (_BaseModel) {
     }
   }, {
     key: "initModels",
-    value: function initModels(callbackModel) {
-      this.updateUnit('l7size');
-      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:
+                this.updateUnit('l7size');
+                _context.next = 3;
+                return this.buildModels();
+
+              case 3:
+                return _context.abrupt("return", _context.sent);
+
+              case 4:
+              case "end":
+                return _context.stop();
+            }
+          }
+        }, _callee, this);
+      }));
+
+      function initModels() {
+        return _initModels.apply(this, arguments);
+      }
+
+      return initModels;
+    }()
     /**
      * 计算等面积点图层（unit meter）笛卡尔坐标标度与世界坐标标度的比例
      * @returns
@@ -213,19 +236,20 @@ var FillModel = /*#__PURE__*/function (_BaseModel) {
   }, {
     key: "buildModels",
     value: function () {
-      var _buildModels = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee(callbackModel) {
-        var _ref3, _ref3$mask, mask, _ref3$maskInside, maskInside, _ref3$animateOption, animateOption, _ref3$workerEnabled, workerEnabled, enablePicking, shape2d, _this$getShaders, frag, vert, type;
+      var _buildModels = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee2() {
+        var _ref3, _ref3$mask, mask, _ref3$maskInside, maskInside, _ref3$animateOption, animateOption, _ref3$workerEnabled, workerEnabled, enablePicking, shape2d, _this$getShaders, frag, vert, type, model;
 
-        return _regeneratorRuntime.wrap(function _callee$(_context) {
+        return _regeneratorRuntime.wrap(function _callee2$(_context2) {
           while (1) {
-            switch (_context.prev = _context.next) {
+            switch (_context2.prev = _context2.next) {
               case 0:
                 _ref3 = this.layer.getLayerConfig(), _ref3$mask = _ref3.mask, mask = _ref3$mask === void 0 ? false : _ref3$mask, _ref3$maskInside = _ref3.maskInside, maskInside = _ref3$maskInside === void 0 ? true : _ref3$maskInside, _ref3$animateOption = _ref3.animateOption, animateOption = _ref3$animateOption === void 0 ? {
                   enable: false
                 } : _ref3$animateOption, _ref3$workerEnabled = _ref3.workerEnabled, workerEnabled = _ref3$workerEnabled === void 0 ? false : _ref3$workerEnabled, enablePicking = _ref3.enablePicking, shape2d = _ref3.shape2d;
                 _this$getShaders = this.getShaders(animateOption), frag = _this$getShaders.frag, vert = _this$getShaders.vert, type = _this$getShaders.type;
                 this.layer.triangulation = PointFillTriangulation;
-                this.layer.buildLayerModel({
+                _context2.next = 5;
+                return this.layer.buildLayerModel({
                   moduleName: type,
                   vertexShader: vert,
                   fragmentShader: frag,
@@ -241,22 +265,21 @@ var FillModel = /*#__PURE__*/function (_BaseModel) {
                     enablePicking: enablePicking,
                     shape2d: shape2d
                   }
-                }).then(function (model) {
-                  callbackModel([model]);
-                }).catch(function (err) {
-                  console.warn(err);
-                  callbackModel([]);
                 });
 
-              case 4:
+              case 5:
+                model = _context2.sent;
+                return _context2.abrupt("return", [model]);
+
+              case 7:
               case "end":
-                return _context.stop();
+                return _context2.stop();
             }
           }
-        }, _callee, this);
+        }, _callee2, this);
       }));
 
-      function buildModels(_x) {
+      function buildModels() {
         return _buildModels.apply(this, arguments);
       }
 
@@ -384,7 +407,7 @@ var FillModel = /*#__PURE__*/function (_BaseModel) {
 
       if (this.unit !== unit) {
         // l7size => meter
-        if (this.unit !== 'meter' && unit === 'meter' && version !== Version.L7MAP && version !== Version.GLOBEL) {
+        if (this.unit !== 'meter' && unit === 'meter' && version !== Version.DEFUALT && version !== Version.GLOBEL) {
           this.isMeter = true;
           this.calMeter2Coord(); // meter => l7size
         } else if (this.unit === 'meter' && unit !== 'meter') {

package/es/point/models/fillmage.d.ts

@@ -12,13 +12,13 @@ export default class FillImageModel extends BaseModel {
         };
         elements: IElements;
     };
-    initModels(callbackModel: (models: IModel[]) => void): void;
+    initModels(): Promise<IModel[]>;
     /**
      * 计算等面积点图层（unit meter）笛卡尔坐标标度与世界坐标标度的比例
      * @returns
      */
     calMeter2Coord(): void;
-    buildModels(callbackModel: (models: IModel[]) => void): void;
+    buildModels(): Promise<IModel[]>;
     clearModels(): void;
     protected registerBuiltinAttributes(): void;
     private updateTexture;

package/es/point/models/fillmage.js

@@ -1,11 +1,13 @@
-import _slicedToArray from "@babel/runtime/helpers/slicedToArray";
-import _classCallCheck from "@babel/runtime/helpers/classCallCheck";
-import _createClass from "@babel/runtime/helpers/createClass";
-import _assertThisInitialized from "@babel/runtime/helpers/assertThisInitialized";
-import _inherits from "@babel/runtime/helpers/inherits";
-import _possibleConstructorReturn from "@babel/runtime/helpers/possibleConstructorReturn";
-import _getPrototypeOf from "@babel/runtime/helpers/getPrototypeOf";
-import _defineProperty from "@babel/runtime/helpers/defineProperty";
+import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
+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";
+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); }; }
 
@@ -97,7 +99,7 @@ var FillImageModel = /*#__PURE__*/function (_BaseModel) {
       }
       /**
        *               rotateFlag
-       * L7MAP            1
+       * DEFAULT          1
        * MAPBOX           1
        * GAODE2.x         -1
        * GAODE1.x         -1
@@ -169,23 +171,44 @@ var FillImageModel = /*#__PURE__*/function (_BaseModel) {
     }
   }, {
     key: "initModels",
-    value: function initModels(callbackModel) {
-      this.updateTexture();
-      this.iconService.on('imageUpdate', this.updateTexture);
-
-      var _ref2 = this.layer.getLayerConfig(),
-          _ref2$unit = _ref2.unit,
-          unit = _ref2$unit === void 0 ? 'l7size' : _ref2$unit;
-
-      var version = this.mapService.version;
+    value: function () {
+      var _initModels = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee() {
+        var _ref2, _ref2$unit, unit, version;
+
+        return _regeneratorRuntime.wrap(function _callee$(_context) {
+          while (1) {
+            switch (_context.prev = _context.next) {
+              case 0:
+                this.updateTexture();
+                this.iconService.on('imageUpdate', this.updateTexture);
+                _ref2 = this.layer.getLayerConfig(), _ref2$unit = _ref2.unit, unit = _ref2$unit === void 0 ? 'l7size' : _ref2$unit;
+                version = this.mapService.version;
+
+                if (unit === 'meter' && version !== Version.DEFUALT && version !== Version.GLOBEL) {
+                  this.isMeter = true;
+                  this.calMeter2Coord();
+                }
+
+                _context.next = 7;
+                return this.buildModels();
+
+              case 7:
+                return _context.abrupt("return", _context.sent);
+
+              case 8:
+              case "end":
+                return _context.stop();
+            }
+          }
+        }, _callee, this);
+      }));
 
-      if (unit === 'meter' && version !== Version.L7MAP && version !== Version.GLOBEL) {
-        this.isMeter = true;
-        this.calMeter2Coord();
+      function initModels() {
+        return _initModels.apply(this, arguments);
       }
 
-      this.buildModels(callbackModel);
-    }
+      return initModels;
+    }()
     /**
      * 计算等面积点图层（unit meter）笛卡尔坐标标度与世界坐标标度的比例
      * @returns
@@ -229,34 +252,50 @@ var FillImageModel = /*#__PURE__*/function (_BaseModel) {
     }
   }, {
     key: "buildModels",
-    value: function buildModels(callbackModel) {
-      var _ref3 = this.layer.getLayerConfig(),
-          _ref3$mask = _ref3.mask,
-          mask = _ref3$mask === void 0 ? false : _ref3$mask,
-          _ref3$maskInside = _ref3.maskInside,
-          maskInside = _ref3$maskInside === void 0 ? true : _ref3$maskInside;
-
-      this.layer.buildLayerModel({
-        moduleName: 'pointFillImage',
-        vertexShader: pointFillVert,
-        fragmentShader: pointFillFrag,
-        triangulation: PointFillTriangulation,
-        depth: {
-          enable: false
-        },
-        blend: this.getBlend(),
-        stencil: getMask(mask, maskInside),
-        cull: {
-          enable: true,
-          face: getCullFace(this.mapService.version)
-        }
-      }).then(function (model) {
-        callbackModel([model]);
-      }).catch(function (err) {
-        console.warn(err);
-        callbackModel([]);
-      });
-    }
+    value: function () {
+      var _buildModels = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee2() {
+        var _ref3, _ref3$mask, mask, _ref3$maskInside, maskInside, model;
+
+        return _regeneratorRuntime.wrap(function _callee2$(_context2) {
+          while (1) {
+            switch (_context2.prev = _context2.next) {
+              case 0:
+                _ref3 = this.layer.getLayerConfig(), _ref3$mask = _ref3.mask, mask = _ref3$mask === void 0 ? false : _ref3$mask, _ref3$maskInside = _ref3.maskInside, maskInside = _ref3$maskInside === void 0 ? true : _ref3$maskInside;
+                _context2.next = 3;
+                return this.layer.buildLayerModel({
+                  moduleName: 'pointFillImage',
+                  vertexShader: pointFillVert,
+                  fragmentShader: pointFillFrag,
+                  triangulation: PointFillTriangulation,
+                  depth: {
+                    enable: false
+                  },
+                  blend: this.getBlend(),
+                  stencil: getMask(mask, maskInside),
+                  cull: {
+                    enable: true,
+                    face: getCullFace(this.mapService.version)
+                  }
+                });
+
+              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: "clearModels",
     value: function clearModels() {

package/es/point/models/image.d.ts

@@ -3,9 +3,9 @@ import BaseModel from '../../core/BaseModel';
 export default class ImageModel extends BaseModel {
     private texture;
     getUninforms(): IModelUniform;
-    initModels(callbackModel: (models: IModel[]) => void): void;
+    initModels(): Promise<IModel[]>;
     clearModels(): void;
-    buildModels(callbackModel: (models: IModel[]) => void): void;
+    buildModels(): Promise<IModel[]>;
     protected registerBuiltinAttributes(): void;
     private updateTexture;
 }

package/es/point/models/image.js

@@ -1,10 +1,12 @@
-import _classCallCheck from "@babel/runtime/helpers/classCallCheck";
-import _createClass from "@babel/runtime/helpers/createClass";
-import _assertThisInitialized from "@babel/runtime/helpers/assertThisInitialized";
-import _inherits from "@babel/runtime/helpers/inherits";
-import _possibleConstructorReturn from "@babel/runtime/helpers/possibleConstructorReturn";
-import _getPrototypeOf from "@babel/runtime/helpers/getPrototypeOf";
-import _defineProperty from "@babel/runtime/helpers/defineProperty";
+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";
+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); }; }
 
@@ -134,12 +136,35 @@ var ImageModel = /*#__PURE__*/function (_BaseModel) {
     }
   }, {
     key: "initModels",
-    value: function initModels(callbackModel) {
-      this.registerBuiltinAttributes();
-      this.updateTexture();
-      this.iconService.on('imageUpdate', this.updateTexture);
-      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:
+                this.registerBuiltinAttributes();
+                this.updateTexture();
+                this.iconService.on('imageUpdate', this.updateTexture);
+                _context.next = 5;
+                return this.buildModels();
+
+              case 5:
+                return _context.abrupt("return", _context.sent);
+
+              case 6:
+              case "end":
+                return _context.stop();
+            }
+          }
+        }, _callee, this);
+      }));
+
+      function initModels() {
+        return _initModels.apply(this, arguments);
+      }
+
+      return initModels;
+    }()
   }, {
     key: "clearModels",
     value: function clearModels() {
@@ -151,31 +176,47 @@ var ImageModel = /*#__PURE__*/function (_BaseModel) {
     }
   }, {
     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: 'pointImage',
-        vertexShader: pointImageVert,
-        fragmentShader: pointImageFrag,
-        triangulation: PointImageTriangulation,
-        depth: {
-          enable: false
-        },
-        primitive: gl.POINTS,
-        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: 'pointImage',
+                  vertexShader: pointImageVert,
+                  fragmentShader: pointImageFrag,
+                  triangulation: PointImageTriangulation,
+                  depth: {
+                    enable: false
+                  },
+                  primitive: gl.POINTS,
+                  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() {

package/es/point/models/index.d.ts

@@ -1,4 +1,4 @@
-export declare type PointType = 'fillImage' | 'fill' | 'radar' | 'image' | 'normal' | 'simplePoint' | 'extrude' | 'text' | 'vectorPoint' | 'tile' | 'tileText' | 'earthFill' | 'earthExtrude';
+export declare type PointType = 'fillImage' | 'fill' | 'radar' | 'image' | 'normal' | 'simplePoint' | 'extrude' | 'text' | 'tile' | 'tileText' | 'earthFill' | 'earthExtrude';
 declare const PointModels: {
     [key in PointType]: any;
 };

package/es/point/models/index.js

@@ -1,4 +1,3 @@
-import PointTileModel from "../../tile/models/tileModel";
 import EarthExtrudeModel from "./earthExtrude"; // earth
 
 import EarthFillModel from "./earthFill";
@@ -21,7 +20,6 @@ var PointModels = {
   simplePoint: SimplePoint,
   extrude: ExtrudeModel,
   text: TextModel,
-  vectorPoint: PointTileModel,
   tile: TileFillModel,
   tileText: TileTextModel,
   earthFill: EarthFillModel,

package/es/point/models/normal.d.ts

@@ -9,8 +9,8 @@ export declare function PointTriangulation(feature: IEncodeFeature): {
 export default class NormalModel extends BaseModel {
     getDefaultStyle(): Partial<IPointLayerStyleOptions>;
     getUninforms(): IModelUniform;
-    initModels(callbackModel: (models: IModel[]) => void): void;
-    buildModels(callbackModel: (models: IModel[]) => void): void;
+    initModels(): Promise<IModel[]>;
+    buildModels(): Promise<IModel[]>;
     clearModels(): void;
     protected registerBuiltinAttributes(): void;
 }

package/es/point/models/normal.js

@@ -1,9 +1,11 @@
-import _classCallCheck from "@babel/runtime/helpers/classCallCheck";
-import _createClass from "@babel/runtime/helpers/createClass";
-import _inherits from "@babel/runtime/helpers/inherits";
-import _possibleConstructorReturn from "@babel/runtime/helpers/possibleConstructorReturn";
-import _getPrototypeOf from "@babel/runtime/helpers/getPrototypeOf";
-import _toConsumableArray from "@babel/runtime/helpers/toConsumableArray";
+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 _toConsumableArray from "@babel/runtime/helpers/esm/toConsumableArray";
+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); }; }
 
@@ -59,38 +61,77 @@ var NormalModel = /*#__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.triangulation = PointTriangulation;
-      this.layer.buildLayerModel({
-        moduleName: 'pointNormal',
-        vertexShader: normalVert,
-        fragmentShader: normalFrag,
-        triangulation: PointTriangulation,
-        depth: {
-          enable: false
-        },
-        primitive: gl.POINTS,
-        blend: this.getBlend(),
-        stencil: getMask(mask, maskInside),
-        pick: false
-      }).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;
+                this.layer.triangulation = PointTriangulation;
+                _context2.next = 4;
+                return this.layer.buildLayerModel({
+                  moduleName: 'pointNormal',
+                  vertexShader: normalVert,
+                  fragmentShader: normalFrag,
+                  triangulation: PointTriangulation,
+                  depth: {
+                    enable: false
+                  },
+                  primitive: gl.POINTS,
+                  blend: this.getBlend(),
+                  stencil: getMask(mask, maskInside),
+                  pick: false
+                });
+
+              case 4:
+                model = _context2.sent;
+                return _context2.abrupt("return", [model]);
+
+              case 6:
+              case "end":
+                return _context2.stop();
+            }
+          }
+        }, _callee2, this);
+      }));
+
+      function buildModels() {
+        return _buildModels.apply(this, arguments);
+      }
+
+      return buildModels;
+    }()
   }, {
     key: "clearModels",
     value: function clearModels() {}

package/es/point/models/radar.d.ts

@@ -11,13 +11,13 @@ export default class RadarModel extends BaseModel {
         };
         elements: IElements;
     };
-    initModels(callbackModel: (models: IModel[]) => void): void;
+    initModels(): Promise<IModel[]>;
     /**
      * 计算等面积点图层（unit meter）笛卡尔坐标标度与世界坐标标度的比例
      * @returns
      */
     calMeter2Coord(): void;
-    buildModels(callbackModel: (models: IModel[]) => void): void;
+    buildModels(): Promise<IModel[]>;
     clearModels(): void;
     protected animateOption2Array(option: Partial<IAnimateOption>): number[];
     protected registerBuiltinAttributes(): void;