@antv/l7-layers 2.10.2 → 2.10.4

package/lib/core/BaseModel.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 _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
 
 var _initializerDefineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/initializerDefineProperty"));
@@ -454,53 +450,15 @@ var BaseModel = (_dec = (0, _l7Core.lazyInject)(_l7Core.TYPES.IGlobalConfigServi
 
   }, {
     key: "buildModels",
-    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:
-                throw new Error('Method not implemented.');
-
-              case 1:
-              case "end":
-                return _context.stop();
-            }
-          }
-        }, _callee);
-      }));
-
-      function buildModels() {
-        return _buildModels.apply(this, arguments);
-      }
-
-      return buildModels;
-    }() // eslint-disable-next-line @typescript-eslint/no-unused-vars
+    value: function buildModels(callbackModel) {
+      throw new Error('Method not implemented.');
+    } // eslint-disable-next-line @typescript-eslint/no-unused-vars
 
   }, {
     key: "initModels",
-    value: function () {
-      var _initModels = (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:
-                throw new Error('Method not implemented.');
-
-              case 1:
-              case "end":
-                return _context2.stop();
-            }
-          }
-        }, _callee2);
-      }));
-
-      function initModels() {
-        return _initModels.apply(this, arguments);
-      }
-
-      return initModels;
-    }() // eslint-disable-next-line @typescript-eslint/no-unused-vars
+    value: function initModels(callbackModel) {
+      throw new Error('Method not implemented.');
+    } // eslint-disable-next-line @typescript-eslint/no-unused-vars
 
   }, {
     key: "clearModels",

package/lib/core/triangulation.js

@@ -251,14 +251,7 @@ function pushDis(point, n) {
   return point;
 }
 
-function getSimpleLineVertices(coordinates) {
-  var points = coordinates;
-
-  if (Array.isArray(points) && Array.isArray(points[0]) && Array.isArray(points[0][0])) {
-    // @ts-ignore
-    points = coordinates.flat();
-  }
-
+function getSimpleLineVertices(points) {
   var distance = 0;
 
   if (points.length < 2) {

package/lib/earth/index.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"));
@@ -73,32 +69,15 @@ var EarthLayer = /*#__PURE__*/function (_BaseLayer) {
 
   (0, _createClass2.default)(EarthLayer, [{
     key: "buildModels",
-    value: function () {
-      var _buildModels = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee() {
-        var shape;
-        return _regenerator.default.wrap(function _callee$(_context) {
-          while (1) {
-            switch (_context.prev = _context.next) {
-              case 0:
-                shape = this.getModelType();
-                this.layerModel = new EarthModels[shape](this);
-                _context.next = 4;
-                return this.initLayerModels();
-
-              case 4:
-              case "end":
-                return _context.stop();
-            }
-          }
-        }, _callee, this);
-      }));
-
-      function buildModels() {
-        return _buildModels.apply(this, arguments);
-      }
-
-      return buildModels;
-    }()
+    value: function buildModels() {
+      var _this2 = this;
+
+      var shape = this.getModelType();
+      this.layerModel = new EarthModels[shape](this);
+      this.layerModel.initModels(function (models) {
+        _this2.dispatchModelLoad(models);
+      });
+    }
     /**
      * 设置当前地球时间
      * @param time

package/lib/earth/models/atmosphere.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"));
@@ -62,32 +58,9 @@ var EarthAtomSphereModel = /*#__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() {
@@ -95,45 +68,25 @@ var EarthAtomSphereModel = /*#__PURE__*/function (_BaseModel) {
     }
   }, {
     key: "buildModels",
-    value: function () {
-      var _buildModels = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee2() {
-        var model;
-        return _regenerator.default.wrap(function _callee2$(_context2) {
-          while (1) {
-            switch (_context2.prev = _context2.next) {
-              case 0:
-                // TODO: 调整图层的绘制顺序 地球大气层
-                this.layer.zIndex = -997;
-                _context2.next = 3;
-                return this.layer.buildLayerModel({
-                  moduleName: 'earthAtmoSphere',
-                  vertexShader: atmoSphereVert,
-                  fragmentShader: atmoSphereFrag,
-                  triangulation: _triangulation.earthTriangulation,
-                  depth: {
-                    enable: false
-                  },
-                  blend: this.getBlend()
-                });
-
-              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) {
+      // TODO: 调整图层的绘制顺序 地球大气层
+      this.layer.zIndex = -997;
+      this.layer.buildLayerModel({
+        moduleName: 'earthAtmoSphere',
+        vertexShader: atmoSphereVert,
+        fragmentShader: atmoSphereFrag,
+        triangulation: _triangulation.earthTriangulation,
+        depth: {
+          enable: false
+        },
+        blend: this.getBlend()
+      }).then(function (model) {
+        callbackModel([model]);
+      }).catch(function (err) {
+        console.warn(err);
+        callbackModel([]);
+      });
+    }
   }, {
     key: "registerBuiltinAttributes",
     value: function registerBuiltinAttributes() {

package/lib/earth/models/base.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"));
@@ -105,57 +101,33 @@ var BaseEarthModel = /*#__PURE__*/function (_BaseModel) {
     }
   }, {
     key: "initModels",
-    value: function () {
-      var _initModels = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee() {
-        var _this2 = this;
-
-        var _this$layer$getLayerC2, globalOptions, source, createTexture2D;
-
-        return _regenerator.default.wrap(function _callee$(_context) {
-          while (1) {
-            switch (_context.prev = _context.next) {
-              case 0:
-                _this$layer$getLayerC2 = this.layer.getLayerConfig(), globalOptions = _this$layer$getLayerC2.globalOptions;
-
-                if ((globalOptions === null || globalOptions === void 0 ? void 0 : globalOptions.earthTime) !== undefined) {
-                  this.setEarthTime(globalOptions.earthTime);
-                }
-
-                source = this.layer.getSource();
-                createTexture2D = this.rendererService.createTexture2D;
-                this.texture = createTexture2D({
-                  height: 0,
-                  width: 0
-                });
-                source.data.images.then(function (imageData) {
-                  _this2.texture = createTexture2D({
-                    data: imageData[0],
-                    width: imageData[0].width,
-                    height: imageData[0].height
-                  });
+    value: function initModels(callbackModel) {
+      var _this2 = this;
 
-                  _this2.layerService.reRender();
-                });
-                _context.next = 8;
-                return this.buildModels();
+      var _this$layer$getLayerC2 = this.layer.getLayerConfig(),
+          globalOptions = _this$layer$getLayerC2.globalOptions;
 
-              case 8:
-                return _context.abrupt("return", _context.sent);
-
-              case 9:
-              case "end":
-                return _context.stop();
-            }
-          }
-        }, _callee, this);
-      }));
-
-      function initModels() {
-        return _initModels.apply(this, arguments);
+      if ((globalOptions === null || globalOptions === void 0 ? void 0 : globalOptions.earthTime) !== undefined) {
+        this.setEarthTime(globalOptions.earthTime);
       }
 
-      return initModels;
-    }()
+      var source = this.layer.getSource();
+      var createTexture2D = this.rendererService.createTexture2D;
+      this.texture = createTexture2D({
+        height: 0,
+        width: 0
+      });
+      source.data.images.then(function (imageData) {
+        _this2.texture = createTexture2D({
+          data: imageData[0],
+          width: imageData[0].width,
+          height: imageData[0].height
+        });
+
+        _this2.layerService.reRender();
+      });
+      this.buildModels(callbackModel);
+    }
   }, {
     key: "clearModels",
     value: function clearModels() {
@@ -163,45 +135,25 @@ var BaseEarthModel = /*#__PURE__*/function (_BaseModel) {
     }
   }, {
     key: "buildModels",
-    value: function () {
-      var _buildModels = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee2() {
-        var model;
-        return _regenerator.default.wrap(function _callee2$(_context2) {
-          while (1) {
-            switch (_context2.prev = _context2.next) {
-              case 0:
-                // Tip: 调整图层的绘制顺序 地球大气层
-                this.layer.zIndex = -998;
-                _context2.next = 3;
-                return this.layer.buildLayerModel({
-                  moduleName: 'earthBase',
-                  vertexShader: baseVert,
-                  fragmentShader: baseFrag,
-                  triangulation: _triangulation.earthTriangulation,
-                  depth: {
-                    enable: true
-                  },
-                  blend: this.getBlend()
-                });
-
-              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) {
+      // Tip: 调整图层的绘制顺序 地球大气层
+      this.layer.zIndex = -998;
+      this.layer.buildLayerModel({
+        moduleName: 'earthBase',
+        vertexShader: baseVert,
+        fragmentShader: baseFrag,
+        triangulation: _triangulation.earthTriangulation,
+        depth: {
+          enable: true
+        },
+        blend: this.getBlend()
+      }).then(function (model) {
+        callbackModel([model]);
+      }).catch(function (err) {
+        console.warn(err);
+        callbackModel([]);
+      });
+    }
   }, {
     key: "registerBuiltinAttributes",
     value: function registerBuiltinAttributes() {

package/lib/earth/models/bloomsphere.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"));
@@ -62,32 +58,9 @@ var EarthBloomSphereModel = /*#__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() {
@@ -95,45 +68,25 @@ var EarthBloomSphereModel = /*#__PURE__*/function (_BaseModel) {
     }
   }, {
     key: "buildModels",
-    value: function () {
-      var _buildModels = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee2() {
-        var model;
-        return _regenerator.default.wrap(function _callee2$(_context2) {
-          while (1) {
-            switch (_context2.prev = _context2.next) {
-              case 0:
-                // Tip: 调整图层的绘制顺序，让它保持在地球后面（减少锯齿现象）
-                this.layer.zIndex = -999;
-                _context2.next = 3;
-                return this.layer.buildLayerModel({
-                  moduleName: 'earthBloom',
-                  vertexShader: bloomSphereVert,
-                  fragmentShader: bloomSphereFrag,
-                  triangulation: _triangulation.earthOuterTriangulation,
-                  depth: {
-                    enable: false
-                  },
-                  blend: this.getBlend()
-                });
-
-              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) {
+      // Tip: 调整图层的绘制顺序，让它保持在地球后面（减少锯齿现象）
+      this.layer.zIndex = -999;
+      this.layer.buildLayerModel({
+        moduleName: 'earthBloom',
+        vertexShader: bloomSphereVert,
+        fragmentShader: bloomSphereFrag,
+        triangulation: _triangulation.earthOuterTriangulation,
+        depth: {
+          enable: false
+        },
+        blend: this.getBlend()
+      }).then(function (model) {
+        callbackModel([model]);
+      }).catch(function (err) {
+        console.warn(err);
+        callbackModel([]);
+      });
+    }
   }, {
     key: "registerBuiltinAttributes",
     value: function registerBuiltinAttributes() {

package/lib/heatmap/index.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"));
@@ -54,36 +50,28 @@ var HeatMapLayer = /*#__PURE__*/function (_BaseLayer) {
 
   (0, _createClass2.default)(HeatMapLayer, [{
     key: "buildModels",
-    value: function () {
-      var _buildModels = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee() {
-        var shape;
-        return _regenerator.default.wrap(function _callee$(_context) {
-          while (1) {
-            switch (_context.prev = _context.next) {
-              case 0:
-                shape = this.getModelType();
-                this.layerModel = new _models.default[shape](this);
-                _context.next = 4;
-                return this.initLayerModels();
-
-              case 4:
-              case "end":
-                return _context.stop();
-            }
-          }
-        }, _callee, this);
-      }));
-
-      function buildModels() {
-        return _buildModels.apply(this, arguments);
-      }
+    value: function buildModels() {
+      var _this2 = this;
+
+      var shape = this.getModelType();
+      this.layerModel = new _models.default[shape](this);
+      this.layerModel.initModels(function (models) {
+        _this2.dispatchModelLoad(models);
+      });
+    }
+  }, {
+    key: "rebuildModels",
+    value: function rebuildModels() {
+      var _this3 = this;
 
-      return buildModels;
-    }()
+      this.layerModel.buildModels(function (models) {
+        _this3.dispatchModelLoad(models);
+      });
+    }
   }, {
     key: "renderModels",
     value: function renderModels() {
-      var _this2 = this;
+      var _this4 = this;
 
       var shape = this.getModelType();
 
@@ -96,16 +84,15 @@ var HeatMapLayer = /*#__PURE__*/function (_BaseLayer) {
       }
 
       if (this.layerModelNeedUpdate) {
-        // TODO 渲染流程修改
-        this.layerModel.buildModels().then(function (models) {
-          _this2.models = models;
-          _this2.layerModelNeedUpdate = false;
+        this.layerModel.buildModels(function (models) {
+          return _this4.models = models;
         });
+        this.layerModelNeedUpdate = false;
       }
 
       this.models.forEach(function (model) {
         return model.draw({
-          uniforms: _this2.layerModel.getUninforms()
+          uniforms: _this4.layerModel.getUninforms()
         });
       });
       return this;