@antv/l7-layers 2.10.1 → 2.10.2

package/lib/plugins/DataSourcePlugin.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"));
@@ -32,41 +36,78 @@ var DataSourcePlugin = (_dec = (0, _inversify.injectable)(), _dec(_class = /*#__
       var _this = this;
 
       this.mapService = layer.getContainer().get(_l7Core.TYPES.IMapService);
-      layer.hooks.init.tap('DataSourcePlugin', function () {
-        var source = layer.getSource();
-
-        if (!source) {
-          // Tip: 用户没有传入 source 的时候使用图层的默认数据
-          var _ref = layer.sourceOption || layer.defaultSourceConfig,
-              data = _ref.data,
-              options = _ref.options;
-
-          source = new _l7Source.default(data, options);
-          layer.setSource(source);
-        }
-
-        if (source.inited) {
-          _this.updateClusterData(layer);
-        } else {
-          source.once('update', function () {
-            _this.updateClusterData(layer);
-          });
-        }
-      }); // 检测数据是否需要更新
-
-      layer.hooks.beforeRenderData.tap('DataSourcePlugin', function () {
-        var neeUpdateCluster = _this.updateClusterData(layer);
-
-        var dataSourceNeedUpdate = layer.dataState.dataSourceNeedUpdate;
-        layer.dataState.dataSourceNeedUpdate = false;
-        return neeUpdateCluster || dataSourceNeedUpdate;
-      });
+      layer.hooks.init.tapPromise('DataSourcePlugin', /*#__PURE__*/(0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee() {
+        var source, _ref2, data, options;
+
+        return _regenerator.default.wrap(function _callee$(_context) {
+          while (1) {
+            switch (_context.prev = _context.next) {
+              case 0:
+                source = layer.getSource();
+
+                if (source) {
+                  _context.next = 6;
+                  break;
+                }
+
+                // Tip: 用户没有传入 source 的时候使用图层的默认数据
+                _ref2 = layer.sourceOption || layer.defaultSourceConfig, data = _ref2.data, options = _ref2.options;
+                source = new _l7Source.default(data, options);
+                _context.next = 6;
+                return new Promise(function (resolve) {
+                  source.on('update', function (e) {
+                    if (e.type === 'inited') {
+                      layer.initSource(source);
+                    }
+
+                    resolve(null);
+                  });
+                });
+
+              case 6:
+                if (source.inited) {
+                  _this.updateClusterData(layer);
+                } else {
+                  source.once('update', function () {
+                    _this.updateClusterData(layer);
+                  });
+                }
+
+              case 7:
+              case "end":
+                return _context.stop();
+            }
+          }
+        }, _callee);
+      }))); // 检测数据是否需要更新
+
+      layer.hooks.beforeRenderData.tapPromise('DataSourcePlugin', /*#__PURE__*/(0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee2() {
+        var neeUpdateCluster, dataSourceNeedUpdate;
+        return _regenerator.default.wrap(function _callee2$(_context2) {
+          while (1) {
+            switch (_context2.prev = _context2.next) {
+              case 0:
+                neeUpdateCluster = _this.updateClusterData(layer);
+                dataSourceNeedUpdate = layer.dataState.dataSourceNeedUpdate;
+                layer.dataState.dataSourceNeedUpdate = false;
+                return _context2.abrupt("return", neeUpdateCluster || dataSourceNeedUpdate);
+
+              case 4:
+              case "end":
+                return _context2.stop();
+            }
+          }
+        }, _callee2);
+      })));
     }
   }, {
     key: "updateClusterData",
     value: function updateClusterData(layer) {
       // Tip: 矢量瓦片不需要进行聚合操作
-      if (layer.isTileLayer || layer.tileLayer) return false;
+      if (layer.isTileLayer || layer.tileLayer || !layer.getSource()) {
+        return false;
+      }
+
       var source = layer.getSource();
       var cluster = source.cluster;
       var _source$clusterOption = source.clusterOptions.zoom,

package/lib/plugins/FeatureScalePlugin.js

@@ -9,8 +9,12 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.default = void 0;
 
+var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"));
+
 var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
 
+var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
+
 var _classCallCheck2 = _interopRequireDefault(require("@babel/runtime/helpers/classCallCheck"));
 
 var _createClass2 = _interopRequireDefault(require("@babel/runtime/helpers/createClass"));
@@ -68,39 +72,80 @@ var FeatureScalePlugin = (_dec = (0, _inversify.injectable)(), _dec(_class = /*#
       var _this = this;
 
       var styleAttributeService = _ref.styleAttributeService;
-      layer.hooks.init.tap('FeatureScalePlugin', function () {
-        _this.scaleOptions = layer.getScaleOptions();
-        var attributes = styleAttributeService.getLayerStyleAttributes();
+      layer.hooks.init.tapPromise('FeatureScalePlugin', /*#__PURE__*/(0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee() {
+        var _layer$getSource;
+
+        var attributes, dataArray;
+        return _regenerator.default.wrap(function _callee$(_context) {
+          while (1) {
+            switch (_context.prev = _context.next) {
+              case 0:
+                _this.scaleOptions = layer.getScaleOptions();
+                attributes = styleAttributeService.getLayerStyleAttributes();
+                dataArray = (_layer$getSource = layer.getSource()) === null || _layer$getSource === void 0 ? void 0 : _layer$getSource.data.dataArray;
+
+                if (!(Array.isArray(dataArray) && dataArray.length === 0)) {
+                  _context.next = 7;
+                  break;
+                }
 
-        _this.getSourceData(layer, function (_ref2) {
-          var dataArray = _ref2.dataArray;
+                return _context.abrupt("return");
 
-          if (Array.isArray(dataArray) && dataArray.length === 0) {
-            return;
-          } else {
-            _this.caculateScalesForAttributes(attributes || [], dataArray);
+              case 7:
+                _this.caculateScalesForAttributes(attributes || [], dataArray);
+
+              case 8:
+              case "end":
+                return _context.stop();
+            }
           }
-        });
-      }); // 检测数据是否需要更新
+        }, _callee);
+      }))); // 检测数据是否需要更新
+
+      layer.hooks.beforeRenderData.tapPromise('FeatureScalePlugin', /*#__PURE__*/function () {
+        var _ref3 = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee2(flag) {
+          var attributes, dataArray;
+          return _regenerator.default.wrap(function _callee2$(_context2) {
+            while (1) {
+              switch (_context2.prev = _context2.next) {
+                case 0:
+                  if (flag) {
+                    _context2.next = 2;
+                    break;
+                  }
 
-      layer.hooks.beforeRenderData.tap('FeatureScalePlugin', function () {
-        _this.scaleOptions = layer.getScaleOptions();
-        var attributes = styleAttributeService.getLayerStyleAttributes();
+                  return _context2.abrupt("return", flag);
 
-        _this.getSourceData(layer, function (_ref3) {
-          var dataArray = _ref3.dataArray;
+                case 2:
+                  _this.scaleOptions = layer.getScaleOptions();
+                  attributes = styleAttributeService.getLayerStyleAttributes();
+                  dataArray = layer.getSource().data.dataArray;
 
-          if (Array.isArray(dataArray) && dataArray.length === 0) {
-            return;
-          }
+                  if (!(Array.isArray(dataArray) && dataArray.length === 0)) {
+                    _context2.next = 7;
+                    break;
+                  }
 
-          _this.caculateScalesForAttributes(attributes || [], dataArray);
+                  return _context2.abrupt("return");
 
-          layer.layerModelNeedUpdate = true;
-        });
+                case 7:
+                  _this.caculateScalesForAttributes(attributes || [], dataArray);
 
-        return true;
-      });
+                  layer.layerModelNeedUpdate = true;
+                  return _context2.abrupt("return", true);
+
+                case 10:
+                case "end":
+                  return _context2.stop();
+              }
+            }
+          }, _callee2);
+        }));
+
+        return function (_x) {
+          return _ref3.apply(this, arguments);
+        };
+      }());
       layer.hooks.beforeRender.tap('FeatureScalePlugin', function () {
         var _layer$getLayerConfig = layer.getLayerConfig(),
             usage = _layer$getLayerConfig.usage;
@@ -111,23 +156,20 @@ var FeatureScalePlugin = (_dec = (0, _inversify.injectable)(), _dec(_class = /*#
 
         _this.scaleOptions = layer.getScaleOptions();
         var attributes = styleAttributeService.getLayerStyleAttributes();
+        var dataArray = layer.getSource().data.dataArray;
 
-        if (attributes) {
-          _this.getSourceData(layer, function (_ref4) {
-            var dataArray = _ref4.dataArray;
-
-            if (dataArray.length === 0) {
-              return;
-            }
-
-            var attributesToRescale = attributes.filter(function (attribute) {
-              return attribute.needRescale;
-            });
+        if (Array.isArray(dataArray) && dataArray.length === 0) {
+          return;
+        }
 
-            if (attributesToRescale.length) {
-              _this.caculateScalesForAttributes(attributesToRescale, dataArray);
-            }
+        if (attributes) {
+          var attributesToRescale = attributes.filter(function (attribute) {
+            return attribute.needRescale;
           });
+
+          if (attributesToRescale.length) {
+            _this.caculateScalesForAttributes(attributesToRescale, dataArray);
+          }
         }
       });
     }
@@ -331,12 +373,12 @@ var FeatureScalePlugin = (_dec = (0, _inversify.injectable)(), _dec(_class = /*#
 
   }, {
     key: "createDefaultScale",
-    value: function createDefaultScale(_ref5) {
-      var type = _ref5.type,
-          domain = _ref5.domain,
-          unknown = _ref5.unknown,
-          clamp = _ref5.clamp,
-          nice = _ref5.nice;
+    value: function createDefaultScale(_ref4) {
+      var type = _ref4.type,
+          domain = _ref4.domain,
+          unknown = _ref4.unknown,
+          clamp = _ref4.clamp,
+          nice = _ref4.nice;
       // @ts-ignore
       var scale = scaleMap[type]();
 

package/lib/plugins/LayerAnimateStylePlugin.js

@@ -30,9 +30,12 @@ var LayerAnimateStylePlugin = (_dec = (0, _inversify.injectable)(), _dec(_class
       layer.hooks.beforeRender.tap('LayerAnimateStylePlugin', function () {
         // @ts-ignore
         var animateStatus = layer.animateStatus;
-        animateStatus && layer.models.forEach(function (model) {
-          model.addUniforms((0, _objectSpread2.default)({}, layer.layerModel.getAnimateUniforms()));
-        });
+
+        if (animateStatus) {
+          layer.models.forEach(function (model) {
+            model.addUniforms((0, _objectSpread2.default)({}, layer.layerModel.getAnimateUniforms()));
+          });
+        }
       });
     }
   }]);

package/lib/plugins/LayerModelPlugin.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"));
@@ -15,6 +19,8 @@ var _inversify = require("inversify");
 
 require("reflect-metadata");
 
+var _BaseLayer = _interopRequireDefault(require("../tile/tileLayer/BaseLayer"));
+
 var _dec, _class;
 
 var LayerModelPlugin = (
@@ -28,54 +34,138 @@ _dec = (0, _inversify.injectable)(), _dec(_class = /*#__PURE__*/function () {
 
   (0, _createClass2.default)(LayerModelPlugin, [{
     key: "initLayerModel",
-    value: function initLayerModel(layer) {
-      // 更新Model 配置项
-      layer.prepareBuildModel(); // 初始化 Model
-
-      layer.buildModels();
-      layer.styleNeedUpdate = false;
-    }
+    value: function () {
+      var _initLayerModel = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee(layer) {
+        return _regenerator.default.wrap(function _callee$(_context) {
+          while (1) {
+            switch (_context.prev = _context.next) {
+              case 0:
+                // 更新Model 配置项
+                layer.prepareBuildModel(); // 初始化 Model
+
+                _context.next = 3;
+                return layer.buildModels();
+
+              case 3:
+                layer.styleNeedUpdate = false;
+
+              case 4:
+              case "end":
+                return _context.stop();
+            }
+          }
+        }, _callee);
+      }));
+
+      function initLayerModel(_x) {
+        return _initLayerModel.apply(this, arguments);
+      }
+
+      return initLayerModel;
+    }()
   }, {
     key: "prepareLayerModel",
-    value: function prepareLayerModel(layer) {
-      var _layer$layerModel;
-
-      // 更新Model 配置项
-      layer.prepareBuildModel(); // clear layerModel resource
-
-      (_layer$layerModel = layer.layerModel) === null || _layer$layerModel === void 0 ? void 0 : _layer$layerModel.clearModels(); // 初始化 Model
-
-      layer.buildModels();
-      layer.layerModelNeedUpdate = false;
-    }
+    value: function () {
+      var _prepareLayerModel = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee2(layer) {
+        return _regenerator.default.wrap(function _callee2$(_context2) {
+          while (1) {
+            switch (_context2.prev = _context2.next) {
+              case 0:
+                // 更新Model 配置项
+                layer.prepareBuildModel(); // clear layerModel resource
+                // 初始化 Model
+
+                _context2.next = 3;
+                return layer.buildModels();
+
+              case 3:
+                layer.layerModelNeedUpdate = false;
+
+              case 4:
+              case "end":
+                return _context2.stop();
+            }
+          }
+        }, _callee2);
+      }));
+
+      function prepareLayerModel(_x2) {
+        return _prepareLayerModel.apply(this, arguments);
+      }
+
+      return prepareLayerModel;
+    }()
   }, {
     key: "apply",
     value: function apply(layer) {
       var _this = this;
 
-      layer.hooks.init.tap('LayerModelPlugin', function () {
-        layer.inited = true;
-        layer.modelLoaded = false;
-        var source = layer.getSource();
-
-        if (source.inited) {
-          _this.initLayerModel(layer);
-        }
-      });
-      layer.hooks.beforeRenderData.tap('DataSourcePlugin', function () {
-        var source = layer.getSource();
-        layer.modelLoaded = false;
-
-        if (source.inited) {
-          _this.prepareLayerModel(layer);
-        } else {
-          source.once('update', function () {
-            _this.prepareLayerModel(layer);
-          });
-        }
-
-        return false;
-      });
+      layer.hooks.init.tapPromise('LayerModelPlugin', /*#__PURE__*/(0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee3() {
+        return _regenerator.default.wrap(function _callee3$(_context3) {
+          while (1) {
+            switch (_context3.prev = _context3.next) {
+              case 0:
+                if (!layer.getSource().isTile) {
+                  _context3.next = 4;
+                  break;
+                }
+
+                layer.prepareBuildModel();
+                layer.tileLayer = new _BaseLayer.default(layer);
+                return _context3.abrupt("return");
+
+              case 4:
+                _context3.next = 6;
+                return _this.initLayerModel(layer);
+
+              case 6:
+              case "end":
+                return _context3.stop();
+            }
+          }
+        }, _callee3);
+      })));
+      layer.hooks.beforeRenderData.tapPromise('LayerModelPlugin', /*#__PURE__*/function () {
+        var _ref2 = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee4(flag) {
+          return _regenerator.default.wrap(function _callee4$(_context4) {
+            while (1) {
+              switch (_context4.prev = _context4.next) {
+                case 0:
+                  if (flag) {
+                    _context4.next = 2;
+                    break;
+                  }
+
+                  return _context4.abrupt("return", false);
+
+                case 2:
+                  if (!layer.getSource().isTile) {
+                    _context4.next = 5;
+                    break;
+                  }
+
+                  layer.tileLayer = new _BaseLayer.default(layer);
+                  return _context4.abrupt("return");
+
+                case 5:
+                  _context4.next = 7;
+                  return _this.prepareLayerModel(layer);
+
+                case 7:
+                  return _context4.abrupt("return", true);
+
+                case 8:
+                case "end":
+                  return _context4.stop();
+              }
+            }
+          }, _callee4);
+        }));
+
+        return function (_x3) {
+          return _ref2.apply(this, arguments);
+        };
+      }());
     }
   }]);
   return LayerModelPlugin;

package/lib/plugins/LayerStylePlugin.js

@@ -30,17 +30,12 @@ _dec = (0, _inversify.injectable)(), _dec(_class = /*#__PURE__*/function () {
     key: "apply",
     value: function apply(layer) {
       layer.hooks.afterInit.tap('LayerStylePlugin', function () {
-        // 更新图层默认状态
-        layer.updateLayerConfig({});
-
         var _layer$getLayerConfig = layer.getLayerConfig(),
             autoFit = _layer$getLayerConfig.autoFit,
             fitBoundsOptions = _layer$getLayerConfig.fitBoundsOptions;
 
         if (autoFit) {
-          setTimeout(function () {
-            layer.fitBounds(fitBoundsOptions);
-          }, 100);
+          layer.fitBounds(fitBoundsOptions);
         }
       });
     }

package/lib/plugins/MultiPassRendererPlugin.js

@@ -46,7 +46,7 @@ _dec = (0, _inversify.injectable)(), _dec(_class = /*#__PURE__*/function () {
       var rendererService = _ref.rendererService,
           postProcessingPassFactory = _ref.postProcessingPassFactory,
           normalPassFactory = _ref.normalPassFactory;
-      layer.hooks.init.tap('MultiPassRendererPlugin', function () {
+      layer.hooks.init.tapPromise('MultiPassRendererPlugin', function () {
         var _layer$getLayerConfig = layer.getLayerConfig(),
             enableMultiPassRenderer = _layer$getLayerConfig.enableMultiPassRenderer,
             _layer$getLayerConfig2 = _layer$getLayerConfig.passes,

package/lib/plugins/PixelPickingPlugin.js

@@ -36,7 +36,7 @@ var PixelPickingPlugin = (_dec = (0, _inversify.injectable)(), _dec(_class = /*#
     value: function apply(layer, _ref) {
       var styleAttributeService = _ref.styleAttributeService;
       // TODO: 由于 Shader 目前无法根据是否开启拾取进行内容修改，因此即使不开启也需要生成 a_PickingColor
-      layer.hooks.init.tap('PixelPickingPlugin', function () {
+      layer.hooks.init.tapPromise('PixelPickingPlugin', function () {
         var _layer$getLayerConfig = layer.getLayerConfig(),
             enablePicking = _layer$getLayerConfig.enablePicking;
 

package/lib/plugins/RegisterStyleAttributePlugin.js

@@ -36,9 +36,11 @@ _dec = (0, _inversify.injectable)(), _dec(_class = /*#__PURE__*/function () {
       var _this = this;
 
       var styleAttributeService = _ref.styleAttributeService;
-      layer.hooks.init.tap('RegisterStyleAttributePlugin', function () {
+      layer.hooks.init.tapPromise('RegisterStyleAttributePlugin', function () {
         // 过滤 tileGroup layer （瓦片图层不需要注册）
-        if ((0, _utils.isTileGroup)(layer)) return;
+        if ((0, _utils.isTileGroup)(layer)) {
+          return;
+        }
 
         _this.registerBuiltinAttributes(styleAttributeService, layer);
       });
@@ -50,21 +52,6 @@ _dec = (0, _inversify.injectable)(), _dec(_class = /*#__PURE__*/function () {
       if (layer.type === 'MaskLayer') {
         this.registerPositionAttribute(styleAttributeService);
         return;
-      } // 用途为 basemap 的 Layer 也只需要注册 a_Position
-
-
-      var _layer$getLayerConfig = layer.getLayerConfig(),
-          usage = _layer$getLayerConfig.usage;
-
-      if (usage === 'basemap') {
-        this.registerPositionAttribute(styleAttributeService);
-        return;
-      }
-
-      if (layer.isTileLayer) {
-        this.registerPositionAttribute(styleAttributeService);
-        this.registerColorAttribute(styleAttributeService);
-        return;
       } // Tip: normal render layer
 
 

package/lib/plugins/ShaderUniformPlugin.js

@@ -90,8 +90,13 @@ _dec = (0, _inversify.injectable)(), _dec2 = (0, _inversify.inject)(_l7Core.TYPE
   }, {
     key: "setLayerCenter",
     value: function setLayerCenter(layer) {
-      if (layer.coordCenter === undefined) layer.coordCenter = layer.getSource().center;
-      this.mapService.setCoordCenter && this.mapService.setCoordCenter(layer.coordCenter);
+      if (layer.coordCenter === undefined) {
+        layer.coordCenter = layer.getSource().center;
+      }
+
+      if (this.mapService.setCoordCenter) {
+        this.mapService.setCoordCenter(layer.coordCenter);
+      }
     }
   }]);
   return ShaderUniformPlugin;

package/lib/plugins/UpdateStyleAttributePlugin.js

@@ -32,7 +32,7 @@ _dec = (0, _inversify.injectable)(), _dec(_class = /*#__PURE__*/function () {
       var _this = this;
 
       var styleAttributeService = _ref.styleAttributeService;
-      layer.hooks.init.tap('UpdateStyleAttributePlugin', function () {
+      layer.hooks.init.tapPromise('UpdateStyleAttributePlugin', function () {
         _this.initStyleAttribute(layer, {
           styleAttributeService: styleAttributeService
         });
@@ -41,13 +41,16 @@ _dec = (0, _inversify.injectable)(), _dec(_class = /*#__PURE__*/function () {
         var _layer$getLayerConfig = layer.getLayerConfig(),
             usage = _layer$getLayerConfig.usage;
 
-        if (layer.layerModelNeedUpdate || layer.tileLayer || usage === 'basemap') {
+        if (layer.layerModelNeedUpdate || layer.tileLayer || usage === 'basemap' // TODO: Chore 不走该流程 应从外部统一控制，而不是打补丁
+        ) {
           return;
         }
 
-        layer.modelLoaded && _this.updateStyleAttribute(layer, {
-          styleAttributeService: styleAttributeService
-        });
+        if (layer.inited) {
+          _this.updateStyleAttribute(layer, {
+            styleAttributeService: styleAttributeService
+          });
+        }
       });
     }
   }, {