@antv/l7-layers 2.10.3 → 2.10.4

package/lib/plugins/FeatureScalePlugin.js

@@ -9,12 +9,8 @@ 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"));
@@ -54,106 +50,84 @@ var FeatureScalePlugin = (_dec = (0, _inversify.injectable)(), _dec(_class = /*#
   }
 
   (0, _createClass2.default)(FeatureScalePlugin, [{
+    key: "getSourceData",
+    value: function getSourceData(layer, callback) {
+      var source = layer.getSource();
+
+      if (source.inited) {
+        callback(source.data);
+      } else {
+        source.once('update', function () {
+          callback(source.data);
+        });
+      }
+    }
+  }, {
     key: "apply",
     value: function apply(layer, _ref) {
       var _this = this;
 
       var styleAttributeService = _ref.styleAttributeService;
-      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;
-                }
-
-                return _context.abrupt("return");
+      layer.hooks.init.tap('FeatureScalePlugin', function () {
+        _this.scaleOptions = layer.getScaleOptions();
+        var attributes = styleAttributeService.getLayerStyleAttributes();
 
-              case 7:
-                _this.caculateScalesForAttributes(attributes || [], dataArray);
+        _this.getSourceData(layer, function (_ref2) {
+          var dataArray = _ref2.dataArray;
 
-              case 8:
-              case "end":
-                return _context.stop();
-            }
+          if (Array.isArray(dataArray) && dataArray.length === 0) {
+            return;
+          } else {
+            _this.caculateScalesForAttributes(attributes || [], dataArray);
           }
-        }, _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;
-                  }
+        });
+      }); // 检测数据是否需要更新
 
-                  return _context2.abrupt("return", flag);
-
-                case 2:
-                  _this.scaleOptions = layer.getScaleOptions();
-                  attributes = styleAttributeService.getLayerStyleAttributes();
-                  dataArray = layer.getSource().data.dataArray;
-
-                  if (!(Array.isArray(dataArray) && dataArray.length === 0)) {
-                    _context2.next = 7;
-                    break;
-                  }
+      layer.hooks.beforeRenderData.tap('FeatureScalePlugin', function () {
+        _this.scaleOptions = layer.getScaleOptions();
+        var attributes = styleAttributeService.getLayerStyleAttributes();
 
-                  return _context2.abrupt("return", true);
+        _this.getSourceData(layer, function (_ref3) {
+          var dataArray = _ref3.dataArray;
 
-                case 7:
-                  _this.caculateScalesForAttributes(attributes || [], dataArray);
+          if (Array.isArray(dataArray) && dataArray.length === 0) {
+            return;
+          }
 
-                  layer.layerModelNeedUpdate = true;
-                  return _context2.abrupt("return", true);
+          _this.caculateScalesForAttributes(attributes || [], dataArray);
 
-                case 10:
-                case "end":
-                  return _context2.stop();
-              }
-            }
-          }, _callee2);
-        }));
+          layer.layerModelNeedUpdate = true;
+        });
 
-        return function (_x) {
-          return _ref3.apply(this, arguments);
-        };
-      }());
+        return true;
+      });
       layer.hooks.beforeRender.tap('FeatureScalePlugin', function () {
-        if (layer.layerModelNeedUpdate) {
+        var _layer$getLayerConfig = layer.getLayerConfig(),
+            usage = _layer$getLayerConfig.usage;
+
+        if (layer.layerModelNeedUpdate || usage === 'basemap') {
           return;
         }
 
         _this.scaleOptions = layer.getScaleOptions();
         var attributes = styleAttributeService.getLayerStyleAttributes();
-        var dataArray = layer.getSource().data.dataArray;
-
-        if (Array.isArray(dataArray) && dataArray.length === 0) {
-          return;
-        }
 
         if (attributes) {
-          var attributesToRescale = attributes.filter(function (attribute) {
-            return attribute.needRescale;
-          });
+          _this.getSourceData(layer, function (_ref4) {
+            var dataArray = _ref4.dataArray;
 
-          if (attributesToRescale.length) {
-            _this.caculateScalesForAttributes(attributesToRescale, dataArray);
-          }
+            if (dataArray.length === 0) {
+              return;
+            }
+
+            var attributesToRescale = attributes.filter(function (attribute) {
+              return attribute.needRescale;
+            });
+
+            if (attributesToRescale.length) {
+              _this.caculateScalesForAttributes(attributesToRescale, dataArray);
+            }
+          });
         }
       });
     }
@@ -357,12 +331,12 @@ var FeatureScalePlugin = (_dec = (0, _inversify.injectable)(), _dec(_class = /*#
 
   }, {
     key: "createDefaultScale",
-    value: function createDefaultScale(_ref4) {
-      var type = _ref4.type,
-          domain = _ref4.domain,
-          unknown = _ref4.unknown,
-          clamp = _ref4.clamp,
-          nice = _ref4.nice;
+    value: function createDefaultScale(_ref5) {
+      var type = _ref5.type,
+          domain = _ref5.domain,
+          unknown = _ref5.unknown,
+          clamp = _ref5.clamp,
+          nice = _ref5.nice;
       // @ts-ignore
       var scale = scaleMap[type]();
 

package/lib/plugins/LayerModelPlugin.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"));
@@ -19,8 +15,6 @@ var _inversify = require("inversify");
 
 require("reflect-metadata");
 
-var _BaseLayer = _interopRequireDefault(require("../tile/tileLayer/BaseLayer"));
-
 var _dec, _class;
 
 var LayerModelPlugin = (
@@ -34,135 +28,54 @@ _dec = (0, _inversify.injectable)(), _dec(_class = /*#__PURE__*/function () {
 
   (0, _createClass2.default)(LayerModelPlugin, [{
     key: "initLayerModel",
-    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;
-    }()
+    value: function initLayerModel(layer) {
+      // 更新Model 配置项
+      layer.prepareBuildModel(); // 初始化 Model
+
+      layer.buildModels();
+      layer.styleNeedUpdate = false;
+    }
   }, {
     key: "prepareLayerModel",
-    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:
-              case "end":
-                return _context2.stop();
-            }
-          }
-        }, _callee2);
-      }));
-
-      function prepareLayerModel(_x2) {
-        return _prepareLayerModel.apply(this, arguments);
-      }
-
-      return 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;
+    }
   }, {
     key: "apply",
     value: function apply(layer) {
       var _this = this;
 
-      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", false);
-
-                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);
-        };
-      }());
+      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;
+      });
     }
   }]);
   return LayerModelPlugin;

package/lib/plugins/LayerStylePlugin.js

@@ -30,12 +30,17 @@ _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) {
-          layer.fitBounds(fitBoundsOptions);
+          setTimeout(function () {
+            layer.fitBounds(fitBoundsOptions);
+          }, 100);
         }
       });
     }

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.tapPromise('MultiPassRendererPlugin', function () {
+      layer.hooks.init.tap('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.tapPromise('PixelPickingPlugin', function () {
+      layer.hooks.init.tap('PixelPickingPlugin', function () {
         var _layer$getLayerConfig = layer.getLayerConfig(),
             enablePicking = _layer$getLayerConfig.enablePicking;
 

package/lib/plugins/RegisterStyleAttributePlugin.js

@@ -36,7 +36,7 @@ _dec = (0, _inversify.injectable)(), _dec(_class = /*#__PURE__*/function () {
       var _this = this;
 
       var styleAttributeService = _ref.styleAttributeService;
-      layer.hooks.init.tapPromise('RegisterStyleAttributePlugin', function () {
+      layer.hooks.init.tap('RegisterStyleAttributePlugin', function () {
         // 过滤 tileGroup layer （瓦片图层不需要注册）
         if ((0, _utils.isTileGroup)(layer)) {
           return;
@@ -52,6 +52,21 @@ _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/UpdateModelPlugin.js

@@ -35,9 +35,6 @@ _dec = (0, _inversify.injectable)(), _dec(_class = /*#__PURE__*/function () {
           layer.layerModel.needUpdate();
         }
       });
-      layer.hooks.afterRender.tap('UpdateModelPlugin', function () {
-        layer.layerModelNeedUpdate = false;
-      });
     }
   }]);
   return UpdateModelPlugin;

package/lib/plugins/UpdateStyleAttributePlugin.js

@@ -32,17 +32,20 @@ _dec = (0, _inversify.injectable)(), _dec(_class = /*#__PURE__*/function () {
       var _this = this;
 
       var styleAttributeService = _ref.styleAttributeService;
-      layer.hooks.init.tapPromise('UpdateStyleAttributePlugin', function () {
+      layer.hooks.init.tap('UpdateStyleAttributePlugin', function () {
         _this.initStyleAttribute(layer, {
           styleAttributeService: styleAttributeService
         });
       });
       layer.hooks.beforeRender.tap('UpdateStyleAttributePlugin', function () {
-        if (layer.layerModelNeedUpdate) {
+        var _layer$getLayerConfig = layer.getLayerConfig(),
+            usage = _layer$getLayerConfig.usage;
+
+        if (layer.layerModelNeedUpdate || layer.tileLayer || usage === 'basemap') {
           return;
         }
 
-        if (layer.inited) {
+        if (layer.modelLoaded) {
           _this.updateStyleAttribute(layer, {
             styleAttributeService: styleAttributeService
           });

package/lib/point/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"));
@@ -27,6 +23,8 @@ var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/de
 
 var _BaseLayer2 = _interopRequireDefault(require("../core/BaseLayer"));
 
+var _utils = require("../tile/utils");
+
 var _index = _interopRequireDefault(require("./models/index"));
 
 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; } } }; }
@@ -70,57 +68,24 @@ var PointLayer = /*#__PURE__*/function (_BaseLayer) {
 
   (0, _createClass2.default)(PointLayer, [{
     key: "buildModels",
-    value: function () {
-      var _buildModels = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee() {
-        var modelType;
-        return _regenerator.default.wrap(function _callee$(_context) {
-          while (1) {
-            switch (_context.prev = _context.next) {
-              case 0:
-                modelType = this.getModelType();
-                this.layerModel = new _index.default[modelType](this);
-                _context.next = 4;
-                return this.initLayerModels();
-
-              case 4:
-              case "end":
-                return _context.stop();
-            }
-          }
-        }, _callee, this);
-      }));
+    value: function buildModels() {
+      var _this2 = this;
 
-      function buildModels() {
-        return _buildModels.apply(this, arguments);
-      }
-
-      return buildModels;
-    }()
+      var modelType = this.getModelType();
+      this.layerModel = new _index.default[modelType](this);
+      this.layerModel.initModels(function (models) {
+        _this2.dispatchModelLoad(models);
+      });
+    }
   }, {
     key: "rebuildModels",
-    value: function () {
-      var _rebuildModels = (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:
-                _context2.next = 2;
-                return this.buildModels();
-
-              case 2:
-              case "end":
-                return _context2.stop();
-            }
-          }
-        }, _callee2, this);
-      }));
-
-      function rebuildModels() {
-        return _rebuildModels.apply(this, arguments);
-      }
+    value: function rebuildModels() {
+      var _this3 = this;
 
-      return rebuildModels;
-    }()
+      this.layerModel.buildModels(function (models) {
+        _this3.dispatchModelLoad(models);
+      });
+    }
     /**
      * 在未传入数据的时候判断点图层的 shape 类型
      * @returns
@@ -143,10 +108,6 @@ var PointLayer = /*#__PURE__*/function (_BaseLayer) {
           return 'fill';
         }
 
-        if (values === 'text') {
-          return 'text';
-        }
-
         if (values && values instanceof Array) {
           var _iterator = _createForOfIteratorHelper(values),
               _step;
@@ -188,6 +149,7 @@ var PointLayer = /*#__PURE__*/function (_BaseLayer) {
         text: {
           blend: 'normal'
         },
+        vectorPoint: {},
         tile: {},
         tileText: {},
         earthFill: {},
@@ -198,7 +160,13 @@ var PointLayer = /*#__PURE__*/function (_BaseLayer) {
   }, {
     key: "getModelType",
     value: function getModelType() {
-      //  2D、 3d、 shape、image、text、normal、
+      var parserType = this.layerSource.getParserType();
+
+      if ((0, _utils.isVectorTile)(parserType)) {
+        return 'vectorPoint';
+      } //  2D、 3d、 shape、image、text、normal、
+
+
       var layerData = this.getEncodedData();
 
       var _this$getLayerConfig2 = this.getLayerConfig(),