@antv/l7-layers 2.10.6 → 2.10.7

package/es/line/models/great_circle.js

@@ -1,3 +1,4 @@
+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";
@@ -5,6 +6,7 @@ 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); }; }
 
@@ -176,11 +178,34 @@ var GreatCircleModel = /*#__PURE__*/function (_BaseModel) {
     }
   }, {
     key: "initModels",
-    value: function initModels(callbackModel) {
-      this.updateTexture();
-      this.iconService.on('imageUpdate', this.updateTexture);
-      this.buildModels(callbackModel);
-    }
+    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:
+                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;
+    }()
   }, {
     key: "clearModels",
     value: function clearModels() {
@@ -192,30 +217,46 @@ var GreatCircleModel = /*#__PURE__*/function (_BaseModel) {
     }
   }, {
     key: "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: LineArcTriangulation,
-        depth: {
-          enable: false
-        },
-        blend: this.getBlend(),
-        stencil: getMask(mask, maskInside)
-      }).then(function (model) {
-        callbackModel([model]);
-      }).catch(function (err) {
-        console.warn(err);
-        callbackModel([]);
-      });
-    }
+    value: function () {
+      var _buildModels = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee2() {
+        var _ref3, _ref3$mask, mask, _ref3$maskInside, maskInside, model;
+
+        return _regeneratorRuntime.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: LineArcTriangulation,
+                  depth: {
+                    enable: false
+                  },
+                  blend: this.getBlend(),
+                  stencil: getMask(mask, maskInside)
+                });
+
+              case 3:
+                model = _context2.sent;
+                return _context2.abrupt("return", [model]);
+
+              case 5:
+              case "end":
+                return _context2.stop();
+            }
+          }
+        }, _callee2, this);
+      }));
+
+      function buildModels() {
+        return _buildModels.apply(this, arguments);
+      }
+
+      return buildModels;
+    }()
   }, {
     key: "registerBuiltinAttributes",
     value: function registerBuiltinAttributes() {

package/es/line/models/half.d.ts

@@ -2,9 +2,9 @@ import { IModel, IModelUniform } from '@antv/l7-core';
 import BaseModel from '../../core/BaseModel';
 export default class LineModel extends BaseModel {
     getUninforms(): IModelUniform;
-    initModels(callbackModel: (models: IModel[]) => void): void;
+    initModels(): Promise<IModel[]>;
     clearModels(): void;
-    buildModels(callbackModel: (models: IModel[]) => void): Promise<void>;
+    buildModels(): Promise<IModel[]>;
     /**
      * 根据参数获取不同的 shader 代码
      * @returns

package/es/line/models/half.js

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

package/es/line/models/index.d.ts

@@ -1,4 +1,4 @@
-export declare type LineModelType = 'arc' | 'arc3d' | 'greatcircle' | 'wall' | 'simple' | 'line' | 'halfLine' | 'linearline' | 'vectorline' | 'tileLine' | 'earthArc3d';
+export declare type LineModelType = 'arc' | 'arc3d' | 'greatcircle' | 'wall' | 'simple' | 'line' | 'halfLine' | 'linearline' | 'tileLine' | 'earthArc3d';
 declare const LineModels: {
     [key in LineModelType]: any;
 };

package/es/line/models/index.js

@@ -1,4 +1,3 @@
-import LineTileModel from "../../tile/models/tileModel";
 import ArcModel from "./arc";
 import Arc3DModel from "./arc_3d";
 import EarthArc3DModel from "./earthArc_3d";
@@ -18,7 +17,6 @@ var LineModels = {
   halfLine: LineHalfModel,
   simple: SimpleLineModel,
   linearline: LinearLine,
-  vectorline: LineTileModel,
   tileLine: TileLineModel,
   earthArc3d: EarthArc3DModel
 };

package/es/line/models/line.d.ts

@@ -4,9 +4,9 @@ export default class LineModel extends BaseModel {
     protected texture: ITexture2D;
     getUninforms(): IModelUniform;
     getAnimateUniforms(): IModelUniform;
-    initModels(callbackModel: (models: IModel[]) => void): void;
+    initModels(): Promise<IModel[]>;
     clearModels(): void;
-    buildModels(callbackModel: (models: IModel[]) => void): void;
+    buildModels(): Promise<IModel[]>;
     /**
      * 根据参数获取不同的 shader 代码
      * @returns

package/es/line/models/line.js

@@ -1,3 +1,4 @@
+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";
@@ -5,6 +6,7 @@ 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); }; }
 
@@ -219,11 +221,34 @@ var LineModel = /*#__PURE__*/function (_BaseModel) {
     }
   }, {
     key: "initModels",
-    value: function initModels(callbackModel) {
-      this.updateTexture();
-      this.iconService.on('imageUpdate', this.updateTexture);
-      this.buildModels(callbackModel);
-    }
+    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:
+                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;
+    }()
   }, {
     key: "clearModels",
     value: function clearModels() {
@@ -235,48 +260,55 @@ var LineModel = /*#__PURE__*/function (_BaseModel) {
     }
   }, {
     key: "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,
-          _ref3$depth = _ref3.depth,
-          depth = _ref3$depth === void 0 ? false : _ref3$depth,
-          _ref3$workerEnabled = _ref3.workerEnabled,
-          workerEnabled = _ref3$workerEnabled === void 0 ? false : _ref3$workerEnabled,
-          enablePicking = _ref3.enablePicking;
-
-      var _this$getShaders = this.getShaders(),
-          frag = _this$getShaders.frag,
-          vert = _this$getShaders.vert,
-          type = _this$getShaders.type; // console.log(frag)
-
-
-      this.layer.triangulation = LineTriangulation;
-      this.layer.buildLayerModel({
-        moduleName: 'line' + type,
-        vertexShader: vert,
-        fragmentShader: frag,
-        triangulation: LineTriangulation,
-        depth: {
-          enable: depth
-        },
-        blend: this.getBlend(),
-        stencil: getMask(mask, maskInside),
-        workerEnabled: workerEnabled,
-        workerOptions: {
-          modelType: 'line' + type,
-          enablePicking: enablePicking,
-          iconMap: this.iconService.getIconMap()
-        }
-      }).then(function (model) {
-        callbackModel([model]);
-      }).catch(function (err) {
-        console.warn(err);
-        callbackModel([]);
-      });
-    }
+    value: function () {
+      var _buildModels = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee2() {
+        var _ref3, _ref3$mask, mask, _ref3$maskInside, maskInside, _ref3$depth, depth, _ref3$workerEnabled, workerEnabled, enablePicking, _this$getShaders, frag, vert, type, model;
+
+        return _regeneratorRuntime.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, _ref3$depth = _ref3.depth, depth = _ref3$depth === void 0 ? false : _ref3$depth, _ref3$workerEnabled = _ref3.workerEnabled, workerEnabled = _ref3$workerEnabled === void 0 ? false : _ref3$workerEnabled, enablePicking = _ref3.enablePicking;
+                _this$getShaders = this.getShaders(), frag = _this$getShaders.frag, vert = _this$getShaders.vert, type = _this$getShaders.type; // console.log(frag)
+
+                this.layer.triangulation = LineTriangulation;
+                _context2.next = 5;
+                return this.layer.buildLayerModel({
+                  moduleName: 'line' + type,
+                  vertexShader: vert,
+                  fragmentShader: frag,
+                  triangulation: LineTriangulation,
+                  depth: {
+                    enable: depth
+                  },
+                  blend: this.getBlend(),
+                  stencil: getMask(mask, maskInside),
+                  workerEnabled: workerEnabled,
+                  workerOptions: {
+                    modelType: 'line' + type,
+                    enablePicking: enablePicking,
+                    iconMap: this.iconService.getIconMap()
+                  }
+                });
+
+              case 5:
+                model = _context2.sent;
+                return _context2.abrupt("return", [model]);
+
+              case 7:
+              case "end":
+                return _context2.stop();
+            }
+          }
+        }, _callee2, this);
+      }));
+
+      function buildModels() {
+        return _buildModels.apply(this, arguments);
+      }
+
+      return buildModels;
+    }()
     /**
      * 根据参数获取不同的 shader 代码
      * @returns

package/es/line/models/linearline.d.ts

@@ -3,9 +3,9 @@ import BaseModel from '../../core/BaseModel';
 export default class LinearLineModel extends BaseModel {
     protected colorTexture: ITexture2D;
     getUninforms(): IModelUniform;
-    initModels(callbackModel: (models: IModel[]) => void): void;
+    initModels(): Promise<IModel[]>;
     clearModels(): void;
-    buildModels(callbackModel: (models: IModel[]) => void): void;
+    buildModels(): Promise<IModel[]>;
     protected registerBuiltinAttributes(): void;
     private updateTexture;
 }

package/es/line/models/linearline.js

@@ -1,3 +1,4 @@
+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";
@@ -5,6 +6,7 @@ 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); }; }
 
@@ -134,10 +136,33 @@ var LinearLineModel = /*#__PURE__*/function (_BaseModel) {
     }
   }, {
     key: "initModels",
-    value: function initModels(callbackModel) {
-      this.updateTexture();
-      this.buildModels(callbackModel);
-    }
+    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:
+                this.updateTexture();
+                _context.next = 3;
+                return this.buildModels();
+
+              case 3:
+                return _context.abrupt("return", _context.sent);
+
+              case 4:
+              case "end":
+                return _context.stop();
+            }
+          }
+        }, _callee, this);
+      }));
+
+      function initModels() {
+        return _initModels.apply(this, arguments);
+      }
+
+      return initModels;
+    }()
   }, {
     key: "clearModels",
     value: function clearModels() {
@@ -148,33 +173,47 @@ var LinearLineModel = /*#__PURE__*/function (_BaseModel) {
     }
   }, {
     key: "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,
-          _ref3$depth = _ref3.depth,
-          depth = _ref3$depth === void 0 ? false : _ref3$depth;
-
-      this.layer.triangulation = LineTriangulation;
-      this.layer.buildLayerModel({
-        moduleName: 'lineRampColors',
-        vertexShader: linear_line_vert,
-        fragmentShader: linear_line_frag,
-        triangulation: LineTriangulation,
-        depth: {
-          enable: depth
-        },
-        blend: this.getBlend(),
-        stencil: getMask(mask, maskInside)
-      }).then(function (model) {
-        callbackModel([model]);
-      }).catch(function (err) {
-        console.warn(err);
-        callbackModel([]);
-      });
-    }
+    value: function () {
+      var _buildModels = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee2() {
+        var _ref3, _ref3$mask, mask, _ref3$maskInside, maskInside, _ref3$depth, depth, model;
+
+        return _regeneratorRuntime.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, _ref3$depth = _ref3.depth, depth = _ref3$depth === void 0 ? false : _ref3$depth;
+                this.layer.triangulation = LineTriangulation;
+                _context2.next = 4;
+                return this.layer.buildLayerModel({
+                  moduleName: 'lineRampColors',
+                  vertexShader: linear_line_vert,
+                  fragmentShader: linear_line_frag,
+                  triangulation: LineTriangulation,
+                  depth: {
+                    enable: depth
+                  },
+                  blend: this.getBlend(),
+                  stencil: getMask(mask, maskInside)
+                });
+
+              case 4:
+                model = _context2.sent;
+                return _context2.abrupt("return", [model]);
+
+              case 6:
+              case "end":
+                return _context2.stop();
+            }
+          }
+        }, _callee2, this);
+      }));
+
+      function buildModels() {
+        return _buildModels.apply(this, arguments);
+      }
+
+      return buildModels;
+    }()
   }, {
     key: "registerBuiltinAttributes",
     value: function registerBuiltinAttributes() {

package/es/line/models/simpleLine.d.ts

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