@antv/l7-layers 2.10.1 → 2.10.3

package/lib/point/models/image.js

@@ -7,6 +7,10 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.default = void 0;
 
+var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"));
+
+var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
+
 var _classCallCheck2 = _interopRequireDefault(require("@babel/runtime/helpers/classCallCheck"));
 
 var _createClass2 = _interopRequireDefault(require("@babel/runtime/helpers/createClass"));
@@ -151,12 +155,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 = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee() {
+        return _regenerator.default.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() {
@@ -168,31 +195,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: _triangulation.PointImageTriangulation,
-        depth: {
-          enable: false
-        },
-        primitive: _l7Core.gl.POINTS,
-        blend: this.getBlend(),
-        stencil: (0, _l7Utils.getMask)(mask, maskInside)
-      }).then(function (model) {
-        callbackModel([model]);
-      }).catch(function (err) {
-        console.warn(err);
-        callbackModel([]);
-      });
-    }
+    value: function () {
+      var _buildModels = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee2() {
+        var _ref2, _ref2$mask, mask, _ref2$maskInside, maskInside, model;
+
+        return _regenerator.default.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: _triangulation.PointImageTriangulation,
+                  depth: {
+                    enable: false
+                  },
+                  primitive: _l7Core.gl.POINTS,
+                  blend: this.getBlend(),
+                  stencil: (0, _l7Utils.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/lib/point/models/index.js

@@ -7,8 +7,6 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.default = void 0;
 
-var _tileModel = _interopRequireDefault(require("../../tile/models/tileModel"));
-
 var _earthExtrude = _interopRequireDefault(require("./earthExtrude"));
 
 var _earthFill = _interopRequireDefault(require("./earthFill"));
@@ -43,7 +41,6 @@ var PointModels = {
   simplePoint: _simplePoint.default,
   extrude: _extrude.default,
   text: _text.default,
-  vectorPoint: _tileModel.default,
   tile: _tile.default,
   tileText: _tileText.default,
   earthFill: _earthFill.default,

package/lib/point/models/normal.js

@@ -8,6 +8,10 @@ Object.defineProperty(exports, "__esModule", {
 exports.PointTriangulation = PointTriangulation;
 exports.default = void 0;
 
+var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"));
+
+var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
+
 var _classCallCheck2 = _interopRequireDefault(require("@babel/runtime/helpers/classCallCheck"));
 
 var _createClass2 = _interopRequireDefault(require("@babel/runtime/helpers/createClass"));
@@ -77,38 +81,77 @@ var NormalModel = /*#__PURE__*/function (_BaseModel) {
     }
   }, {
     key: "initModels",
-    value: function initModels(callbackModel) {
-      this.buildModels(callbackModel);
-    }
+    value: function () {
+      var _initModels = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee() {
+        return _regenerator.default.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: _l7Core.gl.POINTS,
-        blend: this.getBlend(),
-        stencil: (0, _l7Utils.getMask)(mask, maskInside),
-        pick: false
-      }).then(function (model) {
-        callbackModel([model]);
-      }).catch(function (err) {
-        console.warn(err);
-        callbackModel([]);
-      });
-    }
+    value: function () {
+      var _buildModels = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee2() {
+        var _ref2, _ref2$mask, mask, _ref2$maskInside, maskInside, model;
+
+        return _regenerator.default.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: _l7Core.gl.POINTS,
+                  blend: this.getBlend(),
+                  stencil: (0, _l7Utils.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/lib/point/models/radar.js

@@ -7,8 +7,12 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.default = void 0;
 
+var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"));
+
 var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
 
+var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
+
 var _classCallCheck2 = _interopRequireDefault(require("@babel/runtime/helpers/classCallCheck"));
 
 var _createClass2 = _interopRequireDefault(require("@babel/runtime/helpers/createClass"));
@@ -103,20 +107,42 @@ var RadarModel = /*#__PURE__*/function (_BaseModel) {
     }
   }, {
     key: "initModels",
-    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;
+    value: function () {
+      var _initModels = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee() {
+        var _ref3, _ref3$unit, unit, version;
+
+        return _regenerator.default.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 !== _l7Maps.Version.DEFUALT && version !== _l7Maps.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);
+      }));
 
-      if (unit === 'meter' && version !== _l7Maps.Version.L7MAP && version !== _l7Maps.Version.GLOBEL) {
-        this.isMeter = true;
-        this.calMeter2Coord();
+      function initModels() {
+        return _initModels.apply(this, arguments);
       }
 
-      this.buildModels(callbackModel);
-    }
+      return initModels;
+    }()
     /**
      * 计算等面积点图层（unit meter）笛卡尔坐标标度与世界坐标标度的比例
      * @returns
@@ -160,30 +186,46 @@ var RadarModel = /*#__PURE__*/function (_BaseModel) {
     }
   }, {
     key: "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: _triangulation.PointFillTriangulation,
-        depth: {
-          enable: false
-        },
-        blend: this.getBlend(),
-        stencil: (0, _l7Utils.getMask)(mask, maskInside)
-      }).then(function (model) {
-        callbackModel([model]);
-      }).catch(function (err) {
-        console.warn(err);
-        callbackModel([]);
-      });
-    }
+    value: function () {
+      var _buildModels = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee2() {
+        var _ref4, _ref4$mask, mask, _ref4$maskInside, maskInside, model;
+
+        return _regenerator.default.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: _triangulation.PointFillTriangulation,
+                  depth: {
+                    enable: false
+                  },
+                  blend: this.getBlend(),
+                  stencil: (0, _l7Utils.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: "clearModels",
     value: function clearModels() {

package/lib/point/models/simplePoint.js

@@ -8,6 +8,10 @@ Object.defineProperty(exports, "__esModule", {
 exports.PointTriangulation = PointTriangulation;
 exports.default = void 0;
 
+var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"));
+
+var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
+
 var _classCallCheck2 = _interopRequireDefault(require("@babel/runtime/helpers/classCallCheck"));
 
 var _createClass2 = _interopRequireDefault(require("@babel/runtime/helpers/createClass"));
@@ -129,37 +133,76 @@ var SimplePointModel = /*#__PURE__*/function (_BaseModel) {
     }
   }, {
     key: "initModels",
-    value: function initModels(callbackModel) {
-      this.buildModels(callbackModel);
-    }
+    value: function () {
+      var _initModels = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee() {
+        return _regenerator.default.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: 'pointSimple',
-        vertexShader: simplePointVert,
-        fragmentShader: simplePointFrag,
-        triangulation: PointTriangulation,
-        depth: {
-          enable: false
-        },
-        primitive: _l7Core.gl.POINTS,
-        blend: this.getBlend(),
-        stencil: (0, _l7Utils.getMask)(mask, maskInside)
-      }).then(function (model) {
-        callbackModel([model]);
-      }).catch(function (err) {
-        console.warn(err);
-        callbackModel([]);
-      });
-    }
+    value: function () {
+      var _buildModels = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee2() {
+        var _ref2, _ref2$mask, mask, _ref2$maskInside, maskInside, model;
+
+        return _regenerator.default.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: _l7Core.gl.POINTS,
+                  blend: this.getBlend(),
+                  stencil: (0, _l7Utils.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;
+    }()
   }, {
     key: "clearModels",
     value: function clearModels() {