@antv/l7-layers 2.10.3 → 2.10.5

package/es/plugins/FeatureScalePlugin.js

@@ -1,12 +1,10 @@
 import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
-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 _defineProperty from "@babel/runtime/helpers/esm/defineProperty";
 
 var _scaleMap, _dec, _class;
 
-import _regeneratorRuntime from "@babel/runtime/regenerator";
 import { ScaleTypes, StyleScaleType } from '@antv/l7-core';
 import { extent } from 'd3-array';
 import * as d3interpolate from 'd3-interpolate';
@@ -28,106 +26,84 @@ var FeatureScalePlugin = (_dec = injectable(), _dec(_class = /*#__PURE__*/functi
   }
 
   _createClass(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__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee() {
-        var _layer$getSource;
-
-        var attributes, dataArray;
-        return _regeneratorRuntime.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 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee2(flag) {
-          var attributes, dataArray;
-          return _regeneratorRuntime.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);
+            }
+          });
         }
       });
     }
@@ -331,12 +307,12 @@ var FeatureScalePlugin = (_dec = injectable(), _dec(_class = /*#__PURE__*/functi
 
   }, {
     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/es/plugins/LayerModelPlugin.d.ts

@@ -4,7 +4,7 @@ import 'reflect-metadata';
  * Layer Model 初始化，更新，销毁
  */
 export default class LayerModelPlugin implements ILayerPlugin {
-    initLayerModel(layer: ILayer): Promise<void>;
-    prepareLayerModel(layer: ILayer): Promise<void>;
+    initLayerModel(layer: ILayer): void;
+    prepareLayerModel(layer: ILayer): void;
     apply(layer: ILayer): void;
 }

package/es/plugins/LayerModelPlugin.js

@@ -1,13 +1,10 @@
-import _asyncToGenerator from "@babel/runtime/helpers/esm/asyncToGenerator";
 import _classCallCheck from "@babel/runtime/helpers/esm/classCallCheck";
 import _createClass from "@babel/runtime/helpers/esm/createClass";
 
 var _dec, _class;
 
-import _regeneratorRuntime from "@babel/runtime/regenerator";
 import { injectable } from 'inversify';
 import 'reflect-metadata';
-import TileLayer from "../tile/tileLayer/BaseLayer";
 /**
  * Layer Model 初始化，更新，销毁
  */
@@ -19,135 +16,54 @@ var LayerModelPlugin = (_dec = injectable(), _dec(_class = /*#__PURE__*/function
 
   _createClass(LayerModelPlugin, [{
     key: "initLayerModel",
-    value: function () {
-      var _initLayerModel = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee(layer) {
-        return _regeneratorRuntime.wrap(function _callee$(_context) {
-          while (1) {
-            switch (_context.prev = _context.next) {
-              case 0:
-                // 更新Model 配置项
-                layer.prepareBuildModel(); // 初始化 Model
+    value: function initLayerModel(layer) {
+      // 更新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;
-    }()
+      layer.buildModels();
+      layer.styleNeedUpdate = false;
+    }
   }, {
     key: "prepareLayerModel",
-    value: function () {
-      var _prepareLayerModel = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee2(layer) {
-        return _regeneratorRuntime.wrap(function _callee2$(_context2) {
-          while (1) {
-            switch (_context2.prev = _context2.next) {
-              case 0:
-                // 更新Model 配置项
-                layer.prepareBuildModel(); // clear layerModel resource
-                // 初始化 Model
+    value: function prepareLayerModel(layer) {
+      var _layer$layerModel;
 
-                _context2.next = 3;
-                return layer.buildModels();
+      // 更新Model 配置项
+      layer.prepareBuildModel(); // clear layerModel resource
 
-              case 3:
-              case "end":
-                return _context2.stop();
-            }
-          }
-        }, _callee2);
-      }));
+      (_layer$layerModel = layer.layerModel) === null || _layer$layerModel === void 0 ? void 0 : _layer$layerModel.clearModels(); // 初始化 Model
 
-      function prepareLayerModel(_x2) {
-        return _prepareLayerModel.apply(this, arguments);
-      }
-
-      return prepareLayerModel;
-    }()
+      layer.buildModels();
+      layer.layerModelNeedUpdate = false;
+    }
   }, {
     key: "apply",
     value: function apply(layer) {
       var _this = this;
 
-      layer.hooks.init.tapPromise('LayerModelPlugin', /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee3() {
-        return _regeneratorRuntime.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 TileLayer(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 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee4(flag) {
-          return _regeneratorRuntime.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 TileLayer(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;
+      });
     }
   }]);
 

package/es/plugins/LayerStylePlugin.js

@@ -18,12 +18,17 @@ var LayerStylePlugin = (_dec = 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/es/plugins/MultiPassRendererPlugin.js

@@ -33,7 +33,7 @@ var MultiPassRendererPlugin = (_dec = injectable(), _dec(_class = /*#__PURE__*/f
       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/es/plugins/PixelPickingPlugin.js

@@ -22,7 +22,7 @@ var PixelPickingPlugin = (_dec = injectable(), _dec(_class = /*#__PURE__*/functi
     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/es/plugins/RegisterStyleAttributePlugin.js

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

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

package/es/plugins/UpdateStyleAttributePlugin.js

@@ -20,17 +20,20 @@ var UpdateStyleAttributePlugin = (_dec = injectable(), _dec(_class = /*#__PURE__
       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/es/point/index.d.ts

@@ -13,8 +13,8 @@ export default class PointLayer extends BaseLayer<IPointLayerStyleOptions> {
             };
         };
     };
-    buildModels(): Promise<void>;
-    rebuildModels(): Promise<void>;
+    buildModels(): void;
+    rebuildModels(): void;
     /**
      * 在未传入数据的时候判断点图层的 shape 类型
      * @returns
@@ -26,6 +26,6 @@ export default class PointLayer extends BaseLayer<IPointLayerStyleOptions> {
         blend: string;
     } | {} | {} | {
         blend: string;
-    } | {} | {} | {} | {};
-    getModelType(): PointType;
+    } | {} | {} | {} | {} | {};
+    protected getModelType(): PointType;
 }

package/es/point/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";
@@ -13,13 +12,12 @@ function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o =
 
 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; }
 
-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); }; }
 
 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; } }
 
 import BaseLayer from "../core/BaseLayer";
+import { isVectorTile } from "../tile/utils";
 import PointModels from "./models/index";
 
 var PointLayer = /*#__PURE__*/function (_BaseLayer) {
@@ -56,57 +54,24 @@ var PointLayer = /*#__PURE__*/function (_BaseLayer) {
 
   _createClass(PointLayer, [{
     key: "buildModels",
-    value: function () {
-      var _buildModels = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee() {
-        var modelType;
-        return _regeneratorRuntime.wrap(function _callee$(_context) {
-          while (1) {
-            switch (_context.prev = _context.next) {
-              case 0:
-                modelType = this.getModelType();
-                this.layerModel = new PointModels[modelType](this);
-                _context.next = 4;
-                return this.initLayerModels();
-
-              case 4:
-              case "end":
-                return _context.stop();
-            }
-          }
-        }, _callee, this);
-      }));
-
-      function buildModels() {
-        return _buildModels.apply(this, arguments);
-      }
+    value: function buildModels() {
+      var _this2 = this;
 
-      return buildModels;
-    }()
+      var modelType = this.getModelType();
+      this.layerModel = new PointModels[modelType](this);
+      this.layerModel.initModels(function (models) {
+        _this2.dispatchModelLoad(models);
+      });
+    }
   }, {
     key: "rebuildModels",
-    value: function () {
-      var _rebuildModels = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee2() {
-        return _regeneratorRuntime.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);
-      }));
+    value: function rebuildModels() {
+      var _this3 = this;
 
-      function rebuildModels() {
-        return _rebuildModels.apply(this, arguments);
-      }
-
-      return rebuildModels;
-    }()
+      this.layerModel.buildModels(function (models) {
+        _this3.dispatchModelLoad(models);
+      });
+    }
     /**
      * 在未传入数据的时候判断点图层的 shape 类型
      * @returns
@@ -129,10 +94,6 @@ var PointLayer = /*#__PURE__*/function (_BaseLayer) {
           return 'fill';
         }
 
-        if (values === 'text') {
-          return 'text';
-        }
-
         if (values && values instanceof Array) {
           var _iterator = _createForOfIteratorHelper(values),
               _step;
@@ -174,6 +135,7 @@ var PointLayer = /*#__PURE__*/function (_BaseLayer) {
         text: {
           blend: 'normal'
         },
+        vectorPoint: {},
         tile: {},
         tileText: {},
         earthFill: {},
@@ -184,7 +146,13 @@ var PointLayer = /*#__PURE__*/function (_BaseLayer) {
   }, {
     key: "getModelType",
     value: function getModelType() {
-      //  2D、 3d、 shape、image、text、normal、
+      var parserType = this.layerSource.getParserType();
+
+      if (isVectorTile(parserType)) {
+        return 'vectorPoint';
+      } //  2D、 3d、 shape、image、text、normal、
+
+
       var layerData = this.getEncodedData();
 
       var _this$getLayerConfig2 = this.getLayerConfig(),

package/es/point/models/earthExtrude.d.ts

@@ -17,8 +17,8 @@ export default class ExtrudeModel extends BaseModel {
         u_opacitylinear_dir: number;
         u_lightEnable: number;
     };
-    initModels(): Promise<IModel[]>;
-    buildModels(): Promise<IModel[]>;
+    initModels(callbackModel: (models: IModel[]) => void): void;
+    buildModels(callbackModel: (models: IModel[]) => void): void;
     clearModels(): void;
     protected registerBuiltinAttributes(): void;
 }