@antv/l7-layers 2.10.3 → 2.10.4

package/es/core/BaseModel.d.ts

@@ -124,8 +124,8 @@ export default class BaseModel<ChildLayerStyleOptions = {}> implements ILayerMod
     getUninforms(): IModelUniform;
     getAnimateUniforms(): IModelUniform;
     needUpdate(): boolean;
-    buildModels(): Promise<IModel[]>;
-    initModels(): Promise<IModel[]>;
+    buildModels(callbackModel: (models: IModel[]) => void): void;
+    initModels(callbackModel: (models: IModel[]) => void): void;
     clearModels(refresh?: boolean): void;
     getAttribute(): {
         attributes: {

package/es/core/BaseModel.js

@@ -1,4 +1,3 @@
-import _asyncToGenerator from "@babel/runtime/helpers/esm/asyncToGenerator";
 import _toConsumableArray from "@babel/runtime/helpers/esm/toConsumableArray";
 import _initializerDefineProperty from "@babel/runtime/helpers/esm/initializerDefineProperty";
 import _classCallCheck from "@babel/runtime/helpers/esm/classCallCheck";
@@ -9,8 +8,6 @@ import _initializerWarningHelper from "@babel/runtime/helpers/esm/initializerWar
 
 var _dec, _class, _descriptor;
 
-import _regeneratorRuntime from "@babel/runtime/regenerator";
-
 function _createForOfIteratorHelper(o, allowArrayLike) { var it = typeof Symbol !== "undefined" && o[Symbol.iterator] || o["@@iterator"]; if (!it) { if (Array.isArray(o) || (it = _unsupportedIterableToArray(o)) || allowArrayLike && o && typeof o.length === "number") { if (it) o = it; var i = 0; var F = function F() {}; return { s: F, n: function n() { if (i >= o.length) return { done: true }; return { done: false, value: o[i++] }; }, e: function e(_e) { throw _e; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var normalCompletion = true, didErr = false, err; return { s: function s() { it = it.call(o); }, n: function n() { var step = it.next(); normalCompletion = step.done; return step; }, e: function e(_e2) { didErr = true; err = _e2; }, f: function f() { try { if (!normalCompletion && it.return != null) it.return(); } finally { if (didErr) throw err; } } }; }
 
 function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
@@ -435,53 +432,15 @@ var BaseModel = (_dec = lazyInject(TYPES.IGlobalConfigService), (_class = /*#__P
 
   }, {
     key: "buildModels",
-    value: function () {
-      var _buildModels = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee() {
-        return _regeneratorRuntime.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 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee2() {
-        return _regeneratorRuntime.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/es/core/triangulation.js

@@ -204,14 +204,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/es/earth/index.d.ts

@@ -11,12 +11,12 @@ export default class EarthLayer extends BaseLayer<IEarthLayerStyleOptions> {
         data: any[];
         options: ISourceCFG | undefined;
     };
-    buildModels(): Promise<void>;
+    buildModels(): void;
     /**
      * 设置当前地球时间
      * @param time
      */
     setEarthTime(time: number): void;
-    getModelType(): EarthModelType;
+    protected getModelType(): EarthModelType;
 }
 export {};

package/es/earth/index.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); }; }
 
@@ -55,32 +53,15 @@ var EarthLayer = /*#__PURE__*/function (_BaseLayer) {
 
   _createClass(EarthLayer, [{
     key: "buildModels",
-    value: function () {
-      var _buildModels = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee() {
-        var shape;
-        return _regeneratorRuntime.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/es/earth/models/atmosphere.d.ts

@@ -2,8 +2,8 @@ import { IModel, IModelUniform } from '@antv/l7-core';
 import BaseModel from '../../core/BaseModel';
 export default class EarthAtomSphereModel extends BaseModel {
     getUninforms(): IModelUniform;
-    initModels(): Promise<IModel[]>;
+    initModels(callbackModel: (models: IModel[]) => void): void;
     clearModels(): string;
-    buildModels(): Promise<IModel[]>;
+    buildModels(callbackModel: (models: IModel[]) => void): void;
     protected registerBuiltinAttributes(): void;
 }

package/es/earth/models/atmosphere.js

@@ -1,10 +1,8 @@
-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 _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); }; }
 
@@ -45,32 +43,9 @@ var EarthAtomSphereModel = /*#__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: "clearModels",
     value: function clearModels() {
@@ -78,45 +53,25 @@ var EarthAtomSphereModel = /*#__PURE__*/function (_BaseModel) {
     }
   }, {
     key: "buildModels",
-    value: function () {
-      var _buildModels = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee2() {
-        var model;
-        return _regeneratorRuntime.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: 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: 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/es/earth/models/base.d.ts

@@ -9,8 +9,8 @@ export default class BaseEarthModel extends BaseModel {
     private sunRadius;
     getUninforms(): IModelUniform;
     setEarthTime(time: number): void;
-    initModels(): Promise<IModel[]>;
+    initModels(callbackModel: (models: IModel[]) => void): void;
     clearModels(): string;
-    buildModels(): Promise<IModel[]>;
+    buildModels(callbackModel: (models: IModel[]) => void): void;
     protected registerBuiltinAttributes(): void;
 }

package/es/earth/models/base.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); }; }
 
@@ -92,57 +90,33 @@ var BaseEarthModel = /*#__PURE__*/function (_BaseModel) {
     }
   }, {
     key: "initModels",
-    value: function () {
-      var _initModels = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee() {
-        var _this2 = this;
-
-        var _this$layer$getLayerC2, globalOptions, source, createTexture2D;
-
-        return _regeneratorRuntime.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
-                  });
-
-                  _this2.layerService.reRender();
-                });
-                _context.next = 8;
-                return this.buildModels();
-
-              case 8:
-                return _context.abrupt("return", _context.sent);
-
-              case 9:
-              case "end":
-                return _context.stop();
-            }
-          }
-        }, _callee, this);
-      }));
+    value: function initModels(callbackModel) {
+      var _this2 = this;
+
+      var _this$layer$getLayerC2 = this.layer.getLayerConfig(),
+          globalOptions = _this$layer$getLayerC2.globalOptions;
 
-      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() {
@@ -150,45 +124,25 @@ var BaseEarthModel = /*#__PURE__*/function (_BaseModel) {
     }
   }, {
     key: "buildModels",
-    value: function () {
-      var _buildModels = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee2() {
-        var model;
-        return _regeneratorRuntime.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: 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: 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/es/earth/models/bloomsphere.d.ts

@@ -2,8 +2,8 @@ import { IModel, IModelUniform } from '@antv/l7-core';
 import BaseModel from '../../core/BaseModel';
 export default class EarthBloomSphereModel extends BaseModel {
     getUninforms(): IModelUniform;
-    initModels(): Promise<IModel[]>;
+    initModels(callbackModel: (models: IModel[]) => void): void;
     clearModels(): string;
-    buildModels(): Promise<IModel[]>;
+    buildModels(callbackModel: (models: IModel[]) => void): void;
     protected registerBuiltinAttributes(): void;
 }

package/es/earth/models/bloomsphere.js

@@ -1,10 +1,8 @@
-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 _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); }; }
 
@@ -45,32 +43,9 @@ var EarthBloomSphereModel = /*#__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: "clearModels",
     value: function clearModels() {
@@ -78,45 +53,25 @@ var EarthBloomSphereModel = /*#__PURE__*/function (_BaseModel) {
     }
   }, {
     key: "buildModels",
-    value: function () {
-      var _buildModels = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee2() {
-        var model;
-        return _regeneratorRuntime.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: 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: 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/es/heatmap/index.d.ts

@@ -4,8 +4,9 @@ import { IHeatMapLayerStyleOptions } from '../core/interface';
 import { HeatMapModelType } from './models';
 export default class HeatMapLayer extends BaseLayer<IHeatMapLayerStyleOptions> {
     type: string;
-    buildModels(): Promise<void>;
+    buildModels(): void;
+    rebuildModels(): void;
     renderModels(): this;
     updateModelData(data: IAttributeAndElements): void;
-    getModelType(): HeatMapModelType;
+    protected getModelType(): HeatMapModelType;
 }