@antv/l7-layers 2.10.1 → 2.10.3

package/lib/line/models/wall.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"));
@@ -147,11 +151,34 @@ var LineWallModel = /*#__PURE__*/function (_BaseModel) {
     }
   }, {
     key: "initModels",
-    value: function initModels(callbackModel) {
-      this.updateTexture();
-      this.iconService.on('imageUpdate', this.updateTexture);
-      this.buildModels(callbackModel);
-    }
+    value: function () {
+      var _initModels = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee() {
+        return _regenerator.default.wrap(function _callee$(_context) {
+          while (1) {
+            switch (_context.prev = _context.next) {
+              case 0:
+                this.updateTexture();
+                this.iconService.on('imageUpdate', this.updateTexture);
+                _context.next = 4;
+                return this.buildModels();
+
+              case 4:
+                return _context.abrupt("return", _context.sent);
+
+              case 5:
+              case "end":
+                return _context.stop();
+            }
+          }
+        }, _callee, this);
+      }));
+
+      function initModels() {
+        return _initModels.apply(this, arguments);
+      }
+
+      return initModels;
+    }()
   }, {
     key: "clearModels",
     value: function clearModels() {
@@ -162,23 +189,43 @@ var LineWallModel = /*#__PURE__*/function (_BaseModel) {
     }
   }, {
     key: "buildModels",
-    value: function buildModels(callbackModel) {
-      this.layer.buildLayerModel({
-        moduleName: 'lineWall',
-        vertexShader: line_vert,
-        fragmentShader: line_frag,
-        triangulation: _triangulation.LineTriangulation,
-        depth: {
-          enable: false
-        },
-        blend: this.getBlend()
-      }).then(function (model) {
-        callbackModel([model]);
-      }).catch(function (err) {
-        console.warn(err);
-        callbackModel([]);
-      });
-    }
+    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:
+                _context2.next = 2;
+                return this.layer.buildLayerModel({
+                  moduleName: 'lineWall',
+                  vertexShader: line_vert,
+                  fragmentShader: line_frag,
+                  triangulation: _triangulation.LineTriangulation,
+                  depth: {
+                    enable: false
+                  },
+                  blend: this.getBlend()
+                });
+
+              case 2:
+                model = _context2.sent;
+                return _context2.abrupt("return", [model]);
+
+              case 4:
+              case "end":
+                return _context2.stop();
+            }
+          }
+        }, _callee2, this);
+      }));
+
+      function buildModels() {
+        return _buildModels.apply(this, arguments);
+      }
+
+      return buildModels;
+    }()
   }, {
     key: "registerBuiltinAttributes",
     value: function registerBuiltinAttributes() {

package/lib/mask/index.js

@@ -7,7 +7,9 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.default = void 0;
 
-var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
+var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"));
+
+var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
 
 var _classCallCheck2 = _interopRequireDefault(require("@babel/runtime/helpers/classCallCheck"));
 
@@ -27,16 +29,6 @@ var _BaseLayer2 = _interopRequireDefault(require("../core/BaseLayer"));
 
 var _models = _interopRequireDefault(require("./models"));
 
-var _utils = require("../tile/utils");
-
-var _l7Core = require("@antv/l7-core");
-
-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); }
-
-function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) { arr2[i] = arr[i]; } return arr2; }
-
 function _createSuper(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct(); return function _createSuperInternal() { var Super = (0, _getPrototypeOf2.default)(Derived), result; if (hasNativeReflectConstruct) { var NewTarget = (0, _getPrototypeOf2.default)(this).constructor; result = Reflect.construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return (0, _possibleConstructorReturn2.default)(this, result); }; }
 
 function _isNativeReflectConstruct() { if (typeof Reflect === "undefined" || !Reflect.construct) return false; if (Reflect.construct.sham) return false; if (typeof Proxy === "function") return true; try { Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); return true; } catch (e) { return false; } }
@@ -61,99 +53,36 @@ var MaskLayer = /*#__PURE__*/function (_BaseLayer) {
   }
 
   (0, _createClass2.default)(MaskLayer, [{
-    key: "init",
-    value: function init() {
-      var _this2 = this;
-
-      // 设置配置项
-      var sceneId = this.container.get(_l7Core.TYPES.SceneID);
-      this.configService.setLayerConfig(sceneId, this.id, this.rawConfig);
-      this.layerType = this.rawConfig.layerType;
-      this.rendererService = this.container.get(_l7Core.TYPES.IRendererService);
-      this.layerService = this.container.get(_l7Core.TYPES.ILayerService);
-      this.mapService = this.container.get(_l7Core.TYPES.IMapService);
-      this.cameraService = this.container.get(_l7Core.TYPES.ICameraService);
-      this.coordinateService = this.container.get(_l7Core.TYPES.ICoordinateSystemService);
-      this.shaderModuleService = this.container.get(_l7Core.TYPES.IShaderModuleService);
-      this.postProcessingPassFactory = this.container.get(_l7Core.TYPES.IFactoryPostProcessingPass);
-      this.normalPassFactory = this.container.get(_l7Core.TYPES.IFactoryNormalPass); // 图层容器服务
-
-      this.styleAttributeService = this.container.get(_l7Core.TYPES.IStyleAttributeService); // 完成样式服务注册完成前添加的属性
-
-      this.pendingStyleAttributes.forEach(function (_ref) {
-        var attributeName = _ref.attributeName,
-            attributeField = _ref.attributeField,
-            attributeValues = _ref.attributeValues,
-            updateOptions = _ref.updateOptions;
-
-        _this2.styleAttributeService.updateStyleAttribute(attributeName, {
-          // @ts-ignore
-          scale: (0, _objectSpread2.default)({
-            field: attributeField
-          }, _this2.splitValuesAndCallbackInAttribute( // @ts-ignore
-          attributeValues, // @ts-ignore
-          _this2.getLayerConfig()[attributeName]))
-        }, // @ts-ignore
-        updateOptions);
-      });
-      this.pendingStyleAttributes = []; // 获取插件集
-
-      this.plugins = this.container.getAll(_l7Core.TYPES.ILayerPlugin); // 完成插件注册，传入场景和图层容器内的服务
-
-      var _iterator = _createForOfIteratorHelper(this.plugins),
-          _step;
-
-      try {
-        for (_iterator.s(); !(_step = _iterator.n()).done;) {
-          var plugin = _step.value;
-          plugin.apply(this, {
-            rendererService: this.rendererService,
-            mapService: this.mapService,
-            styleAttributeService: this.styleAttributeService,
-            normalPassFactory: this.normalPassFactory,
-            postProcessingPassFactory: this.postProcessingPassFactory
-          });
-        } // 触发 init 生命周期插件
-
-      } catch (err) {
-        _iterator.e(err);
-      } finally {
-        _iterator.f();
-      }
-
-      this.hooks.init.call();
-      this.hooks.afterInit.call();
-      return this;
-    }
-  }, {
     key: "buildModels",
-    value: function buildModels() {
-      var _this3 = this;
-
-      var shape = this.getModelType();
-      this.layerModel = new _models.default[shape](this);
-      this.layerModel.initModels(function (models) {
-        _this3.dispatchModelLoad(models);
-      });
-    }
-  }, {
-    key: "rebuildModels",
-    value: function rebuildModels() {
-      var _this4 = this;
+    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);
+      }
 
-      this.layerModel.buildModels(function (models) {
-        _this4.dispatchModelLoad(models);
-      });
-    }
+      return buildModels;
+    }()
   }, {
     key: "getModelType",
     value: function getModelType() {
-      var parserType = this.layerSource.getParserType();
-
-      if ((0, _utils.isVectorTile)(parserType)) {
-        return 'vectorMask';
-      }
-
       return 'fill';
     }
   }]);

package/lib/mask/models/fill.js

@@ -67,18 +67,43 @@ var MaskModel = /*#__PURE__*/function (_BaseModel) {
     }
   }, {
     key: "initModels",
-    value: function initModels(callbackModel) {
-      this.buildModels(callbackModel);
-    }
-  }, {
-    key: "buildModels",
     value: function () {
-      var _buildModels = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee(callbackModel) {
+      var _initModels = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee() {
         return _regenerator.default.wrap(function _callee$(_context) {
           while (1) {
             switch (_context.prev = _context.next) {
               case 0:
-                this.layer.buildLayerModel({
+                _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: "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:
+                _context2.next = 2;
+                return this.layer.buildLayerModel({
                   moduleName: 'mask',
                   vertexShader: mask_vert,
                   fragmentShader: mask_frag,
@@ -102,22 +127,21 @@ var MaskModel = /*#__PURE__*/function (_BaseModel) {
                     }
                   },
                   pick: false
-                }).then(function (model) {
-                  callbackModel([model]);
-                }).catch(function (err) {
-                  console.warn(err);
-                  callbackModel([]);
                 });
 
-              case 1:
+              case 2:
+                model = _context2.sent;
+                return _context2.abrupt("return", [model]);
+
+              case 4:
               case "end":
-                return _context.stop();
+                return _context2.stop();
             }
           }
-        }, _callee, this);
+        }, _callee2, this);
       }));
 
-      function buildModels(_x) {
+      function buildModels() {
         return _buildModels.apply(this, arguments);
       }
 

package/lib/mask/models/index.js

@@ -7,13 +7,10 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.default = void 0;
 
-var _tileModel = _interopRequireDefault(require("../../tile/models/tileModel"));
-
 var _fill = _interopRequireDefault(require("./fill"));
 
 var MaskModels = {
-  fill: _fill.default,
-  vectorMask: _tileModel.default
+  fill: _fill.default
 };
 var _default = MaskModels;
 exports.default = _default;