@antv/l7-layers 2.10.3 → 2.10.5

package/lib/line/models/arc.js

@@ -7,10 +7,6 @@ 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"));
@@ -220,34 +216,11 @@ var ArcModel = /*#__PURE__*/function (_BaseModel) {
     }
   }, {
     key: "initModels",
-    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.updateTexture();
-                this.iconService.on('imageUpdate', this.updateTexture);
-                _context.next = 4;
-                return this.buildModels();
-
-              case 4:
-                return _context.abrupt("return", _context.sent);
-
-              case 5:
-              case "end":
-                return _context.stop();
-            }
-          }
-        }, _callee, this);
-      }));
-
-      function initModels() {
-        return _initModels.apply(this, arguments);
-      }
-
-      return initModels;
-    }()
+    value: function initModels(callbackModel) {
+      this.updateTexture();
+      this.iconService.on('imageUpdate', this.updateTexture);
+      this.buildModels(callbackModel);
+    }
   }, {
     key: "clearModels",
     value: function clearModels() {
@@ -290,49 +263,39 @@ var ArcModel = /*#__PURE__*/function (_BaseModel) {
     }
   }, {
     key: "buildModels",
-    value: function () {
-      var _buildModels = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee2() {
-        var _ref4, _ref4$segmentNumber, segmentNumber, _ref4$mask, mask, _ref4$maskInside, maskInside, _this$getShaders, frag, vert, type, model;
-
-        return _regenerator.default.wrap(function _callee2$(_context2) {
-          while (1) {
-            switch (_context2.prev = _context2.next) {
-              case 0:
-                _ref4 = this.layer.getLayerConfig(), _ref4$segmentNumber = _ref4.segmentNumber, segmentNumber = _ref4$segmentNumber === void 0 ? 30 : _ref4$segmentNumber, _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$getShaders = this.getShaders(), frag = _this$getShaders.frag, vert = _this$getShaders.vert, type = _this$getShaders.type; //
-
-                _context2.next = 4;
-                return this.layer.buildLayerModel({
-                  moduleName: 'lineArc2d' + type,
-                  vertexShader: vert,
-                  fragmentShader: frag,
-                  triangulation: _triangulation.LineArcTriangulation,
-                  depth: {
-                    enable: false
-                  },
-                  blend: this.getBlend(),
-                  segmentNumber: segmentNumber,
-                  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;
-    }()
+    value: function buildModels(callbackModel) {
+      var _ref4 = this.layer.getLayerConfig(),
+          _ref4$segmentNumber = _ref4.segmentNumber,
+          segmentNumber = _ref4$segmentNumber === void 0 ? 30 : _ref4$segmentNumber,
+          _ref4$mask = _ref4.mask,
+          mask = _ref4$mask === void 0 ? false : _ref4$mask,
+          _ref4$maskInside = _ref4.maskInside,
+          maskInside = _ref4$maskInside === void 0 ? true : _ref4$maskInside;
+
+      var _this$getShaders = this.getShaders(),
+          frag = _this$getShaders.frag,
+          vert = _this$getShaders.vert,
+          type = _this$getShaders.type; //
+
+
+      this.layer.buildLayerModel({
+        moduleName: 'lineArc2d' + type,
+        vertexShader: vert,
+        fragmentShader: frag,
+        triangulation: _triangulation.LineArcTriangulation,
+        depth: {
+          enable: false
+        },
+        blend: this.getBlend(),
+        segmentNumber: segmentNumber,
+        stencil: (0, _l7Utils.getMask)(mask, maskInside)
+      }).then(function (model) {
+        callbackModel([model]);
+      }).catch(function (err) {
+        console.warn(err);
+        callbackModel([]);
+      });
+    }
   }, {
     key: "registerBuiltinAttributes",
     value: function registerBuiltinAttributes() {

package/lib/line/models/arc_3d.js

@@ -7,10 +7,6 @@ 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"));
@@ -212,34 +208,11 @@ var Arc3DModel = /*#__PURE__*/function (_BaseModel) {
     }
   }, {
     key: "initModels",
-    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.updateTexture();
-                this.iconService.on('imageUpdate', this.updateTexture);
-                _context.next = 4;
-                return this.buildModels();
-
-              case 4:
-                return _context.abrupt("return", _context.sent);
-
-              case 5:
-              case "end":
-                return _context.stop();
-            }
-          }
-        }, _callee, this);
-      }));
-
-      function initModels() {
-        return _initModels.apply(this, arguments);
-      }
-
-      return initModels;
-    }()
+    value: function initModels(callbackModel) {
+      this.updateTexture();
+      this.iconService.on('imageUpdate', this.updateTexture);
+      this.buildModels(callbackModel);
+    }
   }, {
     key: "clearModels",
     value: function clearModels() {
@@ -273,45 +246,35 @@ var Arc3DModel = /*#__PURE__*/function (_BaseModel) {
     }
   }, {
     key: "buildModels",
-    value: function () {
-      var _buildModels = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee2() {
-        var _ref4, _ref4$segmentNumber, segmentNumber, _ref4$mask, mask, _ref4$maskInside, maskInside, _this$getShaders, frag, vert, type, model;
-
-        return _regenerator.default.wrap(function _callee2$(_context2) {
-          while (1) {
-            switch (_context2.prev = _context2.next) {
-              case 0:
-                _ref4 = this.layer.getLayerConfig(), _ref4$segmentNumber = _ref4.segmentNumber, segmentNumber = _ref4$segmentNumber === void 0 ? 30 : _ref4$segmentNumber, _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$getShaders = this.getShaders(), frag = _this$getShaders.frag, vert = _this$getShaders.vert, type = _this$getShaders.type;
-                _context2.next = 4;
-                return this.layer.buildLayerModel({
-                  moduleName: 'lineArc3d' + type,
-                  vertexShader: vert,
-                  fragmentShader: frag,
-                  triangulation: _triangulation.LineArcTriangulation,
-                  blend: this.getBlend(),
-                  segmentNumber: segmentNumber,
-                  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;
-    }()
+    value: function buildModels(callbackModel) {
+      var _ref4 = this.layer.getLayerConfig(),
+          _ref4$segmentNumber = _ref4.segmentNumber,
+          segmentNumber = _ref4$segmentNumber === void 0 ? 30 : _ref4$segmentNumber,
+          _ref4$mask = _ref4.mask,
+          mask = _ref4$mask === void 0 ? false : _ref4$mask,
+          _ref4$maskInside = _ref4.maskInside,
+          maskInside = _ref4$maskInside === void 0 ? true : _ref4$maskInside;
+
+      var _this$getShaders = this.getShaders(),
+          frag = _this$getShaders.frag,
+          vert = _this$getShaders.vert,
+          type = _this$getShaders.type;
+
+      this.layer.buildLayerModel({
+        moduleName: 'lineArc3d' + type,
+        vertexShader: vert,
+        fragmentShader: frag,
+        triangulation: _triangulation.LineArcTriangulation,
+        blend: this.getBlend(),
+        segmentNumber: segmentNumber,
+        stencil: (0, _l7Utils.getMask)(mask, maskInside)
+      }).then(function (model) {
+        callbackModel([model]);
+      }).catch(function (err) {
+        console.warn(err);
+        callbackModel([]);
+      });
+    }
   }, {
     key: "registerBuiltinAttributes",
     value: function registerBuiltinAttributes() {

package/lib/line/models/earthArc_3d.js

@@ -7,10 +7,6 @@ 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"));
@@ -212,34 +208,11 @@ var Arc3DModel = /*#__PURE__*/function (_BaseModel) {
     }
   }, {
     key: "initModels",
-    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.updateTexture();
-                this.iconService.on('imageUpdate', this.updateTexture);
-                _context.next = 4;
-                return this.buildModels();
-
-              case 4:
-                return _context.abrupt("return", _context.sent);
-
-              case 5:
-              case "end":
-                return _context.stop();
-            }
-          }
-        }, _callee, this);
-      }));
-
-      function initModels() {
-        return _initModels.apply(this, arguments);
-      }
-
-      return initModels;
-    }()
+    value: function initModels(callbackModel) {
+      this.updateTexture();
+      this.iconService.on('imageUpdate', this.updateTexture);
+      this.buildModels(callbackModel);
+    }
   }, {
     key: "clearModels",
     value: function clearModels() {
@@ -273,48 +246,38 @@ var Arc3DModel = /*#__PURE__*/function (_BaseModel) {
     }
   }, {
     key: "buildModels",
-    value: function () {
-      var _buildModels = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee2() {
-        var _ref4, _ref4$segmentNumber, segmentNumber, _ref4$mask, mask, _ref4$maskInside, maskInside, _this$getShaders, frag, vert, type, model;
-
-        return _regenerator.default.wrap(function _callee2$(_context2) {
-          while (1) {
-            switch (_context2.prev = _context2.next) {
-              case 0:
-                _ref4 = this.layer.getLayerConfig(), _ref4$segmentNumber = _ref4.segmentNumber, segmentNumber = _ref4$segmentNumber === void 0 ? 30 : _ref4$segmentNumber, _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$getShaders = this.getShaders(), frag = _this$getShaders.frag, vert = _this$getShaders.vert, type = _this$getShaders.type;
-                _context2.next = 4;
-                return this.layer.buildLayerModel({
-                  moduleName: 'lineEarthArc3d' + type,
-                  vertexShader: vert,
-                  fragmentShader: frag,
-                  triangulation: _triangulation.LineArcTriangulation,
-                  depth: {
-                    enable: true
-                  },
-                  blend: this.getBlend(),
-                  segmentNumber: segmentNumber,
-                  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;
-    }()
+    value: function buildModels(callbackModel) {
+      var _ref4 = this.layer.getLayerConfig(),
+          _ref4$segmentNumber = _ref4.segmentNumber,
+          segmentNumber = _ref4$segmentNumber === void 0 ? 30 : _ref4$segmentNumber,
+          _ref4$mask = _ref4.mask,
+          mask = _ref4$mask === void 0 ? false : _ref4$mask,
+          _ref4$maskInside = _ref4.maskInside,
+          maskInside = _ref4$maskInside === void 0 ? true : _ref4$maskInside;
+
+      var _this$getShaders = this.getShaders(),
+          frag = _this$getShaders.frag,
+          vert = _this$getShaders.vert,
+          type = _this$getShaders.type;
+
+      this.layer.buildLayerModel({
+        moduleName: 'lineEarthArc3d' + type,
+        vertexShader: vert,
+        fragmentShader: frag,
+        triangulation: _triangulation.LineArcTriangulation,
+        depth: {
+          enable: true
+        },
+        blend: this.getBlend(),
+        segmentNumber: segmentNumber,
+        stencil: (0, _l7Utils.getMask)(mask, maskInside)
+      }).then(function (model) {
+        callbackModel([model]);
+      }).catch(function (err) {
+        console.warn(err);
+        callbackModel([]);
+      });
+    }
   }, {
     key: "registerBuiltinAttributes",
     value: function registerBuiltinAttributes() {

package/lib/line/models/great_circle.js

@@ -7,10 +7,6 @@ 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"));
@@ -197,34 +193,11 @@ var GreatCircleModel = /*#__PURE__*/function (_BaseModel) {
     }
   }, {
     key: "initModels",
-    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.updateTexture();
-                this.iconService.on('imageUpdate', this.updateTexture);
-                _context.next = 4;
-                return this.buildModels();
-
-              case 4:
-                return _context.abrupt("return", _context.sent);
-
-              case 5:
-              case "end":
-                return _context.stop();
-            }
-          }
-        }, _callee, this);
-      }));
-
-      function initModels() {
-        return _initModels.apply(this, arguments);
-      }
-
-      return initModels;
-    }()
+    value: function initModels(callbackModel) {
+      this.updateTexture();
+      this.iconService.on('imageUpdate', this.updateTexture);
+      this.buildModels(callbackModel);
+    }
   }, {
     key: "clearModels",
     value: function clearModels() {
@@ -236,46 +209,30 @@ var GreatCircleModel = /*#__PURE__*/function (_BaseModel) {
     }
   }, {
     key: "buildModels",
-    value: function () {
-      var _buildModels = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee2() {
-        var _ref3, _ref3$mask, mask, _ref3$maskInside, maskInside, model;
-
-        return _regenerator.default.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: 'lineGreatCircle',
-                  vertexShader: line_arc2d_vert,
-                  fragmentShader: line_arc_frag,
-                  triangulation: _triangulation.LineArcTriangulation,
-                  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;
-    }()
+    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: 'lineGreatCircle',
+        vertexShader: line_arc2d_vert,
+        fragmentShader: line_arc_frag,
+        triangulation: _triangulation.LineArcTriangulation,
+        depth: {
+          enable: false
+        },
+        blend: this.getBlend(),
+        stencil: (0, _l7Utils.getMask)(mask, maskInside)
+      }).then(function (model) {
+        callbackModel([model]);
+      }).catch(function (err) {
+        console.warn(err);
+        callbackModel([]);
+      });
+    }
   }, {
     key: "registerBuiltinAttributes",
     value: function registerBuiltinAttributes() {

package/lib/line/models/half.js

@@ -129,32 +129,9 @@ var LineModel = /*#__PURE__*/function (_BaseModel) {
     }
   }, {
     key: "initModels",
-    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;
-    }()
+    value: function initModels(callbackModel) {
+      this.buildModels(callbackModel);
+    }
   }, {
     key: "clearModels",
     value: function clearModels() {
@@ -165,18 +142,17 @@ var LineModel = /*#__PURE__*/function (_BaseModel) {
   }, {
     key: "buildModels",
     value: function () {
-      var _buildModels = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee2() {
-        var _ref2, _ref2$mask, mask, _ref2$maskInside, maskInside, _ref2$depth, depth, _this$getShaders, frag, vert, model;
+      var _buildModels = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee(callbackModel) {
+        var _ref2, _ref2$mask, mask, _ref2$maskInside, maskInside, _ref2$depth, depth, _this$getShaders, frag, vert;
 
-        return _regenerator.default.wrap(function _callee2$(_context2) {
+        return _regenerator.default.wrap(function _callee$(_context) {
           while (1) {
-            switch (_context2.prev = _context2.next) {
+            switch (_context.prev = _context.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, _ref2$depth = _ref2.depth, depth = _ref2$depth === void 0 ? false : _ref2$depth;
                 _this$getShaders = this.getShaders(), frag = _this$getShaders.frag, vert = _this$getShaders.vert;
                 this.layer.triangulation = _triangulation.LineTriangulation;
-                _context2.next = 5;
-                return this.layer.buildLayerModel({
+                this.layer.buildLayerModel({
                   moduleName: 'lineHalf',
                   vertexShader: vert,
                   fragmentShader: frag,
@@ -186,21 +162,22 @@ var LineModel = /*#__PURE__*/function (_BaseModel) {
                   },
                   blend: this.getBlend(),
                   stencil: (0, _l7Utils.getMask)(mask, maskInside)
+                }).then(function (model) {
+                  callbackModel([model]);
+                }).catch(function (err) {
+                  console.warn(err);
+                  callbackModel([]);
                 });
 
-              case 5:
-                model = _context2.sent;
-                return _context2.abrupt("return", [model]);
-
-              case 7:
+              case 4:
               case "end":
-                return _context2.stop();
+                return _context.stop();
             }
           }
-        }, _callee2, this);
+        }, _callee, this);
       }));
 
-      function buildModels() {
+      function buildModels(_x) {
         return _buildModels.apply(this, arguments);
       }
 

package/lib/line/models/index.js

@@ -7,6 +7,8 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.default = void 0;
 
+var _tileModel = _interopRequireDefault(require("../../tile/models/tileModel"));
+
 var _arc = _interopRequireDefault(require("./arc"));
 
 var _arc_3d = _interopRequireDefault(require("./arc_3d"));
@@ -36,6 +38,7 @@ var LineModels = {
   halfLine: _half.default,
   simple: _simpleLine.default,
   linearline: _linearline.default,
+  vectorline: _tileModel.default,
   tileLine: _tile.default,
   earthArc3d: _earthArc_3d.default
 };