@antv/l7-layers 2.10.1 → 2.10.3

package/lib/Geometry/models/billboard.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 _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
 
 var _classCallCheck2 = _interopRequireDefault(require("@babel/runtime/helpers/classCallCheck"));
@@ -82,7 +86,7 @@ var BillBoardModel = /*#__PURE__*/function (_BaseModel) {
           raisingHeight = _ref2$raisingHeight === void 0 ? 0 : _ref2$raisingHeight;
       /**
        *               rotateFlag
-       * L7MAP            1
+       * DEFAULT            1
        * MAPBOX           1
        * GAODE2.x         -1
        * GAODE1.x         -1
@@ -115,47 +119,85 @@ var BillBoardModel = /*#__PURE__*/function (_BaseModel) {
     }
   }, {
     key: "initModels",
-    value: function initModels(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,
-          drawCanvas = _ref3.drawCanvas;
-
-      var createTexture2D = this.rendererService.createTexture2D;
-      this.texture = createTexture2D({
-        height: 0,
-        width: 0
-      });
+    value: function () {
+      var _initModels = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee() {
+        var _ref3, _ref3$mask, mask, _ref3$maskInside, maskInside, drawCanvas, createTexture2D, model;
+
+        return _regenerator.default.wrap(function _callee$(_context) {
+          while (1) {
+            switch (_context.prev = _context.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, drawCanvas = _ref3.drawCanvas;
+                createTexture2D = this.rendererService.createTexture2D;
+                this.texture = createTexture2D({
+                  height: 0,
+                  width: 0
+                });
+
+                if (drawCanvas) {
+                  this.updateTexture(drawCanvas);
+                }
+
+                _context.next = 6;
+                return this.layer.buildLayerModel({
+                  moduleName: 'geometryBillboard',
+                  vertexShader: planeVert,
+                  fragmentShader: planeFrag,
+                  triangulation: this.planeGeometryTriangulation,
+                  primitive: _l7Core.gl.TRIANGLES,
+                  depth: {
+                    enable: true
+                  },
+                  blend: this.getBlend(),
+                  stencil: (0, _l7Utils.getMask)(mask, maskInside)
+                });
+
+              case 6:
+                model = _context.sent;
+                return _context.abrupt("return", [model]);
+
+              case 8:
+              case "end":
+                return _context.stop();
+            }
+          }
+        }, _callee, this);
+      }));
 
-      if (drawCanvas) {
-        this.updateTexture(drawCanvas);
+      function initModels() {
+        return _initModels.apply(this, arguments);
       }
 
-      this.layer.buildLayerModel({
-        moduleName: 'geometryBillboard',
-        vertexShader: planeVert,
-        fragmentShader: planeFrag,
-        triangulation: this.planeGeometryTriangulation,
-        primitive: _l7Core.gl.TRIANGLES,
-        depth: {
-          enable: true
-        },
-        blend: this.getBlend(),
-        stencil: (0, _l7Utils.getMask)(mask, maskInside)
-      }).then(function (model) {
-        callbackModel([model]);
-      }).catch(function (err) {
-        console.warn(err);
-        callbackModel([]);
-      });
-    }
+      return initModels;
+    }()
   }, {
     key: "buildModels",
-    value: function buildModels(callbackModel) {
-      this.initModels(callbackModel);
-    }
+    value: function () {
+      var _buildModels = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee2() {
+        return _regenerator.default.wrap(function _callee2$(_context2) {
+          while (1) {
+            switch (_context2.prev = _context2.next) {
+              case 0:
+                _context2.next = 2;
+                return this.initModels();
+
+              case 2:
+                return _context2.abrupt("return", _context2.sent);
+
+              case 3:
+              case "end":
+                return _context2.stop();
+            }
+          }
+        }, _callee2, this);
+      }));
+
+      function buildModels() {
+        return _buildModels.apply(this, arguments);
+      }
+
+      return buildModels;
+    }()
   }, {
     key: "updateTexture",
     value: function updateTexture(drawCanvas) {

package/lib/Geometry/models/plane.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 _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
 
 var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
@@ -191,49 +195,87 @@ var PlaneModel = /*#__PURE__*/function (_BaseModel) {
     }
   }, {
     key: "initModels",
-    value: function initModels(callbackModel) {
-      var _ref5 = this.layer.getLayerConfig(),
-          _ref5$mask = _ref5.mask,
-          mask = _ref5$mask === void 0 ? false : _ref5$mask,
-          _ref5$maskInside = _ref5.maskInside,
-          maskInside = _ref5$maskInside === void 0 ? true : _ref5$maskInside,
-          mapTexture = _ref5.mapTexture;
-
-      this.mapTexture = mapTexture;
-      var createTexture2D = this.rendererService.createTexture2D;
-      this.texture = createTexture2D({
-        height: 0,
-        width: 0
-      });
-      this.updateTexture(mapTexture);
-      this.layer.buildLayerModel({
-        moduleName: 'geometryPlane',
-        vertexShader: planeVert,
-        fragmentShader: planeFrag,
-        triangulation: this.planeGeometryTriangulation,
-        primitive: _l7Core.gl.TRIANGLES,
-        depth: {
-          enable: true
-        },
-        stencil: (0, _l7Utils.getMask)(mask, maskInside),
-        blend: this.getBlend(),
-        cull: {
-          enable: true,
-          face: _l7Core.gl.BACK // gl.FRONT | gl.BACK;
+    value: function () {
+      var _initModels = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee() {
+        var _ref5, _ref5$mask, mask, _ref5$maskInside, maskInside, mapTexture, createTexture2D, model;
+
+        return _regenerator.default.wrap(function _callee$(_context) {
+          while (1) {
+            switch (_context.prev = _context.next) {
+              case 0:
+                _ref5 = this.layer.getLayerConfig(), _ref5$mask = _ref5.mask, mask = _ref5$mask === void 0 ? false : _ref5$mask, _ref5$maskInside = _ref5.maskInside, maskInside = _ref5$maskInside === void 0 ? true : _ref5$maskInside, mapTexture = _ref5.mapTexture;
+                this.mapTexture = mapTexture;
+                createTexture2D = this.rendererService.createTexture2D;
+                this.texture = createTexture2D({
+                  height: 0,
+                  width: 0
+                });
+                this.updateTexture(mapTexture);
+                _context.next = 7;
+                return this.layer.buildLayerModel({
+                  moduleName: 'geometryPlane',
+                  vertexShader: planeVert,
+                  fragmentShader: planeFrag,
+                  triangulation: this.planeGeometryTriangulation,
+                  primitive: _l7Core.gl.TRIANGLES,
+                  depth: {
+                    enable: true
+                  },
+                  stencil: (0, _l7Utils.getMask)(mask, maskInside),
+                  blend: this.getBlend(),
+                  cull: {
+                    enable: true,
+                    face: _l7Core.gl.BACK // gl.FRONT | gl.BACK;
+
+                  }
+                });
+
+              case 7:
+                model = _context.sent;
+                return _context.abrupt("return", [model]);
+
+              case 9:
+              case "end":
+                return _context.stop();
+            }
+          }
+        }, _callee, this);
+      }));
 
-        }
-      }).then(function (model) {
-        callbackModel([model]);
-      }).catch(function (err) {
-        console.warn(err);
-        callbackModel([]);
-      });
-    }
+      function initModels() {
+        return _initModels.apply(this, arguments);
+      }
+
+      return initModels;
+    }()
   }, {
     key: "buildModels",
-    value: function buildModels(callbackModel) {
-      this.initModels(callbackModel);
-    }
+    value: function () {
+      var _buildModels = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee2() {
+        return _regenerator.default.wrap(function _callee2$(_context2) {
+          while (1) {
+            switch (_context2.prev = _context2.next) {
+              case 0:
+                _context2.next = 2;
+                return this.initModels();
+
+              case 2:
+                return _context2.abrupt("return", _context2.sent);
+
+              case 3:
+              case "end":
+                return _context2.stop();
+            }
+          }
+        }, _callee2, this);
+      }));
+
+      function buildModels() {
+        return _buildModels.apply(this, arguments);
+      }
+
+      return buildModels;
+    }()
   }, {
     key: "createModelData",
     value: function createModelData(options) {

package/lib/Geometry/models/sprite.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 _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
 
 var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
@@ -212,53 +216,89 @@ var SpriteModel = /*#__PURE__*/function (_BaseModel) {
     }
   }, {
     key: "initModels",
-    value: function initModels(callbackModel) {
-      var _this3 = this;
-
-      var _ref6 = this.layer.getLayerConfig(),
-          mapTexture = _ref6.mapTexture,
-          _ref6$spriteTop = _ref6.spriteTop,
-          spriteTop = _ref6$spriteTop === void 0 ? 5000000 : _ref6$spriteTop,
-          _ref6$spriteUpdate = _ref6.spriteUpdate,
-          spriteUpdate = _ref6$spriteUpdate === void 0 ? 10000 : _ref6$spriteUpdate,
-          _ref6$spriteAnimate = _ref6.spriteAnimate,
-          spriteAnimate = _ref6$spriteAnimate === void 0 ? SPRITE_ANIMATE_DIR.DOWN : _ref6$spriteAnimate;
-
-      this.mapTexture = mapTexture;
-      this.spriteTop = spriteTop;
-      this.spriteUpdate = spriteUpdate;
-      spriteAnimate === 'up' ? this.spriteAnimate = SPRITE_ANIMATE_DIR.UP : this.spriteAnimate = SPRITE_ANIMATE_DIR.DOWN;
-      var createTexture2D = this.rendererService.createTexture2D;
-      this.texture = createTexture2D({
-        height: 0,
-        width: 0
-      });
-      this.updateTexture(mapTexture);
-      setTimeout(function () {
-        _this3.updateModel();
-      }, 100);
-      this.layer.buildLayerModel({
-        moduleName: 'geometrySprite',
-        vertexShader: spriteVert,
-        fragmentShader: spriteFrag,
-        triangulation: this.planeGeometryTriangulation,
-        primitive: _l7Core.gl.POINTS,
-        depth: {
-          enable: false
-        },
-        blend: this.getBlend()
-      }).then(function (model) {
-        callbackModel([model]);
-      }).catch(function (err) {
-        console.warn(err);
-        callbackModel([]);
-      });
-    }
+    value: function () {
+      var _initModels = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee() {
+        var _this3 = this;
+
+        var _ref6, mapTexture, _ref6$spriteTop, spriteTop, _ref6$spriteUpdate, spriteUpdate, _ref6$spriteAnimate, spriteAnimate, createTexture2D, model;
+
+        return _regenerator.default.wrap(function _callee$(_context) {
+          while (1) {
+            switch (_context.prev = _context.next) {
+              case 0:
+                _ref6 = this.layer.getLayerConfig(), mapTexture = _ref6.mapTexture, _ref6$spriteTop = _ref6.spriteTop, spriteTop = _ref6$spriteTop === void 0 ? 5000000 : _ref6$spriteTop, _ref6$spriteUpdate = _ref6.spriteUpdate, spriteUpdate = _ref6$spriteUpdate === void 0 ? 10000 : _ref6$spriteUpdate, _ref6$spriteAnimate = _ref6.spriteAnimate, spriteAnimate = _ref6$spriteAnimate === void 0 ? SPRITE_ANIMATE_DIR.DOWN : _ref6$spriteAnimate;
+                this.mapTexture = mapTexture;
+                this.spriteTop = spriteTop;
+                this.spriteUpdate = spriteUpdate;
+                spriteAnimate === 'up' ? this.spriteAnimate = SPRITE_ANIMATE_DIR.UP : this.spriteAnimate = SPRITE_ANIMATE_DIR.DOWN;
+                createTexture2D = this.rendererService.createTexture2D;
+                this.texture = createTexture2D({
+                  height: 0,
+                  width: 0
+                });
+                this.updateTexture(mapTexture);
+                setTimeout(function () {
+                  _this3.updateModel();
+                }, 100);
+                _context.next = 11;
+                return this.layer.buildLayerModel({
+                  moduleName: 'geometrySprite',
+                  vertexShader: spriteVert,
+                  fragmentShader: spriteFrag,
+                  triangulation: this.planeGeometryTriangulation,
+                  primitive: _l7Core.gl.POINTS,
+                  depth: {
+                    enable: false
+                  },
+                  blend: this.getBlend()
+                });
+
+              case 11:
+                model = _context.sent;
+                return _context.abrupt("return", [model]);
+
+              case 13:
+              case "end":
+                return _context.stop();
+            }
+          }
+        }, _callee, this);
+      }));
+
+      function initModels() {
+        return _initModels.apply(this, arguments);
+      }
+
+      return initModels;
+    }()
   }, {
     key: "buildModels",
-    value: function buildModels(callbackModel) {
-      this.initModels(callbackModel);
-    }
+    value: function () {
+      var _buildModels = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee2() {
+        return _regenerator.default.wrap(function _callee2$(_context2) {
+          while (1) {
+            switch (_context2.prev = _context2.next) {
+              case 0:
+                _context2.next = 2;
+                return this.initModels();
+
+              case 2:
+                return _context2.abrupt("return", _context2.sent);
+
+              case 3:
+              case "end":
+                return _context2.stop();
+            }
+          }
+        }, _callee2, this);
+      }));
+
+      function buildModels() {
+        return _buildModels.apply(this, arguments);
+      }
+
+      return buildModels;
+    }()
   }, {
     key: "updateTexture",
     value: function updateTexture(mapTexture) {

package/lib/canvas/index.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"));
@@ -51,31 +55,40 @@ var CanvasLayer = /*#__PURE__*/function (_BaseLayer) {
 
   (0, _createClass2.default)(CanvasLayer, [{
     key: "buildModels",
-    value: function buildModels() {
-      var _this2 = this;
-
-      var modelType = this.getModelType();
-      this.layerModel = new _index.default[modelType](this);
-      this.layerModel.initModels(function (models) {
-        _this2.dispatchModelLoad(models);
-      });
-    }
-  }, {
-    key: "rebuildModels",
-    value: function rebuildModels() {
-      var _this3 = this;
+    value: function () {
+      var _buildModels = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee() {
+        var modelType;
+        return _regenerator.default.wrap(function _callee$(_context) {
+          while (1) {
+            switch (_context.prev = _context.next) {
+              case 0:
+                modelType = this.getModelType();
+                this.layerModel = new _index.default[modelType](this);
+                _context.next = 4;
+                return this.initLayerModels();
+
+              case 4:
+              case "end":
+                return _context.stop();
+            }
+          }
+        }, _callee, this);
+      }));
+
+      function buildModels() {
+        return _buildModels.apply(this, arguments);
+      }
 
-      this.layerModel.buildModels(function (models) {
-        _this3.dispatchModelLoad(models);
-      });
-    }
+      return buildModels;
+    }()
   }, {
     key: "hide",
     value: function hide() {
-      var _this$layerModel;
-
       // 清除画布
-      this.layerModel.clearCanvas && ((_this$layerModel = this.layerModel) === null || _this$layerModel === void 0 ? void 0 : _this$layerModel.clearCanvas());
+      if (this.layerModel.clearCanvas) {
+        this.layerModel.clearCanvas();
+      }
+
       this.updateLayerConfig({
         visible: false
       });
@@ -85,16 +98,16 @@ var CanvasLayer = /*#__PURE__*/function (_BaseLayer) {
   }, {
     key: "renderModels",
     value: function renderModels() {
-      var _this$layerModel2,
-          _this4 = this;
+      var _this$layerModel,
+          _this2 = this;
 
-      if (this !== null && this !== void 0 && (_this$layerModel2 = this.layerModel) !== null && _this$layerModel2 !== void 0 && _this$layerModel2.renderUpdate) {
+      if (this !== null && this !== void 0 && (_this$layerModel = this.layerModel) !== null && _this$layerModel !== void 0 && _this$layerModel.renderUpdate) {
         this.layerModel.renderUpdate();
       }
 
       this.models.forEach(function (model) {
         model.draw({
-          uniforms: _this4.layerModel.getUninforms()
+          uniforms: _this2.layerModel.getUninforms()
         }, false);
       });
       return this;

package/lib/canvas/models/canvas.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 _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
 
 var _classCallCheck2 = _interopRequireDefault(require("@babel/runtime/helpers/classCallCheck"));
@@ -158,18 +162,36 @@ var CanvaModel = /*#__PURE__*/function (_BaseModel) {
     }
   }, {
     key: "initModels",
-    value: function initModels() {
-      var _ref3 = this.layer.getLayerConfig(),
-          _ref3$update = _ref3.update,
-          update = _ref3$update === void 0 ? _interface.CanvasUpdateType.ALWAYS : _ref3$update;
-
-      this.updateMode = update;
-      this.initCanvas();
-      this.renderCanvas();
-      this.bindListener();
-      this.mapService.getContainer();
-      return [];
-    }
+    value: function () {
+      var _initModels = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee() {
+        var _ref3, _ref3$update, update;
+
+        return _regenerator.default.wrap(function _callee$(_context) {
+          while (1) {
+            switch (_context.prev = _context.next) {
+              case 0:
+                _ref3 = this.layer.getLayerConfig(), _ref3$update = _ref3.update, update = _ref3$update === void 0 ? _interface.CanvasUpdateType.ALWAYS : _ref3$update;
+                this.updateMode = update;
+                this.initCanvas();
+                this.renderCanvas();
+                this.bindListener();
+                this.mapService.getContainer();
+                return _context.abrupt("return", []);
+
+              case 7:
+              case "end":
+                return _context.stop();
+            }
+          }
+        }, _callee, this);
+      }));
+
+      function initModels() {
+        return _initModels.apply(this, arguments);
+      }
+
+      return initModels;
+    }()
   }, {
     key: "initCanvas",
     value: function initCanvas() {
@@ -206,9 +228,28 @@ var CanvaModel = /*#__PURE__*/function (_BaseModel) {
     }
   }, {
     key: "buildModels",
-    value: function buildModels() {
-      return this.initModels();
-    }
+    value: function () {
+      var _buildModels = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee2() {
+        return _regenerator.default.wrap(function _callee2$(_context2) {
+          while (1) {
+            switch (_context2.prev = _context2.next) {
+              case 0:
+                return _context2.abrupt("return", this.initModels());
+
+              case 1:
+              case "end":
+                return _context2.stop();
+            }
+          }
+        }, _callee2, this);
+      }));
+
+      function buildModels() {
+        return _buildModels.apply(this, arguments);
+      }
+
+      return buildModels;
+    }()
   }, {
     key: "registerBuiltinAttributes",
     value: function registerBuiltinAttributes() {

package/lib/citybuliding/building.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"));
@@ -50,23 +54,30 @@ var CityBuildingLayer = /*#__PURE__*/function (_BaseLayer) {
 
   (0, _createClass2.default)(CityBuildingLayer, [{
     key: "buildModels",
-    value: function buildModels() {
-      var _this2 = this;
-
-      this.layerModel = new _build.default(this);
-      this.layerModel.initModels(function (models) {
-        _this2.dispatchModelLoad(models);
-      });
-    }
-  }, {
-    key: "rebuildModels",
-    value: function rebuildModels() {
-      var _this3 = this;
-
-      this.layerModel.buildModels(function (models) {
-        _this3.dispatchModelLoad(models);
-      });
-    }
+    value: function () {
+      var _buildModels = (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.layerModel = new _build.default(this);
+                _context.next = 3;
+                return this.initLayerModels();
+
+              case 3:
+              case "end":
+                return _context.stop();
+            }
+          }
+        }, _callee, this);
+      }));
+
+      function buildModels() {
+        return _buildModels.apply(this, arguments);
+      }
+
+      return buildModels;
+    }()
   }, {
     key: "setLight",
     value: function setLight(t) {