@antv/l7-layers 2.10.3 → 2.10.4

package/es/point/models/image.js

@@ -1,4 +1,3 @@
-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";
@@ -6,7 +5,6 @@ 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); }; }
 
@@ -136,35 +134,12 @@ var ImageModel = /*#__PURE__*/function (_BaseModel) {
     }
   }, {
     key: "initModels",
-    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;
-    }()
+    value: function initModels(callbackModel) {
+      this.registerBuiltinAttributes();
+      this.updateTexture();
+      this.iconService.on('imageUpdate', this.updateTexture);
+      this.buildModels(callbackModel);
+    }
   }, {
     key: "clearModels",
     value: function clearModels() {
@@ -176,47 +151,31 @@ var ImageModel = /*#__PURE__*/function (_BaseModel) {
     }
   }, {
     key: "buildModels",
-    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;
-    }()
+    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([]);
+      });
+    }
   }, {
     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' | 'tile' | 'tileText' | 'earthFill' | 'earthExtrude';
+export declare type PointType = 'fillImage' | 'fill' | 'radar' | 'image' | 'normal' | 'simplePoint' | 'extrude' | 'text' | 'vectorPoint' | 'tile' | 'tileText' | 'earthFill' | 'earthExtrude';
 declare const PointModels: {
     [key in PointType]: any;
 };

package/es/point/models/index.js

@@ -1,3 +1,4 @@
+import PointTileModel from "../../tile/models/tileModel";
 import EarthExtrudeModel from "./earthExtrude"; // earth
 
 import EarthFillModel from "./earthFill";
@@ -20,6 +21,7 @@ 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(): Promise<IModel[]>;
-    buildModels(): Promise<IModel[]>;
+    initModels(callbackModel: (models: IModel[]) => void): void;
+    buildModels(callbackModel: (models: IModel[]) => void): void;
     clearModels(): void;
     protected registerBuiltinAttributes(): void;
 }

package/es/point/models/normal.js

@@ -1,11 +1,9 @@
-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); }; }
 
@@ -61,77 +59,38 @@ var NormalModel = /*#__PURE__*/function (_BaseModel) {
     }
   }, {
     key: "initModels",
-    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;
-    }()
+    value: function initModels(callbackModel) {
+      this.buildModels(callbackModel);
+    }
   }, {
     key: "buildModels",
-    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;
-    }()
+    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([]);
+      });
+    }
   }, {
     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(): Promise<IModel[]>;
+    initModels(callbackModel: (models: IModel[]) => void): void;
     /**
      * 计算等面积点图层（unit meter）笛卡尔坐标标度与世界坐标标度的比例
      * @returns
      */
     calMeter2Coord(): void;
-    buildModels(): Promise<IModel[]>;
+    buildModels(callbackModel: (models: IModel[]) => void): void;
     clearModels(): void;
     protected animateOption2Array(option: Partial<IAnimateOption>): number[];
     protected registerBuiltinAttributes(): void;

package/es/point/models/radar.js

@@ -1,5 +1,4 @@
 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";
@@ -7,7 +6,6 @@ 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); }; }
 
@@ -87,42 +85,20 @@ var RadarModel = /*#__PURE__*/function (_BaseModel) {
     }
   }, {
     key: "initModels",
-    value: function () {
-      var _initModels = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee() {
-        var _ref3, _ref3$unit, unit, version;
-
-        return _regeneratorRuntime.wrap(function _callee$(_context) {
-          while (1) {
-            switch (_context.prev = _context.next) {
-              case 0:
-                _ref3 = this.layer.getLayerConfig(), _ref3$unit = _ref3.unit, unit = _ref3$unit === void 0 ? 'l7size' : _ref3$unit;
-                version = this.mapService.version;
-
-                if (unit === 'meter' && version !== Version.DEFUALT && version !== Version.GLOBEL) {
-                  this.isMeter = true;
-                  this.calMeter2Coord();
-                }
-
-                _context.next = 5;
-                return this.buildModels();
-
-              case 5:
-                return _context.abrupt("return", _context.sent);
-
-              case 6:
-              case "end":
-                return _context.stop();
-            }
-          }
-        }, _callee, this);
-      }));
+    value: function initModels(callbackModel) {
+      var _ref3 = this.layer.getLayerConfig(),
+          _ref3$unit = _ref3.unit,
+          unit = _ref3$unit === void 0 ? 'l7size' : _ref3$unit;
+
+      var version = this.mapService.version;
 
-      function initModels() {
-        return _initModels.apply(this, arguments);
+      if (unit === 'meter' && version !== Version.L7MAP && version !== Version.GLOBEL) {
+        this.isMeter = true;
+        this.calMeter2Coord();
       }
 
-      return initModels;
-    }()
+      this.buildModels(callbackModel);
+    }
     /**
      * 计算等面积点图层（unit meter）笛卡尔坐标标度与世界坐标标度的比例
      * @returns
@@ -166,46 +142,30 @@ var RadarModel = /*#__PURE__*/function (_BaseModel) {
     }
   }, {
     key: "buildModels",
-    value: function () {
-      var _buildModels = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee2() {
-        var _ref4, _ref4$mask, mask, _ref4$maskInside, maskInside, model;
-
-        return _regeneratorRuntime.wrap(function _callee2$(_context2) {
-          while (1) {
-            switch (_context2.prev = _context2.next) {
-              case 0:
-                _ref4 = this.layer.getLayerConfig(), _ref4$mask = _ref4.mask, mask = _ref4$mask === void 0 ? false : _ref4$mask, _ref4$maskInside = _ref4.maskInside, maskInside = _ref4$maskInside === void 0 ? true : _ref4$maskInside;
-                _context2.next = 3;
-                return this.layer.buildLayerModel({
-                  moduleName: 'pointRadar',
-                  vertexShader: pointFillVert,
-                  fragmentShader: pointFillFrag,
-                  triangulation: PointFillTriangulation,
-                  depth: {
-                    enable: false
-                  },
-                  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;
-    }()
+    value: function buildModels(callbackModel) {
+      var _ref4 = this.layer.getLayerConfig(),
+          _ref4$mask = _ref4.mask,
+          mask = _ref4$mask === void 0 ? false : _ref4$mask,
+          _ref4$maskInside = _ref4.maskInside,
+          maskInside = _ref4$maskInside === void 0 ? true : _ref4$maskInside;
+
+      this.layer.buildLayerModel({
+        moduleName: 'pointRadar',
+        vertexShader: pointFillVert,
+        fragmentShader: pointFillFrag,
+        triangulation: PointFillTriangulation,
+        depth: {
+          enable: false
+        },
+        blend: this.getBlend(),
+        stencil: getMask(mask, maskInside)
+      }).then(function (model) {
+        callbackModel([model]);
+      }).catch(function (err) {
+        console.warn(err);
+        callbackModel([]);
+      });
+    }
   }, {
     key: "clearModels",
     value: function clearModels() {

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

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

package/es/point/models/simplePoint.js

@@ -1,11 +1,9 @@
-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); }; }
 
@@ -113,76 +111,37 @@ var SimplePointModel = /*#__PURE__*/function (_BaseModel) {
     }
   }, {
     key: "initModels",
-    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;
-    }()
+    value: function initModels(callbackModel) {
+      this.buildModels(callbackModel);
+    }
   }, {
     key: "buildModels",
-    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: 'pointSimple',
-                  vertexShader: simplePointVert,
-                  fragmentShader: simplePointFrag,
-                  triangulation: PointTriangulation,
-                  depth: {
-                    enable: false
-                  },
-                  primitive: gl.POINTS,
-                  blend: this.getBlend(),
-                  stencil: getMask(mask, maskInside)
-                });
-
-              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;
-    }()
+    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: 'pointSimple',
+        vertexShader: simplePointVert,
+        fragmentShader: simplePointFrag,
+        triangulation: PointTriangulation,
+        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([]);
+      });
+    }
   }, {
     key: "clearModels",
     value: function clearModels() {

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

@@ -22,12 +22,11 @@ export default class TextModel extends BaseModel {
     private textCount;
     private preTextStyle;
     getUninforms(): IModelUniform;
-    initModels(): Promise<IModel[]>;
-    buildModels(): Promise<IModel[]>;
+    initModels(callbackModel: (models: IModel[]) => void): void;
+    buildModels: (callbackModel: (models: IModel[]) => void) => Promise<void>;
     needUpdate(): boolean;
     clearModels(): void;
     protected registerBuiltinAttributes(): void;
-    private bindEvent;
     private mapping;
     private textExtent;
     /**